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 @@