From 7a71d1059adb0dd0e01edd4c5e0ad79f70e55f2e Mon Sep 17 00:00:00 2001 From: "tristan.champomier" Date: Thu, 23 Sep 2021 14:49:57 +0200 Subject: [PATCH] Fixed issue #91 --- .../adminuser/adminuser.php | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/lib/object_coordination/adminuser/adminuser.php b/lib/object_coordination/adminuser/adminuser.php index b355d86..c47b46c 100755 --- a/lib/object_coordination/adminuser/adminuser.php +++ b/lib/object_coordination/adminuser/adminuser.php @@ -992,7 +992,8 @@ function exportAdmin() if ($groupUserId==0) { - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","WrongArgument").$localisation); +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","WrongArgument").$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","WrongArgument")); return ""; } @@ -1005,8 +1006,10 @@ function exportAdmin() /* fin récupération des codes par defaut */ # Récupération des étiquettes du formulaire - $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"AdminUser","execdeleteGroupUserAdmin","")."&groupUserId=".$groupUserId.$localisation); - $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","").$localisation); +// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"AdminUser","execdeleteGroupUserAdmin","")."&groupUserId=".$groupUserId.$localisation); + $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"AdminUser","execdeleteGroupUserAdmin","")."&groupUserId=".$groupUserId); +// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","").$localisation); + $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","")); if ( (in_array($GroupUser->getGroupId(), $MyTreeGroup->getSonArray())) || ($GroupUser->getGroupId()==$groupId) ) { @@ -1039,7 +1042,8 @@ function exportAdmin() return ""; }else{ - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument")); return ""; } ExitBloc(); @@ -1063,7 +1067,8 @@ function exportAdmin() // $localisation = $PagingManager->getCurrentLocalisation(); if ($groupUserId==0) { - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument")); return ""; } @@ -1106,15 +1111,18 @@ function exportAdmin() if (!$verif_delete) { - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgDelete",$user_id).$localisation); +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgDelete",$user_id).$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgDelete",$user_id)); } else { - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgDelete").$localisation); +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgDelete").$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgDelete")); } return ""; }else{ - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument")); return ""; } ExitBloc(); @@ -1160,10 +1168,13 @@ function exportAdmin() $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); if( DATA_ACCES_CACHE_PERMISSION ) $GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache(); - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgSave",$user_id).$localisation); + +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgSave",$user_id).$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgSave",$user_id)); return ""; }else{ - systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","selectcheckbox").$localisation); +// systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","selectcheckbox").$localisation); + systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","selectcheckbox")); return ""; } }