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

Fixed issue #61.

Browse Source
This commit is contained in:
Rooty 2021-04-06 18:59:13 +02:00
parent edc6f86723
commit a70877b16e
4 changed files with 135 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
data/template/lcube6/object_coordination/adminuser/changeuseradmin.mxt
View File

@ -1,151 +1,151 @@
<div class="tab-content container-fluid px-2 py-2 border w-75"> <div class="tab-content container-fluid px-2 py-2 border w-75">
<div class="card w-100"> <div class="card w-100">
<form id="frmUserForm" name="frmUserForm" role="form" class="form-input" method="post" mXattribut="action:urlAction"> <form id="frmUserForm" name="frmUserForm" role="form" class="form-input" method="post" mXattribut="action:urlAction">
<input type="hidden" name="user_id" mXattribut="value:user_id" class="hidden"/> <input type="hidden" name="user_id" mXattribut="value:user_id" class="hidden"/>
<input type="hidden" name="urlReturn" mXattribut="value:urlReturn" class="hidden"/> <input type="hidden" name="urlReturn" mXattribut="value:urlReturn" class="hidden"/>
<div class="card-header form-inline"> <div class="card-header form-inline">
<div class="input-group col-xs-12 col-sm-3 col-lg-10 justify-content-center"> <div class="input-group col-xs-12 col-sm-3 col-lg-10 justify-content-center">
<span class="text-center"><h3><mx:text id="formUser1"/></h3></span> <span class="text-center"><h3><mx:text id="formUser1"/></h3></span>
</div>
<div class="input-group col-xs-12 col-sm-3 col-lg-2 justify-content-center">
<span class="float-right"><input data-toggle="toggle" data-onstyle="success font-weight-bold" data-on="<mx:text id="user_account_sEnabled"/>" data-offstyle="danger font-weight-bold" data-off="<mx:text id="user_account_sDisabled"/>" type="checkbox"<mx:text id="accountState"/>></span>
</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" id="title"/>
</div> </div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <div class="input-group col-xs-12 col-sm-3 col-lg-2 justify-content-center">
<div class="input-group-prepend"> <input data-toggle="toggle" data-style="float-right" data-onstyle="success font-weight-bold" data-on="<mx:text id="user_account_sEnabled"/>" data-offstyle="danger font-weight-bold" data-off="<mx:text id="user_account_sDisabled"/>" data-size="mini" type="checkbox"<mx:text id="accountState"/> name="user_account_active">
<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"></i></span>
</div>
<mx:formField id="user_mail" id="mail"/>
</div> </div>
</div> </div>
<div class="row mb-1 w-100"> <div class="card-body center-block">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <div class="row mb-1 w-100">
<div class="input-group-prepend"> <div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<span class="input-group-text"><i class="fa fa-lg fa-user-secret"></i></span> <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" id="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"></i></span>
</div>
<mx:formField id="user_mail" id="mail"/>
</div> </div>
<mx:formField id="user_login" id="login"/>
</div> </div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <div class="row mb-1 w-100">
<div class="input-group-prepend"> <div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<span class="input-group-text"><i class="fa fa-lg fa-lock"></i></span> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-user-secret"></i></span>
</div>
<mx:formField id="user_login" id="login"/>
</div> </div>
<mx:formField id="user_password" id="password"/> <div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
</div> <div class="input-group-prepend">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <span class="input-group-text"><i class="fa fa-lg fa-lock"></i></span>
<div class="input-group-prepend"> </div>
<span class="input-group-text"><i class="fa fa-lg fa-lock"></i></span> <mx:formField id="user_password" id="password"/>
</div> </div>
<mx:formField id="re_user_password" id="password2"/> <div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
</div> <div class="input-group-prepend">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <span class="input-group-text"><i class="fa fa-lg fa-lock"></i></span>
<div class="input-group-prepend"> </div>
<span class="input-group-text"><i class="fa fa-lg fa-birthday-cake"></i></span> <mx:formField id="re_user_password" id="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"></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>
<mx:formField id="user_birthdate" id="birthdate" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-language="fr"/>
</div> </div>
</div> </div>
</div> <div class="card-header text-center">
<div class="card-header text-center"> <h3><mx:text id="formUser2"/></h3>
<h3><mx:text id="formUser2"/></h3> </div>
</div> <div class="card-body center-block">
<div class="card-body center-block"> <div class="row mb-1 w-100">
<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 col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <div class="input-group-prepend">
<div class="input-group-prepend"> <span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span>
<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"></i></span>
</div>
<mx:formField id="user_country" id="country"/>
</div> </div>
<mx:formField id="user_postal_address" id="postaladdress"/>
</div> </div>
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <div class="row mb-1 w-100">
<div class="input-group-prepend"> <div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
<span class="input-group-text"><i class="fa fa-lg fa-envelope"></i></span> <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>
<mx:formField id="user_postal_code" id="postalcode"/> <div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
</div> <div class="input-group-prepend">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <span class="input-group-text"><i class="fa fa-lg fa-fax"></i></span>
<div class="input-group-prepend"> </div>
<span class="input-group-text"><i class="fa fa-lg fa-location-arrow"></i></span> <mx:formField id="user_fax" id="fax"/>
</div> </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"></i></span>
</div>
<mx:formField id="user_country" id="country"/>
</div> </div>
</div> </div>
<div class="row mb-1 w-100"> <div class="card-header text-center">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <h3><mx:text id="formUserIM"/></h3>
<div class="input-group-prepend"> </div>
<span class="input-group-text"><i class="fa fa-lg fa-mobile"></i></span> <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-mastodon"></i></span>
</div>
<mx:formField id="user_mastodon" id="user_mastodon"/>
</div> </div>
<mx:formField id="user_tel" id="tel"/> <div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center">
</div> <div class="input-group-prepend">
<div class="input-group col-xs-12 col-sm-3 col-lg-3 justify-content-center"> <span class="input-group-text"><i class="fa fa-lg fa-xmpp"></i></span>
<div class="input-group-prepend"> </div>
<span class="input-group-text"><i class="fa fa-lg fa-fax"></i></span> <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>
<mx:formField id="user_fax" id="fax"/>
</div> </div>
</div> </div>
</div> <div class="card-footer border-0 bg-white text-center">
<div class="card-header text-center"> <input type="reset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReset" title="<mx:text id="ResetChange"/>" value="<mx:text id="BtnReset"/>" onclick="this.form.reset();"/>
<h3><mx:text id="formUserIM"/></h3> <input type="button" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReturn" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/>
</div> <input type="submit" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnValid" MxAttribut="value:BtnValid"/>
<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-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-footer border-0 bg-white text-center">
<input type="reset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReset" title="<mx:text id="ResetChange"/>" value="<mx:text id="BtnReset"/>" onclick="this.form.reset();"/>
<input type="button" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReturn" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/>
<input type="submit" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnValid" MxAttribut="value:BtnValid"/>
</div>
</form> </form>
<div class="card-header text-center"> <div class="card-header text-center">

4
install/db_scripts/mysql/7_create_structure.sql
View File

@ -83,7 +83,7 @@ CREATE TABLE `{_PREFIX_}object_user_temp` (
`user_comment` text NOT NULL, `user_comment` text NOT NULL,
`user_info` text NOT NULL, `user_info` text NOT NULL,
`user_charte_status` tinyint(4) NOT NULL DEFAULT 0, `user_charte_status` tinyint(4) NOT NULL DEFAULT 0,
`user_account_active` tinyint(4) NOT NULL DEFAULT 1 `user_account_active` enum('on','off') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off'
) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0;
#-- -------------------------------------------------------- #-- --------------------------------------------------------
#-- #--
@ -339,7 +339,7 @@ CREATE TABLE `{_PREFIX_}user` (
`user_comment` text NOT NULL DEFAULT '', `user_comment` text NOT NULL DEFAULT '',
`user_info` text NOT NULL DEFAULT '', `user_info` text NOT NULL DEFAULT '',
`user_charte_status` tinyint(4) NOT NULL DEFAULT 0, `user_charte_status` tinyint(4) NOT NULL DEFAULT 0,
`user_account_active` tinyint(4) NOT NULL DEFAULT 1 `user_account_active` enum('on','off') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off'
) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0;
#-- -------------------------------------------------------- #-- --------------------------------------------------------
#-- #--

4
install/db_scripts/mysql/7_insert_datas.sql
View File

@ -163,8 +163,8 @@ INSERT INTO `{_PREFIX_}right` VALUES (17, 'Community', 'actionLecture', 2, 2, 0,
#-- #--
#-- Contenu de la table `user` #-- Contenu de la table `user`
#-- #--
INSERT INTO `{_PREFIX_}user` VALUES (1, '0', 'Anonyme', '', 'Guest', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0, 1); INSERT INTO `{_PREFIX_}user` VALUES (1, '0', 'Anonyme', '', 'Guest', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0, 'on');
INSERT INTO `{_PREFIX_}user` VALUES (2, '0', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0, 0); INSERT INTO `{_PREFIX_}user` VALUES (2, '0', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0, 'on');
#----------------------------------------------------------- #-----------------------------------------------------------
#-- #--
#-- Contenu de la table `user_preference` #-- Contenu de la table `user_preference`

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

@ -210,9 +210,8 @@ Class AdminUser extends CoordinationObj
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_login", htmlentitiesconv($currentUser->getLogin())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_login", htmlentitiesconv($currentUser->getLogin()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_mail", htmlentitiesconv($currentUser->getMail())); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_mail", htmlentitiesconv($currentUser->getMail()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.vmailto", "mailto:".htmlentitiesconv($currentUser->getMail())); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.vmailto", "mailto:".htmlentitiesconv($currentUser->getMail()));
// var_dump($currentUser->getAccountActive());
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_account_active",formatUrl($this->getId(),"AdminUser","ChangeAccountActive","",$currentUser->getId())); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.url_account_active",formatUrl($this->getId(),"AdminUser","ChangeAccountActive","",$currentUser->getId()));
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive())?"toggle-on text-success":"toggle-off text-danger" ); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ligne.vuser_account_active", ($currentUser->getAccountActive()=="on")?"toggle-on text-success":"toggle-off text-danger" );
$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.vuser_id", "user".$currentUser->getId()); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("ligne.vuser_id", "user".$currentUser->getId());
/* Pour récuperer les libellés */ /* Pour récuperer les libellés */
@ -669,7 +668,7 @@ function exportAdmin()
$MyUser = $GLOBALS["SYSTEM_MANAGER"]["USER"]->createInstance($param); $MyUser = $GLOBALS["SYSTEM_MANAGER"]["USER"]->createInstance($param);
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("accountState", ($MyUser->getAccountActive())?" checked=\"checked\"":""); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("accountState", ($MyUser->getAccountActive()=="on")?" checked=\"checked\"":"");
$titre = array(getMessage("mr"),getMessage("mrs"), getMessage("miss")); $titre = array(getMessage("mr"),getMessage("mrs"), getMessage("miss"));
$GLOBALS["SYSTEM_TEMPLATE"]->MxSelect("user_title", "user_title", $MyUser->getTitle(), $titre, "", "", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipSelectTitle"), ENT_QUOTES)."\""); $GLOBALS["SYSTEM_TEMPLATE"]->MxSelect("user_title", "user_title", $MyUser->getTitle(), $titre, "", "", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("tipSelectTitle"), ENT_QUOTES)."\"");
@ -765,6 +764,9 @@ function exportAdmin()
/* Récupération du noeud à administrer sinon noeud d'entrée de l'admin */ /* Récupération du noeud à administrer sinon noeud d'entrée de l'admin */
$groupId=($this->getData("groupId")!="")?$this->getData("groupId"):1; $groupId=($this->getData("groupId")!="")?$this->getData("groupId"):1;
$group_id=(isset($_POST["group_id"]) && is_numeric($_POST["group_id"]))?$_POST["group_id"]:$groupId; $group_id=(isset($_POST["group_id"]) && is_numeric($_POST["group_id"]))?$_POST["group_id"]:$groupId;
/* Vérification du statut du compte */
$user_account_active=(isset($_POST["user_account_active"]))?$_POST["user_account_active"]:"off";
/* 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();
@ -843,15 +845,15 @@ function exportAdmin()
else else
{ {
$d = DateTime::createFromFormat('d/m/Y', $_POST['user_birthdate']); $d = DateTime::createFromFormat('d/m/Y', $_POST['user_birthdate']);
var_dump($_POST);
//On enregistre les modifications de l'objet User //On enregistre les modifications de l'objet User
$MyUser->setAccountActive($user_account_active);
$MyUser->setTitle($_POST['user_title']); $MyUser->setTitle($_POST['user_title']);
$MyUser->setFirstName($_POST['user_first_name']); $MyUser->setFirstName($_POST['user_first_name']);
$MyUser->setLastName($_POST['user_last_name']); $MyUser->setLastName($_POST['user_last_name']);
$MyUser->setLogin($_POST['user_login']); $MyUser->setLogin($_POST['user_login']);
$MyUser->setPassword($_POST['user_password']); $MyUser->setPassword($_POST['user_password']);
$MyUser->setMail($_POST['user_mail']); $MyUser->setMail($_POST['user_mail']);
var_dump($d->getTimestamp());
$MyUser->setBirthDate($d->getTimestamp()); $MyUser->setBirthDate($d->getTimestamp());
$MyUser->setPostalAddress($_POST['user_postal_address']); $MyUser->setPostalAddress($_POST['user_postal_address']);
$MyUser->setPostalCode($_POST['user_postal_code']); $MyUser->setPostalCode($_POST['user_postal_code']);