rooty/Qware_core
0
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue #91

Browse Source
This commit is contained in:
Rooty 2021-09-23 14:49:57 +02:00
parent 5c46ae301b
commit 7a71d1059a
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/object_coordination/adminuser/adminuser.php
View File

@ -992,7 +992,8 @@ function exportAdmin()
if ($groupUserId==0) 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 ""; return "";
} }
@ -1005,8 +1006,10 @@ function exportAdmin()
/* fin récupération des codes par defaut */ /* fin récupération des codes par defaut */
# Récupération des étiquettes du formulaire # 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("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);
// $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) ) if ( (in_array($GroupUser->getGroupId(), $MyTreeGroup->getSonArray())) || ($GroupUser->getGroupId()==$groupId) )
{ {
@ -1039,7 +1042,8 @@ function exportAdmin()
return ""; return "";
}else{ }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 ""; return "";
} }
ExitBloc(); ExitBloc();
@ -1063,7 +1067,8 @@ function exportAdmin()
// $localisation = $PagingManager->getCurrentLocalisation(); // $localisation = $PagingManager->getCurrentLocalisation();
if ($groupUserId==0) 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 ""; return "";
} }
@ -1106,15 +1111,18 @@ function exportAdmin()
if (!$verif_delete) 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 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 ""; return "";
}else{ }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 ""; return "";
} }
ExitBloc(); ExitBloc();
@ -1160,10 +1168,13 @@ function exportAdmin()
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache();
if( DATA_ACCES_CACHE_PERMISSION ) if( DATA_ACCES_CACHE_PERMISSION )
$GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache(); $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 ""; return "";
}else{ }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 ""; return "";
} }
} }