From c47fc5be619c20efb2a50f7ef5e204d84157acd5 Mon Sep 17 00:00:00 2001 From: "tristan.champomier" Date: Sat, 3 Apr 2021 14:25:35 +0200 Subject: [PATCH] Fixed request #51. Add textareas for community descriptions. --- data/message/fr/adminnode.ini | 1 + data/message/fr/user.ini | 1 + .../addcom/actionadmin.mxt | 22 +++++++++++-- lib/object_coordination/addcom/addcom.php | 31 +++++++++++++------ lib/object_coordination/home/home.php | 2 +- 5 files changed, 44 insertions(+), 13 deletions(-) diff --git a/data/message/fr/adminnode.ini b/data/message/fr/adminnode.ini index 5d00891..f583149 100755 --- a/data/message/fr/adminnode.ini +++ b/data/message/fr/adminnode.ini @@ -29,6 +29,7 @@ TxtNodeChoose = "(*) Choisissez l'espace" TxtDeplacer = "Déplacer dans" TxtCommValidateCreate = "Valider la création de la communauté" +TxtDetailsComm = "Descriptions de la communauté" TxtTemplateChoice = "Template par défaut" TxtTemplateChoiceNode = "Template de l'espace" TxtTemplateAvailNode = "Template(s) disponible(s) pour l'espace :" diff --git a/data/message/fr/user.ini b/data/message/fr/user.ini index a3f6f11..266ac13 100755 --- a/data/message/fr/user.ini +++ b/data/message/fr/user.ini @@ -221,6 +221,7 @@ etape2 = "Etape 2" etape3 = "Etape 3" etape4 = "Etape 4" etape5 = "Etape 5" +etape6 = "Etape 6" 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/lcube6/object_coordination/addcom/actionadmin.mxt b/data/template/lcube6/object_coordination/addcom/actionadmin.mxt index 2169775..c857097 100755 --- a/data/template/lcube6/object_coordination/addcom/actionadmin.mxt +++ b/data/template/lcube6/object_coordination/addcom/actionadmin.mxt @@ -204,7 +204,7 @@

-
+

@@ -215,9 +215,27 @@
+
+
+

+
+
+

+
+
+ +
+
+

+
+
+ +
+
+
-

+

" value=""/> diff --git a/lib/object_coordination/addcom/addcom.php b/lib/object_coordination/addcom/addcom.php index 4c5ff76..138e49e 100755 --- a/lib/object_coordination/addcom/addcom.php +++ b/lib/object_coordination/addcom/addcom.php @@ -56,6 +56,7 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad addMessageFile("main.ini"); addMessageFile("object.ini"); addMessageFile("adminnode.ini"); + addMessageFile("adminhome.ini"); /* gestion du lib en fonction de la langue courante */ $currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode(); @@ -66,20 +67,27 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad $arrayCallCss = array(); $arrayCallCss[] = "data/css/bootstrap-datepicker/1.9.0/bootstrap-datepicker3.min.css"; + $arrayCallCss[] = "data/javascript/summernote/0.8.18/summernote-bs4.min.css"; mxCallCss($arrayCallCss); $arrayCallJs = array(); $arrayCallJs[] = "data/javascript/bootstrap-datepicker/1.9.0/bootstrap-datepicker.min.js"; $arrayCallJs[] = "data/javascript/bootstrap-datepicker/1.9.0/locales/bootstrap-datepicker.".$currentCode.".min.js"; + $arrayCallJs[] = "data/javascript/summernote/0.8.18/summernote-bs4.min.js"; + $arrayCallJs[] = "data/javascript/summernote/plugins/file/201910/summernote-file.js"; + $arrayCallJs[] = "data/javascript/summernote/0.8.18/lang/summernote-fr-FR.min.js"; mxCallJs($arrayCallJs); $arrayRawJs[] = "\$('.datepicker').datepicker();"; - $arrayRawJs[] = "function imgPicto(){if(document.getElementById){if(document.getElementById(\"fmNodeAdd\")){var obj=document.getElementById(\"template\");document.getElementById(\"pictoObject\").src=\"data/image/icons/node/\"+document.getElementById(\"fmNodeAdd\").iconeN.options[(document.getElementById(\"fmNodeAdd\").iconeN.selectedIndex)].value;}}else if(document.all){if(document.all[\"fmNodeAdd\"]){document.all[\"pictoObject\"].src=\"data/image/icons/node/\"+document.all[\"fmNodeAdd\"].iconeN.options[(document.all[\"fmNodeAdd\"].iconeN.selectedIndex)].value;}}}function Valid_register(the_form,the_field){var objectform = document.forms[the_form];var nbr = objectform.length;var flag = 0;for(z=0 ; z < nbr; z++){if(objectform.elements[z].checked == true && objectform.elements[z].name == the_field){flag=1;}}if(flag == 0){alert('');return false;}objectform.submit();}function imgTemplate(){if(document.getElementById){if(document.getElementById(\"fmNodeAdd\")){var obj=document.getElementById(\"template\");document.getElementById(\"pictoTemplate\").src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}}else if(document.all){if(document.all[\"fmNodeAdd\"]){var obj=document.all[\"template\"];document.all[\"pictoTemplate\"].src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}}}imgTemplate();function setSelectOptions(the_form, the_select, do_check){var selectObject = document.forms[the_form].elements[the_select];var selectCount = selectObject.length;for (var i = 0; i < selectCount; i++){selectObject.options[i].selected = do_check;}return true;}function setCheckOptions(the_form, the_select){var selectObject = document.forms[the_form];var selectCount = selectObject.length;for (var i = 0; i < selectCount; i++) {if(selectObject.elements[i].name == the_select){if(selectObject.elements[i].checked == true){selectObject.elements[i].checked = false;}else{selectObject.elements[i].checked = true;}}}return true;}"; + $arrayRawJs[] = "function imgPicto(){if(document.getElementById){if(document.getElementById(\"fmNodeAdd\")){var obj=document.getElementById(\"template\");document.getElementById(\"pictoObject\").src=\"data/image/icons/node/\"+document.getElementById(\"fmNodeAdd\").iconeN.options[(document.getElementById(\"fmNodeAdd\").iconeN.selectedIndex)].value;}}else if(document.all){if(document.all[\"fmNodeAdd\"]){document.all[\"pictoObject\"].src=\"data/image/icons/node/\"+document.all[\"fmNodeAdd\"].iconeN.options[(document.all[\"fmNodeAdd\"].iconeN.selectedIndex)].value;}}}function Valid_register(the_form,the_field){var objectform = document.forms[the_form];var nbr = objectform.length;var flag = 0;for(z=0 ; z < nbr; z++){if(objectform.elements[z].checked == true && objectform.elements[z].name == the_field){flag=1;}}if(flag == 0){alert('');return false;}objectform.submit();}function imgTemplate(){if(document.getElementById){if(document.getElementById(\"fmNodeAdd\")){var obj=document.getElementById(\"template\");document.getElementById(\"pictoTemplate\").src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}}else if(document.all){if(document.all[\"fmNodeAdd\"]){var obj=document.all[\"template\"];document.all[\"pictoTemplate\"].src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}}}imgTemplate();function setSelectOptions(the_form, the_select, do_check){var selectObject = document.forms[the_form].elements[the_select];var selectCount = selectObject.length;for (var i = 0; i < selectCount; i++){selectObject.options[i].selected = do_check;}return true;}function setCheckOptions(the_form, the_select){var selectObject = document.forms[the_form];var selectCount = selectObject.length;for (var i = 0; i < selectCount; i++) {if(selectObject.elements[i].name == the_select){if(selectObject.elements[i].checked == true){selectObject.elements[i].checked = false;}else{selectObject.elements[i].checked = true;}}}return true;}\$(document).ready( function(){\$('#contentResumeInfos').summernote({lang: 'fr_FR',toolbar: [['style', ['style','fontsize']],['font', ['bold', 'underline', 'clear']],['fontname', ['fontname']],['color',['backcolor','color']],['para', ['style','ul', 'ol', 'paragraph']],['table', ['table']],['hr', ['hr']],/* File plugin not enabled */ /* ['insert', ['file','link', 'picture', 'video']], */ ['insert', ['link', 'picture', 'video']],['view', ['fullscreen', 'codeview']],['misc', ['undo', 'redo']],],height: 180,disableResizeEditor: true, /* disable resizing editor */ airMode: false,});});\$(document).ready( function(){\$('#contentTextInfos').summernote({lang: 'fr_FR',toolbar: [['style', ['style','fontsize']],['font', ['bold', 'underline', 'clear']],['fontname', ['fontname']],['color',['backcolor','color']],['para', ['style','ul', 'ol', 'paragraph']],['table', ['table']],['hr', ['hr']],/* File plugin not enabled */ /* ['insert', ['file','link', 'picture', 'video']], */ ['insert', ['link', 'picture', 'video']],['view', ['fullscreen', 'codeview']],['misc', ['undo', 'redo']],],height: 650,disableResizeEditor: true, /* disable resizing editor */ airMode: false,});});"; mxRawJs($arrayRawJs); - + /* On inclus la template (voir package.template.php) */ WithBlocPath("AddCom", "actionadmin"); + //$this->tabeCreate(); + $text =getMessage("NoText"); + # Affichage de la liste déroulante # Détermine le chemin des icônes $chemintotal = $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/"; @@ -233,7 +241,7 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad asort($tabIcone); $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("TEMPLATE_ADMIN", "template", $tabIcone, $tabIcone, "", 7, "", "class=\"form\""); /* Fin Affichage des templates */ - + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("BtnAdd", "button", "boutton", getMessage("BtnAdd"), "class=\"form\""); # Récupération des étiquettes du formulaire $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlAction", formatUrl($this->getId(),"AddCom","execAdmin","")); @@ -252,26 +260,21 @@ function execAdmin() addMessageFile("main.ini"); addMessageFile("object.ini"); addMessageFile("adminnode.ini"); + addMessageFile("adminhome.ini"); /* gestion du lib en fonction de la langue courante */ $currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode(); $defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"]; /* fin récupération des codes par défaut */ -// var_dump($_POST); -// exit(0); - $chaine=""; if($_POST) { foreach($_POST as $cle=>$val) { -// echo "cle = ".$cle." val =".$val."
"; -// if($val=="" && ($cle !="user_comment" && $cle !="user_fax" && $cle !="user_organisation" && $cle !="user_country")) - if($val=="" && ($cle !="NodeEntry_type" && $cle !="NodeEntry_typereg" && $cle !="NodeEntry_domain" && $cle !="user_fax" && $cle !="user_mastodon" && $cle !="user_jabber" && $cle !="user_facebook" && $cle !="user_msn" && $cle !="user_website")) + if($val=="" && ($cle !="NodeEntry_type" && $cle !="NodeEntry_typereg" && $cle !="NodeEntry_domain" && $cle !="user_fax" && $cle !="user_mastodon" && $cle !="user_jabber" && $cle !="user_facebook" && $cle !="user_msn" && $cle !="user_website" && $cle="contentResumeInfos" && $cle="contentTextInfos")) { $chaine .= getMessage($cle).", "; -// var_dump(getMessage($cle)); } } if($chaine!="") @@ -625,6 +628,14 @@ function execAdmin() if( DATA_ACCES_CACHE_PERMISSION ) $GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache(); + + # Insertion des informations de description de la communauté en bdd + $sql="INSERT INTO ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_OBJECT_PREFIX."textentrynode (textentrynode_text, textentrynode_resume, node_id, langue_id) VALUES ('".$_POST['contentTextInfos']."','".$_POST['contentResumeInfos']."',".recupCommunity().",".$GLOBALS["SYSTEM_USER_SESSION"]->langue->getId().")"; + + # Exécution de Requete + $result=$GLOBALS['SYSTEM_DATABASE_CONN']->sql_query($sql); + # Destruction des éléments + $GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult(); #------------------------------------------------------------------------------------------------------------------------------------ # Redirection vers le formulaire systemRedirect(formatUrl($this->getId(),"AddCom","actionAdmin", "msgSave")); diff --git a/lib/object_coordination/home/home.php b/lib/object_coordination/home/home.php index 36a99ac..cf89992 100755 --- a/lib/object_coordination/home/home.php +++ b/lib/object_coordination/home/home.php @@ -321,7 +321,7 @@ Class Home extends CoordinationObj $sql="INSERT INTO ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_OBJECT_PREFIX."textentrynode (textentrynode_text, textentrynode_resume, node_id, langue_id) VALUES ('".$_POST['contentTextInfos']."','".$_POST['contentResumeInfos']."',".recupCommunity().",".$GLOBALS["SYSTEM_USER_SESSION"]->langue->getId().")"; # Exécution de Requete - $result=$GLOBALS['SYSTEM_DATABASE_CONN']->sql_query($sql); + $result=$GLOBALS['SYSTEM_DATABASE_CONN']->sql_query($sql); } # Destruction des éléments