From 95b7d1f74eef92fefc0ab49d9e69da730f5998b8 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sun, 18 Jun 2023 16:57:11 +0200 Subject: [PATCH] =?UTF-8?q?Libell=C3=A9s=20et=20corrections=20d'erreurs=20?= =?UTF-8?q?dont=20acc=C3=A8s=20implicite=20=C3=A0=20la=20configuration=20s?= =?UTF-8?q?auf=20news=20et=20redirection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/user/user.php | 54 ++++++++--- core/module/user/view/profilAdd/profilAdd.php | 60 +++++-------- .../user/view/profilEdit/profilEdit.php | 89 +++++++------------ 3 files changed, 99 insertions(+), 104 deletions(-) diff --git a/core/module/user/user.php b/core/module/user/user.php index ef1452bd..a72025bb 100644 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -584,27 +584,41 @@ class user extends common 'add' => $this->getInput('profilEditBlogAdd', helper::FILTER_BOOLEAN), 'edit' => $this->getInput('profilEditBlogEdit', helper::FILTER_BOOLEAN), 'delete' => $this->getInput('profilEditBlogDelete', helper::FILTER_BOOLEAN), - 'config' => $this->getInput('profilEditBlogConfig', helper::FILTER_BOOLEAN), 'option' => $this->getInput('profilEditBlogOption', helper::FILTER_BOOLEAN), 'comment' => $this->getInput('profilEditBlogComment', helper::FILTER_BOOLEAN), 'commentApprove' => $this->getInput('profilEditBlogCommentApprove', helper::FILTER_BOOLEAN), 'commentDelete' => $this->getInput('profilEditBlogCommentDelete', helper::FILTER_BOOLEAN), 'commentDeleteAll' => $this->getInput('profilEditBlogCommentDeleteAll', helper::FILTER_BOOLEAN), + 'config' => $this->getInput('profilEditBlogAdd', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditBlogEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditBlogDelete', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditBlogOption', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditBlogComment', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditBlogCommentApprove', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditBlogCommentDelete', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditBlogCommentDeleteAll', helper::FILTER_BOOLEAN) ], 'news' => [ 'add' => $this->getInput('profilEditNewsAdd', helper::FILTER_BOOLEAN), 'edit' => $this->getInput('profilEditNewsEdit', helper::FILTER_BOOLEAN), - 'delete' => $this->getInput('profilEditNewsDelete', helper::FILTER_BOOLEAN), - 'config' => $this->getInput('profilEditNewsConfig', helper::FILTER_BOOLEAN), + 'delete' => $this->getInput('profilEditNewsEdit', helper::FILTER_BOOLEAN), 'option' => $this->getInput('profilEditNewsOption', helper::FILTER_BOOLEAN), + 'config' => $this->getInput('profilEditNewsAdd', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditNewsEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditNewsEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditNewsOption', helper::FILTER_BOOLEAN) ], 'gallery' => [ 'add' => $this->getInput('profilEditGalleryAdd', helper::FILTER_BOOLEAN), 'edit' => $this->getInput('profilEditGalleryEdit', helper::FILTER_BOOLEAN), 'delete' => $this->getInput('profilEditGalleryDelete', helper::FILTER_BOOLEAN), - 'config' => $this->getInput('profilEditGalleryConfig', helper::FILTER_BOOLEAN), 'option' => $this->getInput('profilEditGalleryOption', helper::FILTER_BOOLEAN), - 'theme' => $this->getInput('profilEditGalleryConfig', helper::FILTER_BOOLEAN), + 'theme' => $this->getInput('profilEditGalleryTheme', helper::FILTER_BOOLEAN), + 'config' => $this->getInput('profilEditGalleryAdd', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditGalleryEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditGalleryDelete', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditGalleryOption', helper::FILTER_BOOLEAN) || + $this->getInput('profilEditGalleryTheme', helper::FILTER_BOOLEAN) ], 'form' => [ 'config' => $this->getInput('profilEditFormConfig', helper::FILTER_BOOLEAN), @@ -698,35 +712,53 @@ class user extends common 'add' => $this->getInput('profilAddBlogAdd', helper::FILTER_BOOLEAN), 'edit' => $this->getInput('profilAddBlogEdit', helper::FILTER_BOOLEAN), 'delete' => $this->getInput('profilAddBlogDelete', helper::FILTER_BOOLEAN), - 'config' => $this->getInput('profilAddBlogConfig', helper::FILTER_BOOLEAN), 'option' => $this->getInput('profilAddBlogOption', helper::FILTER_BOOLEAN), 'comment' => $this->getInput('profilAddBlogComment', helper::FILTER_BOOLEAN), 'commentApprove' => $this->getInput('profilAddBlogCommentApprove', helper::FILTER_BOOLEAN), 'commentDelete' => $this->getInput('profilAddBlogCommentDelete', helper::FILTER_BOOLEAN), 'commentDeleteAll' => $this->getInput('profilAddBlogCommentDeleteAll', helper::FILTER_BOOLEAN), + 'config' => $this->getInput('profilAddBlogAdd', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddBlogEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddBlogDelete', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddBlogOption', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddBlogComment', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddBlogCommentApprove', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddBlogCommentDelete', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddBlogCommentDeleteAll', helper::FILTER_BOOLEAN) ], 'news' => [ 'add' => $this->getInput('profilAddNewsAdd', helper::FILTER_BOOLEAN), 'edit' => $this->getInput('profilAddNewsEdit', helper::FILTER_BOOLEAN), - 'delete' => $this->getInput('profilAddNewsDelete', helper::FILTER_BOOLEAN), - 'config' => $this->getInput('profilAddNewsConfig', helper::FILTER_BOOLEAN), + 'delete' => $this->getInput('profilAddNewsEdit', helper::FILTER_BOOLEAN), 'option' => $this->getInput('profilAddNewsOption', helper::FILTER_BOOLEAN), + 'config' => $this->getInput('profilAddNewsAdd', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddNewsEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddNewsEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddNewsOption', helper::FILTER_BOOLEAN) ], 'gallery' => [ 'add' => $this->getInput('profilAddGalleryAdd', helper::FILTER_BOOLEAN), 'edit' => $this->getInput('profilAddGalleryEdit', helper::FILTER_BOOLEAN), 'delete' => $this->getInput('profilAddGalleryDelete', helper::FILTER_BOOLEAN), - 'config' => $this->getInput('profilAddGalleryConfig', helper::FILTER_BOOLEAN), 'option' => $this->getInput('profilAddGalleryOption', helper::FILTER_BOOLEAN), - 'theme' => $this->getInput('profilAddGalleryConfig', helper::FILTER_BOOLEAN), + 'theme' => $this->getInput('profilAddGalleryTheme', helper::FILTER_BOOLEAN), + 'config' => $this->getInput('profilAddGalleryAdd', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddGalleryEdit', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddGalleryDelete', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddGalleryOption', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddGalleryTheme', helper::FILTER_BOOLEAN) ], 'form' => [ - 'config' => $this->getInput('profilAddFormConfig', helper::FILTER_BOOLEAN), 'option' => $this->getInput('profilAddFormOption', helper::FILTER_BOOLEAN), 'data' => $this->getInput('profilAddFormData', helper::FILTER_BOOLEAN), 'delete' => $this->getInput('profilAddFormDelete', helper::FILTER_BOOLEAN), 'deleteAll' => $this->getInput('profilAddFormDeleteAll', helper::FILTER_BOOLEAN), 'export2csv' => $this->getInput('profilAddFormExport2csv', helper::FILTER_BOOLEAN), + 'config' => $this->getInput('profilAddFormOption', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddFormData', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddFormDelete', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddFormDeleteAll', helper::FILTER_BOOLEAN) || + $this->getInput('profilAddFormExport2csv', helper::FILTER_BOOLEAN) ], 'search' => [ 'config' => $this->getInput('profilAddSearchConfig', helper::FILTER_BOOLEAN), diff --git a/core/module/user/view/profilAdd/profilAdd.php b/core/module/user/view/profilAdd/profilAdd.php index 719e4b18..33a70ab2 100644 --- a/core/module/user/view/profilAdd/profilAdd.php +++ b/core/module/user/view/profilAdd/profilAdd.php @@ -55,7 +55,7 @@
- +
@@ -69,10 +69,10 @@
- +
- +
@@ -95,9 +95,6 @@
-
- -
@@ -108,15 +105,15 @@
- +
-
- +
+
- +
@@ -129,21 +126,16 @@
-
+
-
- +
+
-
+
-
-
-
- -
-
+
@@ -162,21 +154,18 @@
- +
-
- -
-
+
-
- +
+
@@ -189,16 +178,15 @@
-
- -
- + +
+
+
-
@@ -207,9 +195,7 @@
-
- -
+
@@ -222,7 +208,7 @@
- +
@@ -236,7 +222,7 @@
- +
diff --git a/core/module/user/view/profilEdit/profilEdit.php b/core/module/user/view/profilEdit/profilEdit.php index b786de92..cffef8e9 100644 --- a/core/module/user/view/profilEdit/profilEdit.php +++ b/core/module/user/view/profilEdit/profilEdit.php @@ -65,7 +65,7 @@ ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'page', 'edit']) ]); ?>
@@ -82,17 +82,17 @@
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'page', 'module']) ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'page', 'cssEditor']) ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'page', 'jsEditor']) ]); ?>
@@ -114,7 +114,7 @@ ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'blog', 'edit']) ]); ?>
@@ -123,11 +123,6 @@ 'checked' => $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'blog', 'delete']) ]); ?> -
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'blog', 'config']) - ]); ?> -
@@ -136,24 +131,24 @@ ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'blog', 'comment']) ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'blog', 'commentApprove']) ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'blog', 'commentDelete']) ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'blog', 'commentDeleteAll']) ]); ?>
@@ -168,29 +163,22 @@
-
+
$this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'news', 'add']) ]); ?>
-
- + $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'news', 'edit']) ]); ?>
-
+
$this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'news', 'delete']) ]); ?>
-
-
-
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'news', 'config']) - ]); ?> -
-
+
$this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'news', 'option']) ]); ?> @@ -213,7 +201,7 @@ ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'gallery', 'edit']) ]); ?>
@@ -224,18 +212,13 @@
-
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'gallery', 'config']) - ]); ?> -
-
+
$this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'gallery', 'option']) ]); ?>
-
- + $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'gallery', 'theme']) ]); ?>
@@ -250,40 +233,34 @@
-
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'config']) - ]); ?> -
$this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'option']) ]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'data']) ]); ?>
- -
-
-
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'delete']) - ]); ?> -
-
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'deleteAll']) - ]); ?> -
$this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'export2csv']) ]); ?>
+
+
+ $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'delete']) + ]); ?> +
+
+ $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'form', 'deleteAll']) + ]); ?> +
+
@@ -295,7 +272,7 @@
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'redirection', 'config']) ]); ?>
@@ -311,7 +288,7 @@
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'search', 'config']) ]); ?>