From 21a903b1e595eddcd123335a90f5c5c81c0e8b7e Mon Sep 17 00:00:00 2001 From: fredtempez Date: Tue, 2 May 2023 23:37:51 +0200 Subject: [PATCH] Ajout du profil d'un membre --- core/module/user/user.php | 84 ++++++++++++++++--------- core/module/user/view/add/add.css | 7 ++- core/module/user/view/add/add.js.php | 37 ++++++++++- core/module/user/view/add/add.php | 70 +++++++++++---------- core/module/user/view/edit/edit.js.php | 39 +++++++++++- core/module/user/view/edit/edit.php | 87 +++++++++++--------------- 6 files changed, 207 insertions(+), 117 deletions(-) diff --git a/core/module/user/user.php b/core/module/user/user.php index 6aa554d0..dbfe5a3f 100644 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -46,6 +46,8 @@ class user extends common public static $userGroups = []; + public static $userProfils = []; + public static $userLongtime = false; public static $separators = [ @@ -89,6 +91,13 @@ class user extends common $userLastname = $this->getInput('userAddLastname', helper::FILTER_STRING_SHORT, true); $userMail = $this->getInput('userAddMail', helper::FILTER_MAIL, true); + // Profil + $group = $this->getInput('userAddGroup', helper::FILTER_INT, true); + $profil = null; + if ($group < 1 || $group > 2 ) { + $profil = $this->getInput('userAddProfil' . $group, helper::FILTER_INT); + } + // Stockage des données $this->setData([ 'user', @@ -96,18 +105,18 @@ class user extends common [ 'firstname' => $userFirstname, 'forgot' => 0, - 'group' => $this->getInput('userAddGroup', helper::FILTER_INT, true), + 'group' => $group, + 'profil' => $profil, 'lastname' => $userLastname, 'pseudo' => $this->getInput('userAddPseudo', helper::FILTER_STRING_SHORT, true), 'signature' => $this->getInput('userAddSignature', helper::FILTER_INT, true), 'mail' => $userMail, 'password' => $this->getInput('userAddPassword', helper::FILTER_PASSWORD, true), - "connectFail" => null, - "connectTimeout" => null, - "accessUrl" => null, - "accessTimer" => null, - "accessCsrf" => null, - "files" => $this->getInput('userAddFiles', helper::FILTER_BOOLEAN), + 'connectFail' => null, + 'connectTimeout' => null, + 'accessUrl' => null, + 'accessTimer' => null, + 'accessCsrf' => null, 'language' => $this->getInput('userEditLanguage', helper::FILTER_STRING_SHORT), ] ]); @@ -133,19 +142,26 @@ class user extends common 'state' => $sent === true ? true : null ]); } + // Langues disponibles pour l'interface de l'utilisateur - if (is_dir(self::I18N_DIR)) { - $dir = getcwd(); - chdir(self::I18N_DIR); - $files = glob('*.json'); - chdir($dir); - } - foreach ($files as $file) { - // La langue est-elle référencée ? - if (array_key_exists(basename($file, '.json'), self::$languages)) { - self::$languagesInstalled[basename($file, '.json')] = self::$languages[basename($file, '.json')]; + self::$languagesInstalled = $this->getData(['language']); + if (self::$languagesInstalled) { + foreach (self::$languagesInstalled as $lang => $datas) { + self::$languagesInstalled[$lang] = self::$languages[$lang]; } } + + // Profils disponibles + foreach ($this->getData(['profil']) as $profilId => $profilData) { + if ($profilId < 1 || $profilId > 2) { + continue; + } + foreach ($profilData as $key => $value) { + self::$userProfils[$profilId][$key] = $profilData[$key]['name']; + } + } + + // Valeurs en sortie $this->addOutput([ 'title' => helper::translate('Nouvel utilisateur'), @@ -316,7 +332,6 @@ class user extends common } // Langues disponibles pour l'interface de l'utilisateur - self::$languagesInstalled = $this->getData(['language']); if (self::$languagesInstalled) { foreach (self::$languagesInstalled as $lang => $datas) { @@ -324,6 +339,17 @@ class user extends common } } + // Profils disponibles + foreach ($this->getData(['profil']) as $profilId => $profilData) { + if ($profilId < 1 || $profilId > 2) { + continue; + } + echo $profilId; + foreach ($profilData as $key => $value) { + self::$userProfils[$profilId][$key] = $profilData[$key]['name']; + } + } + // Valeurs en sortie $this->addOutput([ 'title' => $this->getData(['user', $this->getUrl(2), 'firstname']) . ' ' . $this->getData(['user', $this->getUrl(2), 'lastname']), @@ -405,6 +431,7 @@ class user extends common ]; } } + // Valeurs en sortie $this->addOutput([ 'title' => helper::translate('Utilisateurs'), @@ -442,24 +469,24 @@ class user extends common 'help' => 'Supprimer', 'disabled' => $groupData['readonly'], ]) - ]; + ]; } elseif ( $groupId == self::GROUP_MEMBER || $groupId == self::GROUP_MODERATOR ) { // Enumérer les sous groupes MEMBER et MODERATOR foreach ($groupData as $subGroupId => $subGroupData) { - self::$userGroups[$groupId.'.'.$subGroupId] = [ + self::$userGroups[$groupId . '.' . $subGroupId] = [ $groupId . '-' . $subGroupId, - self::$groups[$groupId] .'
Profil : '. $subGroupData['name'], + self::$groups[$groupId] . '
Profil : ' . $subGroupData['name'], nl2br($subGroupData['comment']), - template::button('profilEdit' . $groupId.$subGroupId, [ - 'href' => helper::baseUrl() . 'user/profilEdit/' . $groupId . '/' . $subGroupId . '/' . $_SESSION['csrf'], + template::button('profilEdit' . $groupId . $subGroupId, [ + 'href' => helper::baseUrl() . 'user/profilEdit/' . $groupId . '/' . $subGroupId . '/' . $_SESSION['csrf'], 'value' => template::ico('pencil'), 'help' => 'Éditer', 'disabled' => $subGroupData['readonly'], ]), - template::button('profilDelete' . $groupId.$subGroupId, [ + template::button('profilDelete' . $groupId . $subGroupId, [ 'class' => 'userDelete buttonRed', 'href' => helper::baseUrl() . 'user/profilDelete/' . $groupId . '/' . $subGroupId . '/' . $_SESSION['csrf'], 'value' => template::ico('trash'), @@ -500,13 +527,11 @@ class user extends common $profil = $this->getUrl(3); // Changement de groupe, effacer le profil de l'ancien groupe et incrément le profil if ($oldGroup !== $group) { - $this->deleteData(['profil', $oldGroup, $profil]); + $this->deleteData(['profil', $oldGroup, $profil]); $profil = helper::increment($profil, $this->getData(['profil', $group])); } - echo "groupe " . $group; echo "profil " . $profil; - exit(); $this->setData([ 'profil', $group, @@ -540,8 +565,6 @@ class user extends common ] ]); - - // Valeurs en sortie $this->addOutput([ 'redirect' => helper::baseUrl() . 'user/profil', @@ -565,7 +588,8 @@ class user extends common * Ajouter un profil de permission */ - public function profilAdd() { + public function profilAdd() + { // Valeurs en sortie; $this->addOutput([ diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css index 8d196947..a7bb5765 100755 --- a/core/module/user/view/add/add.css +++ b/core/module/user/view/add/add.css @@ -16,4 +16,9 @@ /** NE PAS EFFACER * admin.css -*/ \ No newline at end of file +*/ + +#userAddProfil1Wrapper, +#userAddProfil2Wrapper { + padding: 0; +} \ No newline at end of file diff --git a/core/module/user/view/add/add.js.php b/core/module/user/view/add/add.js.php index 4f2cbb2d..ad7d7810 100644 --- a/core/module/user/view/add/add.js.php +++ b/core/module/user/view/add/add.js.php @@ -10,4 +10,39 @@ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International * @link http://zwiicms.fr/ */ -$("#userAddId").on("change keydown keyup",(function(event){var userId=$(this).val();if(8!==event.keyCode&&37!==event.keyCode&&39!==event.keyCode&&46!==event.keyCode&&window.getSelection().toString()!==userId){var searchReplace={"á":"a","à":"a","â":"a","ä":"a","ã":"a","å":"a","ç":"c","é":"e","è":"e","ê":"e","ë":"e","í":"i","ì":"i","î":"i","ï":"i","ñ":"n","ó":"o","ò":"o","ô":"o","ö":"o","õ":"o","ú":"u","ù":"u","û":"u","ü":"u","ý":"y","ÿ":"y","Á":"A","À":"A","Â":"A","Ä":"A","Ã":"A","Å":"A","Ç":"C","É":"E","È":"E","Ê":"E","Ë":"E","Í":"I","Ì":"I","Î":"I","Ï":"I","Ñ":"N","Ó":"O","Ò":"O","Ô":"O","Ö":"O","Õ":"O","Ú":"U","Ù":"U","Û":"U","Ü":"U","Ý":"Y","Ÿ":"Y","'":"-",'"':"-"," ":"-"};userId=(userId=userId.replace(/[áàâäãåçéèêëíìîïñóòôöõúùûüýÿ'" ]/gi,(function(match){return searchReplace[match]}))).replace(/[^a-z0-9-]/gi,""),$(this).val(userId)}})),$("#userAddGroup").on("change",(function(){$(".userAddGroupDescription").hide(),$("#userAddGroupDescription"+$(this).val()).show()})).trigger("change"),$(document).ready((function(){"1"===$("#userAddGroup").val()?$("#userAddMemberFiles").slideDown():$("#userAddMemberFiles").slideUp((function(){$("#userAddtFiles").prop("checked",!1).trigger("change")}))})),$("#userAddGroup").on("change",(function(){"1"===$("#userAddGroup").val()?$("#userAddMemberFiles").slideDown():$("#userAddMemberFiles").slideUp((function(){$("#userAddFiles").prop("checked",!1).trigger("change")}))})).trigger("change"); \ No newline at end of file + +/** + * Affichage de l'id en simulant FILTER_ID + */ +$("#userAddId").on("change keydown keyup", function(event) { + var userId = $(this).val(); + if( + event.keyCode !== 8 // BACKSPACE + && event.keyCode !== 37 // LEFT + && event.keyCode !== 39 // RIGHT + && event.keyCode !== 46 // DELETE + && window.getSelection().toString() !== userId // Texte sélectionné + ) { + var searchReplace = { + "á": "a", "à": "a", "â": "a", "ä": "a", "ã": "a", "å": "a", "ç": "c", "é": "e", "è": "e", "ê": "e", "ë": "e", "í": "i", "ì": "i", "î": "i", "ï": "i", "ñ": "n", "ó": "o", "ò": "o", "ô": "o", "ö": "o", "õ": "o", "ú": "u", "ù": "u", "û": "u", "ü": "u", "ý": "y", "ÿ": "y", + "Á": "A", "À": "A", "Â": "A", "Ä": "A", "Ã": "A", "Å": "A", "Ç": "C", "É": "E", "È": "E", "Ê": "E", "Ë": "E", "Í": "I", "Ì": "I", "Î": "I", "Ï": "I", "Ñ": "N", "Ó": "O", "Ò": "O", "Ô": "O", "Ö": "O", "Õ": "O", "Ú": "U", "Ù": "U", "Û": "U", "Ü": "U", "Ý": "Y", "Ÿ": "Y", + "'": "-", "\"": "-", " ": "-" + }; + userId = userId.replace(/[áàâäãåçéèêëíìîïñóòôöõúùûüýÿ'" ]/ig, function(match) { + return searchReplace[match]; + }); + userId = userId.replace(/[^a-z0-9-]/ig, ""); + $(this).val(userId); + } +}); + +/** + * Droits des groupes + */ +$("#userAddGroup").on("change", function() { + $(".userAddGroupDescription").hide(); + $("#userAddGroupDescription" + $(this).val()).show(); +}).trigger("change"); + + + diff --git a/core/module/user/view/add/add.php b/core/module/user/view/add/add.php index 93ff3228..a9fffc9b 100644 --- a/core/module/user/view/add/add.php +++ b/core/module/user/view/add/add.php @@ -14,7 +14,8 @@
-

+

+

@@ -30,23 +31,34 @@ ]); ?>
- 'off', - 'label' => 'Pseudo' - ]); ?> - 'Signature', - 'selected' => 1 - ]); ?> + +
+
+ 'off', + 'label' => 'Pseudo' + ]); ?> +
+
+ 'Signature', + 'selected' => 1 + ]); ?> +
+
'off', 'label' => 'Adresse électronique' ]); ?> + 'Langues' + ]); ?>
-

+

+

'off', @@ -72,39 +84,29 @@
-

+

+

-
-
- 'Langues' - ]); ?> -
+
'Groupe', 'selected' => self::GROUP_MEMBER ]); ?> -
- false, - 'help' => 'Ce membre pourra téléverser ou télécharger des fichiers dans le dossier \'partage\' et ses sous-dossiers' +
+
+
+ 'Profil', ]); ?>
-
- +
+
+
+ 'Profil', + ]); ?>
-
    -
    • -
-
    -
    • -
    • -
    • -
-
    -
    • -
diff --git a/core/module/user/view/edit/edit.js.php b/core/module/user/view/edit/edit.js.php index 7d228e77..9eb3af61 100644 --- a/core/module/user/view/edit/edit.js.php +++ b/core/module/user/view/edit/edit.js.php @@ -10,4 +10,41 @@ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International * @link http://zwiicms.fr/ */ -$("#userEditGroup").on("change",(function(){$(".userEditGroupDescription").hide(),$("#userEditGroupDescription"+$(this).val()).show(),$("#userEditGroup option:selected").val()<0?$("#userEditLabelAuth").css("display","none"):$("#userEditLabelAuth").css("display","inline-block")})).trigger("change"),$(document).ready((function(){"1"===$("#userEditGroup").val()?$("#userEditMemberFiles").slideDown():$("#userEditMemberFiles").slideUp((function(){$("#userEditFiles").prop("checked",!1).trigger("change")}))})),$("#userEditGroup").on("change",(function(){"1"===$("#userEditGroup").val()?$("#userEditMemberFiles").slideDown():$("#userEditMemberFiles").slideUp((function(){$("#userEditFiles").prop("checked",!1).trigger("change")}))})).trigger("change"); \ No newline at end of file + + +/** + * Droits des groupes + */ +$("#userEditGroup").on("change", function() { + $(".userEditGroupDescription").hide(); + $("#userEditGroupDescription" + $(this).val()).show(); + if ($("#userEditGroup option:selected").val() < 0) { + $("#userEditLabelAuth").css("display","none"); + } else { + $("#userEditLabelAuth").css("display","inline-block"); + } +}).trigger("change"); + +$(document).ready(function(){ + // Membre avec ou sans gestion de fichiers + if($("#userEditGroup").val() === '1') { + $("#userEditMemberFiles").slideDown(); + } + else { + $("#userEditMemberFiles").slideUp(function() { + $("#userEditFiles").prop("checked", false).trigger("change"); + }); + } +}); + +$("#userEditGroup").on("change", function() { + // Membre avec ou sans gestion de fichiers + if($("#userEditGroup").val() === '1') { + $("#userEditMemberFiles").slideDown(); + } + else { + $("#userEditMemberFiles").slideUp(function() { + $("#userEditFiles").prop("checked", false).trigger("change"); + }); + } +}).trigger("change"); diff --git a/core/module/user/view/edit/edit.php b/core/module/user/view/edit/edit.php index 16137d22..0617a4fd 100644 --- a/core/module/user/view/edit/edit.php +++ b/core/module/user/view/edit/edit.php @@ -43,20 +43,30 @@ ]); ?>
- 'off', - 'label' => 'Pseudo', - 'value' => $this->getData(['user', $this->getUrl(2), 'pseudo']) - ]); ?> - 'Signature', - 'selected' => $this->getData(['user', $this->getUrl(2), 'signature']) - ]); ?> +
+
+ 'off', + 'label' => 'Pseudo', + 'value' => $this->getData(['user', $this->getUrl(2), 'pseudo']) + ]); ?> +
+
+ 'Signature', + 'selected' => $this->getData(['user', $this->getUrl(2), 'signature']) + ]); ?> +
+
'off', 'label' => 'Adresse électronique', 'value' => $this->getData(['user', $this->getUrl(2), 'mail']) ]); ?> + 'Langue', + 'selected' => $this->getData(['user', $this->getUser('id'), 'language']) + ]); ?>
@@ -91,15 +101,9 @@

- +

-
- 'Langues', - 'selected' => $this->getData(['user', $this->getUser('id'), 'language']) - ]); ?> -
getUser('group') === self::GROUP_ADMIN): ?> 'Groupe', 'selected' => $this->getData(['user', $this->getUrl(2), 'group']) ]); ?> -
- $this->getData(['user', $this->getUrl(2), 'files']), - 'help' => 'Ce membre pourra téléverser ou télécharger des fichiers dans le dossier \'partage\' et ses sous-dossiers' - ]); ?> -
-
- -
-
    -
  • - -
    • -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
    -
  • - -
    • -
- + getData(['user', $this->getUrl(2), 'group']) === self::GROUP_MEMBER): ?> +
+ 'Profil', + 'selected' => $this->getData(['user', $this->getUser('id'), 'profil']) + ]); ?> +
+ + getData(['user', $this->getUrl(2), 'group']) === self::GROUP_MEMBER): ?> +
+ 'Profil', + 'selected' => $this->getData(['user', $this->getUser('id'), 'profil']) + ]); ?> + + +