diff --git a/core/class/layout.class.php b/core/class/layout.class.php index c8104dcf..3be5f66d 100644 --- a/core/class/layout.class.php +++ b/core/class/layout.class.php @@ -344,7 +344,10 @@ class layout extends common $items .= $this->getData(['theme', 'footer', 'displaymemberAccount']) === false ? ' class="displayNone">' : '>'; $items .= ' | '; if ( - $this->getUser('permission','filemanager') === true + $this->getUser( + 'permission', + 'filemanager' + ) === true ) { $items .= '' . template::ico('folder', [ 'href' => helper::baseUrl(false) . 'core/vendor/filemanager/dialog.php?type=0&akey=' . md5_file(self::DATA_DIR . 'core.json') . '&lang=' . $this->getData(['user', $this->getUser('id'), 'language']), @@ -498,7 +501,11 @@ class layout extends common && $this->getData(['theme', 'menu', 'memberBar']) === true ) { if ( - $this->getUser('group') >= self::GROUP_MEMBER && $this->getUser('permission','folder', 'share') === true + $this->getUser('group') >= self::GROUP_MEMBER && $this->getUser( + 'permission', + 'folder', + 'share' + ) === true ) { $itemsRight .= '
  • ' . template::ico('folder', [ 'href' => helper::baseUrl(false) . 'core/vendor/filemanager/dialog.php?type=0&akey=' . md5_file(self::DATA_DIR . 'core.json') . '&lang=' . $this->getData(['user', $this->getUser('id'), 'language']), @@ -936,7 +943,7 @@ class layout extends common $leftItems .= ''; $leftItems .= '
  • '; // Bouton Ajouter une page - if ($this->getUser('permission','page', 'add')) { + if ($this->getUser('permission', 'page', 'add')) { $leftItems .= '
  • ' . template::ico('plus', [ 'href' => helper::baseUrl() . 'page/add', 'help' => 'Nouvelle page ou barre latérale' @@ -955,7 +962,7 @@ class layout extends common or $this->getUrl(0) === '' ) { // Bouton Editer une page - if ($this->getUser('permission','page', 'edit')) { + if ($this->getUser('permission', 'page', 'edit')) { $leftItems .= '
  • ' . template::ico('pencil', [ 'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0), 'help' => 'Éditer la page' @@ -963,7 +970,7 @@ class layout extends common } // Bouton Editer le module d'une page if ( - $this->getUser('permission','page', 'module') + $this->getUser('permission', 'page', 'module') && $this->getData(['page', $this->getUrl(0), 'moduleId']) ) { $leftItems .= '
  • ' . template::ico('gear', [ @@ -973,7 +980,7 @@ class layout extends common } // Bouton dupliquer une page if ( - $this->getUser('permission','page', 'duplicate') + $this->getUser('permission', 'page', 'duplicate') ) { $leftItems .= '
  • ' . template::ico('clone', [ 'href' => helper::baseUrl() . 'page/duplicate/' . $this->getUrl(0), @@ -983,7 +990,7 @@ class layout extends common } // Bouton Effacer une page if ( - $this->getUser('permission','page', 'delete') + $this->getUser('permission', 'page', 'delete') ) { $leftItems .= '
  • ' . template::ico('trash', [ 'href' => helper::baseUrl() . 'page/delete/' . $this->getUrl(0), @@ -998,7 +1005,10 @@ class layout extends common $rightItems = ''; if ( $this->getUser('group') >= self::GROUP_MODERATOR - && $this->getUser('permission','filemanager') + && $this->getUser( + 'permission', + 'filemanager' + ) ) { $rightItems .= '
  • ' . template::ico('folder', [ 'help' => 'Fichiers', @@ -1027,7 +1037,6 @@ class layout extends common 'help' => 'Utilisateurs', 'href' => helper::baseUrl() . 'user' ]) . '
  • '; - // Mise à jour automatique $today = mktime(0, 0, 0); $checkUpdate = $this->getData(['core', 'lastAutoUpdate']); @@ -1054,7 +1063,11 @@ class layout extends common $rightItems .= '
  • ' . template::ico('update colorRed') . '
  • '; } } - if ($this->getUser('group') >= self::GROUP_MODERATOR) { + if ( + $this->getUser('group') >= self::GROUP_MODERATOR + && $this->getUser('permission', 'user', 'edit') + + ) { $rightItems .= '
  • ' . template::ico('user', ['margin' => 'right']) . '' . $this->getUser('firstname') . ' ' . $this->getUser('lastname') . diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 32d8984d..8542e4e8 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -384,6 +384,9 @@ class init extends common ], 'search' => [ 'config' => false, + ], + 'user' => [ + 'edit' => true, ] ], '2' => [ @@ -464,6 +467,9 @@ class init extends common ], 'search' => [ 'config' => false, + ], + 'user' => [ + 'edit' => true, ] ], ], @@ -544,6 +550,9 @@ class init extends common ], 'search' => [ 'config' => true, + ], + 'user' => [ + 'edit' => true, ] ], '2' => [ @@ -621,6 +630,9 @@ class init extends common ], 'search' => [ 'config' => true, + ], + 'user' => [ + 'edit' => true, ] ], ], diff --git a/core/module/user/user.php b/core/module/user/user.php index 14dc9db9..cb213d54 100644 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -636,6 +636,9 @@ class user extends common 'redirection' => [ 'config' => $this->getInput('profilEditRedirectionConfig', helper::FILTER_BOOLEAN), ], + 'user' => [ + 'edit' => $this->getInput('profilEditUserEdit', helper::FILTER_BOOLEAN), + ] ] ]); @@ -768,6 +771,9 @@ class user extends common 'redirection' => [ 'config' => $this->getInput('profilAddRedirectionConfig', helper::FILTER_BOOLEAN), ], + 'user' => [ + 'edit' => $this->getInput('profilAddUserEdit', helper::FILTER_BOOLEAN), + ] ] ]); // Valeurs en sortie diff --git a/core/module/user/view/profilAdd/profilAdd.php b/core/module/user/view/profilAdd/profilAdd.php index 1b197c53..cf487f10 100644 --- a/core/module/user/view/profilAdd/profilAdd.php +++ b/core/module/user/view/profilAdd/profilAdd.php @@ -45,6 +45,20 @@
    +
    +
    +
    +

    + +

    +
    +
    + +
    +
    +
    +
    +

    diff --git a/core/module/user/view/profilEdit/profilEdit.php b/core/module/user/view/profilEdit/profilEdit.php index 600417b6..032fbed4 100644 --- a/core/module/user/view/profilEdit/profilEdit.php +++ b/core/module/user/view/profilEdit/profilEdit.php @@ -52,6 +52,22 @@

    getUrl(2) >= self::GROUP_MODERATOR): ?> +
    +
    +
    +

    + +

    +
    +
    + $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'user', 'edit']) + ]); ?> +
    +
    +
    +
    +