diff --git a/data/message/fr/user.ini b/data/message/fr/user.ini index 7d398cc..9821608 100755 --- a/data/message/fr/user.ini +++ b/data/message/fr/user.ini @@ -43,6 +43,24 @@ double_dots = " : " struct_denomination = "Dénomination" struct_type = "Type de structure" + +tipEmail = "Courriel" +node_email = "Adresse courriel" +tipMastodon = "Mastodon" +node_mastodon = "URL page Mastodon" +tipMobilizon = "Mobilizon" +node_mobilizon = "URL page Mobilizon" +tipMatrix = "Matrix" +node_matrix = "Salon Matrix" +tipPeertube = "Peertube" +node_peertube = "URL Page Peertube" +tipNextcloud = "Nextcloud" +node_nextcloud = "URL serveur Nextcloud" +tipTwitter = "Twitter" +node_twitter = "URL page Twitter" +tipFacebook = "Facebook" +node_facebook = "URL page Facebook" + mrs = "Mme" mr = "M" miss = "Mlle" @@ -217,15 +235,18 @@ TxtExport = "Format de l'export" generalInformation = "Informations générales" etape1 = "Etape 1" +complementInformation = "Informations complémentaires" etape2 = "Etape 2" +visualInfomation = "Visuels" +etape3 = "Etape 3" lblUploadLogoFile = "Envoyer le logo" lblUploadFaviconFile = "Envoyer le favicon" lblUploadFile = "Envoyer un fichier" -etape3 = "Etape 3" etape4 = "Etape 4" etape5 = "Etape 5" etape6 = "Etape 6" etape7 = "Etape 7" +etape8 = "Etape 8" TxtValid = "Valider" TxtInscription = "Veuillez saisir les informations pour votre pré-inscription, l'administrateur de la communauté se chargera de finaliser l'inscription." diff --git a/data/template/qware/object_coordination/addcom/actionadmin.mxt b/data/template/qware/object_coordination/addcom/actionadmin.mxt index dc57fab..fea3d12 100755 --- a/data/template/qware/object_coordination/addcom/actionadmin.mxt +++ b/data/template/qware/object_coordination/addcom/actionadmin.mxt @@ -5,8 +5,8 @@

-
-
+
+
@@ -16,7 +16,7 @@
-
+
*
@@ -24,20 +24,20 @@
-
-
+
+
-
+
-
+
*
@@ -49,31 +49,90 @@
-

+

+
+
+
+
+
+ * +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+

-
+
-
+
-
+
-
+
@@ -81,184 +140,178 @@
-
-
-

() -
-
-
- -
- -
+
+
+

() +
+
+
+ +
+
-
- -
-
-
+
+ +
+
+
-
-
-

-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- * -
- -
-
-
-
-
- * -
- -
-
-
- * -
- -
-
-
- * -
- -
-
-
- * -
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- * -
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-

-
-
-
-

- -

-

- -

-
-
-
- -
+
-

-
+

+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ * +
+ +
+
+
+
+
+ * +
+ +
+
+
+ * +
+ +
+
+
+ * +
+ +
+
+
+ * +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ * +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+

+
+
+
+

+ +

+

+ +

+
+
+
+ +
+
+

+

@@ -272,16 +325,16 @@
- -
-
-

-
-
- " value=""/> - "/> - -
-
+ +
+
+

+
+
+ " value=""/> + "/> + +
+
diff --git a/data/template/qware/object_coordination/adminnode/updateadmin.mxt b/data/template/qware/object_coordination/adminnode/updateadmin.mxt index 0619051..3e1f951 100755 --- a/data/template/qware/object_coordination/adminnode/updateadmin.mxt +++ b/data/template/qware/object_coordination/adminnode/updateadmin.mxt @@ -109,6 +109,69 @@
+ + +
+
+

+
+
+
+
+
+ * +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
" value="" onclick="this.form.reset();"/> " onclick="history.back();"/> diff --git a/data/template/qware/object_printing/navigationprint/main.mxt b/data/template/qware/object_printing/navigationprint/main.mxt index ff2b4c4..442da1f 100755 --- a/data/template/qware/object_printing/navigationprint/main.mxt +++ b/data/template/qware/object_printing/navigationprint/main.mxt @@ -1,24 +1,21 @@ - - - - - - + + + + - - + diff --git a/lib/object_coordination/addcom/addcom.php b/lib/object_coordination/addcom/addcom.php index 52aa1de..f8fd37d 100755 --- a/lib/object_coordination/addcom/addcom.php +++ b/lib/object_coordination/addcom/addcom.php @@ -111,6 +111,16 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("NodeEntry_typereg", "text", "NodeEntry_typereg","", "class=\"form\"", getMessage("txtNodeTypereg")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("NodeEntry_domain", "text", "NodeEntry_domain","", "class=\"form\" required=\"true\"", getMessage("txtNodeDomain")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_email", "text", "node_email", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipEmail"), ENT_QUOTES)."\"", getMessage("node_email")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_mastodon", "text", "node_mastodon", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMastodon"), ENT_QUOTES)."\"", getMessage("node_mastodon")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_mobilizon", "text", "node_mobilizon", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMobilizon"), ENT_QUOTES)."\"", getMessage("node_mobilizon")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_matrix", "text", "node_matrix", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMatrix"), ENT_QUOTES)."\"", getMessage("node_matrix")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_peertube", "text", "node_peertube", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipPeertube"), ENT_QUOTES)."\"", getMessage("node_peertube")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_nextcloud", "text", "node_nextcloud", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipNextcloud"), ENT_QUOTES)."\"", getMessage("node_nextcloud")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_twitter", "text", "node_twitter", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipTwitter"), ENT_QUOTES)."\"", getMessage("node_twitter")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_facebook", "text", "node_facebook", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipFacebook"), ENT_QUOTES)."\"", getMessage("node_facebook")); + + $titre = array(getMessage("mr"),getMessage("mrs"), getMessage("miss")); $GLOBALS["SYSTEM_TEMPLATE"]->MxSelect("user_title", "user_title", "", $titre, getMessage("user_title"), "", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipSelectTitle"), ENT_QUOTES)."\""); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("user_first_name", "text", "user_first_name", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipFirstName"), ENT_QUOTES)."\"", getMessage("user_first_name")); @@ -141,6 +151,15 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("NodeEntry_typereg", "text", "NodeEntry_typereg",$_POST['NodeEntry_typereg'], "class=\"form\"", getMessage("txtNodeTypereg")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("NodeEntry_domain", "text", "NodeEntry_domain",$_POST['NodeEntry_domain'], "class=\"form\" required=\"true\"", getMessage("txtNodeDomain")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_email", "text", "node_email", $_POST['node_email'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipEmail"), ENT_QUOTES)."\"", getMessage("node_email")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_mastodon", "text", "node_mastodon", $_POST['node_mastodon'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMastodon"), ENT_QUOTES)."\"", getMessage("node_mastodon")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_mobilizon", "text", "node_mobilizon", $_POST['node_mobilizon'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMobilizon"), ENT_QUOTES)."\"", getMessage("node_mobilizon")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_matrix", "text", "node_matrix", $_POST['node_matrix'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMatrix"), ENT_QUOTES)."\"", getMessage("node_matrix")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_peertube", "text", "node_peertube", $_POST['node_peertube'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipPeertube"), ENT_QUOTES)."\"", getMessage("node_peertube")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_nextcloud", "text", "node_nextcloud", $_POST['node_nextcloud'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipNextcloud"), ENT_QUOTES)."\"", getMessage("node_nextcloud")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_twitter", "text", "node_twitter", $_POST['node_twitter'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipTwitter"), ENT_QUOTES)."\"", getMessage("node_twitter")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("node_facebook", "text", "node_facebook", $_POST['node_facebook'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipFacebook"), ENT_QUOTES)."\"", getMessage("node_facebook")); + $titre = array(getMessage("mr"),getMessage("mrs"), getMessage("miss")); $GLOBALS["SYSTEM_TEMPLATE"]->MxSelect("user_title", "user_title", $_POST['user_title'], $titre, getMessage("user_title"), "", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipSelectTitle"), ENT_QUOTES)."\""); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("user_first_name", "text", "user_first_name", $_POST['user_first_name'], "class=\"form\" title=\"".htmlspecialchars(getMessage("tipFirstName"), ENT_QUOTES)."\"", getMessage("user_first_name")); @@ -278,7 +297,7 @@ function execAdmin() { foreach($_POST as $cle=>$val) { - if($val=="" && ($cle !="user_title" && $cle !="user_first_name" && $cle !="user_last_name" && $cle !="user_postal_code" && $cle !="user_postal_address" && $cle !="user_city" && $cle !="user_state" && $cle !="NodeEntry_type" && $cle !="NodeEntry_typereg" && $cle !="user_tel" && $cle !="user_fax" && $cle !="user_mastodon" && $cle !="user_jabber" && $cle !="user_facebook" && $cle !="user_msn" && $cle !="user_website" && $cle="contentResumeInfos" && $cle="contentTextInfos" && $cle !="MAX_FILE_SIZE" && $cle !="uploadFileLogo" && $cle !="uploadFileFavicon" && $cle !="uploadFile" && $cle !="files")) + if($val=="" && ($cle !="node_mastodon" && $cle !="node_mobilizon" && $cle !="node_matrix" && $cle !="node_peertube" && $cle !="node_nextcloud" && $cle !="node_twitter" && $cle !="node_facebook" && $cle !="user_title" && $cle !="user_first_name" && $cle !="user_last_name" && $cle !="user_postal_code" && $cle !="user_postal_address" && $cle !="user_city" && $cle !="user_state" && $cle !="NodeEntry_type" && $cle !="NodeEntry_typereg" && $cle !="user_tel" && $cle !="user_fax" && $cle !="user_mastodon" && $cle !="user_jabber" && $cle !="user_facebook" && $cle !="user_msn" && $cle !="user_website" && $cle="contentResumeInfos" && $cle="contentTextInfos" && $cle !="MAX_FILE_SIZE" && $cle !="uploadFileLogo" && $cle !="uploadFileFavicon" && $cle !="uploadFile" && $cle !="files")) { $chaine .= getMessage($cle).", "; } @@ -350,8 +369,9 @@ function execAdmin() $MyUser = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser); } // création du noeud principal+groupe principal - $Node=new Node(); - $Group=new Group(); + $Node = new Node(); + $NodeSettings = new NodeSettings(); + $Group = new Group(); /* Pour le nom de l'objet... */ reset($_POST); while (list($key, $val) = each($_POST)) { @@ -371,6 +391,15 @@ function execAdmin() $Node->SetHasPublic( ((isset($_POST["haspublic"]))?($_POST["haspublic"]):0) ); $Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") ); + $NodeSettings->SetEmail( ((isset($_POST["node_email"]))?($_POST["node_email"]):"") ); + $NodeSettings->setMastodon( ((isset($_POST["node_mastodon"]))?($_POST["node_mastodon"]):"") ); + $NodeSettings->setMobilizon( ((isset($_POST["node_mobilizon"]))?($_POST["node_mobilizon"]):"") ); + $NodeSettings->setMatrix( ((isset($_POST["node_matrix"]))?($_POST["node_matrix"]):"") ); + $NodeSettings->SetPeertube( ((isset($_POST["node_peertube"]))?($_POST["node_peertube"]):"") ); + $NodeSettings->setNextcloud( ((isset($_POST["node_nextcloud"]))?($_POST["node_nextcloud"]):"") ); + $NodeSettings->SetTwitter( ((isset($_POST["node_twitter"]))?($_POST["node_twitter"]):"") ); + $NodeSettings->setFacebook( ((isset($_POST["node_facebook"]))?($_POST["node_facebook"]):"") ); + // Récupération de la template!!! if (isset($_POST["template"]) && is_array($_POST["template"])) { @@ -386,7 +415,8 @@ function execAdmin() $Node->setIdPere(1); $Group->setIdPere(1); //On laisse les pictos par défaut - $Node =$GLOBALS["SYSTEM_MANAGER"]["NODE"]->insertInstance($Node); + $Node =$GLOBALS["SYSTEM_MANAGER"]["NODE"]->insertInstance($Node); + $NodeSettings =$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->insertInstance($NodeSettings); $Group =$GLOBALS["SYSTEM_MANAGER"]["GROUP"]->insertInstance($Group); /*vérification de l'inexistance du répertoire*/ diff --git a/lib/object_coordination/adminnode/adminnode.php b/lib/object_coordination/adminnode/adminnode.php index b3df242..dddbfa6 100755 --- a/lib/object_coordination/adminnode/adminnode.php +++ b/lib/object_coordination/adminnode/adminnode.php @@ -272,6 +272,7 @@ Class AdminNode extends CoordinationObj { /* Ajout du fichier AdminNode.ini */ addMessageFile("adminnode.ini"); + addMessageFile("user.ini"); /* gestion du lib en fonction de la langue courante */ $currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode(); @@ -330,9 +331,9 @@ Class AdminNode extends CoordinationObj { //On load le Noeud $Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->createInstance($node_Id1); - + $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminNode", "execUpdateAdmin")); - + $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("nodeHiddenUpdate", $node_Id1); // --> recuperation du treeNode correspondant au noeurd @@ -355,7 +356,6 @@ Class AdminNode extends CoordinationObj // var_dump($nodeIcone); $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("ToHidde".".icone", "iconeN", $nodeIcone, $tabIcone, '', '', 'id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeIcon"), ENT_QUOTES)."\"", getMessage("txtNodeIcon")); - /* Affichage des templates */ # Affichage de la liste dïżœoulante # Détermine le chemin des icones @@ -402,6 +402,23 @@ Class AdminNode extends CoordinationObj $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocName", "loop"); } + // Génération des éléments du bloc des paramètres de communauté + if( $node_Id1 === recupCommunity($node_Id1) ) + { + $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($node_Id1); + + $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_mastodon", "text", "node_mastodon", htmlentitiesconv($NodeSettings->getMastodon()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMastodon"), ENT_QUOTES)."\"", getMessage("node_mastodon")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_mobilizon", "text", "node_mobilizon", htmlentitiesconv($NodeSettings->getMobilizon()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMobilizon"), ENT_QUOTES)."\"", getMessage("node_mobilizon")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_matrix", "text", "node_matrix", htmlentitiesconv($NodeSettings->getMatrix()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipMatrix"), ENT_QUOTES)."\"", getMessage("node_matrix")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_peertube", "text", "node_peertube", htmlentitiesconv($NodeSettings->getPeertube()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipPeertube"), ENT_QUOTES)."\"", getMessage("node_peertube")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_nextcloud", "text", "node_nextcloud", htmlentitiesconv($NodeSettings->getNextcloud()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipNextcloud"), ENT_QUOTES)."\"", getMessage("node_nextcloud")); + $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.blocSettings", "DELETE"); + } + // Pour déplacer le Groupe $tabMove=array(); $k=0; @@ -457,9 +474,6 @@ Class AdminNode extends CoordinationObj { $tabCodeLangue=array(); $isValid=true; - -// var_dump($_POST); -// exit(0); $nodeId=($this->getData("nodeId")!="")?$this->getData("nodeId"):eid(); @@ -481,8 +495,18 @@ Class AdminNode extends CoordinationObj $Node->setHasPublic( ((isset($_POST["node_haspublic"]))?($_POST["node_haspublic"]):'off') ); // $Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") ); -// var_dump($Node); -// exit(0); + if( $node_id === recupCommunity($node_id) ) + { + $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($node_id); + $NodeSettings->setEmail( ((isset($_POST["node_email"]))?(htmlentitiesconv($_POST["node_email"])):"") ); + $NodeSettings->setMastodon( ((isset($_POST["node_mastodon"]))?(htmlentitiesconv($_POST["node_mastodon"])):"") ); + $NodeSettings->setMobilizon( ((isset($_POST["node_mobilizon"]))?(htmlentitiesconv($_POST["node_mobilizon"])):"") ); + $NodeSettings->setMatrix( ((isset($_POST["node_matrix"]))?(htmlentitiesconv($_POST["node_matrix"])):"") ); + $NodeSettings->setPeertube( ((isset($_POST["node_peertube"]))?(htmlentitiesconv($_POST["node_peertube"])):"") ); + $NodeSettings->setNextcloud( ((isset($_POST["node_nextcloud"]))?(htmlentitiesconv($_POST["node_nextcloud"])):"") ); + $NodeSettings->setTwitter( ((isset($_POST["node_twitter"]))?(htmlentitiesconv($_POST["node_twitter"])):"") ); + $NodeSettings->setFacebook( ((isset($_POST["node_facebook"]))?(htmlentitiesconv($_POST["node_facebook"])):"") ); + } # Variables de configuration de l'objet /* Pour le nom de l'objet... */ @@ -526,6 +550,9 @@ Class AdminNode extends CoordinationObj { $Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->updateInstance($Node); + if( $node_id === recupCommunity($node_id) ) + $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->updateInstance($NodeSettings); + if ($emptyCache==true) { $GLOBALS["SYSTEM_MANAGER"]["TREE_NODE_CACHE"]->emptyCache(); @@ -538,6 +565,8 @@ Class AdminNode extends CoordinationObj if( DATA_ACCES_CACHE_PERMISSION ) $GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache(); +// exit(0); + systemRedirect( formatUrl($this->getId(), "AdminNode", "updateAdmin", "msgSave")."&node_Id1=".$Node->getId() ); return "msgSave"; }else{ diff --git a/lib/object_coordination/usertemp/usertemp.php b/lib/object_coordination/usertemp/usertemp.php index b163442..d353fc1 100755 --- a/lib/object_coordination/usertemp/usertemp.php +++ b/lib/object_coordination/usertemp/usertemp.php @@ -186,7 +186,7 @@ Class UserTemp extends CoordinationObj addMessageFile("user.ini"); //Récupération de l'identifiant de la communauté : methode en fin de page - $nodeId = recupCommunity('id'); + $nodeId = recupCommunity(false, 'id'); if(isset($_POST['user_id'])) { @@ -247,7 +247,7 @@ Class UserTemp extends CoordinationObj // $body = str_replace("<#MAIL#>",$objUser->getMail(),$body); // $mail->isMail(); // $mail->setLanguage('fr', 'lib/package/phpmailer/language/'); -// $mail->AddReplyTo(recupCommunity("mailnode"),recupCommunity("lib", $currentCode)); +// $mail->AddReplyTo(recupCommunity(false, "mailnode"),recupCommunity(false, "lib", $currentCode)); // $mail->SetFrom(recupCommunity("mailnode"),recupCommunity("lib", $currentCode)); // $mail->AddAddress($address, $objUser->getLogin()); // $mail->AddBCC(recupCommunity("mailnode"), ""); diff --git a/lib/object_printing/navigationprint/navigationprint.php b/lib/object_printing/navigationprint/navigationprint.php index cc88151..f722bef 100755 --- a/lib/object_printing/navigationprint/navigationprint.php +++ b/lib/object_printing/navigationprint/navigationprint.php @@ -90,6 +90,9 @@ class NavigationPrint extends Printing $imgLogo=$GLOBALS['CONF_DATA_PATH']."data/image/communities/3_logo.svg"; } + /* Obtention des informations du bloc d'affichage des réseaux sociaux */ + /* #TODO */ + // BLOC INFOS UTILISATEUR if ($GLOBALS["SYSTEM_USER_SESSION"]->user->getId()==$GLOBALS["SYSTEM_DEFAULT_USER_GUEST"]) { diff --git a/lib/system/system_data/nodesettings/nodesettings.php b/lib/system/system_data/nodesettings/nodesettings.php index bffc128..d445d3f 100755 --- a/lib/system/system_data/nodesettings/nodesettings.php +++ b/lib/system/system_data/nodesettings/nodesettings.php @@ -242,7 +242,7 @@ var $facebook= null; */ function setMatrix($matrix) { - if (!is_string($mobilizon)) + if (!is_string($matrix)) return false; $this->matrix=$matrix; diff --git a/lib/system/system_data/nodesettings/nodesettingsmanager.php b/lib/system/system_data/nodesettings/nodesettingsmanager.php index c1e041a..f4f4522 100755 --- a/lib/system/system_data/nodesettings/nodesettingsmanager.php +++ b/lib/system/system_data/nodesettings/nodesettingsmanager.php @@ -349,7 +349,7 @@ class NodeSettingsManager extends Manager if ((strtolower(get_class($obj))=="nodesettings") && ($obj->isLoaded()==true)) { /* Récupération des infos */ - $id=$this->sourceUpdate($obj->getId(), $obj->getEmail(), $obj->getMastodon(), $obj->Mobilizon(), $obj->getMatrix(), $obj->getPeertube(), $obj->getNextcloud(), $obj->getTwitter(), $obj->getFacebook()); + $id=$this->sourceUpdate($obj->getId(), $obj->getEmail(), $obj->getMastodon(), $obj->getMobilizon(), $obj->getMatrix(), $obj->getPeertube(), $obj->getNextcloud(), $obj->getTwitter(), $obj->getFacebook()); $this->CallSystemPlugin("__updateNodeSettings", $obj); return $obj; } @@ -376,7 +376,7 @@ class NodeSettingsManager extends Manager if ($obj->isLoaded()==false) { /* Récupération des infos */ - $id=$this->sourceInsert($obj->getEmail(), $obj->getMastodon(), $obj->Mobilizon(), $obj->getMatrix(), $obj->getPeertube(), $obj->getNextcloud(), $obj->getTwitter(), $obj->getFacebook()); + $id=$this->sourceInsert($obj->getEmail(), $obj->getMastodon(), $obj->getMobilizon(), $obj->getMatrix(), $obj->getPeertube(), $obj->getNextcloud(), $obj->getTwitter(), $obj->getFacebook()); $obj->setId($id); $this->CallSystemPlugin("__insertNodeSettings", $obj); return $obj; diff --git a/lib/system/system_data/nodesettings/ressource/nodesettingsmanagerdb.php b/lib/system/system_data/nodesettings/ressource/nodesettingsmanagerdb.php index 93b5cd9..0ce2041 100755 --- a/lib/system/system_data/nodesettings/ressource/nodesettingsmanagerdb.php +++ b/lib/system/system_data/nodesettings/ressource/nodesettingsmanagerdb.php @@ -271,7 +271,7 @@ var $conn = null; if ($this->conn->sql_affectedrows()==0) { $systemError=1; - $classe="Node"; + $classe="NodeSettings"; $message="Erreur de SUPPRESSION dans FetchNodeSettingsManagerDb avec l'id ".$id; addError($systemError,$classe,$message, __line__, __file__); return false; diff --git a/lib/system/system_data/usersession/usersession.php b/lib/system/system_data/usersession/usersession.php index a6b9c7e..50bd59e 100755 --- a/lib/system/system_data/usersession/usersession.php +++ b/lib/system/system_data/usersession/usersession.php @@ -232,22 +232,63 @@ var $permission; */ function getDefaultNode() { + $userDomain = false; + if ($this->userPreference->isLoaded()==true) { return $this->userPreference->getEntryNodeId(); }else{ +// if( $GLOBALS["SYSTEM_USER_SESSION"]['listUserNode']) +// { +// foreach($GLOBALS["SYSTEM_USER_SESSION"]->listUserNode->tabTree as $tree) +// { +// for($i=0; $i < 1; $i++) +// { +// if($tree->tabFather[$i]->domain == $_SERVER["HTTP_HOST"]) +// $userDomain = true; +// else +// $userDomain = false; +// } +// } +// } + $tmp=$this->listUserNode->getConfiguredNodeId(); /* on prend le premier noeud */ -// var_dump("tmp count: ".count($tmp)); if (count($tmp)==0) { - /* retour à une session par defaut */ - $this->defaultSession(); - /* pas de noeuds configurés pour l'utilisateur?! */ - $systemError=1; - addError($systemError, "User Session", "Utilisateur corrompu, pas de noeud configures", __line__, __file__); - return $GLOBALS["SYSTEM_DEFAULT_NODE"]; +// if($userDomain) +// { + /* retour à une session par defaut */ +// $this->defaultSession(); + /* pas de noeuds configurés pour l'utilisateur?! */ +// $systemError=1; +// addError($systemError, "User Session", "Utilisateur corrompu, pas de noeud configures", __line__, __file__); +// return $GLOBALS["SYSTEM_DEFAULT_NODE"]; +// } +// else if(!$userDomain) +// { + /* retour à une session par defaut */ +// $this->defaultSession(); +// $this->messageSystem="wrongAuthSession"; + return false; +// return 1; +// } }else{ +// if( $GLOBALS["SYSTEM_USER_SESSION"]['listUserNode']) +// { +// foreach($this->listUserNode->tabTree as $tree) +// { +// for($i=0; $i < 1; $i++) +// { +// if($tree->tabFather[$i]->domain == $_SERVER["HTTP_HOST"]) +// $userDomain = true; +// else +// $userDomain = false; +// } +// } +// } + + return $tmp[0]; } }