From 303220a88f90501ae466a88fda10938315e67cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= Date: Wed, 11 Jan 2023 22:51:17 +0100 Subject: [PATCH 1/6] ajout d'un hook pour ajouter des landingpage dans la liste de user_ihm --- htdocs/user/param_ihm.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 3d2e3240ce3..1bd806849b6 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -215,6 +215,14 @@ if (isModEnabled('ticket')) { $tmparray['ticket/list.php?mainmenu=ticket&leftmenu='] = 'Tickets'; } +// Hook for insertion new items in the List of possible landing pages +$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); +if ($reshook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); +} else if ($reshook == 0) { + $tmparray=$hookmanager->resArray; +} + $head = user_prepare_head($object); $title = $langs->trans("User"); From 74a5c91a48238b505dac86fbfe204ce6dc8bdc38 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 11 Jan 2023 21:59:55 +0000 Subject: [PATCH 2/6] Fixing style errors. --- htdocs/user/param_ihm.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 1bd806849b6..81ecdca8e73 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -216,10 +216,10 @@ if (isModEnabled('ticket')) { } // Hook for insertion new items in the List of possible landing pages -$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); +$reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object); if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); -} else if ($reshook == 0) { +} elseif ($reshook == 0) { $tmparray=$hookmanager->resArray; } From 468b8bcab38e0b0ec6bc5f8226bc0758c776c405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= Date: Thu, 12 Jan 2023 19:26:55 +0100 Subject: [PATCH 3/6] correction bug si pas reponse sur le hook --- htdocs/user/param_ihm.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 81ecdca8e73..2f8f4ae24ad 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -216,11 +216,13 @@ if (isModEnabled('ticket')) { } // Hook for insertion new items in the List of possible landing pages -$reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object); -if ($reshook < 0) { - setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); -} elseif ($reshook == 0) { - $tmparray=$hookmanager->resArray; +$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); +if (!empty($reshook)) { + if ($reshook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + } else if ($reshook == 0) { + $tmparray=$hookmanager->resArray; + } } $head = user_prepare_head($object); From c8055715447465066a6a2855fb0958d08d0b8277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= Date: Thu, 12 Jan 2023 19:35:49 +0100 Subject: [PATCH 4/6] correction bug si pas reponse sur le hook --- htdocs/user/param_ihm.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 2f8f4ae24ad..4ee2c318f5e 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -217,14 +217,15 @@ if (isModEnabled('ticket')) { // Hook for insertion new items in the List of possible landing pages $reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); -if (!empty($reshook)) { - if ($reshook < 0) { - setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - } else if ($reshook == 0) { +if ($reshook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); +} else if ($reshook === 0) { + if (count($hookmanager->resArray)!==0) { $tmparray=$hookmanager->resArray; } } + $head = user_prepare_head($object); $title = $langs->trans("User"); From 2f80f873eae389a27dd9851b02b1fdeebf8ae624 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Thu, 12 Jan 2023 18:36:33 +0000 Subject: [PATCH 5/6] Fixing style errors. --- htdocs/user/param_ihm.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 4ee2c318f5e..da8eebacaac 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -216,10 +216,10 @@ if (isModEnabled('ticket')) { } // Hook for insertion new items in the List of possible landing pages -$reshook = $hookmanager->executeHooks('addToLandingPageList',$tmparray,$object); +$reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object); if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); -} else if ($reshook === 0) { +} elseif ($reshook === 0) { if (count($hookmanager->resArray)!==0) { $tmparray=$hookmanager->resArray; } From 317b49917aa7192abc9ae375f807e96731f95292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?= Date: Fri, 13 Jan 2023 23:06:44 +0100 Subject: [PATCH 6/6] correctif hook --- htdocs/user/param_ihm.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index da8eebacaac..136da34e1bd 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -219,13 +219,12 @@ if (isModEnabled('ticket')) { $reshook = $hookmanager->executeHooks('addToLandingPageList', $tmparray, $object); if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); -} elseif ($reshook === 0) { - if (count($hookmanager->resArray)!==0) { - $tmparray=$hookmanager->resArray; - } +} elseif ($reshook > 0) { + $tmparray=$hookmanager->resArray; +} elseif ($reshook == 0) { + $tmparray=array_merge($tmparray, $hookmanager->resArray); } - $head = user_prepare_head($object); $title = $langs->trans("User");