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

Php8.0 support: Fixed issue #82.

Browse Source
This commit is contained in:
Rooty 2021-06-17 14:27:35 +02:00
parent 36dffde3ef
commit 854e945f79
33 changed files with 387 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/object_coordination/addcom/addcom.php
View File

@ -273,7 +273,7 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad
$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("BtnAdd", "button", "boutton", getMessage("BtnAdd"), "class=\"form\""); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("BtnAdd", "button", "boutton", getMessage("BtnAdd"), "class=\"form\"");
# Récupération des étiquettes du formulaire # Récupération des étiquettes du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"AddCom","execAdmin","")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"AddCom","execAdmin",""));
return ""; return "";
} }
@ -378,7 +378,9 @@ function execAdmin()
$Group = new Group(); $Group = new Group();
/* Pour le nom de l'objet... */ /* Pour le nom de l'objet... */
reset($_POST); reset($_POST);
while (list($key, $val) = each($_POST)) { // while (list($key, $val) = each($_POST)) {
// PHP 8.0
foreach ($_POST as $key => $val)
if (!(strpos($key, "nameLanguage")===false)) // on a trouvé un nom pour une langue if (!(strpos($key, "nameLanguage")===false)) // on a trouvé un nom pour une langue
{ {
$tabCodeLangue[]=str_replace("nameLanguage", "",$key); // on stocke le tableau des codes pour test $tabCodeLangue[]=str_replace("nameLanguage", "",$key); // on stocke le tableau des codes pour test
@ -678,7 +680,7 @@ function execAdmin()
$GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult(); $GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult();
#------------------------------------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------------------------------------
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"AddCom","actionAdmin", "msgSave")); systemRedirect(Navigation::formatUrl($this->getId(),"AddCom","actionAdmin", "msgSave"));
} }
return ""; return "";
} }

28
lib/object_coordination/adminentrynode/adminentrynode.php
View File

@ -88,7 +88,7 @@ Class AdminEntryNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -119,7 +119,7 @@ Class AdminEntryNode extends CoordinationObj
printTabUser($tabUser, "", "USER", "user_id", '', getMessage("TxtUser")); printTabUser($tabUser, "", "USER", "user_id", '', getMessage("TxtUser"));
/* -- Fin Affichage des groupes d'ajout */ /* -- Fin Affichage des groupes d'ajout */
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminEntryNode", "execCreateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminEntryNode", "execCreateAdmin"));
$tabUserId=array(); $tabUserId=array();
for ($i=0; $i<count($tabUser); $i++) for ($i=0; $i<count($tabUser); $i++)
@ -216,7 +216,7 @@ Class AdminEntryNode extends CoordinationObj
if ( (in_array($tabNodeGroupUser[$j]->getGroupId(), $tabGroupId)) || (in_array($tabNodeGroupUser[$j]->getUserId(), $tabUserId))) if ( (in_array($tabNodeGroupUser[$j]->getGroupId(), $tabGroupId)) || (in_array($tabNodeGroupUser[$j]->getUserId(), $tabUserId)))
{ {
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("TREE_NODE.TREE_NODE_DELETE.urlDelete", formatUrl($this->getId(), "AdminEntryNode", "deleteAdmin", "", "&nodeGroupUserId=".$tabNodeGroupUser[$j]->getId() )); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("TREE_NODE.TREE_NODE_DELETE.urlDelete", Navigation::formatUrl($this->getId(), "AdminEntryNode", "deleteAdmin", "", "&nodeGroupUserId=".$tabNodeGroupUser[$j]->getId() ));
} }
else{ else{
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("TREE_NODE.TREE_NODE_DELETE", "delete"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("TREE_NODE.TREE_NODE_DELETE", "delete");
@ -263,7 +263,7 @@ Class AdminEntryNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -313,10 +313,10 @@ Class AdminEntryNode extends CoordinationObj
$NodeGroupuser=$GLOBALS["SYSTEM_MANAGER"]["NODE_GROUP_USER"]->insertInstance($NodeGroupUser); $NodeGroupuser=$GLOBALS["SYSTEM_MANAGER"]["NODE_GROUP_USER"]->insertInstance($NodeGroupUser);
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache();
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "msgSave")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "msgSave"));
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
/* Sortie de la Template */ /* Sortie de la Template */
@ -358,7 +358,7 @@ Class AdminEntryNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -431,11 +431,11 @@ Class AdminEntryNode extends CoordinationObj
$GLOBALS['SYSTEM_TEMPLATE']->MxText("NodeName", $lib); $GLOBALS['SYSTEM_TEMPLATE']->MxText("NodeName", $lib);
$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("NodeName", "text", "NodeName", $lib, "class=\"form\" readonly"); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("NodeName", "text", "NodeName", $lib, "class=\"form\" readonly");
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminEntryNode", "execDeleteAdmin", "", "&nodeGroupUserId=".$NodeGroupUser->getId() )); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminEntryNode", "execDeleteAdmin", "", "&nodeGroupUserId=".$NodeGroupUser->getId() ));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionReturn", formatUrl($this->getId(), "AdminEntryNode", "actionAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionReturn", Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin"));
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "WrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "WrongArgument"));
return ""; return "";
} }
/* Sortie de la Template */ /* Sortie de la Template */
@ -464,7 +464,7 @@ Class AdminEntryNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -515,14 +515,14 @@ Class AdminEntryNode extends CoordinationObj
$NodeGroupuser=$GLOBALS["SYSTEM_MANAGER"]["NODE_GROUP_USER"]->deleteInstance($NodeGroupUser); $NodeGroupuser=$GLOBALS["SYSTEM_MANAGER"]["NODE_GROUP_USER"]->deleteInstance($NodeGroupUser);
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache();
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "msgDelete")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "msgDelete"));
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "WrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminEntryNode", "actionAdmin", "WrongArgument"));
return ""; return "";
} }
/* Sortie de la Template */ /* Sortie de la Template */

32
lib/object_coordination/admingroup/admingroup.php
View File

@ -47,7 +47,7 @@ Class AdminGroup extends CoordinationObj
$tabPictoTabe = array("plus","cogs","minus"); $tabPictoTabe = array("plus","cogs","minus");
$tabTabe = array("BtnAdd","BtnModify","BtnDelete"); $tabTabe = array("BtnAdd","BtnModify","BtnDelete");
$tabAction = array(array("actionAdmin"), array("updateAdmin"), array("deleteAdmin")); $tabAction = array(array("actionAdmin"), array("updateAdmin"), array("deleteAdmin"));
$tabUrlTabe = array(formatUrl($this->getId(), "AdminGroup", "actionAdmin"),formatUrl($this->getId(), "AdminGroup", "updateAdmin"),formatUrl($this->getId(), "AdminGroup", "deleteAdmin")); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "AdminGroup", "actionAdmin"),Navigation::formatUrl($this->getId(), "AdminGroup", "updateAdmin"),Navigation::formatUrl($this->getId(), "AdminGroup", "deleteAdmin"));
printTabeAdmin("TabeB",$tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeB",$tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
return true; return true;
} }
@ -105,7 +105,7 @@ Class AdminGroup extends CoordinationObj
printTabTreeNode($tabTreeGroup, 0, "GROUP", "group_id", false, "", "", "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("TxtGroupIn"), ENT_QUOTES)."\""); printTabTreeNode($tabTreeGroup, 0, "GROUP", "group_id", false, "", "", "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("TxtGroupIn"), ENT_QUOTES)."\"");
/* -- Fin Affichage des groupes d'ajout */ /* -- Fin Affichage des groupes d'ajout */
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminGroup", "execCreateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminGroup", "execCreateAdmin"));
/* gestion du lib en fonction de la langue courante */ /* gestion du lib en fonction de la langue courante */
$currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode(); $currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode();
@ -197,10 +197,10 @@ Class AdminGroup extends CoordinationObj
$GLOBALS["SYSTEM_MANAGER"]["TREE_GROUP_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["TREE_GROUP_CACHE"]->emptyCache();
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_GROUP_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_GROUP_CACHE"]->emptyCache();
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache();
systemRedirect( formatUrl($this->getId(), "AdminGroup", "actionAdmin", "msgSave")."&groupId=".$Group->getId() ); systemRedirect( Navigation::formatUrl($this->getId(), "AdminGroup", "actionAdmin", "msgSave")."&groupId=".$Group->getId() );
return "msgSave"; return "msgSave";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminGroup", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "actionAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
} }
@ -263,7 +263,7 @@ Class AdminGroup extends CoordinationObj
//On load le Group //On load le Group
$Group=$GLOBALS["SYSTEM_MANAGER"]["GROUP"]->createInstance($group_id); $Group=$GLOBALS["SYSTEM_MANAGER"]["GROUP"]->createInstance($group_id);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminGroup", "execUpdateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminGroup", "execUpdateAdmin"));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("IdHiddenUpdate", $group_id); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("IdHiddenUpdate", $group_id);
/* -- Fin d'affichage des noeud d'ajout */ /* -- Fin d'affichage des noeud d'ajout */
# Lecture du dossier correspondant aux icones # Lecture du dossier correspondant aux icones
@ -327,12 +327,12 @@ Class AdminGroup extends CoordinationObj
} }
if (count($tabMove)==0) if (count($tabMove)==0)
{ {
systemRedirect(formatUrl($this->getId(), "AdminGroup", "updateAdmin", "enableGroup")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "updateAdmin", "enableGroup"));
return "enableGroup"; return "enableGroup";
} }
printTabTreeGroup($tabMove, $Group->getIdPere(), "ToHidde.GROUP_PERE", "group_id_pere"); printTabTreeGroup($tabMove, $Group->getIdPere(), "ToHidde.GROUP_PERE", "group_id_pere");
}else{ }else{
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminGroup", "updateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminGroup", "updateAdmin"));
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete");
} }
/* Sortie de la Template */ /* Sortie de la Template */
@ -355,7 +355,7 @@ Class AdminGroup extends CoordinationObj
if ($group_id==0) if ($group_id==0)
{ {
systemRedirect(formatUrl($this->getId(), "AdminGroup", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "actionAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
@ -400,10 +400,10 @@ Class AdminGroup extends CoordinationObj
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_GROUP_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_GROUP_CACHE"]->emptyCache();
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache();
systemRedirect( formatUrl($this->getId(), "AdminGroup", "updateAdmin", "msgSave")."&group_id=".$Group->getId() ); systemRedirect( Navigation::formatUrl($this->getId(), "AdminGroup", "updateAdmin", "msgSave")."&group_id=".$Group->getId() );
return "msgSave"; return "msgSave";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminGroup", "updateAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "updateAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
} }
@ -464,7 +464,7 @@ Class AdminGroup extends CoordinationObj
{ {
if ($tabTreeGroup[$i]->getId()==$group_id) if ($tabTreeGroup[$i]->getId()==$group_id)
{ {
systemRedirect(formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "enableDeleteGroup")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "enableDeleteGroup"));
return "enableDeleteGroup"; return "enableDeleteGroup";
} }
} }
@ -472,7 +472,7 @@ Class AdminGroup extends CoordinationObj
$Group=$GLOBALS["SYSTEM_MANAGER"]["GROUP"]->createInstance($group_id); $Group=$GLOBALS["SYSTEM_MANAGER"]["GROUP"]->createInstance($group_id);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("ToHidde.urlHiddenUpdate", $group_id); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("ToHidde.urlHiddenUpdate", $group_id);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("ToHidde.urlAction", formatUrl($this->getId(), "AdminGroup", "execDeleteAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("ToHidde.urlAction", Navigation::formatUrl($this->getId(), "AdminGroup", "execDeleteAdmin"));
$lib=$Group->getLibelle($currentCode); $lib=$Group->getLibelle($currentCode);
if ($lib=="") if ($lib=="")
@ -498,7 +498,7 @@ Class AdminGroup extends CoordinationObj
$this->printGroupDependancy($tab[$i], $MyTreeGroup->getLibelleFromGroup($tab[$i], $defaultCode) ); $this->printGroupDependancy($tab[$i], $MyTreeGroup->getLibelleFromGroup($tab[$i], $defaultCode) );
} }
}else{ }else{
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminGroup", "deleteAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminGroup", "deleteAdmin"));
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete");
} }
/* Sortie de la Template */ /* Sortie de la Template */
@ -609,7 +609,7 @@ Class AdminGroup extends CoordinationObj
{ {
if ($tabTreeGroup[$i]->getId()==$group_id) if ($tabTreeGroup[$i]->getId()==$group_id)
{ {
systemRedirect(formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "enableDeleteGroup")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "enableDeleteGroup"));
return "enableDeleteGroup"; return "enableDeleteGroup";
} }
} }
@ -634,10 +634,10 @@ Class AdminGroup extends CoordinationObj
$GLOBALS["SYSTEM_MANAGER"]["TREE_GROUP_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["TREE_GROUP_CACHE"]->emptyCache();
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_GROUP_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_GROUP_CACHE"]->emptyCache();
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache();
systemRedirect(formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "msgDelete")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "msgDelete"));
return "msgDelete"; return "msgDelete";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
/* Sortie de la Template */ /* Sortie de la Template */

67
lib/object_coordination/adminnode/adminnode.php
View File

@ -44,7 +44,7 @@ Class AdminNode extends CoordinationObj
$tabPictoTabe = array("plus","cogs","minus"); $tabPictoTabe = array("plus","cogs","minus");
$tabTabe = array("BtnAdd","BtnModify","BtnDelete"); $tabTabe = array("BtnAdd","BtnModify","BtnDelete");
$tabAction = array(array("actionAdmin"), array("updateAdmin"),array("deleteAdmin")); $tabAction = array(array("actionAdmin"), array("updateAdmin"),array("deleteAdmin"));
$tabUrlTabe = array(formatUrl($this->getId(), "AdminNode", "actionAdmin"),formatUrl($this->getId(), "AdminNode", "updateAdmin"),formatUrl($this->getId(), "AdminNode", "deleteAdmin")); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin"),Navigation::formatUrl($this->getId(), "AdminNode", "updateAdmin"),Navigation::formatUrl($this->getId(), "AdminNode", "deleteAdmin"));
printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
$GLOBALS['boolTab'] = true; $GLOBALS['boolTab'] = true;
} }
@ -113,12 +113,12 @@ Class AdminNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminNode", "execCreateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminNode", "execCreateAdmin"));
# Affichage de la liste déroulante # Affichage de la liste déroulante
# Détermine le chemin des icônes # Détermine le chemin des icônes
@ -256,10 +256,10 @@ Class AdminNode extends CoordinationObj
$GLOBALS["SYSTEM_MANAGER"]["TREE_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["TREE_NODE_CACHE"]->emptyCache();
$GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["LIST_USER_NODE_CACHE"]->emptyCache();
systemRedirect( formatUrl($this->getId(), "AdminNode", "actionAdmin", "msgSave")."&nodeId=".$Node->getId() ); systemRedirect( Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin", "msgSave")."&nodeId=".$Node->getId() );
return "msgSave"; return "msgSave";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
} }
@ -271,14 +271,14 @@ Class AdminNode extends CoordinationObj
*/ */
function updateAdmin() function updateAdmin()
{ {
/* Ajout du fichier AdminNode.ini */ /* Ajout du fichier AdminNode.ini */
addMessageFile("adminnode.ini"); addMessageFile("adminnode.ini");
addMessageFile("user.ini"); addMessageFile("user.ini");
/* gestion du lib en fonction de la langue courante */ /* gestion du lib en fonction de la langue courante */
$currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode(); $currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode();
$defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"]; $defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"];
/* -- fin rïżœupïżœation des codes par defaut */ /* -- fin récupération des codes par defaut */
mxPageTitle("updateAdminTitlePage"); mxPageTitle("updateAdminTitlePage");
@ -312,7 +312,7 @@ Class AdminNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -333,7 +333,7 @@ Class AdminNode extends CoordinationObj
//On load le Noeud //On load le Noeud
$Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->createInstance($node_Id1); $Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->createInstance($node_Id1);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminNode", "execUpdateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminNode", "execUpdateAdmin"));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("nodeHiddenUpdate", $node_Id1); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("nodeHiddenUpdate", $node_Id1);
@ -400,7 +400,7 @@ Class AdminNode extends CoordinationObj
$GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.NodeName",$Node->getLibelle($tab[$i]->getCode() )); $GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.NodeName",$Node->getLibelle($tab[$i]->getCode() ));
$GLOBALS['SYSTEM_TEMPLATE']->MxImage("ToHidde.blocName.pictoLanguage", $tab[$i]->getIcone()); $GLOBALS['SYSTEM_TEMPLATE']->MxImage("ToHidde.blocName.pictoLanguage", $tab[$i]->getIcone());
$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocName.nameInput", "text", "nameLanguage".$tab[$i]->getCode(), htmlentitiesconv($Node->getLibelle($tab[$i]->getCode())), "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("txtNodeName"), ENT_QUOTES)."\"", getMessage("txtNodeName")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocName.nameInput", "text", "nameLanguage_".$tab[$i]->getCode(), $Node->getLibelle($tab[$i]->getCode()), "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("txtNodeName"), ENT_QUOTES)."\"", getMessage("txtNodeName"));
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocName", "loop"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocName", "loop");
} }
@ -456,12 +456,12 @@ Class AdminNode extends CoordinationObj
if (count($tabMove)==0) if (count($tabMove)==0)
{ {
systemRedirect(formatUrl($this->getId(), "AdminNode", "updateAdmin", "enableNode")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "updateAdmin", "enableNode"));
return "enableGroup"; return "enableGroup";
} }
printTabTreeNode($tabMove, $Node->getIdPere(), "ToHidde.NODE", "node_Id2", false, "class=\"large\""); printTabTreeNode($tabMove, $Node->getIdPere(), "ToHidde.NODE", "node_Id2", false, "class=\"large\"");
}else{ }else{
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminNode", "updateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminNode", "updateAdmin"));
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete");
} }
/* Sortie de la Template */ /* Sortie de la Template */
@ -476,6 +476,8 @@ Class AdminNode extends CoordinationObj
*/ */
function execUpdateAdmin() function execUpdateAdmin()
{ {
// var_dump($_POST);
// exit();
$tabCodeLangue=array(); $tabCodeLangue=array();
$isValid=true; $isValid=true;
@ -486,7 +488,7 @@ Class AdminNode extends CoordinationObj
if ($node_id==0) if ($node_id==0)
{ {
systemRedirect(formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
@ -517,21 +519,22 @@ Class AdminNode extends CoordinationObj
# Variables de configuration de l'objet # Variables de configuration de l'objet
/* Pour le nom de l'objet... */ /* Pour le nom de l'objet... */
while (list($key, $val) = each($_POST)) { // while (list($key, $val) = each($_POST)) {
if (!(strpos($key, "nameLanguage")===false)) // PHP 8.0
// on a trouvïżœun nom pour une langue foreach ($_POST as $key => $val)
{
if (!(strpos($key, "nameLanguage_")===false))
// on a trouvé un nom pour une langue
{ {
if ( $val!="" ) if ( $val!="" )
{ {
$tabCodeLangue[]=str_replace("nameLanguage", "",$key); $tabCodeLangue[]=str_replace("nameLanguage_", "", $key);
// on stocke le tableau des codes pour test $Node->setLibelle(str_replace("nameLanguage_", "", $key), $val);
// on ajoute le lib
$Node->setLibelle(str_replace("nameLanguage", "",$key), $val);
} }
} }
} }
if ( !(in_array($GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"],$tabCodeLangue)) ) if ( !(in_array($GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"], $tabCodeLangue)) )
{ {
$isValid=false; $isValid=false;
} }
@ -572,10 +575,10 @@ Class AdminNode extends CoordinationObj
if( DATA_ACCES_CACHE_PERMISSION ) if( DATA_ACCES_CACHE_PERMISSION )
$GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache();
systemRedirect( formatUrl($this->getId(), "AdminNode", "updateAdmin", "msgSave")."&node_Id1=".$Node->getId() ); systemRedirect( Navigation::formatUrl($this->getId(), "AdminNode", "updateAdmin", "msgSave")."&node_Id1=".$Node->getId() );
return "msgSave"; return "msgSave";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminNode", "updateAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "updateAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
} }
@ -614,12 +617,12 @@ Class AdminNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlHiddenUpdate", formatUrl($this->getId(), "AdminNode", "deleteAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlHiddenUpdate", Navigation::formatUrl($this->getId(), "AdminNode", "deleteAdmin"));
# Affichage de la liste déroulante # Affichage de la liste déroulante
# Détermine le chemin des icones # Détermine le chemin des icones
@ -639,7 +642,7 @@ Class AdminNode extends CoordinationObj
$GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.DELETE.SECTION_RIGHT.Right", getMessage("Right") ); $GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.DELETE.SECTION_RIGHT.Right", getMessage("Right") );
if ($tabTreeNode[$i]->getId()==$node_id) if ($tabTreeNode[$i]->getId()==$node_id)
{ {
systemRedirect(formatUrl($this->getId(), "AdminNode", "deleteAdmin", "enableDeleteNode")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "deleteAdmin", "enableDeleteNode"));
return "enableDeleteNode"; return "enableDeleteNode";
} }
} }
@ -648,7 +651,7 @@ Class AdminNode extends CoordinationObj
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("NodeHiddenUpdate", $node_id); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("NodeHiddenUpdate", $node_id);
$Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->createInstance($node_id); $Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->createInstance($node_id);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminNode", "execDeleteAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminNode", "execDeleteAdmin"));
$lib=$Node->getLibelle($currentCode); $lib=$Node->getLibelle($currentCode);
if ($lib=="") if ($lib=="")
@ -672,7 +675,7 @@ Class AdminNode extends CoordinationObj
} }
} }
}else{ }else{
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminNode", "deleteAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminNode", "deleteAdmin"));
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete");
} }
@ -769,7 +772,7 @@ Class AdminNode extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -785,7 +788,7 @@ Class AdminNode extends CoordinationObj
{ {
if ($tabTreeNode[$i]->getId()==$node_id) if ($tabTreeNode[$i]->getId()==$node_id)
{ {
systemRedirect(formatUrl($this->getId(), "AdminNode", "deleteAdmin", "enableDeleteNode")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "deleteAdmin", "enableDeleteNode"));
return "enableDeleteNode"; return "enableDeleteNode";
} }
} }
@ -812,10 +815,10 @@ Class AdminNode extends CoordinationObj
$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(formatUrl($this->getId(), "AdminNode", "deleteAdmin", "msgDelete")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminNode", "deleteAdmin", "msgDelete"));
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminGroup", "deleteAdmin", "wrongArgument"));
return "wrongArgument"; return "wrongArgument";
} }
return ""; return "";

98
lib/object_coordination/adminobject/adminobject.php
View File

@ -51,7 +51,7 @@ Class AdminObject extends CoordinationObj
$tabPictoTabe = array("eye","plus"); $tabPictoTabe = array("eye","plus");
$tabTabe = array("TxtTabeListObject","TxtTabeCreateObject"); $tabTabe = array("TxtTabeListObject","TxtTabeCreateObject");
$tabAction = array( array("actionAdmin", "updateObjectAdmin", "deleteObjectAdmin", "rightAdmin", "rightDeleteAdmin"), array("addObjectAdmin", "createNewObjectAdmin") ); $tabAction = array( array("actionAdmin", "updateObjectAdmin", "deleteObjectAdmin", "rightAdmin", "rightDeleteAdmin"), array("addObjectAdmin", "createNewObjectAdmin") );
$tabUrlTabe = array(formatUrl($this->getId(), "AdminObject", "actionAdmin","", "&ListNode=".$NodeSelect."&optList=".$optList),formatUrl($this->getId(), "AdminObject", "addObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin","", "&ListNode=".$NodeSelect."&optList=".$optList),Navigation::formatUrl($this->getId(), "AdminObject", "addObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList));
printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
return true; return true;
} }
@ -73,7 +73,7 @@ Class AdminObject extends CoordinationObj
$tabPictoTabe = array("cogs","cogs","minus"); $tabPictoTabe = array("cogs","cogs","minus");
$tabTabe = array("TxtUpdateObject","TxtConfigObject", "TxtDeleteObject"); $tabTabe = array("TxtUpdateObject","TxtConfigObject", "TxtDeleteObject");
$tabAction = array( array("updateObjectAdmin"), array("rightAdmin", "rightDeleteAdmin"), array("deleteObjectAdmin") ); $tabAction = array( array("updateObjectAdmin"), array("rightAdmin", "rightDeleteAdmin"), array("deleteObjectAdmin") );
$tabUrlTabe = array(formatUrl($this->getId(), "AdminObject", "updateObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&amp;objectId=".$id, formatUrl($this->getId(), "AdminObject", "rightAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&amp;objectId=".$id, formatUrl($this->getId(), "AdminObject", "deleteObjectAdmin","", "&ListNode=".$NodeSelect."&optList=".$optList)."&amp;objectId=".$id); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "AdminObject", "updateObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&amp;objectId=".$id, Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&amp;objectId=".$id, Navigation::formatUrl($this->getId(), "AdminObject", "deleteObjectAdmin","", "&ListNode=".$NodeSelect."&optList=".$optList)."&amp;objectId=".$id);
printTabeAdmin("TabeSecond", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeSecond", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
return true; return true;
} }
@ -157,7 +157,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->islib/object_coordination/objectblob/Loaded()==false ){ if ( $myTree->islib/object_coordination/objectblob/Loaded()==false ){
systemRedirect(formatUrl($this->getId(), "adminobject", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "adminobject", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -198,7 +198,7 @@ Class AdminObject extends CoordinationObj
/*Affichage des Noeuds pour filtrer les instances*/ /*Affichage des Noeuds pour filtrer les instances*/
$tabTreeNode[0]=$myTree; //--> treeNodeUnique.... $tabTreeNode[0]=$myTree; //--> treeNodeUnique....
printTabTreeNode($tabTreeNode, $NodeSelect, "listNode", "ListNode", true, '', getMessage("TxtListNode")); printTabTreeNode($tabTreeNode, $NodeSelect, "listNode", "ListNode", true, '', getMessage("TxtListNode"));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionNode", formatUrl($this->getId(), "AdminObject", "actionAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionNode", Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin"));
/* Pour le Tri/Nom */ /* Pour le Tri/Nom */
$tabName=array(); $tabName=array();
@ -397,9 +397,9 @@ Class AdminObject extends CoordinationObj
if ( ($myTree->isSon($tabObject[$i]->node) || $tabObject[$i]->node==$myTree->getId()) && ($tabObject[$i]->getId() != $this->getId() ) ) if ( ($myTree->isSon($tabObject[$i]->node) || $tabObject[$i]->node==$myTree->getId()) && ($tabObject[$i]->getId() != $this->getId() ) )
{ {
/* on est bien sur l'arbre propriétaire-> on peut modifier la configuration de l'objet */ /* on est bien sur l'arbre propriétaire-> on peut modifier la configuration de l'objet */
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.UPDATE.urlUpdateObject", formatUrl($this->getId(), "AdminObject", "updateObjectAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabObject[$i]->getId())); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.UPDATE.urlUpdateObject", Navigation::formatUrl($this->getId(), "AdminObject", "updateObjectAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabObject[$i]->getId()));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.UPDATE.BtnModify", getMessage("BtnModify")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.UPDATE.BtnModify", getMessage("BtnModify"));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.DELETE.urlDeleteObject", formatUrl($this->getId(), "AdminObject", "deleteObjectAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabObject[$i]->getId())); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.DELETE.urlDeleteObject", Navigation::formatUrl($this->getId(), "AdminObject", "deleteObjectAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabObject[$i]->getId()));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.DELETE.BtnDelete", getMessage("BtnDelete")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.DELETE.BtnDelete", getMessage("BtnDelete"));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.BtnView", getMessage("BtnView")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.BtnView", getMessage("BtnView"));
}else{ }else{
@ -410,7 +410,7 @@ Class AdminObject extends CoordinationObj
/* --Fin test du droit de modif */ /* --Fin test du droit de modif */
if ( ($myTree->isSon($tabObject[$i]->node)) || ($tabObject[$i]->node==$myTree->getId()) || ($myTree->isFather($tabObject[$i]->node)) ) if ( ($myTree->isSon($tabObject[$i]->node)) || ($tabObject[$i]->node==$myTree->getId()) || ($myTree->isFather($tabObject[$i]->node)) )
{ {
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.PERMISSION.urlRightObject", formatUrl($this->getId(), "AdminObject", "rightAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabObject[$i]->getId())); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.PERMISSION.urlRightObject", Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabObject[$i]->getId()));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.PERMISSION.BtnRight", getMessage("BtnRight")); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("actionAdminObject.PERMISSION.BtnRight", getMessage("BtnRight"));
}else{ }else{
/* on est pas sur l'arbre propriétaire-> on ne peut pas modifier la configuration de l'objet */ /* on est pas sur l'arbre propriétaire-> on ne peut pas modifier la configuration de l'objet */
@ -463,7 +463,7 @@ Class AdminObject extends CoordinationObj
$defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"]; $defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"];
/* -- fin récupération des codes par defaut */ /* -- fin récupération des codes par defaut */
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminObject", "createNewObjectAdmin","&ListNode=".$NodeSelect."&optList=".$optList)); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminObject", "createNewObjectAdmin","&ListNode=".$NodeSelect."&optList=".$optList));
/* Pour le Tri/Nom */ /* Pour le Tri/Nom */
$tabName=array(); $tabName=array();
for ($i=0; $i<count($tabAllowed);$i++) for ($i=0; $i<count($tabAllowed);$i++)
@ -524,7 +524,7 @@ Class AdminObject extends CoordinationObj
if ( is_object($obj) ) if ( is_object($obj) )
{ {
$data=$obj->__createObject(formatUrl($this->getId(), "AdminObject", "execNewObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList), formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList), $groupId, $nodeId, $tabAllowed); $data=$obj->__createObject(Navigation::formatUrl($this->getId(), "AdminObject", "execNewObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList), Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList), $groupId, $nodeId, $tabAllowed);
/* Ajout du fichier AdminObject.ini */ /* Ajout du fichier AdminObject.ini */
addMessageFile("adminobject.ini"); addMessageFile("adminobject.ini");
@ -534,11 +534,11 @@ Class AdminObject extends CoordinationObj
return $data; /* donne le retour de __createObject */ return $data; /* donne le retour de __createObject */
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument"));
return ""; return "";
} }
} }
@ -570,14 +570,14 @@ Class AdminObject extends CoordinationObj
if ( is_object($obj) ) if ( is_object($obj) )
{ {
$data=$obj->__execCreateObject($groupId, $nodeId, $tabAllowed); // Passage des args pour validation $data=$obj->__execCreateObject($groupId, $nodeId, $tabAllowed); // Passage des args pour validation
systemRedirect(formatUrl($this->getId(), "AdminObject", "rightAdmin", $data, "&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$obj->getId() )); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin", $data, "&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$obj->getId() ));
return $data; return $data;
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -611,7 +611,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -645,7 +645,7 @@ Class AdminObject extends CoordinationObj
if ( is_object($obj) ) if ( is_object($obj) )
{ {
$data=$obj->__updateObject(formatUrl($this->getId(), "AdminObject", "execUpdateObjectAdmin", "","&ListNode=".$NodeSelect."&optList=".$optList),formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList), $groupId, $nodeId,$tabAllowed); $data=$obj->__updateObject(Navigation::formatUrl($this->getId(), "AdminObject", "execUpdateObjectAdmin", "","&ListNode=".$NodeSelect."&optList=".$optList),Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList), $groupId, $nodeId,$tabAllowed);
/* Ajout du fichier AdminObject.ini */ /* Ajout du fichier AdminObject.ini */
addMessageFile("adminobject.ini"); addMessageFile("adminobject.ini");
@ -655,11 +655,11 @@ Class AdminObject extends CoordinationObj
return $data; /* donne le retour de __updateObject */ return $data; /* donne le retour de __updateObject */
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -691,7 +691,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -724,15 +724,15 @@ Class AdminObject extends CoordinationObj
{ {
$obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId); $obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId);
$data=$obj->__execUpdateObject($groupId, $nodeId, $tabAllowed); $data=$obj->__execUpdateObject($groupId, $nodeId, $tabAllowed);
systemRedirect(formatUrl($this->getId(), "AdminObject", "updateObjectAdmin", $data, "&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$obj->getId() )); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "updateObjectAdmin", $data, "&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$obj->getId() ));
return $data; return $data;
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -762,7 +762,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -794,9 +794,9 @@ Class AdminObject extends CoordinationObj
$obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId); $obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId);
if ( is_object($obj) ) if ( is_object($obj) )
{ {
$data=$obj->__deleteObject(formatUrl($this->getId(), "AdminObject", "execDeleteObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList), formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList), $groupId, $nodeId, $tabAllowed); $data=$obj->__deleteObject(Navigation::formatUrl($this->getId(), "AdminObject", "execDeleteObjectAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList), Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList), $groupId, $nodeId, $tabAllowed);
$GLOBALS['SYSTEM_TEMPLATE']->MxText("urlReturn", formatUrl($this->getId(), "AdminObject", "actionAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList) ); $GLOBALS['SYSTEM_TEMPLATE']->MxText("urlReturn", Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList) );
/* Ajout du fichier AdminObject.ini */ /* Ajout du fichier AdminObject.ini */
addMessageFile("adminobject.ini"); addMessageFile("adminobject.ini");
@ -807,11 +807,11 @@ Class AdminObject extends CoordinationObj
return $data; /* donne le retour de __deleteObject */ return $data; /* donne le retour de __deleteObject */
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -844,7 +844,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -878,14 +878,14 @@ Class AdminObject extends CoordinationObj
{ {
$obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId); $obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId);
$data=$obj->__execDeleteObject($groupId, $nodeId, $tabAllowed); $data=$obj->__execDeleteObject($groupId, $nodeId, $tabAllowed);
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", $data)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", $data));
return $data; return $data;
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -953,7 +953,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -1019,8 +1019,8 @@ Class AdminObject extends CoordinationObj
printTabUser($tabUser, 0, "USER", "user_id" , ' onchange="javascript:document.configObject.group_id.selectedIndex=0;"', getMessage("TxtChoose")); printTabUser($tabUser, 0, "USER", "user_id" , ' onchange="javascript:document.configObject.group_id.selectedIndex=0;"', getMessage("TxtChoose"));
/* -- Fin Affichage des groupes d'ajout */ /* -- Fin Affichage des groupes d'ajout */
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminObject", "rightAddAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId)); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminObject", "rightAddAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlReturn", formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList) ); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlReturn", Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin","","&ListNode=".$NodeSelect."&optList=".$optList) );
/* Récupération des droits */ /* Récupération des droits */
$tabRight=$GLOBALS["SYSTEM_MANAGER"]["RIGHT"]->getInstanceFromObjectId($objectId); $tabRight=$GLOBALS["SYSTEM_MANAGER"]["RIGHT"]->getInstanceFromObjectId($objectId);
@ -1149,7 +1149,7 @@ Class AdminObject extends CoordinationObj
{ {
/* Pour les bouton */ /* Pour les bouton */
$GLOBALS['SYSTEM_TEMPLATE']->MxText("RIGHT.DELETE.imgPath", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']); $GLOBALS['SYSTEM_TEMPLATE']->MxText("RIGHT.DELETE.imgPath", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("RIGHT.DELETE.urlDeleteObject", formatUrl($this->getId(), "AdminObject", "rightDeleteAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabRight[$i]->getObjectId()."&rightId=".$tabRight[$i]->getId())); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("RIGHT.DELETE.urlDeleteObject", Navigation::formatUrl($this->getId(), "AdminObject", "rightDeleteAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabRight[$i]->getObjectId()."&rightId=".$tabRight[$i]->getId()));
}else{ }else{
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("RIGHT.DELETE", "delete"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("RIGHT.DELETE", "delete");
} }
@ -1164,7 +1164,7 @@ Class AdminObject extends CoordinationObj
$GLOBALS['SYSTEM_TEMPLATE']->MxText("nbRight", count($tabRight)); $GLOBALS['SYSTEM_TEMPLATE']->MxText("nbRight", count($tabRight));
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
/* Sortie de la Template */ /* Sortie de la Template */
@ -1205,7 +1205,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -1238,10 +1238,10 @@ Class AdminObject extends CoordinationObj
$obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId); $obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId);
$data=$obj->__execAddRight($node_id, $user_id, $group_id, $method_name); $data=$obj->__execAddRight($node_id, $user_id, $group_id, $method_name);
systemRedirect(formatUrl($this->getId(), "AdminObject", "rightAdmin", $data,"&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin", $data,"&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId));
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
@ -1306,7 +1306,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -1339,7 +1339,7 @@ Class AdminObject extends CoordinationObj
/* -- Affichage des Group d'ajout */ /* -- Affichage des Group d'ajout */
$tabUser=$GLOBALS["SYSTEM_CONTROL"]->arrayOfAdministrableUserFromTabTreeGroup($tabTreeGroup, 0, "GROUP"); $tabUser=$GLOBALS["SYSTEM_CONTROL"]->arrayOfAdministrableUserFromTabTreeGroup($tabTreeGroup, 0, "GROUP");
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlReturn", formatUrl($this->getId(), "AdminObject", "rightAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId) ); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlReturn", Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId) );
/* Récupération des droits */ /* Récupération des droits */
$tabRight=$GLOBALS["SYSTEM_MANAGER"]["RIGHT"]->getInstanceFromObjectId($objectId); $tabRight=$GLOBALS["SYSTEM_MANAGER"]["RIGHT"]->getInstanceFromObjectId($objectId);
@ -1362,11 +1362,11 @@ Class AdminObject extends CoordinationObj
{ {
if ($rightId==$tabRight[$i]->getId()) if ($rightId==$tabRight[$i]->getId())
{ {
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminObject", "execRightDeleteAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabRight[$i]->getObjectId()."&rightId=".$tabRight[$i]->getId())); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "AdminObject", "execRightDeleteAdmin","","&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$tabRight[$i]->getObjectId()."&rightId=".$tabRight[$i]->getId()));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlReturn", formatUrl($this->getId(), "AdminObject", "rightAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&objectId=".$tabRight[$i]->getId() ); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlReturn", Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&objectId=".$tabRight[$i]->getId() );
$GLOBALS['SYSTEM_TEMPLATE']->MxText("urlReturn", formatUrl($this->getId(), "AdminObject", "rightAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&objectId=".$tabRight[$i]->getObjectId() ); $GLOBALS['SYSTEM_TEMPLATE']->MxText("urlReturn", Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin", "", "&ListNode=".$NodeSelect."&optList=".$optList)."&objectId=".$tabRight[$i]->getObjectId() );
/* gestion de la template */ /* gestion de la template */
if ( ($tabRight[$i]->getGroupId() != 0) && (!Is_null($tabRight[$i]->getGroupId())) ) if ( ($tabRight[$i]->getGroupId() != 0) && (!Is_null($tabRight[$i]->getGroupId())) )
{ {
@ -1415,11 +1415,11 @@ Class AdminObject extends CoordinationObj
} }
if (count($tabRight)==0) if (count($tabRight)==0)
{ {
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument", "&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
/* Sortie de la Template */ /* Sortie de la Template */
@ -1455,7 +1455,7 @@ Class AdminObject extends CoordinationObj
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTree) ){ if ( !is_object($myTree) ){
if ( $myTree->isLoaded()==false ){ if ( $myTree->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }
@ -1485,10 +1485,10 @@ Class AdminObject extends CoordinationObj
/* Creation de l'objet */ /* Creation de l'objet */
$obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId); $obj=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstance($objectId);
$data=$obj->__execDeleteRight($rightId); $data=$obj->__execDeleteRight($rightId);
systemRedirect(formatUrl($this->getId(), "AdminObject", "rightAdmin", $data,"&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "rightAdmin", $data,"&ListNode=".$NodeSelect."&optList=".$optList."&objectId=".$objectId));
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList)); systemRedirect(Navigation::formatUrl($this->getId(), "AdminObject", "actionAdmin", "wrongArgument","&ListNode=".$NodeSelect."&optList=".$optList));
return ""; return "";
} }
} }

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

@ -46,7 +46,7 @@ Class AdminUser extends CoordinationObj
$tabPictoTabe = array("cogs","plus"); $tabPictoTabe = array("cogs","plus");
$tabTabe = array("listUser","BtnAdd"); $tabTabe = array("listUser","BtnAdd");
$tabAction = array( array("actionAdmin", "changeUserAdmin", "deleteGroupUserAdmin"), array("addUserAdmin") ); $tabAction = array( array("actionAdmin", "changeUserAdmin", "deleteGroupUserAdmin"), array("addUserAdmin") );
$tabUrlTabe = array(formatUrl($this->getId(), "AdminUser", "actionAdmin"),formatUrl($this->getId(), "AdminUser", "addUserAdmin")); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "AdminUser", "actionAdmin"),Navigation::formatUrl($this->getId(), "AdminUser", "addUserAdmin"));
printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
return true; return true;
} }
@ -97,8 +97,8 @@ Class AdminUser extends CoordinationObj
/* Export des comptes */ /* Export des comptes */
$GLOBALS['SYSTEM_TEMPLATE']->MxText("TxtExport", getMessage("TxtExport")); $GLOBALS['SYSTEM_TEMPLATE']->MxText("TxtExport", getMessage("TxtExport"));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlSort", "document.FManageUser.action='".formatUrl($this->getId(),"AdminUser","actionAdmin")."'; document.FManageUser.target='';"); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlSort", "document.FManageUser.action='".Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin")."'; document.FManageUser.target='';");
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlExport", "document.FManageUser.action='".formatUrl($this->getId(), "AdminUser", "exportAdmin")."'; document.FManageUser.target='blank';"); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlExport", "document.FManageUser.action='".Navigation::formatUrl($this->getId(), "AdminUser", "exportAdmin")."'; document.FManageUser.target='blank';");
$GLOBALS['SYSTEM_TEMPLATE']->MxSelect("exportFormat", "exportFormat", '', array('xml'=>'Xml','csv'=>'Csv','html'=>'Html','rss2.0'=>'RSS 2.0'), getMessage("TxtExport"), "", '', "class=\"form\""); $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("exportFormat", "exportFormat", '', array('xml'=>'Xml','csv'=>'Csv','html'=>'Html','rss2.0'=>'RSS 2.0'), getMessage("TxtExport"), "", '', "class=\"form\"");
/* Creation du Tree d'admin */ /* Creation du Tree d'admin */
@ -126,18 +126,18 @@ Class AdminUser extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("user_birthdate", "text", "user_birthdate", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipBirthDate"), ENT_QUOTES)."\"", getMessage("user_birthdate")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("user_birthdate", "text", "user_birthdate", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipBirthDate"), ENT_QUOTES)."\"", getMessage("user_birthdate"));
// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("user_id", $MyUser->getId()); // $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("user_id", $MyUser->getId());
# Récupération des étiquettes du formulaire # Récupération des étiquettes du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlActionAdd", formatUrl($this->getId(),"AdminUser","execAddUserAdmin","")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlActionAdd", Navigation::formatUrl($this->getId(),"AdminUser","execAddUserAdmin",""));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturnAdd", formatUrl($this->GetId(),"AdminUser","actionAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturnAdd", Navigation::formatUrl($this->GetId(),"AdminUser","actionAdmin"));
// printTabTreeGroup($tabTreeGroup, $groupId, "GROUPUSER"); // printTabTreeGroup($tabTreeGroup, $groupId, "GROUPUSER");
printTabTreeGroup($tabTreeGroup, "", "GROUPUSER", "groupuser_id", '', getMessage("TxtGroup")); printTabTreeGroup($tabTreeGroup, "", "GROUPUSER", "groupuser_id", '', getMessage("TxtGroup"));
/* END NEW USER FORM */ /* END NEW USER FORM */
# Envoi du formulaire en fonction de l'action : encode le javascript # Envoi du formulaire en fonction de l'action : encode le javascript
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->GetId(),"AdminUser","actionAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->GetId(),"AdminUser","actionAdmin"));
if ($GLOBALS["SYSTEM_TEMPLATE"]->IsMxAttribut("urlAddUser")) if ($GLOBALS["SYSTEM_TEMPLATE"]->IsMxAttribut("urlAddUser"))
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAddUser", formatUrl($this->GetId(),"AdminUser","addUserAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAddUser", Navigation::formatUrl($this->GetId(),"AdminUser","addUserAdmin"));
/* Affichage de la liste des groupes */ /* Affichage de la liste des groupes */
// printTabTreeGroup($tabTreeGroup, $group_id, "GROUP"); // printTabTreeGroup($tabTreeGroup, $group_id, "GROUP");
@ -185,8 +185,8 @@ Class AdminUser extends CoordinationObj
$currentUser=$tabUser[$i]; $currentUser=$tabUser[$i];
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.BtnUpdate",getMessage("BtnUpdate")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.BtnUpdate",getMessage("BtnUpdate"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.BtnDelete",getMessage("BtnDelete")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.BtnDelete",getMessage("BtnDelete"));
// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_user",formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId())); // $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_user",Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId()));
// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.del_user",formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId())); // $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.del_user",Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_first_name", htmlentitiesconv($currentUser->getFirstName())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_first_name", htmlentitiesconv($currentUser->getFirstName()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_last_name", htmlentitiesconv($currentUser->getLastName())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_last_name", htmlentitiesconv($currentUser->getLastName()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_login", htmlentitiesconv($currentUser->getLogin())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_login", htmlentitiesconv($currentUser->getLogin()));
@ -195,8 +195,8 @@ Class AdminUser extends CoordinationObj
if( htmlentitiesconv($currentUser->getLogin()) != "Guest" ) if( htmlentitiesconv($currentUser->getLogin()) != "Guest" )
{ {
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_user",formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId())); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_user",Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","",$currentUser->getId()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_account_active",formatUrl($this->getId(),"AdminUser","execAccountActiveAdmin","",$currentUser->getId())); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_account_active",Navigation::formatUrl($this->getId(),"AdminUser","execAccountActiveAdmin","",$currentUser->getId()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-success":"toggle-off text-danger" ); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-success":"toggle-off text-danger" );
} else { } else {
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-secondary":"toggle-off text-secondary" ); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-secondary":"toggle-off text-secondary" );
@ -371,7 +371,7 @@ function exportAdmin()
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTreeGroup) ){ if ( !is_object($myTreeGroup) ){
if ( $myTreeGroup->isLoaded()==false ){ if ( $myTreeGroup->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","msgError")); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgError"));
return "WrongArgument"; return "WrongArgument";
} }
} }
@ -418,8 +418,8 @@ function exportAdmin()
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("user_id", $MyUser->getId()); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("user_id", $MyUser->getId());
# Récupération des étiquettes du formulaire # Récupération des étiquettes du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"AdminUser","execAddUserAdmin","")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"AdminUser","execAddUserAdmin",""));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturn", formatUrl($this->GetId(),"AdminUser","actionAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturn", Navigation::formatUrl($this->GetId(),"AdminUser","actionAdmin"));
printTabTreeGroup($tabTreeGroup, $groupId, "GROUP"); printTabTreeGroup($tabTreeGroup, $groupId, "GROUP");
return ""; return "";
@ -451,7 +451,7 @@ function exportAdmin()
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTreeGroup) && ((!isset($_POST["group_id"]) && (!is_numeric($_POST["group_id"]))) )){ if ( !is_object($myTreeGroup) && ((!isset($_POST["group_id"]) && (!is_numeric($_POST["group_id"]))) )){
if ( $myTreeGroup->isLoaded()==false ){ if ( $myTreeGroup->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","msgError").$location); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgError").$location);
return "WrongArgument"; return "WrongArgument";
} }
} }
@ -547,10 +547,10 @@ function exportAdmin()
if( DATA_ACCES_CACHE_PERMISSION ) if( DATA_ACCES_CACHE_PERMISSION )
$GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache();
systemRedirect(formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgSave", $user_id)); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgSave", $user_id));
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","selectcheckbox")); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","selectcheckbox"));
return ""; return "";
} }
} }
@ -607,7 +607,7 @@ function exportAdmin()
else else
{ {
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","msgError")); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgError"));
return "msgError"; return "msgError";
} }
@ -616,7 +616,7 @@ function exportAdmin()
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTreeGroup) ){ if ( !is_object($myTreeGroup) ){
if ( $myTreeGroup->isLoaded()==false ){ if ( $myTreeGroup->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","msgError")); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgError"));
return "WrongArgument"; return "WrongArgument";
} }
} }
@ -655,9 +655,9 @@ function exportAdmin()
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("user_id", $MyUser->getId()); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("user_id", $MyUser->getId());
# Récupération des étiquettes du formulaire # Récupération des étiquettes du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"AdminUser","execChangeUserAdmin","",$param)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"AdminUser","execChangeUserAdmin","",$param));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAddAction", formatUrl($this->getId(),"AdminUser","execAddGroupUserAdmin","",$param)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAddAction", Navigation::formatUrl($this->getId(),"AdminUser","execAddGroupUserAdmin","",$param));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", formatUrl($this->GetId(),"AdminUser","actionAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", Navigation::formatUrl($this->GetId(),"AdminUser","actionAdmin"));
printTabTreeGroup($tabTreeGroup, $groupId, "GROUP"); printTabTreeGroup($tabTreeGroup, $groupId, "GROUP");
/* recuperation des id administrables */ /* recuperation des id administrables */
@ -692,7 +692,7 @@ function exportAdmin()
} }
$lib = $treeGroup; $lib = $treeGroup;
$GLOBALS['SYSTEM_TEMPLATE']->MxText("GROUP_USER.GroupName", $lib); $GLOBALS['SYSTEM_TEMPLATE']->MxText("GROUP_USER.GroupName", $lib);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("GROUP_USER.GROUP_DELETE.urlDelete", formatUrl($this->getId(), "AdminUser", "deleteGroupUserAdmin")."&amp;groupUserId=".$tabGroupUser[$j]->getId() ); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("GROUP_USER.GROUP_DELETE.urlDelete", Navigation::formatUrl($this->getId(), "AdminUser", "deleteGroupUserAdmin")."&amp;groupUserId=".$tabGroupUser[$j]->getId() );
$GLOBALS['SYSTEM_TEMPLATE']->MxText("GROUP_USER.GROUP_DELETE.BtnDelete", getMessage("BtnDelete") ); $GLOBALS['SYSTEM_TEMPLATE']->MxText("GROUP_USER.GROUP_DELETE.BtnDelete", getMessage("BtnDelete") );
$GLOBALS['SYSTEM_TEMPLATE']->MxText("GROUP_USER.GROUP_DELETE.imgPath", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']); $GLOBALS['SYSTEM_TEMPLATE']->MxText("GROUP_USER.GROUP_DELETE.imgPath", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']);
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("GROUP_USER", "loop"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("GROUP_USER", "loop");
@ -731,7 +731,7 @@ function exportAdmin()
/* Verification de l'existance du Tree */ /* Verification de l'existance du Tree */
if ( !is_object($myTreeGroup) ){ if ( !is_object($myTreeGroup) ){
if ( $myTreeGroup->isLoaded()==false ){ if ( $myTreeGroup->isLoaded()==false ){
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","msgError")); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgError"));
return "WrongArgument"; return "WrongArgument";
} }
} }
@ -823,7 +823,7 @@ function exportAdmin()
$ObjUsersave = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser); $ObjUsersave = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser);
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","datamodified")); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","datamodified"));
} }
} }
return ""; return "";
@ -862,7 +862,7 @@ function exportAdmin()
$ObjUsersave = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser); $ObjUsersave = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser);
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin")); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin"));
} }
return ""; return "";
} }
@ -990,7 +990,7 @@ function exportAdmin()
if ($groupUserId==0) if ($groupUserId==0)
{ {
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","WrongArgument").$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","WrongArgument").$localisation);
return ""; return "";
} }
@ -1003,8 +1003,8 @@ 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", formatUrl($this->getId(),"AdminUser","execdeleteGroupUserAdmin","")."&amp;groupUserId=".$groupUserId.$localisation); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"AdminUser","execdeleteGroupUserAdmin","")."&amp;groupUserId=".$groupUserId.$localisation);
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", formatUrl($this->getId(),"AdminUser","actionAdmin","").$localisation); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","").$localisation);
if ( (in_array($GroupUser->getGroupId(), $MyTreeGroup->getSonArray())) || ($GroupUser->getGroupId()==$groupId) ) if ( (in_array($GroupUser->getGroupId(), $MyTreeGroup->getSonArray())) || ($GroupUser->getGroupId()==$groupId) )
{ {
@ -1037,7 +1037,7 @@ function exportAdmin()
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation);
return ""; return "";
} }
ExitBloc(); ExitBloc();
@ -1061,7 +1061,7 @@ function exportAdmin()
// $localisation = $PagingManager->getCurrentLocalisation(); // $localisation = $PagingManager->getCurrentLocalisation();
if ($groupUserId==0) if ($groupUserId==0)
{ {
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation);
return ""; return "";
} }
@ -1104,15 +1104,15 @@ function exportAdmin()
if (!$verif_delete) if (!$verif_delete)
{ {
systemRedirect(formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgDelete",$user_id).$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgDelete",$user_id).$localisation);
} }
else else
{ {
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","msgDelete").$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","msgDelete").$localisation);
} }
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","wrongArgument").$localisation);
return ""; return "";
} }
ExitBloc(); ExitBloc();
@ -1158,10 +1158,10 @@ 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(formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgSave",$user_id).$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","ChangeUserAdmin","msgSave",$user_id).$localisation);
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(),"AdminUser","actionAdmin","selectcheckbox").$localisation); systemRedirect(Navigation::formatUrl($this->getId(),"AdminUser","actionAdmin","selectcheckbox").$localisation);
return ""; return "";
} }
} }

20
lib/object_coordination/community/community.php
View File

@ -105,7 +105,7 @@ Class Community extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", htmlentitiesconv($GLOBALS['CONF_PAGE_EXECUTION']."?id=".$GLOBALS['SYSTEM_USER_SESSION']->id."&system=navigationNode&navigationNodeId=".$GLOBALS["SYSTEM_USER_SESSION"]->entryNodeId)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", htmlentitiesconv($GLOBALS['CONF_PAGE_EXECUTION']."?id=".$GLOBALS['SYSTEM_USER_SESSION']->id."&system=navigationNode&navigationNodeId=".$GLOBALS["SYSTEM_USER_SESSION"]->entryNodeId));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->GetId(), "Community", "actionLecture", $msg)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->GetId(), "Community", "actionLecture", $msg));
//Initialisation des compteurs //Initialisation des compteurs
$j =1; $j =1;
@ -121,7 +121,7 @@ Class Community extends CoordinationObj
{ {
//Affiche la communauté dans la langue courante et formate l'url pour le lien vers le détail //Affiche la communauté dans la langue courante et formate l'url pour le lien vers le détail
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.col.node",$tabNode[$i][1]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.col.node",$tabNode[$i][1]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.col.urlget",formatUrl($this->getId(), "Community", "actionLecture", "", $tabNode[$i][0])); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.col.urlget",Navigation::formatUrl($this->getId(), "Community", "actionLecture", "", $tabNode[$i][0]));
$GLOBALS['SYSTEM_TEMPLATE']->MxText("ligne.col.imgPath", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']); $GLOBALS['SYSTEM_TEMPLATE']->MxText("ligne.col.imgPath", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']);
switch($c) switch($c)
@ -184,7 +184,7 @@ Class Community extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("bloc1.entrynodeid",$tabNode[$i][0]); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("bloc1.entrynodeid",$tabNode[$i][0]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("bloc1.entrynodeselected"," selected='selected' "); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("bloc1.entrynodeselected"," selected='selected' ");
$url_inscrire = formatUrl($this->GetId(),"Community","formlecture","",$tabNode[$i][0]); $url_inscrire = Navigation::formatUrl($this->GetId(),"Community","formlecture","",$tabNode[$i][0]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("inscrire", "button", "ok", getMessage("registerCom"), " onclick=\"javascript:window.location.href='$url_inscrire';\""); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("inscrire", "button", "ok", getMessage("registerCom"), " onclick=\"javascript:window.location.href='$url_inscrire';\"");
} }
else else
@ -295,7 +295,7 @@ Class Community extends CoordinationObj
# Récupération des étiquette du formulaire # Récupération des étiquette du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("libelle", getMessage("textinfo")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("libelle", getMessage("textinfo"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"Community","execAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"Community","execAdmin"));
# Destruction des éléments # Destruction des éléments
@ -350,7 +350,7 @@ Class Community extends CoordinationObj
$GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult(); $GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult();
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"Community","actionAdmin","datamodified")); systemRedirect(Navigation::formatUrl($this->getId(),"Community","actionAdmin","datamodified"));
return ""; return "";
} }
@ -420,10 +420,10 @@ Class Community extends CoordinationObj
# Destruction des éléments # Destruction des éléments
$GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult(); $GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult();
# Récupération des étiquette du formulaire # Récupération des étiquette du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"Community","execLecture","",$_GET['param'])); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"Community","execLecture","",$_GET['param']));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturn",formatUrl($this->getId(),"Community","actionLecture")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturn",Navigation::formatUrl($this->getId(),"Community","actionLecture"));
// $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlQaptcha", formatUrl($this->getId(),"Community","formLectureQaptcha")); // $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlQaptcha", Navigation::formatUrl($this->getId(),"Community","formLectureQaptcha"));
# Affichage des champs de formulaire pour l'inscription # Affichage des champs de formulaire pour l'inscription
if(!$tabPOST) if(!$tabPOST)
{ {
@ -622,7 +622,7 @@ Class Community extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("DATA", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."object_coordination/Community/formlecture.mxt"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("DATA", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."object_coordination/Community/formlecture.mxt");
$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("DATA", "relative"); $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("DATA", "relative");
$this->formLecture($_POST); $this->formLecture($_POST);
// systemRedirect(formatUrl($this->getId(),"Community","formLecture","user_exist")); // systemRedirect(Navigation::formatUrl($this->getId(),"Community","formLecture","user_exist"));
} }
else else
{ {
@ -676,7 +676,7 @@ Class Community extends CoordinationObj
# Redirection vers le formulaire # Redirection vers le formulaire
// systemRedirect(absoluteUrl("user_subscribe", $_GET['param'])); // systemRedirect(absoluteUrl("user_subscribe", $_GET['param']));
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"Home", "actionLecture", "user_subscribe")); systemRedirect(Navigation::formatUrl($this->getId(),"Home", "actionLecture", "user_subscribe"));
} }
// } // }
// else //si la Charte n'est pas validée // else //si la Charte n'est pas validée

24
lib/object_coordination/home/home.php
View File

@ -51,7 +51,7 @@ Class Home extends CoordinationObj
$tabPictoTabe = array("eye","cogs"); $tabPictoTabe = array("eye","cogs");
$tabTabe = array("TxtTabeView","TxtTabeAdmin"); $tabTabe = array("TxtTabeView","TxtTabeAdmin");
$tabAction = array(array("lectureAdmin"), array("actionAdmin")); $tabAction = array(array("lectureAdmin"), array("actionAdmin"));
$tabUrlTabe = array(formatUrl($this->getId(), "TextInfo", "lectureAdmin"),formatUrl($this->getId(), "TextInfo", "actionAdmin")); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "TextInfo", "lectureAdmin"),Navigation::formatUrl($this->getId(), "TextInfo", "actionAdmin"));
printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
} }
/** /**
@ -103,8 +103,8 @@ Class Home extends CoordinationObj
$urlNewAccount.= "?system=authNewAccount"; $urlNewAccount.= "?system=authNewAccount";
$urlNewAccount = addIdToUrl($urlNewAccount); $urlNewAccount = addIdToUrl($urlNewAccount);
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionNewAccount", formatUrl($urlArray["id"], "Home", "formLecture", "", recupCommunity())); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionNewAccount", Navigation::formatUrl($urlArray["id"], "Home", "formLecture", "", recupCommunity()));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionNewSubscription", formatUrl($urlArray["id"], "Home", "formLectureAdh", "", recupCommunity())); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlActionNewSubscription", Navigation::formatUrl($urlArray["id"], "Home", "formLectureAdh", "", recupCommunity()));
/* Création de l'URL pour rappel du mot de passe */ /* Création de l'URL pour rappel du mot de passe */
$urlForgotPassword = $_SERVER['SCRIPT_NAME']; $urlForgotPassword = $_SERVER['SCRIPT_NAME'];
@ -251,16 +251,16 @@ Class Home extends CoordinationObj
// // $urlArray["methodname"]=$tabObject[$i][0]->getMethodName(); // // $urlArray["methodname"]=$tabObject[$i][0]->getMethodName();
// } // }
// } // }
// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("blocSubscriptionsForms".".linkStatuts", formatUrl($urlArray["id"],$urlArray["classname"],"actionLectureInfo","","2")); // $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("blocSubscriptionsForms".".linkStatuts", Navigation::formatUrl($urlArray["id"],$urlArray["classname"],"actionLectureInfo","","2"));
// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("blocSubscriptionsForms".".linkRegInt", formatUrl($urlArray["id"],$urlArray["classname"],"actionLectureInfo","","3")); // $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("blocSubscriptionsForms".".linkRegInt", Navigation::formatUrl($urlArray["id"],$urlArray["classname"],"actionLectureInfo","","3"));
// $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("blocSubscriptionsForms".".linkChartConf", formatUrl($urlArray["id"],$urlArray["classname"],"actionLectureInfo","","4")); // $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("blocSubscriptionsForms".".linkChartConf", Navigation::formatUrl($urlArray["id"],$urlArray["classname"],"actionLectureInfo","","4"));
// } // }
} }
# Récupération des étiquette du formulaire # Récupération des étiquette du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("WarnNotSubs", htmlspecialchars(getMessage("WarnNotSubs1")).$libmyNoeud.htmlspecialchars(getMessage("WarnNotSubs2"))); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("WarnNotSubs", htmlspecialchars(getMessage("WarnNotSubs1")).$libmyNoeud.htmlspecialchars(getMessage("WarnNotSubs2")));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"Home","execLecture","",$_GET['param'])); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"Home","execLecture","",$_GET['param']));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturn",formatUrl($this->getId(),"Home","actionLecture")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlReturn",Navigation::formatUrl($this->getId(),"Home","actionLecture"));
// $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlQaptcha", formatUrl($this->getId(),"Home","formLectureQaptcha")); // $GLOBALS["SYSTEM_TEMPLATE"]->MxText("urlQaptcha", Navigation::formatUrl($this->getId(),"Home","formLectureQaptcha"));
# Affichage des champs de formulaire pour l'inscription # Affichage des champs de formulaire pour l'inscription
if(!$tabPOST) if(!$tabPOST)
@ -772,7 +772,7 @@ public function formLectureQaptcha()
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("wysiText", $wysiText->Display()); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("wysiText", $wysiText->Display());
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("currentLang", $currentCode); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("currentLang", $currentCode);
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(), "Home", "execAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(), "Home", "execAdmin"));
return ""; return "";
} }
@ -817,7 +817,7 @@ public function formLectureQaptcha()
$GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult(); $GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult();
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"Home", "actionAdmin", "datamodified")); systemRedirect(Navigation::formatUrl($this->getId(),"Home", "actionAdmin", "datamodified"));
return ""; return "";
} }
@ -907,7 +907,7 @@ public function formLectureQaptcha()
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("DATA", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."object_coordination/home/formlecture.mxt"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("DATA", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."object_coordination/home/formlecture.mxt");
$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("DATA", "relative"); $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("DATA", "relative");
$this->formLecture($_POST); $this->formLecture($_POST);
// systemRedirect(formatUrl($this->getId(),"Home","formLecture","user_exist")); // systemRedirect(Navigation::formatUrl($this->getId(),"Home","formLecture","user_exist"));
} }
else else
{ {

100
lib/object_coordination/installmanager/installmanager.php
View File

@ -52,7 +52,7 @@ Class InstallManager extends CoordinationObj
$tabPictoTabe = array("eye","minus", "cogs"); $tabPictoTabe = array("eye","minus", "cogs");
$tabTabe = array("BtnUpload","BtnInstall", "BtnBkp"); $tabTabe = array("BtnUpload","BtnInstall", "BtnBkp");
$tabAction = array(array("actionInstall"), array("listInstall", "beforeInstall", "install","afterInstall", "beforeUninstall", "uninstall", "afterUninstall"), array("bkpManageInstall")); $tabAction = array(array("actionInstall"), array("listInstall", "beforeInstall", "install","afterInstall", "beforeUninstall", "uninstall", "afterUninstall"), array("bkpManageInstall"));
$tabUrlTabe = array(formatUrl($this->getId(), "InstallManager", "actionInstall"),formatUrl($this->getId(), "InstallManager", "listInstall"),formatUrl($this->getId(), "InstallManager", "bkpManageInstall")); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "InstallManager", "actionInstall"),Navigation::formatUrl($this->getId(), "InstallManager", "listInstall"),Navigation::formatUrl($this->getId(), "InstallManager", "bkpManageInstall"));
printTabeAdmin("TabeB",$tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeB",$tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
return true; return true;
} }
@ -199,7 +199,7 @@ Class InstallManager extends CoordinationObj
################################################################# #################################################################
# affichage des éléments # affichage des éléments
################################################################# #################################################################
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlUpload", formatUrl($this->getId(), "InstallManager", "uploadInstall")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlUpload", Navigation::formatUrl($this->getId(), "InstallManager", "uploadInstall"));
$tabDel=array(); $tabDel=array();
// if( is_array($tabPackage) && count($tabPackage) > 0 ) // if( is_array($tabPackage) && count($tabPackage) > 0 )
@ -249,15 +249,15 @@ Class InstallManager extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".size", (isset($tabSize[$val]) && $tabSize[$val]!=null)?(round($tabSize[$val]/1024,2)):getMessage("TxtNoSize")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".size", (isset($tabSize[$val]) && $tabSize[$val]!=null)?(round($tabSize[$val]/1024,2)):getMessage("TxtNoSize"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".name", $tmp[1]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".name", $tmp[1]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".version", $tmp[2]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".version", $tmp[2]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".urlDetail", formatUrl($this->getId(), "InstallManager", "actionInstall", "&detailId=".$val)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".urlDetail", Navigation::formatUrl($this->getId(), "InstallManager", "actionInstall", "&detailId=".$val));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".BtnView", getMessage("BtnView")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".BtnView", getMessage("BtnView"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".urlDownload", formatUrl($this->getId(), "InstallManager", "downloadSourceInstall", "","&detailId=".$val)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".urlDownload", Navigation::formatUrl($this->getId(), "InstallManager", "downloadSourceInstall", "","&detailId=".$val));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".TxtUploadFromFtp", getMessage("TxtUploadFromFtp")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".TxtUploadFromFtp", getMessage("TxtUploadFromFtp"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc($tmp[0], "loop"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc($tmp[0], "loop");
} }
} }
// } else { // } else {
// systemRedirect(formatUrl($this->getId(),"InstallManager", "actionInstall", "TxtNoPackageAvailable")); // systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "actionInstall", "TxtNoPackageAvailable"));
// return ""; // return "";
// } // }
# On efface les blocs qui ne servent à rien... # On efface les blocs qui ne servent à rien...
@ -300,13 +300,13 @@ Class InstallManager extends CoordinationObj
if ($connection->downloadFile($src5Path, $dest5Path)){ if ($connection->downloadFile($src5Path, $dest5Path)){
$tabMd=parse_ini_file($dest5Path); $tabMd=parse_ini_file($dest5Path);
if( (isset($tabMd["md5"])) && ($tabMd["md5"]==md5_file($destPath)) ){ if( (isset($tabMd["md5"])) && ($tabMd["md5"]==md5_file($destPath)) ){
systemRedirect(formatUrl($this->getId(), "InstallManager", "actionInstall", "MsgDownloaded")); systemRedirect(Navigation::formatUrl($this->getId(), "InstallManager", "actionInstall", "MsgDownloaded"));
return ""; return "";
} }
} }
@unlink($destPath); @unlink($destPath);
@unlink($dest5Path); @unlink($dest5Path);
systemRedirect(formatUrl($this->getId(), "InstallManager", "actionInstall", "MsgFailedForMd5")); systemRedirect(Navigation::formatUrl($this->getId(), "InstallManager", "actionInstall", "MsgFailedForMd5"));
return ""; return "";
$connection->close(); $connection->close();
@ -314,7 +314,7 @@ Class InstallManager extends CoordinationObj
$connection->close; $connection->close;
} }
} }
systemRedirect(formatUrl($this->getId(), "InstallManager", "actionInstall", "MsgDownloadError","&detailId=".$detailId)); systemRedirect(Navigation::formatUrl($this->getId(), "InstallManager", "actionInstall", "MsgDownloadError","&detailId=".$detailId));
return ""; return "";
} }
@ -389,7 +389,7 @@ Class InstallManager extends CoordinationObj
reset($tabPackage); reset($tabPackage);
// urlUpload // urlUpload
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlUpload", formatUrl($this->getId(), "InstallManager", "uploadInstall")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlUpload", Navigation::formatUrl($this->getId(), "InstallManager", "uploadInstall"));
// tabDownloadCp == package pouvant être installé // tabDownloadCp == package pouvant être installé
// tabTmp = package déjà installé // tabTmp = package déjà installé
@ -441,17 +441,17 @@ Class InstallManager extends CoordinationObj
$tabDel[$tmp[0]]=true; $tabDel[$tmp[0]]=true;
$GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".name", $tmp[1]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".name", $tmp[1]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".version", $tmp[2]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText($tmp[0].".version", $tmp[2]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".urlDetail", formatUrl($this->getId(), "InstallManager", "listInstall", "&detailId=".$val)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".urlDetail", Navigation::formatUrl($this->getId(), "InstallManager", "listInstall", "&detailId=".$val));
########################################################################### ###########################################################################
if (!in_array($val, $tabTmp)){ if (!in_array($val, $tabTmp)){
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".class", "text-warning"); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".class", "text-warning");
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".INSTALL.urlInstall", formatUrl($this->getId(), "InstallManager", "beforeInstall", "","&detailId=".$val)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".INSTALL.urlInstall", Navigation::formatUrl($this->getId(), "InstallManager", "beforeInstall", "","&detailId=".$val));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".INSTALL.urlDeleteSrc", formatUrl($this->getId(), "InstallManager", "deletePackageInstall", "","&detailId=".$val)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".INSTALL.urlDeleteSrc", Navigation::formatUrl($this->getId(), "InstallManager", "deletePackageInstall", "","&detailId=".$val));
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc($tmp[0].".UNINSTALL", "delete"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc($tmp[0].".UNINSTALL", "delete");
}else{ }else{
// Package non installïżœ $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".class", "text-success"); // Package non installïżœ $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".class", "text-success");
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".UNINSTALL.urlUnInstall", formatUrl($this->getId(), "InstallManager", "beforeUninstall", "","&detailId=".$val)); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut($tmp[0].".UNINSTALL.urlUnInstall", Navigation::formatUrl($this->getId(), "InstallManager", "beforeUninstall", "","&detailId=".$val));
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc($tmp[0].".INSTALL", "delete"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc($tmp[0].".INSTALL", "delete");
} }
########################################################################### ###########################################################################
@ -494,26 +494,26 @@ Class InstallManager extends CoordinationObj
{ {
$tmp=mb_split("-", $_FILES["uploadFile"]["name"]); $tmp=mb_split("-", $_FILES["uploadFile"]["name"]);
} else { } else {
systemRedirect(formatUrl($this->getId(),"InstallManager", "actionInstall", "msgPackageNameNotValid")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "actionInstall", "msgPackageNameNotValid"));
return ""; return "";
} }
} else { } else {
systemRedirect(formatUrl($this->getId(),"InstallManager", "actionInstall", "msgPackageNotValid")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "actionInstall", "msgPackageNotValid"));
return ""; return "";
} }
// on test si le package a été uploadé... // on test si le package a été uploadé...
if(file_exists($uploadDir.$_FILES["uploadFile"]["name"])){ if(file_exists($uploadDir.$_FILES["uploadFile"]["name"])){
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "msgAllreadyExist")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "msgAllreadyExist"));
return ""; return "";
} }
$myUpload=new UploadToDir("uploadFile", $uploadDir); $myUpload=new UploadToDir("uploadFile", $uploadDir);
if ($myUpload->uploadFile(nid(), $this->getId(), uid(), "NONE", $chmod)!=false){ if ($myUpload->uploadFile(nid(), $this->getId(), uid(), "NONE", $chmod)!=false){
systemRedirect(formatUrl($this->getId(),"InstallManager", "beforeInstall", "msgDone", "&detailId=".substr($_FILES["uploadFile"]["name"],0 , (strlen($_FILES["uploadFile"]["name"])-4)))); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "beforeInstall", "msgDone", "&detailId=".substr($_FILES["uploadFile"]["name"],0 , (strlen($_FILES["uploadFile"]["name"])-4))));
return ""; return "";
}else{ }else{
systemRedirect(formatUrl($this->getId(),"InstallManager", "actionInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "actionInstall", "wrongArgument"));
return ""; return "";
} }
} }
@ -548,11 +548,11 @@ Class InstallManager extends CoordinationObj
if (file_exists($path5)){ if (file_exists($path5)){
@unlink($path5); @unlink($path5);
} }
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "msgSourceDeleted")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "msgSourceDeleted"));
return ""; return "";
} }
} }
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -577,7 +577,7 @@ Class InstallManager extends CoordinationObj
$path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/packagesrc/".$detailId.".tar"; $path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/packagesrc/".$detailId.".tar";
if ($detailId=="" || !file_exists($path)){ if ($detailId=="" || !file_exists($path)){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -592,7 +592,7 @@ Class InstallManager extends CoordinationObj
$archive->extractTo($GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId, null, true); $archive->extractTo($GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId, null, true);
} catch (Exception $e) { } catch (Exception $e) {
# Décompression non valide # Décompression non valide
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
#TODO : Check and define scripts permissions #TODO : Check and define scripts permissions
@ -603,7 +603,7 @@ Class InstallManager extends CoordinationObj
includeDep("installmanager/installdriver.php"); includeDep("installmanager/installdriver.php");
$installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId); $installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId);
$url=formatUrl($this->getId(), "InstallManager", "install", "","&detailId=".$detailId); $url=Navigation::formatUrl($this->getId(), "InstallManager", "install", "","&detailId=".$detailId);
$end=$installDriver->__beforeInstall($url); $end=$installDriver->__beforeInstall($url);
$this->tabeCreate(); $this->tabeCreate();
@ -628,7 +628,7 @@ Class InstallManager extends CoordinationObj
$path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/"; $path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/";
if ($detailId=="" || !is_dir($path)){ if ($detailId=="" || !is_dir($path)){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -637,7 +637,7 @@ Class InstallManager extends CoordinationObj
includeDep("installmanager/installdriver.php"); includeDep("installmanager/installdriver.php");
$installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId); $installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId);
$end=$installDriver->__install($detailId, $doBackup, formatUrl($this->getId(),"InstallManager", "afterInstall", "", "&detailId=".$detailId)); $end=$installDriver->__install($detailId, $doBackup, Navigation::formatUrl($this->getId(),"InstallManager", "afterInstall", "", "&detailId=".$detailId));
$this->tabeCreate(); $this->tabeCreate();
return $end; return $end;
@ -659,7 +659,7 @@ Class InstallManager extends CoordinationObj
$path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/"; $path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/";
if ($detailId=="" || !is_dir($path)){ if ($detailId=="" || !is_dir($path)){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -695,7 +695,7 @@ Class InstallManager extends CoordinationObj
$path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/packagesrc/".$detailId.".tar"; $path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/packagesrc/".$detailId.".tar";
if ($detailId=="" || !file_exists($path)){ if ($detailId=="" || !file_exists($path)){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -709,7 +709,7 @@ Class InstallManager extends CoordinationObj
$archive->extract_files($chmod); $archive->extract_files($chmod);
if (count($archive->error)!=0){ if (count($archive->error)!=0){
# Décompression non valide # Décompression non valide
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -718,7 +718,7 @@ Class InstallManager extends CoordinationObj
includeDep("installmanager/installdriver.php"); includeDep("installmanager/installdriver.php");
$installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId); $installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId);
$url=formatUrl($this->getId(), "InstallManager", "uninstall", "","&detailId=".$detailId); $url=Navigation::formatUrl($this->getId(), "InstallManager", "uninstall", "","&detailId=".$detailId);
$end=$installDriver->__beforeUninstall($url); $end=$installDriver->__beforeUninstall($url);
$this->tabeCreate(); $this->tabeCreate();
@ -741,7 +741,7 @@ Class InstallManager extends CoordinationObj
$path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/"; $path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/";
if ($detailId=="" || !is_dir($path)){ if ($detailId=="" || !is_dir($path)){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -750,7 +750,7 @@ Class InstallManager extends CoordinationObj
includeDep("installmanager/installdriver.php"); includeDep("installmanager/installdriver.php");
$installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId); $installDriver=InstallFactory::getInstallDriver($detailId, $GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId);
$url=formatUrl($this->getId(), "InstallManager", "afterUninstall", "","&detailId=".$detailId); $url=Navigation::formatUrl($this->getId(), "InstallManager", "afterUninstall", "","&detailId=".$detailId);
$end=$installDriver->__uninstall($url); $end=$installDriver->__uninstall($url);
$this->tabeCreate(); $this->tabeCreate();
@ -773,7 +773,7 @@ Class InstallManager extends CoordinationObj
$path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/"; $path=$GLOBALS["CONF_DATA_PATH"]."data/upload/install/package/".$detailId."/";
if ($detailId=="" || !is_dir($path)){ if ($detailId=="" || !is_dir($path)){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "listInstall", "wrongArgument"));
return ""; return "";
} }
@ -846,8 +846,8 @@ Class InstallManager extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.DB.nom", $tabDb[$j]["nom"]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.DB.nom", $tabDb[$j]["nom"]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.DB.TxtName", getMessage("TxtName")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.DB.TxtName", getMessage("TxtName"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.DB.TxtAction", getMessage("TxtAction")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.DB.TxtAction", getMessage("TxtAction"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.DB.link", "javascript:validExecBd('".formatUrl($this->getId(), "installmanager", "dbExecInstall", "", "&idDbBkp=".$tabDb[$j]["id"]."');")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.DB.link", "javascript:validExecBd('".Navigation::formatUrl($this->getId(), "installmanager", "dbExecInstall", "", "&idDbBkp=".$tabDb[$j]["id"]."');"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.DB.linkDel", "javascript:validDeleteBd('".formatUrl($this->getId(), "installmanager", "dbDeleteInstall", "", "&idDbBkp=".$tabDb[$j]["id"]."');")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.DB.linkDel", "javascript:validDeleteBd('".Navigation::formatUrl($this->getId(), "installmanager", "dbDeleteInstall", "", "&idDbBkp=".$tabDb[$j]["id"]."');"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("BACKUP.DB", "loop"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("BACKUP.DB", "loop");
} }
}else{ }else{
@ -863,8 +863,8 @@ Class InstallManager extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.SCRIPT.oldname", $tabScript[$j]["oldname"]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.SCRIPT.oldname", $tabScript[$j]["oldname"]);
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.SCRIPT.TxtAction", getMessage("TxtAction")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.SCRIPT.TxtAction", getMessage("TxtAction"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.SCRIPT.TxtName", getMessage("TxtName")); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("BACKUP.SCRIPT.TxtName", getMessage("TxtName"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.SCRIPT.link", "javascript:validExecScript('".formatUrl($this->getId(), "installmanager", "scriptExecInstall", "", "&idScriptBkp=".$tabScript[$j]["id"]."');")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.SCRIPT.link", "javascript:validExecScript('".Navigation::formatUrl($this->getId(), "installmanager", "scriptExecInstall", "", "&idScriptBkp=".$tabScript[$j]["id"]."');"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.SCRIPT.linkDel", "javascript:validDeleteScript('".formatUrl($this->getId(), "installmanager", "scriptDeleteInstall", "", "&idScriptBkp=".$tabScript[$j]["id"]."');")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("BACKUP.SCRIPT.linkDel", "javascript:validDeleteScript('".Navigation::formatUrl($this->getId(), "installmanager", "scriptDeleteInstall", "", "&idScriptBkp=".$tabScript[$j]["id"]."');"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("BACKUP.SCRIPT", "loop"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("BACKUP.SCRIPT", "loop");
} }
}else{ }else{
@ -883,7 +883,7 @@ Class InstallManager extends CoordinationObj
if (count($tabpatch)==0) if (count($tabpatch)==0)
$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("BACKUP", "delete"); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("BACKUP", "delete");
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("jsDoBkp", "javascript:validDoBkp('".formatUrl($this->getId(), "InstallManager", "createDbBkpInstall", "")."');"); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("jsDoBkp", "javascript:validDoBkp('".Navigation::formatUrl($this->getId(), "InstallManager", "createDbBkpInstall", "")."');");
} }
/** /**
* execution d'un bkp db... * execution d'un bkp db...
@ -896,7 +896,7 @@ Class InstallManager extends CoordinationObj
$idScriptBkp =( (isset($_GET["idScriptBkp"])) && (is_numeric($_GET["idScriptBkp"])) )?$_GET["idScriptBkp"]:null; $idScriptBkp =( (isset($_GET["idScriptBkp"])) && (is_numeric($_GET["idScriptBkp"])) )?$_GET["idScriptBkp"]:null;
if ($idScriptBkp==null){ if ($idScriptBkp==null){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
return ""; return "";
} }
includePackage("backup.php"); includePackage("backup.php");
@ -906,9 +906,9 @@ Class InstallManager extends CoordinationObj
$script=$backup->getScriptArchiveFromId($idScriptBkp); $script=$backup->getScriptArchiveFromId($idScriptBkp);
if ($script!==false){ if ($script!==false){
@copy($script["newname"], $script["oldname"]); @copy($script["newname"], $script["oldname"]);
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgRestaurationOk")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgRestaurationOk"));
}else{ }else{
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
} }
return ""; return "";
} }
@ -924,7 +924,7 @@ Class InstallManager extends CoordinationObj
$idScriptBkp =( (isset($_GET["idScriptBkp"])) && (is_numeric($_GET["idScriptBkp"])) )?$_GET["idScriptBkp"]:null; $idScriptBkp =( (isset($_GET["idScriptBkp"])) && (is_numeric($_GET["idScriptBkp"])) )?$_GET["idScriptBkp"]:null;
if ($idScriptBkp==null){ if ($idScriptBkp==null){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
return ""; return "";
} }
includePackage("backup.php"); includePackage("backup.php");
@ -936,9 +936,9 @@ Class InstallManager extends CoordinationObj
$sql_bd="DELETE FROM ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_PACKAGE_PREFIX."backupfile WHERE id=".$idScriptBkp; $sql_bd="DELETE FROM ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_PACKAGE_PREFIX."backupfile WHERE id=".$idScriptBkp;
$query_bd=$GLOBALS["SYSTEM_DATABASE_CONN"]->sql_query($sql_bd); $query_bd=$GLOBALS["SYSTEM_DATABASE_CONN"]->sql_query($sql_bd);
@unlink($script["newname"]); @unlink($script["newname"]);
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgDeleted")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgDeleted"));
}else{ }else{
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
} }
return ""; return "";
} }
@ -954,7 +954,7 @@ Class InstallManager extends CoordinationObj
$idDbBkp =( (isset($_GET["idDbBkp"])) && (is_numeric($_GET["idDbBkp"])) )?$_GET["idDbBkp"]:null; $idDbBkp =( (isset($_GET["idDbBkp"])) && (is_numeric($_GET["idDbBkp"])) )?$_GET["idDbBkp"]:null;
if ($idDbBkp==null){ if ($idDbBkp==null){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
return ""; return "";
} }
includePackage("backup.php"); includePackage("backup.php");
@ -964,9 +964,9 @@ Class InstallManager extends CoordinationObj
$db=$backup->getDbArchiveFromId($idDbBkp); $db=$backup->getDbArchiveFromId($idDbBkp);
if ($db!==false){ if ($db!==false){
$backup->restoreBackUpDb($GLOBALS["CONF_DATA_PATH"]."data/backup/", $db["nom"]); $backup->restoreBackUpDb($GLOBALS["CONF_DATA_PATH"]."data/backup/", $db["nom"]);
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgRestaurationOk")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgRestaurationOk"));
}else{ }else{
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
} }
return ""; return "";
} }
@ -982,7 +982,7 @@ Class InstallManager extends CoordinationObj
if ($idDbBkp==null){ if ($idDbBkp==null){
# Erreur : package demandé non disponible... :-( # Erreur : package demandé non disponible... :-(
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
return ""; return "";
} }
includePackage("backup.php"); includePackage("backup.php");
@ -994,9 +994,9 @@ Class InstallManager extends CoordinationObj
$sql_bd="DELETE FROM ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_PACKAGE_PREFIX."backupbd WHERE id=".$idDbBkp; $sql_bd="DELETE FROM ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_PACKAGE_PREFIX."backupbd WHERE id=".$idDbBkp;
$query_bd=$GLOBALS["SYSTEM_DATABASE_CONN"]->sql_query($sql_bd); $query_bd=$GLOBALS["SYSTEM_DATABASE_CONN"]->sql_query($sql_bd);
@unlink($GLOBALS["CONF_DATA_PATH"]."data/backup/".$db["nom"]); @unlink($GLOBALS["CONF_DATA_PATH"]."data/backup/".$db["nom"]);
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgDeleted")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgDeleted"));
}else{ }else{
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "wrongArgument"));
} }
return ""; return "";
} }
@ -1011,7 +1011,7 @@ Class InstallManager extends CoordinationObj
$name="bkp-".date("Y-m-d"); $name="bkp-".date("Y-m-d");
$id=$backup->createBackup($name); $id=$backup->createBackup($name);
$backup->bkpDbFromTab($id, $name, 0000); $backup->bkpDbFromTab($id, $name, 0000);
systemRedirect(formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgBkpOk")); systemRedirect(Navigation::formatUrl($this->getId(),"InstallManager", "bkpManageInstall", "MsgBkpOk"));
} }

6
lib/object_coordination/textinfo/textinfo.php
View File

@ -56,7 +56,7 @@ Class TextInfo extends CoordinationObj
$tabPictoTabe = array("eye","cogs"); $tabPictoTabe = array("eye","cogs");
$tabTabe = array("TxtTabeView","TxtTabeAdmin"); $tabTabe = array("TxtTabeView","TxtTabeAdmin");
$tabAction = array(array("lectureAdmin"), array("actionAdmin")); $tabAction = array(array("lectureAdmin"), array("actionAdmin"));
$tabUrlTabe = array(formatUrl($this->getId(), "TextInfo", "lectureAdmin"),formatUrl($this->getId(), "TextInfo", "actionAdmin")); $tabUrlTabe = array(Navigation::formatUrl($this->getId(), "TextInfo", "lectureAdmin"),Navigation::formatUrl($this->getId(), "TextInfo", "actionAdmin"));
printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction); printTabeAdmin("TabeB", $tabTabe, $tabUrlTabe, $tabPictoTabe, $tabAction);
} }
@ -156,7 +156,7 @@ Class TextInfo extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("wysiwyg_fr", $wysiTextFr->Display()); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("wysiwyg_fr", $wysiTextFr->Display());
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("currentLang", $currentCode); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("currentLang", $currentCode);
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"TextInfo","execAdmin")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"TextInfo","execAdmin"));
return ""; return "";
} }
@ -224,7 +224,7 @@ Class TextInfo extends CoordinationObj
} }
# Redirection vers le formulaire (avec le message) # Redirection vers le formulaire (avec le message)
systemRedirect(formatUrl($this->getId(),"TextInfo","actionAdmin","datamodified")); systemRedirect(Navigation::formatUrl($this->getId(),"TextInfo","actionAdmin","datamodified"));
return ""; return "";
} }

8
lib/object_coordination/usermodif/usermodif.php
View File

@ -119,7 +119,7 @@ Class UserModif extends CoordinationObj
} }
# Récupération des étiquette du formulaire # Récupération des étiquette du formulaire
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"UserModif","execModifier")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", Navigation::formatUrl($this->getId(),"UserModif","execModifier"));
ExitBloc(); ExitBloc();
return ""; return "";
@ -175,13 +175,13 @@ Class UserModif extends CoordinationObj
$GLOBALS["SYSTEM_CONTROL"]->messageSystem = "user_exist"; $GLOBALS["SYSTEM_CONTROL"]->messageSystem = "user_exist";
/* On inclus la template (voir package.template.php) */ /* On inclus la template (voir package.template.php) */
$this->actionModifier(); $this->actionModifier();
systemRedirect(formatUrl($this->getId(),"UserModif","actionModifier","user_exist")); systemRedirect(Navigation::formatUrl($this->getId(),"UserModif","actionModifier","user_exist"));
} }
else else
{ {
if ($_POST['user_password']!=$_POST['re_user_password']) if ($_POST['user_password']!=$_POST['re_user_password'])
{ {
systemRedirect(formatUrl($this->getId(),"UserModif","actionModifier","msgWrongPassValidation")); systemRedirect(Navigation::formatUrl($this->getId(),"UserModif","actionModifier","msgWrongPassValidation"));
return ""; return "";
} }
@ -212,7 +212,7 @@ Class UserModif extends CoordinationObj
$ObjUsersave = $GLOBALS['SYSTEM_MANAGER']['USER']->saveInstance($GLOBALS["SYSTEM_USER_SESSION"]->user); $ObjUsersave = $GLOBALS['SYSTEM_MANAGER']['USER']->saveInstance($GLOBALS["SYSTEM_USER_SESSION"]->user);
# Redirection vers le formulaire # Redirection vers le formulaire
systemRedirect(formatUrl($this->getId(),"UserModif","actionModifier","userdatamodified")); systemRedirect(Navigation::formatUrl($this->getId(),"UserModif","actionModifier","userdatamodified"));
} }
return ""; return "";
} }

26
lib/object_coordination/usertemp/usertemp.php
View File

@ -162,9 +162,9 @@ Class UserTemp extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("user_accept", "button", "boutton", getMessage("user_accept"), " class=\"btn btn-outline-secondary btn-lg btn-sm\" aria-pressed=\"true\" onclick=\"javascript:Valid_register(1,'FManageRegister','user_id[]');\""); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("user_accept", "button", "boutton", getMessage("user_accept"), " class=\"btn btn-outline-secondary btn-lg btn-sm\" aria-pressed=\"true\" onclick=\"javascript:Valid_register(1,'FManageRegister','user_id[]');\"");
# Envoi du formulaire en fonction de l'action : encode le javascript # Envoi du formulaire en fonction de l'action : encode le javascript
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction0", formatUrl($this->getId(),"UserTemp","execManageRegister")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction0", Navigation::formatUrl($this->getId(),"UserTemp","execManageRegister"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction1", formatUrl($this->getId(),"UserTemp","execManageRegister")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction1", Navigation::formatUrl($this->getId(),"UserTemp","execManageRegister"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction2", formatUrl($this->getId(),"UserTemp","execDeleteManageRegister")); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction2", Navigation::formatUrl($this->getId(),"UserTemp","execDeleteManageRegister"));
return ""; return "";
} }
@ -257,9 +257,9 @@ Class UserTemp extends CoordinationObj
// $mail->AddAttachment("data/image/communities/".$_GET['param']."_logo.png"); // $mail->AddAttachment("data/image/communities/".$_GET['param']."_logo.png");
// //
// if(!$mail->Send()) { // if(!$mail->Send()) {
// systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error")); // systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error"));
// } else { // } else {
// systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend")); // systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend"));
// exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"Une demande d'inscription de l'utilisateur ".$objUser->getLogin()." est en attente sur Fab-l3.org\""); // exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"Une demande d'inscription de l'utilisateur ".$objUser->getLogin()." est en attente sur Fab-l3.org\"");
// } // }
@ -291,17 +291,17 @@ Class UserTemp extends CoordinationObj
// $mail->AltBody = 'Pour pouvoir afficher correctement le message, veuillez utiliser un client de courriels compatible HTML !'; // $mail->AltBody = 'Pour pouvoir afficher correctement le message, veuillez utiliser un client de courriels compatible HTML !';
$mail->send(); $mail->send();
systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend")); systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend"));
exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"Une demande d'inscription de l'utilisateur ".$objUser->getLogin()." est en attente sur Fab-l3.org\""); exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"Une demande d'inscription de l'utilisateur ".$objUser->getLogin()." est en attente sur Fab-l3.org\"");
} catch (Exception $e) { } catch (Exception $e) {
systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error")); systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error"));
// echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo; // echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
} }
} }
else else
{ {
//Redirection vers la page précédente actionManagerRegister, aucune coche sélectionnée //Redirection vers la page précédente actionManagerRegister, aucune coche sélectionnée
systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","selectcheckbox")); systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","selectcheckbox"));
} }
} }
@ -388,9 +388,9 @@ Class UserTemp extends CoordinationObj
// $mail->AddAttachment("data/image/communities/".recupCommunity("id")."_logo.png"); // attachment // $mail->AddAttachment("data/image/communities/".recupCommunity("id")."_logo.png"); // attachment
// //
// if(!$mail->Send()) { // if(!$mail->Send()) {
// systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error")); // systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error"));
// } else { // } else {
// systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend")); // systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend"));
// exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"La demande d'inscription de l'utilisateur ".$objUser->getLogin()." n'a pas été acceptée sur Fab-l3.org\""); // exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"La demande d'inscription de l'utilisateur ".$objUser->getLogin()." n'a pas été acceptée sur Fab-l3.org\"");
// } // }
require_once('lib/package/class.phpmailer.phpmailer.php'); require_once('lib/package/class.phpmailer.phpmailer.php');
@ -421,15 +421,15 @@ Class UserTemp extends CoordinationObj
// $mail->AltBody = 'Pour pouvoir afficher correctement le message, veuillez utiliser un client de courriels compatible HTML !'; // $mail->AltBody = 'Pour pouvoir afficher correctement le message, veuillez utiliser un client de courriels compatible HTML !';
$mail->send(); $mail->send();
systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend")); systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend"));
exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"La demande d'inscription de l'utilisateur ".$objUser->getLogin()." n'a pas été acceptée sur Fab-l3.org\""); exec("xmpp_notification.py -c=/home/webpub/fab-l3.org/www/config/.sendxmpprc-webplatform -m=\"La demande d'inscription de l'utilisateur ".$objUser->getLogin()." n'a pas été acceptée sur Fab-l3.org\"");
} catch (Exception $e) { } catch (Exception $e) {
systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error")); systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","workend_error"));
// echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo; // echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
} }
} else { } else {
//Redirection vers la page précédente actionManagerRegister, aucune coche sélectionnée //Redirection vers la page précédente actionManagerRegister, aucune coche sélectionnée
systemRedirect(formatUrl($this->getId(),"UserTemp","actionManageRegister","selectcheckbox")); systemRedirect(Navigation::formatUrl($this->getId(),"UserTemp","actionManageRegister","selectcheckbox"));
} }
} }

130
lib/object_plugin/magicquotegpc/magicquotegpc.php
View File

@ -65,71 +65,71 @@ class MagicQuoteGpc extends Plugin
*/ */
function __beforeSessionStart() function __beforeSessionStart()
{ {
if( !get_magic_quotes_runtime() && !get_magic_quotes_gpc() ) // if( !get_magic_quotes_runtime() && !get_magic_quotes_gpc() )
{ // {
if( is_array($_GET) ) // if( is_array($_GET) )
{ // {
while( list($k, $v) = each($_GET) ) // while( list($k, $v) = each($_GET) )
{ // {
if( is_array($_GET[$k]) ) // if( is_array($_GET[$k]) )
{ // {
while( list($k2, $v2) = each($_GET[$k]) ) // while( list($k2, $v2) = each($_GET[$k]) )
{ // {
$_GET[$k][$k2] = addslashes($v2); // $_GET[$k][$k2] = addslashes($v2);
} // }
@reset($_GET[$k]); // @reset($_GET[$k]);
} // }
else // else
{ // {
$_GET[$k] = addslashes($v); // $_GET[$k] = addslashes($v);
} // }
} // }
@reset($_GET); // @reset($_GET);
} // }
//
if( is_array($_POST) ) // if( is_array($_POST) )
{ // {
while( list($k, $v) = each($_POST) ) // while( list($k, $v) = each($_POST) )
{ // {
//echo "<br>".$k; // //echo "<br>".$k;
if( is_array($_POST[$k]) ) // if( is_array($_POST[$k]) )
{ // {
while( list($k2, $v2) = each($_POST[$k]) ) // while( list($k2, $v2) = each($_POST[$k]) )
{ // {
$_POST[$k][$k2] = addslashes($v2); // $_POST[$k][$k2] = addslashes($v2);
} // }
@reset($_POST[$k]); // @reset($_POST[$k]);
} // }
else // else
{ // {
$_POST[$k] = addslashes($v); // $_POST[$k] = addslashes($v);
//$_POST[substr($k, 4, (strlen($k)))] = addslashes($v); // //$_POST[substr($k, 4, (strlen($k)))] = addslashes($v);
//$_POST[$k] = ""; // //$_POST[$k] = "";
} // }
} // }
@reset($_POST); // @reset($_POST);
} // }
//
if( is_array($_COOKIE) ) // if( is_array($_COOKIE) )
{ // {
while( list($k, $v) = each($_COOKIE) ) // while( list($k, $v) = each($_COOKIE) )
{ // {
if( is_array($_COOKIE[$k]) ) // if( is_array($_COOKIE[$k]) )
{ // {
while( list($k2, $v2) = each($_COOKIE[$k]) ) // while( list($k2, $v2) = each($_COOKIE[$k]) )
{ // {
$_COOKIE[$k][$k2] = addslashes($v2); // $_COOKIE[$k][$k2] = addslashes($v2);
} // }
@reset($_COOKIE[$k]); // @reset($_COOKIE[$k]);
} // }
else // else
{ // {
$_COOKIE[$k] = addslashes($v); // $_COOKIE[$k] = addslashes($v);
} // }
} // }
@reset($_COOKIE); // @reset($_COOKIE);
} // }
} // }
return true; return true;
} }
} }

23
lib/object_plugin/navigation/navigation.php
View File

@ -102,7 +102,8 @@ class Navigation extends Plugin{
if(isset($_GET["oid"]) && is_numeric($_GET["oid"])) if(isset($_GET["oid"]) && is_numeric($_GET["oid"]))
$_GET["classe"]=get_class(Navigation::idToSessionCoordinationObject($_GET["oid"])); $_GET["classe"]=get_class(Navigation::idToSessionCoordinationObject($_GET["oid"]));
} }
function idToSessionCoordinationObject($id)
public static function idToSessionCoordinationObject($id)
{ {
if (is_numeric($id) && is_array($GLOBALS["SYSTEM_CONTROL"]->objectArray)){ if (is_numeric($id) && is_array($GLOBALS["SYSTEM_CONTROL"]->objectArray)){
for($i=0;$i<count($GLOBALS["SYSTEM_CONTROL"]->objectArray);$i++){ for($i=0;$i<count($GLOBALS["SYSTEM_CONTROL"]->objectArray);$i++){
@ -147,7 +148,7 @@ class Navigation extends Plugin{
*@return chaine *@return chaine
*@desc chaine chaine sans caractére spéciaux *@desc chaine chaine sans caractére spéciaux
*/ */
function formatName($ch) public static function formatName($ch)
{ {
/* Fonction permettant de supprimer les numéros, le point et l'espace à l'affichage */ /* Fonction permettant de supprimer les numéros, le point et l'espace à l'affichage */
@ -219,7 +220,7 @@ class Navigation extends Plugin{
* @param chaine identifiant du message(optionnel)... * @param chaine identifiant du message(optionnel)...
* @return chaine url formatté * @return chaine url formatté
*/ */
function formatUrlNode($system, $navigationNodeId, $msg="",$param="") public static function formatUrlNode($system, $navigationNodeId, $msg="",$param="")
{ {
global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE; global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE;
// var_dump($GLOBALS["CONF_PLUGIN_URL_REWRITE"]); // var_dump($GLOBALS["CONF_PLUGIN_URL_REWRITE"]);
@ -289,7 +290,7 @@ class Navigation extends Plugin{
* @param chaine identifiant du message(optionnel)... * @param chaine identifiant du message(optionnel)...
* @return chaine url formatté * @return chaine url formatté
*/ */
function formatUrl($oid, $className, $methodName, $msg="", $param="", $navigationNodeId=null) public static function formatUrl($oid, $className, $methodName, $msg="", $param="", $navigationNodeId=null)
{ {
global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE; global $SERVER_NAME, $SCRIPT_NAME, $CONF_PERSISTANT_SECURE;
if ($GLOBALS["CONF_PLUGIN_URL_REWRITE"]) if ($GLOBALS["CONF_PLUGIN_URL_REWRITE"])
@ -510,13 +511,13 @@ if (!function_exists("formatUrlNode")) // permet la redeclaration au niveau du p
* @param chaine identifiant du message(optionnel)... * @param chaine identifiant du message(optionnel)...
* @return chaine url formatté * @return chaine url formatté
*/ */
if (!function_exists("formatUrl")) // permet la redeclaration aux niveau du plugin // if (!function_exists("formatUrl")) // permet la redeclaration aux niveau du plugin
{ // {
function formatUrl($oid, $className, $methodName, $msg="",$param="", $navigationNodeId=null) // function formatUrl($oid, $className, $methodName, $msg="",$param="", $navigationNodeId=null)
{ // {
return Navigation::formatUrl($oid, $className, $methodName, $msg, $param, $navigationNodeId); // return Navigation::formatUrl($oid, $className, $methodName, $msg, $param, $navigationNodeId);
} // }
} // }
/** /**
* Fonction formatUrl * Fonction formatUrl

12
lib/object_printing/navigationprint/navigationprint.php
View File

@ -137,8 +137,8 @@ class NavigationPrint extends Printing
$urlNewAccount = $_SERVER['SCRIPT_NAME']; $urlNewAccount = $_SERVER['SCRIPT_NAME'];
$urlNewAccount.= "?system=authNewAccount"; $urlNewAccount.= "?system=authNewAccount";
$urlNewAccount = addIdToUrl($urlNewAccount); $urlNewAccount = addIdToUrl($urlNewAccount);
$MaTemplate->MxAttribut("urlActionNewAccount", formatUrl($urlArray["id"],"Home","formLecture","",recupCommunity())); $MaTemplate->MxAttribut("urlActionNewAccount", Navigation::formatUrl($urlArray["id"],"Home","formLecture","",recupCommunity()));
$MaTemplate->MxAttribut("urlActionNewSubscription", formatUrl($urlArray["id"],"Home","formLectureAdh","",recupCommunity())); $MaTemplate->MxAttribut("urlActionNewSubscription", Navigation::formatUrl($urlArray["id"],"Home","formLectureAdh","",recupCommunity()));
/* Création de l'URL pour rappel du mot de passe */ /* Création de l'URL pour rappel du mot de passe */
$urlForgotPassword = $_SERVER['SCRIPT_NAME']; $urlForgotPassword = $_SERVER['SCRIPT_NAME'];
@ -186,7 +186,7 @@ class NavigationPrint extends Printing
// var_dump($objID."\n".$objCN."\n".$objMN); // var_dump($objID."\n".$objCN."\n".$objMN);
if( isset($objID) AND isset($objCN) AND isset($objMN) ) if( isset($objID) AND isset($objCN) AND isset($objMN) )
$MaTemplate->MxAttribut("blocAUTH".".urlAccount", formatUrl($objID, $objCN, $objMN, "", "")); $MaTemplate->MxAttribut("blocAUTH".".urlAccount", Navigation::formatUrl($objID, $objCN, $objMN, "", ""));
$MaTemplate->MxAttribut("blocAUTH".".disconnectURL", $urlDisco); $MaTemplate->MxAttribut("blocAUTH".".disconnectURL", $urlDisco);
$MaTemplate->MxText("blocAUTH".".firstName", $GLOBALS["SYSTEM_USER_SESSION"]->user->getFirstName()); $MaTemplate->MxText("blocAUTH".".firstName", $GLOBALS["SYSTEM_USER_SESSION"]->user->getFirstName());
@ -321,7 +321,9 @@ class NavigationPrint extends Printing
} }
asort($tabName); asort($tabName);
reset($tabName); reset($tabName);
while (list($i, $lib) = each($tabName)) // while (list($i, $lib) = each($tabName))
// PHP8.0
foreach ($tabName as $i => $lib)
{ {
/* en fonction de l'obj */ /* en fonction de l'obj */
if(is_object($tabObj[$i])) // c un dir!!!! if(is_object($tabObj[$i])) // c un dir!!!!
@ -399,7 +401,7 @@ class NavigationPrint extends Printing
$img="data/image/icons/object/defaultobject.png"; $img="data/image/icons/object/defaultobject.png";
} }
$urlToGo = formatUrl($tabObj[$i][1]->getId(), $tabObj[$i][0]->getClassName(), $tabObj[$i][0]->getMethodName(),"","",$tabObj[$i][0]->getNodeId()); $urlToGo = Navigation::formatUrl($tabObj[$i][1]->getId(), $tabObj[$i][0]->getClassName(), $tabObj[$i][0]->getMethodName(),"","",$tabObj[$i][0]->getNodeId());
/* pour l'url */ /* pour l'url */
$MaTemplate->MxAttribut("bloc1.nodeUrl", $urlToGo); $MaTemplate->MxAttribut("bloc1.nodeUrl", $urlToGo);

2
lib/object_printing/userprint/userprint.php
View File

@ -92,7 +92,7 @@ class UserPrint extends Printing
$urlNewAccount.= "?system=authNewAccount"; $urlNewAccount.= "?system=authNewAccount";
$urlNewAccount = addIdToUrl($urlNewAccount); $urlNewAccount = addIdToUrl($urlNewAccount);
$MaTemplate->MxAttribut("urlActionNewAccount", formatUrl($urlArray["id"],"Home","formLecture","",recupCommunity())); $MaTemplate->MxAttribut("urlActionNewAccount", Navigation::formatUrl($urlArray["id"],"Home","formLecture","",recupCommunity()));
// var_dump($node->getCType()); // var_dump($node->getCType());
if ($node->getCType() == "asso") if ($node->getCType() == "asso")

11
lib/system/system_control/systemcontrol.php
View File

@ -1300,10 +1300,15 @@ var $currentCoordinationObject=null;
} }
asort($tabName); asort($tabName);
reset($tabName); reset($tabName);
if (list($i, $lib) = each($tabName)) // if (list($i, $lib) = each($tabName))
// PHP 8.0
if( is_array($tabName) && count($tabName) >= 1 )
{ {
return $tabObject[$i][0]; foreach ($tabName as $i => $lib)
}else{ {
return $tabObject[$i][0];
}
} else {
return new Right(); return new Right();
} }
} }

4
lib/system/system_coordination/coordinationobjmanagerfactory.php
View File

@ -60,7 +60,7 @@ class CoordinationObjManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (CoordinationObjManagerFactory::isValidType($type)) if (CoordinationObjManagerFactory::isValidType($type))
@ -86,7 +86,7 @@ class CoordinationObjManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_coordination/ressource/coordinationobjmanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_coordination/ressource/coordinationobjmanager".$type.".php"))? true:false;

4
lib/system/system_data/cache/cachemanagerfactory.php vendored
View File

@ -68,7 +68,7 @@ class CacheManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type, $info=NULL) public static function createInstance($type, $info=NULL)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (CacheManagerFactory::isValidType($type)) if (CacheManagerFactory::isValidType($type))
@ -95,7 +95,7 @@ class CacheManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/cache/ressource/cachemanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/cache/ressource/cachemanager".$type.".php"))? true:false;

4
lib/system/system_data/group/groupmanagerfactory.php
View File

@ -63,7 +63,7 @@ class GroupManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (GroupManagerFactory::isValidType($type)) if (GroupManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class GroupManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/group/ressource/groupmanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/group/ressource/groupmanager".$type.".php"))? true:false;

4
lib/system/system_data/groupuser/groupusermanagerfactory.php
View File

@ -62,7 +62,7 @@ class GroupUserManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (GroupUserManagerFactory::isValidType($type)) if (GroupUserManagerFactory::isValidType($type))
@ -88,7 +88,7 @@ class GroupUserManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/groupuser/ressource/groupusermanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/groupuser/ressource/groupusermanager".$type.".php"))? true:false;

4
lib/system/system_data/language/languagemanagerfactory.php
View File

@ -63,7 +63,7 @@ class LanguageManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (LanguageManagerFactory::isValidType($type)) if (LanguageManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class LanguageManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/language/ressource/languagemanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/language/ressource/languagemanager".$type.".php"))? true:false;

4
lib/system/system_data/node/nodemanagerfactory.php
View File

@ -63,7 +63,7 @@ class NodeManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (NodeManagerFactory::isValidType($type)) if (NodeManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class NodeManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/node/ressource/nodemanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/node/ressource/nodemanager".$type.".php"))? true:false;

4
lib/system/system_data/nodegroupuser/nodegroupusermanagerfactory.php
View File

@ -63,7 +63,7 @@ class NodeGroupUserManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (NodeGroupUserManagerFactory::isValidType($type)) if (NodeGroupUserManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class NodeGroupUserManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/nodegroupuser/ressource/nodegroupusermanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/nodegroupuser/ressource/nodegroupusermanager".$type.".php"))? true:false;

4
lib/system/system_data/nodesettings/nodesettingsmanagerfactory.php
View File

@ -63,7 +63,7 @@ class NodeSettingsManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (NodeSettingsManagerFactory::isValidType($type)) if (NodeSettingsManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class NodeSettingsManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/nodesettings/ressource/nodesettingsmanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/nodesettings/ressource/nodesettingsmanager".$type.".php"))? true:false;

4
lib/system/system_data/right/rightmanagerfactory.php
View File

@ -63,7 +63,7 @@ class RightManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (RightManagerFactory::isValidType($type)) if (RightManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class RightManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/right/ressource/rightmanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/right/ressource/rightmanager".$type.".php"))? true:false;

4
lib/system/system_data/user/usermanagerfactory.php
View File

@ -60,7 +60,7 @@ class UserManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
@ -87,7 +87,7 @@ class UserManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/user/ressource/usermanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/user/ressource/usermanager".$type.".php"))? true:false;

4
lib/system/system_data/userpreference/userpreferencemanagerfactory.php
View File

@ -63,7 +63,7 @@ class UserPreferenceManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (UserPreferenceManagerFactory::isValidType($type)) if (UserPreferenceManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class UserPreferenceManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/userpreference/ressource/userpreferencemanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/userpreference/ressource/userpreferencemanager".$type.".php"))? true:false;

4
lib/system/system_data/usersession/usersessionmanagerfactory.php
View File

@ -63,7 +63,7 @@ class UserSessionManagerFactory extends Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
if (UserSessionManagerFactory::isValidType($type)) if (UserSessionManagerFactory::isValidType($type))
@ -90,7 +90,7 @@ class UserSessionManagerFactory extends Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
global $CONF_LIB_PATH; global $CONF_LIB_PATH;
return (file_exists($CONF_LIB_PATH."lib/system/system_data/usersession/ressource/usersessionmanager".$type.".php"))? true:false; return (file_exists($CONF_LIB_PATH."lib/system/system_data/usersession/ressource/usersessionmanager".$type.".php"))? true:false;

4
lib/system/system_data_model/factory.php
View File

@ -78,7 +78,7 @@ class Factory
* @access public * @access public
* @return object * @return object
*/ */
function createInstance($type) public static function createInstance($type)
{ {
} }
@ -90,7 +90,7 @@ class Factory
* @access private * @access private
* @return object * @return object
*/ */
function isValidType($type) public static function isValidType($type)
{ {
} }
} }

4
lib/system/system_message/systemmessage.php
View File

@ -183,7 +183,9 @@ var $messages = array();
$tabBloc[$i]=str_replace(str_replace("mxt", "",$GLOBALS['SYSTEM_TEMPLATE_MAIN']), "", $tabBloc[$i])."."; $tabBloc[$i]=str_replace(str_replace("mxt", "",$GLOBALS['SYSTEM_TEMPLATE_MAIN']), "", $tabBloc[$i]).".";
} }
while (list($key, $val) = each($this->messages)) // while (list($key, $val) = each($this->messages))
// PHP8.0
foreach ($this->messages as $key => $val)
{ {
/* Gére en fonction de la template si le flag existe */ /* Gére en fonction de la template si le flag existe */
for ($i=0; $i<count($tabBloc); $i++) for ($i=0; $i<count($tabBloc); $i++)

9
lib/system/system_template/modelixe.php
View File

@ -110,7 +110,7 @@ ini_set('include_path', $path);
//Désactivation de magic_quotes_runtime de php.ini //Désactivation de magic_quotes_runtime de php.ini
if (get_magic_quotes_runtime()) set_magic_quotes_runtime(0); // if (get_magic_quotes_runtime()) set_magic_quotes_runtime(0);
class ModeliXe extends ErrorManager{ class ModeliXe extends ErrorManager{
@ -630,7 +630,9 @@ class ModeliXe extends ErrorManager{
$fin = count($arrayArg); $fin = count($arrayArg);
reset($arrayArg); reset($arrayArg);
while (list($cle, $Avalue) = each($arrayArg)){ // while (list($cle, $Avalue) = each($arrayArg)){
// PHP8.0
foreach ($arrayArg as $cle => $Avalue) {
$test = 0; $test = 0;
//Build of multiple choice select from a value array //Build of multiple choice select from a value array
@ -1036,7 +1038,8 @@ class ModeliXe extends ErrorManager{
//Parsing des balises ModeliXe //Parsing des balises ModeliXe
reset($this->flagArray); reset($this->flagArray);
while (list($Akey, $value) = each($this->flagArray)){ // while (list($Akey, $value) = each($this->flagArray)){
foreach ($this->flagArray as $Akey => $value) {
switch ($this->flagSystem){ switch ($this->flagSystem){
case 'xml': case 'xml':

16
lib/system/system_template/modelixeqware.php
View File

@ -258,12 +258,16 @@ class ModeliXeQware extends ModeliXe
//Remplacement de l'ensemble des attributs ModeliXe par les valeurs qui ont été instanciées ou leurs valeurs par défaut //Remplacement de l'ensemble des attributs ModeliXe par les valeurs qui ont été instanciées ou leurs valeurs par défaut
reset($this->attributArray); reset($this->attributArray);
while (list($cle, $Fkey) = each($this->attributArray)){ // while (list($cle, $Fkey) = each($this->attributArray)){
// PHP8.0
foreach ($this->attributArray as $cle => $Fkey) {
$Farray = &$this->$Fkey; $Farray = &$this->$Fkey;
if (is_array($Farray)){ if (is_array($Farray)){
reset($Farray); reset($Farray);
while (list($Pkey, $value) = each($Farray)){ // while (list($Pkey, $value) = each($Farray)){
// PHP8.0
foreach ($Farray as $Pkey => $value) {
if ($path == substr($Pkey, 0, strrpos($Pkey, '.'))) { if ($path == substr($Pkey, 0, strrpos($Pkey, '.'))) {
if (isset($this->xPattern[$Fkey][$Pkey])){ if (isset($this->xPattern[$Fkey][$Pkey])){
$pattern = $this->xPattern[$Fkey][$Pkey]; $pattern = $this->xPattern[$Fkey][$Pkey];
@ -279,13 +283,17 @@ class ModeliXeQware extends ModeliXe
//Remplacement de l'ensemble des balises ModeliXe par les valeurs qui ont été instanciées ou leurs valeurs par défaut //Remplacement de l'ensemble des balises ModeliXe par les valeurs qui ont été instanciées ou leurs valeurs par défaut
reset($this->flagArray); reset($this->flagArray);
while (list($cle, $Fkey) = each($this->flagArray)){ // while (list($cle, $Fkey) = each($this->flagArray)){
// PHP8.0
foreach ($this->flagArray as $cle => $Fkey) {
$Farray = &$this->$Fkey; $Farray = &$this->$Fkey;
if (is_array($Farray)){ if (is_array($Farray)){
reset($Farray); reset($Farray);
while (list($Pkey, $value) = each($Farray)){ // while (list($Pkey, $value) = each($Farray)){
// PHP8.0
foreach ($Farray as $Pkey => $value) {
if ($path == substr($Pkey, 0, strrpos($Pkey, '.'))) { if ($path == substr($Pkey, 0, strrpos($Pkey, '.'))) {
if (isset($this->xPattern[$Fkey][$Pkey])){ if (isset($this->xPattern[$Fkey][$Pkey])){