From 6cb59063f4c0d4f17d77bf376f2cac3772d7714a Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Tue, 8 Nov 2022 14:28:32 +0100 Subject: [PATCH] blog phase 2 --- module/blog/blog.php | 24 ++++++++++++++---------- module/blog/view/add/add.php | 3 ++- module/blog/view/comment/comment.php | 2 +- module/blog/view/edit/edit.php | 3 ++- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/module/blog/blog.php b/module/blog/blog.php index fdedbff..6eac546 100644 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -31,12 +31,12 @@ class blog extends common { public static $actions = [ 'add' => self::GROUP_EDITOR, 'comment' => self::GROUP_EDITOR, - 'commentApprove' => self::GROUP_EDITOR, - 'commentDelete' => self::GROUP_EDITOR, - 'commentDeleteAll' => self::GROUP_EDITOR, + 'commentApprove' => self::GROUP_MODERATOR, + 'commentDelete' => self::GROUP_MODERATOR, + 'commentDeleteAll' => self::GROUP_MODERATOR, 'config' => self::GROUP_EDITOR, - 'texts' => self::GROUP_EDITOR, - 'delete' => self::GROUP_EDITOR, + 'texts' => self::GROUP_MODERATOR, + 'delete' => self::GROUP_MODERATOR, 'edit' => self::GROUP_EDITOR, 'index' => self::GROUP_VISITOR, 'rss' => self::GROUP_VISITOR @@ -317,7 +317,8 @@ class blog extends common { 'class' => 'blogCommentDeleteAll buttonRed', 'href' => helper::baseUrl() . $this->getUrl(0) . '/commentDeleteAll/' . $this->getUrl(2).'/' . $_SESSION['csrf'] , 'ico' => 'cancel', - 'value' => $text['blog']['comment'][0] + 'value' => $text['blog']['comment'][0], + 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true ]); // Dates suivant la langue d'administration setlocale(LC_TIME, 'fr_FR'); @@ -328,7 +329,7 @@ class blog extends common { $pagination = helper::pagination($commentIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0), 'config', 'itemsperPage']) ); // Liste des pages self::$pages = $pagination['pages']; - // Commentaires en fonction de la pagination + // Commentaires en fonction de la pagination for($i = $pagination['first']; $i < $pagination['last']; $i++) { // Met en forme le tableau $comment = $comments[$commentIds[$i]]; @@ -340,7 +341,8 @@ class blog extends common { $buttonApproval = template::button('blogCommentApproved' . $commentIds[$i], [ 'class' => $comment['approval'] === true ? 'blogCommentRejected buttonGreen' : 'blogCommentApproved buttonRed' , 'href' => helper::baseUrl() . $this->getUrl(0) . '/commentApprove/' . $this->getUrl(2) . '/' . $commentIds[$i] . '/' . $_SESSION['csrf'] , - 'value' => $comment['approval'] === true ? 'A' : 'R' + 'value' => $comment['approval'] === true ? 'A' : 'R', + 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true ]); } self::$comments[] = [ @@ -353,7 +355,8 @@ class blog extends common { template::button('blogCommentDelete' . $commentIds[$i], [ 'class' => 'blogCommentDelete buttonRed', 'href' => helper::baseUrl() . $this->getUrl(0) . '/commentDelete/' . $this->getUrl(2) . '/' . $commentIds[$i] . '/' . $_SESSION['csrf'] , - 'value' => template::ico('cancel') + 'value' => template::ico('cancel'), + 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true ]) ]; } @@ -566,7 +569,8 @@ class blog extends common { template::button('blogConfigDelete' . $articleIds[$i], [ 'class' => 'blogConfigDelete buttonRed', 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $articleIds[$i] . '/' . $_SESSION['csrf'], - 'value' => template::ico('cancel') + 'value' => template::ico('cancel'), + 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true ]) ]; } diff --git a/module/blog/view/add/add.php b/module/blog/view/add/add.php index ad68285..a6af312 100644 --- a/module/blog/view/add/add.php +++ b/module/blog/view/add/add.php @@ -106,7 +106,8 @@ echo template::formOpen('blogAddForm'); ?> $text['blog_view']['add'][15], 'selected' => $module::EDIT_ALL, - 'help' => $text['blog_view']['add'][16] + 'help' => $text['blog_view']['add'][16], + 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true ]); ?> diff --git a/module/blog/view/comment/comment.php b/module/blog/view/comment/comment.php index 3aac5db..f60d076 100644 --- a/module/blog/view/comment/comment.php +++ b/module/blog/view/comment/comment.php @@ -13,7 +13,7 @@ include('./module/blog/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . ]); ?> - +
diff --git a/module/blog/view/edit/edit.php b/module/blog/view/edit/edit.php index ff3ce6f..bb50254 100644 --- a/module/blog/view/edit/edit.php +++ b/module/blog/view/edit/edit.php @@ -111,7 +111,8 @@ echo template::formOpen('blogEditForm'); ?> $text['blog_view']['edit'][15], 'selected' => is_numeric($this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'editConsent'])) ? $module::EDIT_GROUP : $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'editConsent']), - 'help' => $text['blog_view']['edit'][16] + 'help' => $text['blog_view']['edit'][16], + 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true ]); ?>