diff --git a/data/message/fr_FR-utf8/adminnode.ini b/data/message/fr_FR-utf8/adminnode.ini index 07d4559..2350b70 100755 --- a/data/message/fr_FR-utf8/adminnode.ini +++ b/data/message/fr_FR-utf8/adminnode.ini @@ -35,10 +35,11 @@ TxtTemplateChoiceNode = "Template de l'espace" TxtTemplateAvailNode = "Template(s) disponible(s) pour l'espace :" txtCommunityIcon = "Icône de la communauté" txtNodeEntryName = "Nom de la communauté" -txtHasPublicPage = "Page publique" +txtCommHasPublicPage = "Page publique" comm_haspublicpage_sEnabled = "Activé" user_haspublicpage_sDisabled = "Désactivé" txtCommPublicList = "Liste publique" +txtCommRegisterEnable = "Inscription" comm_public_sEnabled = "Activé" user_public_sDisabled = "Désactivé" TxtNodeIn = "Créer dans l'espace" diff --git a/data/template/qware/object_coordination/addcom/actionadmin.mxt b/data/template/qware/object_coordination/addcom/actionadmin.mxt index 3ef7138..6695b46 100755 --- a/data/template/qware/object_coordination/addcom/actionadmin.mxt +++ b/data/template/qware/object_coordination/addcom/actionadmin.mxt @@ -5,10 +5,6 @@

-
- -
- " data-offstyle="danger font-weight-bold" data-off="" data-size="mini" type="checkbox" name="commlistpublic">
@@ -27,14 +23,8 @@
-
-
- -
- " data-offstyle="danger font-weight-bold" data-off="" data-size="mini" type="checkbox" name="haspublicpage"> -
-
+
@@ -54,6 +44,26 @@
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/data/template/qware/object_coordination/adminnode/actionadmin.mxt b/data/template/qware/object_coordination/adminnode/actionadmin.mxt index e895ceb..6ddc0ab 100755 --- a/data/template/qware/object_coordination/adminnode/actionadmin.mxt +++ b/data/template/qware/object_coordination/adminnode/actionadmin.mxt @@ -67,6 +67,28 @@ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
@@ -85,12 +107,6 @@
-
-
- -
- -
diff --git a/data/template/qware/object_coordination/adminnode/updateadmin.mxt b/data/template/qware/object_coordination/adminnode/updateadmin.mxt index e2a985e..f84607a 100755 --- a/data/template/qware/object_coordination/adminnode/updateadmin.mxt +++ b/data/template/qware/object_coordination/adminnode/updateadmin.mxt @@ -29,7 +29,7 @@ -
+
@@ -39,7 +39,7 @@
-
+
*
@@ -49,6 +49,26 @@
+ +
+
+ +
+ > +
+
+
+ +
+ > +
+
+
+ +
+ > +
+
@@ -82,6 +102,7 @@
+
@@ -101,13 +122,8 @@
-
-
- -
- > -
+
diff --git a/install/db_scripts/mysql/7_create_structure.sql b/install/db_scripts/mysql/7_create_structure.sql index 39cbfa7..29a5ec5 100755 --- a/install/db_scripts/mysql/7_create_structure.sql +++ b/install/db_scripts/mysql/7_create_structure.sql @@ -249,17 +249,19 @@ CREATE TABLE `{_PREFIX_}langue` ( CREATE TABLE `{_PREFIX_}node` ( `node_id` int(4) UNSIGNED NOT NULL, `node_node_id` int(4) UNSIGNED NOT NULL DEFAULT 0, - `node_libelle` text NOT NULL, - `node_icone` varchar(200) NOT NULL DEFAULT '', - `node_template` varchar(100) NOT NULL DEFAULT '', - `node_domain` varchar(128) NOT NULL, - `node_haspublic` enum('on','off') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'off', - `node_ctype` enum('default','gaming','asso') DEFAULT 'default', - `node_ctypereg` varchar(128) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `node_libelle` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `node_icone` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `node_template` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `node_domain` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `node_haspublicpage` enum('on','off') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off', + `node_listpublic` enum('on','off') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off', + `node_registerenable` enum('on','off') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off', + `node_ctype` enum('default','blog','asso','steam','vitrine','ecommerce') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'default', + `node_ctypereg` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, `node_usergroupid` int(3) DEFAULT 0, `node_subsgroupid` int(3) DEFAULT 0, `node_subsgrouptempid` int(3) DEFAULT 0, - `node_mailnode` varchar(128) DEFAULT NULL + `node_mailnode` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8; #-- -------------------------------------------------------- #-- diff --git a/lib/object_coordination/adminnode/adminnode.php b/lib/object_coordination/adminnode/adminnode.php index 01a59ca..03c11c9 100755 --- a/lib/object_coordination/adminnode/adminnode.php +++ b/lib/object_coordination/adminnode/adminnode.php @@ -222,7 +222,8 @@ Class AdminNode extends CoordinationObj $Node->setCTypereg( ((isset($_POST["node_ctypereg"]))?($_POST["node_ctypereg"]):"") ); $Node->setDomain( ((isset($_POST["node_domain"]))?($_POST["node_domain"]):"") ); $Node->setHasPublic( ((isset($_POST["node_haspublicpage"]))?($_POST["node_haspublicpage"]):'off') ); - $Node->setHasPublic( ((isset($_POST["node_listpublic"]))?($_POST["node_listpublic"]):'off') ); + $Node->setListPublic( ((isset($_POST["node_listpublic"]))?($_POST["node_listpublic"]):'off') ); + $Node->setRegisterEnable( ((isset($_POST["node_registerenable"]))?($_POST["node_registerenable"]):'off') ); // $Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") ); # Variables de configuration de l'objet @@ -384,14 +385,7 @@ Class AdminNode extends CoordinationObj $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("ToHidde.template", "template_name", $Node->getTemplate(), $tabTemplate, '', '', 'id="template"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeTemplate"), ENT_QUOTES)."\"", getMessage("txtNodeTemplate")); $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("ToHidde.pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/".$nodeIcone, getMessage("PreviewPicto")); $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("ToHidde.screenTemplate", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."preview.png", getMessage("PreviewTemplate")); -// $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.ctype", "text", "node_ctype", htmlentitiesconv($Node->getCType()), "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeType"), ENT_QUOTES)."\"", getMessage("txtNodeType")); - printTabCommProfiles($selected=htmlentitiesconv($Node->getCType()), $MxBlocName="ToHidde.COMMPROFILES", $name="node_ctype"); - $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.ctypereg", "text", "node_ctypereg", htmlentitiesconv($Node->getCTypereg()), "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeTypereg"), ENT_QUOTES)."\"", getMessage("txtNodeTypereg")); - $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.domain", "text", "node_domain", htmlentitiesconv($Node->getDomain()), "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeDomain"), ENT_QUOTES)."\"", getMessage("txtNodeDomain")); - $GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.node_haspublicpage_value", ($Node->getHasPublicPage()!="on")?"":" checked"); - $GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.node_listpublic_value", ($Node->getListPublic()!="on")?"":" checked"); - /* fin template */ - + for ($i=0; $igetLibelle($currentCode); @@ -408,10 +402,18 @@ Class AdminNode extends CoordinationObj if(recupCommunity($node_Id1) === "3") $nodeCom = "2"; else $nodeCom = recupCommunity($node_Id1); // Génération des éléments du bloc des paramètres de communauté + // Si le noeud courant n'est pas un noeud de communauté, on n'affiche pas certains paramètres if( $node_Id1 === recupCommunity($nodeCom) ) { $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($nodeCom); + printTabCommProfiles($selected=htmlentitiesconv($Node->getCType()), $MxBlocName="ToHidde.blocFootValues.COMMPROFILES", $name="node_ctype"); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocFootValues.ctypereg", "text", "node_ctypereg", htmlentitiesconv($Node->getCTypereg()), "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeTypereg"), ENT_QUOTES)."\"", getMessage("txtNodeTypereg")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocFootValues.domain", "text", "node_domain", htmlentitiesconv($Node->getDomain()), "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeDomain"), ENT_QUOTES)."\"", getMessage("txtNodeDomain")); + $GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.blocHeadValues.node_haspublicpage_value", ($Node->getHasPublicPage()!="on")?"":" checked"); + $GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.blocHeadValues.node_listpublic_value", ($Node->getListPublic()!="on")?"":" checked"); + $GLOBALS['SYSTEM_TEMPLATE']->MxText("ToHidde.blocHeadValues.node_registerenable_value", ($Node->getRegisterEnable()!="on")?"":" checked"); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_email", "text", "node_email", htmlentitiesconv($NodeSettings->getEmail()), "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("tipEmail"), ENT_QUOTES)."\"", getMessage("node_email")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_git", "text", "node_git", htmlentitiesconv($NodeSettings->getGit()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipGit"), ENT_QUOTES)."\"", getMessage("node_git")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_mastodon", "text", "node_mastodon", htmlentitiesconv($NodeSettings->getMastodon()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMastodon"), ENT_QUOTES)."\"", getMessage("node_mastodon")); @@ -422,7 +424,9 @@ Class AdminNode extends CoordinationObj $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_twitter", "text", "node_twitter", htmlentitiesconv($NodeSettings->getTwitter()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipTwitter"), ENT_QUOTES)."\"", getMessage("node_twitter")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_facebook", "text", "node_facebook", htmlentitiesconv($NodeSettings->getFacebook()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipFacebook"), ENT_QUOTES)."\"", getMessage("node_facebook")); } else { + $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocHeadValues", "DELETE"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocSettings", "DELETE"); + $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocFootValues", "DELETE"); } // Pour déplacer le Groupe @@ -479,6 +483,7 @@ Class AdminNode extends CoordinationObj function execUpdateAdmin() { // var_dump($_POST); +// var_dump( ((isset($_POST["node_listpublic"]))?($_POST["node_listpublic"]):'off') ); // exit(); $tabCodeLangue=array(); $isValid=true; @@ -502,6 +507,7 @@ Class AdminNode extends CoordinationObj $Node->setDomain( ((isset($_POST["node_domain"]))?(htmlentitiesconv($_POST["node_domain"])):"") ); $Node->setHasPublicPage( ((isset($_POST["node_haspublicpage"]))?($_POST["node_haspublicpage"]):'off') ); $Node->setListPublic( ((isset($_POST["node_listpublic"]))?($_POST["node_listpublic"]):'off') ); + $Node->setRegisterEnable( ((isset($_POST["node_registerenable"]))?($_POST["node_registerenable"]):'off') ); // $Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") ); if(recupCommunity($node_id) === "3") $nodeCom = "2"; else $nodeCom = recupCommunity($node_id); @@ -546,7 +552,7 @@ Class AdminNode extends CoordinationObj if ($node_id_pere!=0) { $MyTree=$GLOBALS["SYSTEM_MANAGER"]["TREE_NODE"]->createInstance($node_id); - // Son pere ne peu pas ïżœre un de ses fils ou lui mïżœe !!! + // Son pere ne peu pas être un de ses fils ou lui même !!! if ( (in_array($node_id_pere, $MyTree->getSonArray())) && ($MyTree->getId()!=$node_id_pere) ) { $isValid=false; diff --git a/lib/system/system_data/node/node.php b/lib/system/system_data/node/node.php index 8ccd601..9c46479 100755 --- a/lib/system/system_data/node/node.php +++ b/lib/system/system_data/node/node.php @@ -105,6 +105,12 @@ var $haspublicpage= 0; */ var $listpublic= 0; +/** +* @var chaine +* @desc chaine fqdn +*/ +var $registerenable= 0; + /** * @var chaine * @desc chaine community type @@ -352,6 +358,28 @@ var $mailnode= null; $this->listpublic=$listpublic; return true; } + +/** +* "getteur" de l'attribut inscription activée. +* @access public +* @return chaine libelle du Noeud +*/ + function getRegisterEnable() + { + return $this->registerenable; + } + +/** +* "setteur" de l'attribut liste publique. +* @access public +* @param chaine libelle (pas de code Html) +* @return booleen +*/ + function setRegisterEnable($registerenable) + { + $this->registerenable=$registerenable; + return true; + } /** * "getteur" de l'attribut type. @@ -371,6 +399,12 @@ var $mailnode= null; */ function setCType($ctype) { + if (is_numeric($ctype)) + return false; + + if( $ctype =="#" ) + $ctype="default"; + $this->ctype=$ctype; return true; } @@ -492,7 +526,7 @@ var $mailnode= null; * @param entier identifiant numérique du Node père * @param chaine libelle du Node */ - function doLoad($id, $idpere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) + function doLoad($id, $idpere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) { $this->setId($id); $this->libelle->setSql($libelle); @@ -502,6 +536,7 @@ var $mailnode= null; $this->setDomain($domain); $this->setHasPublicPage($haspublicpage); $this->setListPublic($listpublic); + $this->setRegisterEnable($registerenable); $this->setCType($ctype); $this->setCTypereg($ctypereg); $this->setUserGroupId($usergroupid); diff --git a/lib/system/system_data/node/nodemanager.php b/lib/system/system_data/node/nodemanager.php index f05d328..c7db54f 100755 --- a/lib/system/system_data/node/nodemanager.php +++ b/lib/system/system_data/node/nodemanager.php @@ -126,7 +126,7 @@ class NodeManager extends Manager * @abstract * @return entier */ - function doUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) + function doUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) { return 0; /* entier */ } @@ -143,7 +143,7 @@ class NodeManager extends Manager * @abstract * @return entier */ - function doInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) + function doInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) { return true; } @@ -218,7 +218,7 @@ class NodeManager extends Manager * @access private * @return entier */ - function sourceInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) + function sourceInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) { # Gestion d'un tableau intermediaire avec la reprise des elements if (!is_numeric($idPere)) @@ -230,7 +230,7 @@ class NodeManager extends Manager addError($systemError,$classe,$message, __line__, __file__); return false; } - return $this->doInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode); + return $this->doInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode); } /** @@ -244,7 +244,7 @@ class NodeManager extends Manager * @access private * @return booleen */ - function sourceUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) + function sourceUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) { # Gestion d'un tableau intermediaire avec la reprise des elements if (!Is_numeric($id) || !is_numeric($idPere)) @@ -257,7 +257,7 @@ class NodeManager extends Manager return false; } - return $this->doUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode); + return $this->doUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode); } /** @@ -332,7 +332,7 @@ class NodeManager extends Manager if (is_array($tab) && isset($tab["id"]) && is_numeric($tab["id"])) { /* création et alimentation de l'objet */ - $return->doLoad($tab["id"], $tab["idpere"], $tab["libelle"], $tab["icone"], $tab["template"], $tab["domain"], $tab["haspublicpage"], $tab["listpublic"], $tab["ctype"], $tab["ctypereg"], $tab["usergroupid"], $tab["subsgroupid"], $tab["subsgrouptempid"], $tab["mailnode"]); + $return->doLoad($tab["id"], $tab["idpere"], $tab["libelle"], $tab["icone"], $tab["template"], $tab["domain"], $tab["haspublicpage"], $tab["listpublic"], $tab["registerenable"], $tab["ctype"], $tab["ctypereg"], $tab["usergroupid"], $tab["subsgroupid"], $tab["subsgrouptempid"], $tab["mailnode"]); }else{ $systemError=3; $classe="NodeManager"; @@ -368,7 +368,7 @@ class NodeManager extends Manager for ($i=0; $idoLoad($tab[$i]["id"], $tab[$i]["idpere"], $tab[$i]["libelle"], $tab[$i]["icone"], $tab[$i]["template"], $tab[$i]["domain"], $tab[$i]["haspublicpage"], $tab[$i]["listpublic"], $tab[$i]["ctype"], $tab[$i]["ctypereg"], $tab[$i]["usergroupid"], $tab[$i]["subsgroupid"], $tab[$i]["subsgrouptempid"], $tab[$i]["mailnode"]); + $return[$i]->doLoad($tab[$i]["id"], $tab[$i]["idpere"], $tab[$i]["libelle"], $tab[$i]["icone"], $tab[$i]["template"], $tab[$i]["domain"], $tab[$i]["haspublicpage"], $tab[$i]["listpublic"], $tab[$i]["registerenable"], $tab[$i]["ctype"], $tab[$i]["ctypereg"], $tab[$i]["usergroupid"], $tab[$i]["subsgroupid"], $tab[$i]["subsgrouptempid"], $tab[$i]["mailnode"]); } }else{ $systemError=3; @@ -431,7 +431,7 @@ class NodeManager extends Manager if ((strtolower(get_class($obj))=="node") && ($obj->isLoaded()==true)) { /* Récupération des infos */ - $id=$this->sourceUpdate($obj->getId(), $obj->getIdPere(), $obj->getXmlLibelle(), $obj->getIcone(), $obj->getTemplate(), $obj->getDomain(), $obj->getHasPublicPage(), $obj->getListPublic(), $obj->getCType(), $obj->getCTypereg(), $obj->getUserGroupId(), $obj->getSubsGroupId(), $obj->getSubsGroupTempId(), $obj->getMailNode()); + $id=$this->sourceUpdate($obj->getId(), $obj->getIdPere(), $obj->getXmlLibelle(), $obj->getIcone(), $obj->getTemplate(), $obj->getDomain(), $obj->getHasPublicPage(), $obj->getListPublic(), $obj->getRegisterEnable(), $obj->getCType(), $obj->getCTypereg(), $obj->getUserGroupId(), $obj->getSubsGroupId(), $obj->getSubsGroupTempId(), $obj->getMailNode()); $this->CallSystemPlugin("__updateNode", $obj); return $obj; } @@ -458,7 +458,7 @@ class NodeManager extends Manager if ($obj->isLoaded()==false) { /* Récupération des infos */ - $id=$this->sourceInsert($obj->getIdPere(), $obj->getXmlLibelle(), $obj->getIcone(), $obj->getTemplate(), $obj->getDomain(), $obj->getHasPublicPage(), $obj->getListPublic(), $obj->getCType(), $obj->getCTypereg(), $obj->getUserGroupId(), $obj->getSubsGroupId(), $obj->getSubsGroupTempId(), $obj->getMailNode()); + $id=$this->sourceInsert($obj->getIdPere(), $obj->getXmlLibelle(), $obj->getIcone(), $obj->getTemplate(), $obj->getDomain(), $obj->getHasPublicPage(), $obj->getListPublic(), $obj->getRegisterEnable(), $obj->getCType(), $obj->getCTypereg(), $obj->getUserGroupId(), $obj->getSubsGroupId(), $obj->getSubsGroupTempId(), $obj->getMailNode()); $obj->setId($id); $this->CallSystemPlugin("__insertNode", $obj); return $obj; diff --git a/lib/system/system_data/node/ressource/nodemanagerdb.php b/lib/system/system_data/node/ressource/nodemanagerdb.php index ff96a79..2b591fa 100755 --- a/lib/system/system_data/node/ressource/nodemanagerdb.php +++ b/lib/system/system_data/node/ressource/nodemanagerdb.php @@ -194,7 +194,7 @@ var $conn = null; * @access private * @return entier */ - function doInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) + function doInsert($idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) { $sql="INSERT INTO ".$this->getTable()." (" .$this->getSqlName("idpere").", " @@ -204,13 +204,14 @@ var $conn = null; .$this->getSqlName("domain").", " .$this->getSqlName("haspublicpage").", " .$this->getSqlName("listpublic").", " + .$this->getSqlName("registerenable").", " .$this->getSqlName("ctype").", " .$this->getSqlName("ctypereg").", " .$this->getSqlName("usergroupid").", " .$this->getSqlName("subsgroupid").", " .$this->getSqlName("subsgrouptempid").", " .$this->getSqlName("mailnode").") VALUES ("; - $sql.="'".$idPere."', '".$libelle."', '".$icone."', '".$template."', '".$domain."', '".$haspublicpage."', '".$listpublic."', '".$ctype."', '".$ctypereg."', '".$usergroupid."', '".$subsgroupid."', '".$subsgrouptempid."', '".$mailnode."')"; + $sql.="'".$idPere."', '".$libelle."', '".$icone."', '".$template."', '".$domain."', '".$haspublicpage."', '".$listpublic."', '".$registerenable."', '".$ctype."', '".$ctypereg."', '".$usergroupid."', '".$subsgroupid."', '".$subsgrouptempid."', '".$mailnode."')"; # Requete $result=$this->conn->sql_query($sql); @@ -238,7 +239,7 @@ var $conn = null; * @access private * @return booleen */ - function doUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) + function doUpdate($id, $idPere, $libelle, $icone, $template, $domain, $haspublicpage, $listpublic, $registerenable, $ctype, $ctypereg, $usergroupid, $subsgroupid, $subsgrouptempid, $mailnode) { $sql="UPDATE ".$this->getTable()." SET " .$this->getSqlName("id")."='".$id."', " @@ -249,6 +250,7 @@ var $conn = null; .$this->getSqlName("domain")."='".$domain."', " .$this->getSqlName("haspublicpage")."='".$haspublicpage."', " .$this->getSqlName("listpublic")."='".$listpublic."', " + .$this->getSqlName("registerenable")."='".$registerenable."', " .$this->getSqlName("ctype")."='".$ctype."', " .$this->getSqlName("ctypereg")."='".$ctypereg."', " .$this->getSqlName("usergroupid")."='".$usergroupid."', " @@ -350,11 +352,12 @@ var $conn = null; $result["domain"] =$sqlArray[$this->getSqlName("domain")]; $result["haspublicpage"] =$sqlArray[$this->getSqlName("haspublicpage")]; $result["listpublic"] =$sqlArray[$this->getSqlName("listpublic")]; + $result["registerenable"] =$sqlArray[$this->getSqlName("registerenable")]; $result["ctype"] =$sqlArray[$this->getSqlName("ctype")]; $result["ctypereg"] =$sqlArray[$this->getSqlName("ctypereg")]; - $result["usergroupid"] =$sqlArray[$this->getSqlName("usergroupid")]; - $result["subsgroupid"] =$sqlArray[$this->getSqlName("subsgroupid")]; - $result["subsgrouptempid"] =$sqlArray[$this->getSqlName("subsgrouptempid")]; + $result["usergroupid"] =$sqlArray[$this->getSqlName("usergroupid")]; + $result["subsgroupid"] =$sqlArray[$this->getSqlName("subsgroupid")]; + $result["subsgrouptempid"] =$sqlArray[$this->getSqlName("subsgrouptempid")]; $result["mailnode"] =$sqlArray[$this->getSqlName("mailnode")]; return $result; } @@ -380,13 +383,14 @@ var $conn = null; $this->sqlAttributArray["icone"] ="node_icone"; $this->sqlAttributArray["template"] ="node_template"; $this->sqlAttributArray["domain"] ="node_domain"; - $this->sqlAttributArray["haspublicpage"] ="node_haspublicpage"; - $this->sqlAttributArray["listpublic"] ="node_listpublic"; + $this->sqlAttributArray["haspublicpage"] ="node_haspublicpage"; + $this->sqlAttributArray["listpublic"] ="node_listpublic"; + $this->sqlAttributArray["registerenable"] ="node_registerenable"; $this->sqlAttributArray["ctype"] ="node_ctype"; $this->sqlAttributArray["ctypereg"] ="node_ctypereg"; - $this->sqlAttributArray["usergroupid"] ="node_usergroupid"; - $this->sqlAttributArray["subsgroupid"] ="node_subsgroupid"; - $this->sqlAttributArray["subsgrouptempid"] ="node_subsgrouptempid"; + $this->sqlAttributArray["usergroupid"] ="node_usergroupid"; + $this->sqlAttributArray["subsgroupid"] ="node_subsgroupid"; + $this->sqlAttributArray["subsgrouptempid"] ="node_subsgrouptempid"; $this->sqlAttributArray["mailnode"] ="node_mailnode"; return true; } @@ -397,13 +401,14 @@ var $conn = null; $this->sqlAttributArray["icone"] ="icone"; $this->sqlAttributArray["template"] ="template"; $this->sqlAttributArray["domain"] ="domain"; - $this->sqlAttributArray["haspublicpage"] ="haspublicpage"; - $this->sqlAttributArray["listpublic"] ="listpublic"; + $this->sqlAttributArray["haspublicpage"] ="haspublicpage"; + $this->sqlAttributArray["listpublic"] ="listpublic"; + $this->sqlAttributArray["registerenable"] ="registerenable"; $this->sqlAttributArray["ctype"] ="ctype"; $this->sqlAttributArray["ctypereg"] ="ctypereg"; - $this->sqlAttributArray["usergroupid"] ="usergroupid"; - $this->sqlAttributArray["subsgroupid"] ="subsgroupid"; - $this->sqlAttributArray["subsgrouptempid"] ="subsgrouptempid"; + $this->sqlAttributArray["usergroupid"] ="usergroupid"; + $this->sqlAttributArray["subsgroupid"] ="subsgroupid"; + $this->sqlAttributArray["subsgrouptempid"] ="subsgrouptempid"; $this->sqlAttributArray["mailnode"] ="mailnode"; return true; }