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

Implemented nodesettings in backend files and qware template

Browse Source
This commit is contained in:
Rooty 2021-04-19 21:36:20 +02:00
parent f57591ec0e
commit 4dd38e9723
12 changed files with 480 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
data/message/fr/user.ini
View File

@ -43,6 +43,24 @@ double_dots = " : "
struct_denomination = "Dénomination" struct_denomination = "Dénomination"
struct_type = "Type de structure" 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" mrs = "Mme"
mr = "M" mr = "M"
miss = "Mlle" miss = "Mlle"
@ -217,15 +235,18 @@ TxtExport = "Format de l'export"
generalInformation = "Informations générales" generalInformation = "Informations générales"
etape1 = "Etape 1" etape1 = "Etape 1"
complementInformation = "Informations complémentaires"
etape2 = "Etape 2" etape2 = "Etape 2"
visualInfomation = "Visuels"
etape3 = "Etape 3"
lblUploadLogoFile = "Envoyer le logo" lblUploadLogoFile = "Envoyer le logo"
lblUploadFaviconFile = "Envoyer le favicon" lblUploadFaviconFile = "Envoyer le favicon"
lblUploadFile = "Envoyer un fichier" lblUploadFile = "Envoyer un fichier"
etape3 = "Etape 3"
etape4 = "Etape 4" etape4 = "Etape 4"
etape5 = "Etape 5" etape5 = "Etape 5"
etape6 = "Etape 6" etape6 = "Etape 6"
etape7 = "Etape 7" etape7 = "Etape 7"
etape8 = "Etape 8"
TxtValid = "Valider" TxtValid = "Valider"
TxtInscription = "Veuillez saisir les informations pour votre pré-inscription, l'administrateur de la communauté se chargera de finaliser l'inscription." TxtInscription = "Veuillez saisir les informations pour votre pré-inscription, l'administrateur de la communauté se chargera de finaliser l'inscription."

441
data/template/qware/object_coordination/addcom/actionadmin.mxt
View File

@ -5,8 +5,8 @@
<h3><mx:text id="etape1"/><mx:text id="double_dots"/><mx:text id="generalInformation"/></h3> <h3><mx:text id="etape1"/><mx:text id="double_dots"/><mx:text id="generalInformation"/></h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row mb-2"> <div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-4 justify-content-center">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text" id="newsicon"><i class="fa fa-lg fa-file-picture-o"></i></span> <span class="input-group-text" id="newsicon"><i class="fa fa-lg fa-file-picture-o"></i></span>
</div> </div>
@ -16,7 +16,7 @@
</div> </div>
</div> </div>
<mx:bloc id="blocName"> <mx:bloc id="blocName">
<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-4 justify-content-center">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg"></i><span class="fa"><mx:image id="pictoLanguage"/><span class="text-danger"> *</span></span></span> <span class="input-group-text"><i class="fa fa-lg"></i><span class="fa"><mx:image id="pictoLanguage"/><span class="text-danger"> *</span></span></span>
</div> </div>
@ -24,20 +24,20 @@
</div> </div>
</mx:bloc id="blocName"> </mx:bloc id="blocName">
</div> </div>
<div class="row mb-2"> <div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-4 justify-content-center">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-group"></i></span> <span class="input-group-text"><i class="fa fa-lg fa-group"></i></span>
</div> </div>
<mx:select id="COMMPROFILES" id="NodeEntry_type"/> <mx:select id="COMMPROFILES" id="NodeEntry_type"/>
</div> </div>
<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-4 justify-content-center">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-group"></i></span> <span class="input-group-text"><i class="fa fa-lg fa-group"></i></span>
</div> </div>
<mx:formField id="NodeEntry_typereg"/> <mx:formField id="NodeEntry_typereg"/>
</div> </div>
<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-4 justify-content-center">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-group"><span class="text-danger"> *</span></i></span> <span class="input-group-text"><i class="fa fa-lg fa-group"><span class="text-danger"> *</span></i></span>
</div> </div>
@ -49,31 +49,90 @@
<div class="card w-100"> <div class="card w-100">
<div class="card-header text-center"> <div class="card-header text-center">
<h3><mx:text id="etape2"/><mx:text id="double_dots"/><mx:text id="generalInformation"/></h3> <h3><mx:text id="etape2"/><mx:text id="double_dots"/><mx:text id="complementInformation"/></h3>
</div>
<div class="card-body">
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope-o"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="node_email" id="node_email"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-mastodon"></i></span>
</div>
<mx:formField id="node_mastodon" id="node_mastodon"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-activitypub"></i></span>
</div>
<mx:formField id="node_mobilizon" id="node_mobilizon"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-matrix-org"></i></span>
</div>
<mx:formField id="node_matrix" id="node_matrix"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-peertube"></i></span>
</div>
<mx:formField id="node_peertube" id="node_peertube"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-nextcloud"></i></span>
</div>
<mx:formField id="node_nextcloud" id="node_nextcloud"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-twitter"></i></span>
</div>
<mx:formField id="node_twitter" id="node_twitter"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-facebook"></i></span>
</div>
<mx:formField id="node_facebook" id="node_facebook"/>
</div>
</div>
</div>
</div>
<div class="card w-100">
<div class="card-header text-center">
<h3><mx:text id="etape3"/><mx:text id="double_dots"/><mx:text id="visualInfomation"/></h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<!-- <form id="formUpload" role="form" class="text-center px-0" method="post" enctype="multipart/form-data" mXattribut="action:urlUpload"> --> <!-- <form id="formUpload" role="form" class="text-center px-0" method="post" enctype="multipart/form-data" mXattribut="action:urlUpload"> -->
<div class="row mb-2"> <div class="row mb-2">
<input type='hidden' class="hidden" name='MAX_FILE_SIZE' value='10000000000000'/> <input type='hidden' class="hidden" name='MAX_FILE_SIZE' value='10000000000000'/>
<div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0 justify-content-center">
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" name="uploadFileLogo" id="uploadFileLogo"/> <input type="file" class="custom-file-input" name="uploadFileLogo" id="uploadFileLogo"/>
<label class="custom-file-label text-left" for="uploadFileLogo"><mx:text id="lblUploadLogoFile"/></label> <label class="custom-file-label text-left" for="uploadFileLogo"><mx:text id="lblUploadLogoFile"/></label>
</div> </div>
</div> </div>
<div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0 justify-content-center">
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" name="uploadFileFavicon" id="uploadFileFavicon"/> <input type="file" class="custom-file-input" name="uploadFileFavicon" id="uploadFileFavicon"/>
<label class="custom-file-label text-left" for="uploadFileFavicon"><mx:text id="lblUploadFaviconFile"/></label> <label class="custom-file-label text-left" for="uploadFileFavicon"><mx:text id="lblUploadFaviconFile"/></label>
</div> </div>
</div> </div>
<div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0"> <div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0 justify-content-center">
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" name="uploadFile" id="uploadFile"/> <input type="file" class="custom-file-input" name="uploadFile" id="uploadFile"/>
<label class="custom-file-label text-left" for="uploadFile"><mx:text id="lblUploadFile"/></label> <label class="custom-file-label text-left" for="uploadFile"><mx:text id="lblUploadFile"/></label>
</div> </div>
</div> </div>
<div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0 float-right"> <div class="input-group col-xs-12 col-sm-8 col-lg-3 px-10 m-0 justify-content-center">
<input type="submit" name="BtnValid" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" MxAttribut="value:BtnUploadInstall"/> <input type="submit" name="BtnValid" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" MxAttribut="value:BtnUploadInstall"/>
</div> </div>
</div> </div>
@ -81,184 +140,178 @@
</div> </div>
</div> </div>
<div class="card w-100"> <div class="card w-100">
<div class="card-header text-center"> <div class="card-header text-center">
<h3><mx:text id="etape3"/><mx:text id="double_dots"/><mx:text id="briquesList"/></h3> (<a href="javascript:void(0);" onclick="setCheckOptions('fmNodeAdd', 'class_id[]'); return false;"><mx:text id="selectall"/></a>) <h3><mx:text id="etape4"/><mx:text id="double_dots"/><mx:text id="briquesList"/></h3> (<a href="javascript:void(0);" onclick="setCheckOptions('fmNodeAdd', 'class_id[]'); return false;"><mx:text id="selectall"/></a>)
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row mb-2"> <div class="row mb-2">
<mx:bloc id="actionAdminClass"> <mx:bloc id="actionAdminClass">
<div class="input-group col-xs-12 col-sm-8 col-lg-3"> <div class="input-group col-xs-12 col-sm-8 col-lg-3">
<!--<div class="input-group-prepend"> <div class="input-group-prepend">
<mx:text id="className"/>
</div>
<div class="form-check">
<mx:checker id="classId" class="form-check-input"/>
</div>-->
<div class="input-group-prepend">
<span class="input-group-text"><mx:text id="className"/></span> <span class="input-group-text"><mx:text id="className"/></span>
</div> </div>
<div class="form-check"> <div class="form-check">
<mx:checker id="classId" class="form-check-input"/> <mx:checker id="classId" class="form-check-input"/>
</div> </div>
</div> </div>
</mx:bloc id="actionAdminClass"> </mx:bloc id="actionAdminClass">
</div> </div>
</div> </div>
</div> </div>
<div class="card w-100"> <div class="card w-100">
<div class="card-header text-center">
<h3><mx:text id="etape4"/><mx:text id="double_dots"/><mx:text id="user_admin"/></h3>
</div>
<div class="card-body center-block">
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-venus-mars"></i></span>
</div>
<mx:select id="user_title"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-user"></i></span>
</div>
<mx:formField id="user_first_name" id="firstname"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-user"></i></span>
</div>
<mx:formField id="user_last_name" id="lastname"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope-o"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_mail" id="mail"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-user-secret"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_login" id="user_login"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-lock"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_password" id="user_password"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-lock"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_password2" id="user_password2"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-birthday-cake"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_birthdate" id="birthdate" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-language="fr"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span>
</div>
<mx:formField id="user_postal_address" id="postaladdress"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span>
</div>
<mx:formField id="user_postal_code" id="postalcode"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-location-arrow"></i></span>
</div>
<mx:formField id="user_city" id="city"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-flag"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_country" id="country"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span>
</div>
<mx:formField id="user_state" id="state"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-mobile"></i></span>
</div>
<mx:formField id="user_tel" id="tel"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-fax"></i></span>
</div>
<mx:formField id="user_fax" id="fax"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-mastodon"></i></span>
</div>
<mx:formField id="user_mastodon" id="user_mastodon"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-xmpp"></i></span>
</div>
<mx:formField id="user_jabber" id="user_jabber"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-facebook"></i></span>
</div>
<mx:formField id="user_facebook" id="user_facebook"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-globe"></i></span>
</div>
<mx:formField id="user_website" id="user_website"/>
</div>
</div>
</div>
</div>
<div class="card w-100">
<div class="card-header text-center">
<h3><mx:text id="etape5"/><mx:text id="double_dots"/><mx:text id="TxtTemplateChoiceNode"/></h3>
</div>
<div class="card-body center-block">
<div class="row justify-content-center">
<p class="input-group col-xs-12 col-sm-8 col-lg-4">
<span class="input-group-addon"><span class="glyphicon glyphicon-user required"></span><mx:text id="TxtTemplateAvailNode"/></span><mx:select id="TEMPLATE_ADMIN" id="template" onchange="javascript:imgTemplate();"/>
</p>
<p class="input-group col-xs-12 col-sm-8 col-lg-4">
<span class="input-group-addon center"><span class="glyphicon"></span><img name="pictoTemplate" id="pictoTemplate" src="data/template/default/preview.png" mXattribut="alt:previewtemplate" class="preview" /></span>
</p>
</div>
</div>
</div>
<div class="card w-100">
<div class="card-header text-center"> <div class="card-header text-center">
<h3><mx:text id="etape6"/><mx:text id="double_dots"/><mx:text id="TxtDetailsComm"/></h3> <h3><mx:text id="etape5"/><mx:text id="double_dots"/><mx:text id="user_admin"/></h3>
</div> </div>
<div class="card-body center-block">
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-venus-mars"></i></span>
</div>
<mx:select id="user_title"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-user"></i></span>
</div>
<mx:formField id="user_first_name" id="firstname"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-user"></i></span>
</div>
<mx:formField id="user_last_name" id="lastname"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope-o"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_mail" id="mail"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-user-secret"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_login" id="user_login"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-lock"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_password" id="user_password"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-lock"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_password2" id="user_password2"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-birthday-cake"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_birthdate" id="birthdate" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-language="fr"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span>
</div>
<mx:formField id="user_postal_address" id="postaladdress"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span>
</div>
<mx:formField id="user_postal_code" id="postalcode"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-location-arrow"></i></span>
</div>
<mx:formField id="user_city" id="city"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-flag"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="user_country" id="country"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span>
</div>
<mx:formField id="user_state" id="state"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-mobile"></i></span>
</div>
<mx:formField id="user_tel" id="tel"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-fax"></i></span>
</div>
<mx:formField id="user_fax" id="fax"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-mastodon"></i></span>
</div>
<mx:formField id="user_mastodon" id="user_mastodon"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-xmpp"></i></span>
</div>
<mx:formField id="user_jabber" id="user_jabber"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-facebook"></i></span>
</div>
<mx:formField id="user_facebook" id="user_facebook"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-globe"></i></span>
</div>
<mx:formField id="user_website" id="user_website"/>
</div>
</div>
</div>
</div>
<div class="card w-100">
<div class="card-header text-center">
<h3><mx:text id="etape6"/><mx:text id="double_dots"/><mx:text id="TxtTemplateChoiceNode"/></h3>
</div>
<div class="card-body center-block">
<div class="row justify-content-center">
<p class="input-group col-xs-12 col-sm-8 col-lg-4">
<span class="input-group-addon"><span class="glyphicon glyphicon-user required"></span><mx:text id="TxtTemplateAvailNode"/></span><mx:select id="TEMPLATE_ADMIN" id="template" onchange="javascript:imgTemplate();"/>
</p>
<p class="input-group col-xs-12 col-sm-8 col-lg-4">
<span class="input-group-addon center"><span class="glyphicon"></span><img name="pictoTemplate" id="pictoTemplate" src="data/template/default/preview.png" mXattribut="alt:previewtemplate" class="preview" /></span>
</p>
</div>
</div>
</div>
<div class="card w-100">
<div class="card-header text-center">
<h3><mx:text id="etape7"/><mx:text id="double_dots"/><mx:text id="TxtDetailsComm"/></h3>
</div>
<div class="card-header text-center"> <div class="card-header text-center">
<h3><mx:text id="lblTextComResume"/></h3> <h3><mx:text id="lblTextComResume"/></h3>
</div> </div>
@ -272,16 +325,16 @@
<mx:formField id="contentTextInfos" id="contentTextInfos"/> <mx:formField id="contentTextInfos" id="contentTextInfos"/>
</div> </div>
</div> </div>
<div class="card w-100"> <div class="card w-100">
<div class="card-header text-center"> <div class="card-header text-center">
<h3><mx:text id="etape7"/><mx:text id="double_dots"/><mx:text id="TxtCommValidateCreate"/></h3> <h3><mx:text id="etape8"/><mx:text id="double_dots"/><mx:text id="TxtCommValidateCreate"/></h3>
</div> </div>
<div class="card-footer border-0 bg-white text-center"> <div class="card-footer border-0 bg-white text-center">
<input type="reset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReset" onclick="this.form.reset();" title="<mx:text id="ResetChange"/>" value="<mx:text id="BtnReset"/>"/> <input type="reset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReset" onclick="this.form.reset();" title="<mx:text id="ResetChange"/>" value="<mx:text id="BtnReset"/>"/>
<input type="button" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReturn" onclick="history.back();" value="<mx:text id="BtnReturn"/>"/> <input type="button" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReturn" onclick="history.back();" value="<mx:text id="BtnReturn"/>"/>
<input type="submit" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" id="valid" name="BtnValid" onclick="javascript:Valid_register('fmNodeAdd','class_id[]')" MxAttribut="value:BtnValid"/> <input type="submit" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" id="valid" name="BtnValid" onclick="javascript:Valid_register('fmNodeAdd','class_id[]')" MxAttribut="value:BtnValid"/>
</div> </div>
</div> </div>
</form> </form>
</div> </div>

63
data/template/qware/object_coordination/adminnode/updateadmin.mxt
View File

@ -109,6 +109,69 @@
</div> </div>
</div> </div>
</div> </div>
<mx:bloc id="blocSettings">
<div class="card w-100 border-0">
<div class="card-header text-center">
<h3><mx:text id="complementInformation"/></h3>
</div>
<div class="card-body">
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-envelope-o"><span class="text-danger"> *</span></i></span>
</div>
<mx:formField id="node_email" id="node_email"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-mastodon"></i></span>
</div>
<mx:formField id="node_mastodon" id="node_mastodon"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-activitypub"></i></span>
</div>
<mx:formField id="node_mobilizon" id="node_mobilizon"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-matrix-org"></i></span>
</div>
<mx:formField id="node_matrix" id="node_matrix"/>
</div>
</div>
<div class="row mb-1 w-100">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-peertube"></i></span>
</div>
<mx:formField id="node_peertube" id="node_peertube"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-nextcloud"></i></span>
</div>
<mx:formField id="node_nextcloud" id="node_nextcloud"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-twitter"></i></span>
</div>
<mx:formField id="node_twitter" id="node_twitter"/>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-facebook"></i></span>
</div>
<mx:formField id="node_facebook" id="node_facebook"/>
</div>
</div>
</div>
</div>
</mx:bloc id="blocSettings">
<div class="card-footer border-0 bg-white center-block"> <div class="card-footer border-0 bg-white center-block">
<input type="reset" name="BtnReset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" title="<mx:text id="BtnReset"/>" value="<mx:text id="BtnReset"/>" onclick="this.form.reset();"/> <input type="reset" name="BtnReset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" title="<mx:text id="BtnReset"/>" value="<mx:text id="BtnReset"/>" onclick="this.form.reset();"/>
<input type="button" name="BtnReturn" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/> <input type="button" name="BtnReturn" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/>

43
data/template/qware/object_printing/navigationprint/main.mxt
View File

@ -1,24 +1,21 @@
<!-- <nav id="navigationprint" class="navbar main-nav fixed-top navbar-expand-lg navbar-light bg-light m-0 p-0" role="navigation"> --> <a class="navbar-brand" href="/">
<a class="navbar-brand" href="/"> <mx:image id="pictoCommunity"/>
<!-- <img class="img-responsive" style="max-width: 100px;" src="data/image/communities/139_logo.svg" alt="logo"/> --> </a>
<mx:image id="pictoCommunity"/> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topmenu" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
</a> <span class="navbar-toggler-icon"></span>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topmenu" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> </button>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="topmenu"> <div class="collapse navbar-collapse" id="topmenu">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<mx:text id="Navigation"/><mx:text id="nodeDir"/> <mx:text id="Navigation"/><mx:text id="nodeDir"/>
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="nav-item"><a class="nav-link envelope" href="mailto:contact@fab-l3.org" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li> <li class="nav-item"><a class="nav-link envelope" href="mailto:contact@fab-l3.org" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li>
<li class="nav-item"><a class="nav-link mastodon" href="https://social.fab-l3.org/@lcube" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li> <li class="nav-item"><a class="nav-link mastodon" href="https://social.fab-l3.org/@lcube" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li>
<li class="nav-item"><a class="nav-link mobilizon" href="https://ev.fab-l3.org" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li> <li class="nav-item"><a class="nav-link mobilizon" href="https://ev.fab-l3.org" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li>
<li class="nav-item"><a class="nav-link matrix" href="https://rim.fab-l3.org/#/room/#lcube:sim.fab-l3.org" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li> <li class="nav-item"><a class="nav-link matrix" href="https://rim.fab-l3.org/#/room/#lcube:sim.fab-l3.org" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li>
<li class="nav-item"><a class="nav-link peertube" href="https://tube.fab-l3.org" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li> <li class="nav-item"><a class="nav-link peertube" href="https://tube.fab-l3.org" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li>
<li class="nav-item"><a class="nav-link nextcloud" href="https://cloud.fab-l3.org" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li> <li class="nav-item"><a class="nav-link nextcloud" href="https://cloud.fab-l3.org" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li>
<li class="nav-item"><a class="nav-link twitter" href="https://twitter.com/FablabLCube" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li> <li class="nav-item"><a class="nav-link twitter" href="https://twitter.com/FablabLCube" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li>
</ul> </ul>
</div> </div>
<!-- </nav> -->

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

@ -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_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("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")); $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"]->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")); $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_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("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")); $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"]->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")); $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) 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).", "; $chaine .= getMessage($cle).", ";
} }
@ -350,8 +369,9 @@ function execAdmin()
$MyUser = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser); $MyUser = $GLOBALS["SYSTEM_MANAGER"]["USER"]->saveInstance($MyUser);
} }
// création du noeud principal+groupe principal // création du noeud principal+groupe principal
$Node=new Node(); $Node = new Node();
$Group=new Group(); $NodeSettings = new NodeSettings();
$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)) {
@ -371,6 +391,15 @@ function execAdmin()
$Node->SetHasPublic( ((isset($_POST["haspublic"]))?($_POST["haspublic"]):0) ); $Node->SetHasPublic( ((isset($_POST["haspublic"]))?($_POST["haspublic"]):0) );
$Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") ); $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!!! // Récupération de la template!!!
if (isset($_POST["template"]) && is_array($_POST["template"])) if (isset($_POST["template"]) && is_array($_POST["template"]))
{ {
@ -386,7 +415,8 @@ function execAdmin()
$Node->setIdPere(1); $Node->setIdPere(1);
$Group->setIdPere(1); $Group->setIdPere(1);
//On laisse les pictos par défaut //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); $Group =$GLOBALS["SYSTEM_MANAGER"]["GROUP"]->insertInstance($Group);
/*vérification de l'inexistance du répertoire*/ /*vérification de l'inexistance du répertoire*/

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

@ -272,6 +272,7 @@ Class AdminNode extends CoordinationObj
{ {
/* Ajout du fichier AdminNode.ini */ /* Ajout du fichier AdminNode.ini */
addMessageFile("adminnode.ini"); addMessageFile("adminnode.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();
@ -330,9 +331,9 @@ 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", formatUrl($this->getId(), "AdminNode", "execUpdateAdmin"));
$GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("nodeHiddenUpdate", $node_Id1); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("nodeHiddenUpdate", $node_Id1);
// --> recuperation du treeNode correspondant au noeurd // --> recuperation du treeNode correspondant au noeurd
@ -355,7 +356,6 @@ Class AdminNode extends CoordinationObj
// var_dump($nodeIcone); // var_dump($nodeIcone);
$GLOBALS['SYSTEM_TEMPLATE']->MxSelect("ToHidde".".icone", "iconeN", $nodeIcone, $tabIcone, '', '', 'id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeIcon"), ENT_QUOTES)."\"", getMessage("txtNodeIcon")); $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 des templates */
# Affichage de la liste dïżœoulante # Affichage de la liste dïżœoulante
# Détermine le chemin des icones # Détermine le chemin des icones
@ -402,6 +402,23 @@ Class AdminNode extends CoordinationObj
$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocName", "loop"); $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 // Pour déplacer le Groupe
$tabMove=array(); $tabMove=array();
$k=0; $k=0;
@ -457,9 +474,6 @@ Class AdminNode extends CoordinationObj
{ {
$tabCodeLangue=array(); $tabCodeLangue=array();
$isValid=true; $isValid=true;
// var_dump($_POST);
// exit(0);
$nodeId=($this->getData("nodeId")!="")?$this->getData("nodeId"):eid(); $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->setHasPublic( ((isset($_POST["node_haspublic"]))?($_POST["node_haspublic"]):'off') );
// $Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") ); // $Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") );
// var_dump($Node); if( $node_id === recupCommunity($node_id) )
// exit(0); {
$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 # Variables de configuration de l'objet
/* Pour le nom de l'objet... */ /* Pour le nom de l'objet... */
@ -526,6 +550,9 @@ Class AdminNode extends CoordinationObj
{ {
$Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->updateInstance($Node); $Node=$GLOBALS["SYSTEM_MANAGER"]["NODE"]->updateInstance($Node);
if( $node_id === recupCommunity($node_id) )
$NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->updateInstance($NodeSettings);
if ($emptyCache==true) if ($emptyCache==true)
{ {
$GLOBALS["SYSTEM_MANAGER"]["TREE_NODE_CACHE"]->emptyCache(); $GLOBALS["SYSTEM_MANAGER"]["TREE_NODE_CACHE"]->emptyCache();
@ -538,6 +565,8 @@ 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();
// exit(0);
systemRedirect( formatUrl($this->getId(), "AdminNode", "updateAdmin", "msgSave")."&node_Id1=".$Node->getId() ); systemRedirect( formatUrl($this->getId(), "AdminNode", "updateAdmin", "msgSave")."&node_Id1=".$Node->getId() );
return "msgSave"; return "msgSave";
}else{ }else{

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

@ -186,7 +186,7 @@ Class UserTemp extends CoordinationObj
addMessageFile("user.ini"); addMessageFile("user.ini");
//Récupération de l'identifiant de la communauté : methode en fin de page //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'])) if(isset($_POST['user_id']))
{ {
@ -247,7 +247,7 @@ Class UserTemp extends CoordinationObj
// $body = str_replace("<#MAIL#>",$objUser->getMail(),$body); // $body = str_replace("<#MAIL#>",$objUser->getMail(),$body);
// $mail->isMail(); // $mail->isMail();
// $mail->setLanguage('fr', 'lib/package/phpmailer/language/'); // $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->SetFrom(recupCommunity("mailnode"),recupCommunity("lib", $currentCode));
// $mail->AddAddress($address, $objUser->getLogin()); // $mail->AddAddress($address, $objUser->getLogin());
// $mail->AddBCC(recupCommunity("mailnode"), ""); // $mail->AddBCC(recupCommunity("mailnode"), "");

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

@ -90,6 +90,9 @@ class NavigationPrint extends Printing
$imgLogo=$GLOBALS['CONF_DATA_PATH']."data/image/communities/3_logo.svg"; $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 // BLOC INFOS UTILISATEUR
if ($GLOBALS["SYSTEM_USER_SESSION"]->user->getId()==$GLOBALS["SYSTEM_DEFAULT_USER_GUEST"]) if ($GLOBALS["SYSTEM_USER_SESSION"]->user->getId()==$GLOBALS["SYSTEM_DEFAULT_USER_GUEST"])
{ {

2
lib/system/system_data/nodesettings/nodesettings.php
View File

@ -242,7 +242,7 @@ var $facebook= null;
*/ */
function setMatrix($matrix) function setMatrix($matrix)
{ {
if (!is_string($mobilizon)) if (!is_string($matrix))
return false; return false;
$this->matrix=$matrix; $this->matrix=$matrix;

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

@ -349,7 +349,7 @@ class NodeSettingsManager extends Manager
if ((strtolower(get_class($obj))=="nodesettings") && ($obj->isLoaded()==true)) if ((strtolower(get_class($obj))=="nodesettings") && ($obj->isLoaded()==true))
{ {
/* Récupération des infos */ /* 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); $this->CallSystemPlugin("__updateNodeSettings", $obj);
return $obj; return $obj;
} }
@ -376,7 +376,7 @@ class NodeSettingsManager extends Manager
if ($obj->isLoaded()==false) if ($obj->isLoaded()==false)
{ {
/* Récupération des infos */ /* 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); $obj->setId($id);
$this->CallSystemPlugin("__insertNodeSettings", $obj); $this->CallSystemPlugin("__insertNodeSettings", $obj);
return $obj; return $obj;

2
lib/system/system_data/nodesettings/ressource/nodesettingsmanagerdb.php
View File

@ -271,7 +271,7 @@ var $conn = null;
if ($this->conn->sql_affectedrows()==0) if ($this->conn->sql_affectedrows()==0)
{ {
$systemError=1; $systemError=1;
$classe="Node"; $classe="NodeSettings";
$message="Erreur de SUPPRESSION dans FetchNodeSettingsManagerDb avec l'id ".$id; $message="Erreur de SUPPRESSION dans FetchNodeSettingsManagerDb avec l'id ".$id;
addError($systemError,$classe,$message, __line__, __file__); addError($systemError,$classe,$message, __line__, __file__);
return false; return false;

55
lib/system/system_data/usersession/usersession.php
View File

@ -232,22 +232,63 @@ var $permission;
*/ */
function getDefaultNode() function getDefaultNode()
{ {
$userDomain = false;
if ($this->userPreference->isLoaded()==true) if ($this->userPreference->isLoaded()==true)
{ {
return $this->userPreference->getEntryNodeId(); return $this->userPreference->getEntryNodeId();
}else{ }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(); $tmp=$this->listUserNode->getConfiguredNodeId();
/* on prend le premier noeud */ /* on prend le premier noeud */
// var_dump("tmp count: ".count($tmp));
if (count($tmp)==0) if (count($tmp)==0)
{ {
/* retour à une session par defaut */ // if($userDomain)
$this->defaultSession(); // {
/* pas de noeuds configurés pour l'utilisateur?! */ /* retour à une session par defaut */
$systemError=1; // $this->defaultSession();
addError($systemError, "User Session", "Utilisateur corrompu, pas de noeud configures", __line__, __file__); /* pas de noeuds configurés pour l'utilisateur?! */
return $GLOBALS["SYSTEM_DEFAULT_NODE"]; // $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{ }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]; return $tmp[0];
} }
} }