diff --git a/core/class/layout.class.php b/core/class/layout.class.php index 3be5f66d..b7009b55 100644 --- a/core/class/layout.class.php +++ b/core/class/layout.class.php @@ -344,10 +344,7 @@ 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']), @@ -356,11 +353,15 @@ class layout extends common 'help' => 'Fichiers du site' ]); } - $items .= '' . template::ico('user', [ - 'margin' => 'all', - 'help' => 'Mon compte', - 'href' => helper::baseUrl() . 'user/edit/' . $this->getUser('id') - ]); + if ( + $this->getUser('permission', 'user', 'edit') === true + ) { + $items .= '' . template::ico('user', [ + 'margin' => 'all', + 'help' => 'Mon compte', + 'href' => helper::baseUrl() . 'user/edit/' . $this->getUser('id') + ]); + } $items .= '' . template::ico('logout', [ 'margin' => 'all', 'help' => 'Déconnecter', @@ -501,11 +502,8 @@ 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']), @@ -513,11 +511,15 @@ class layout extends common 'help' => 'Fichiers du site' ]) . '
  • '; } - $itemsRight .= '
  • ' . template::ico('user', [ - 'help' => 'Mon compte', - 'margin' => 'right', - 'href' => helper::baseUrl() . 'user/edit/' . $this->getUser('id') - ]) . '
  • '; + if ( + $this->getUser('permission', 'user', 'edit') === true + ) { + $itemsRight .= '
  • ' . template::ico('user', [ + 'help' => 'Mon compte', + 'margin' => 'right', + 'href' => helper::baseUrl() . 'user/edit/' . $this->getUser('id') + ]) . '
  • '; + } $itemsRight .= '
  • ' . template::ico('logout', [ 'help' => 'Déconnecter', diff --git a/core/module/user/view/profilAdd/profilAdd.php b/core/module/user/view/profilAdd/profilAdd.php index e8511699..dcde6044 100644 --- a/core/module/user/view/profilAdd/profilAdd.php +++ b/core/module/user/view/profilAdd/profilAdd.php @@ -45,20 +45,6 @@
    -
    -
    -
    -

    - -

    -
    -
    - -
    -
    -
    -
    -

    @@ -123,7 +109,7 @@

    -
    +
    @@ -243,6 +229,20 @@
    +
    +
    +
    +

    + +

    +
    +
    + +
    +
    +
    +
    +
    diff --git a/core/module/user/view/profilEdit/profilEdit.php b/core/module/user/view/profilEdit/profilEdit.php index f26223c1..cbd43898 100644 --- a/core/module/user/view/profilEdit/profilEdit.php +++ b/core/module/user/view/profilEdit/profilEdit.php @@ -52,22 +52,6 @@
    getUrl(2) >= self::GROUP_MODERATOR): ?> -
    -
    -
    -

    - -

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

    + +

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