-
@@ -27,4 +28,4 @@
diff --git a/phpmyfaq/admin/category.add.php b/phpmyfaq/admin/category.add.php index 5fef2d45e4..1fa14be536 100644 --- a/phpmyfaq/admin/category.add.php +++ b/phpmyfaq/admin/category.add.php @@ -69,7 +69,8 @@ 'ad_entry_grouppermission' => Translation::get('ad_entry_grouppermission'), 'ad_entry_all_groups' => Translation::get('ad_entry_all_groups'), 'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'), - 'restricted_groups' => $currentUser->perm->getAllGroupsOptions([], $user) + 'restricted_groups' => ($faqConfig->get('security.permLevel') === 'medium') ? + $currentUser->perm->getAllGroupsOptions([], $user) : '', ]; if ($parentId > 0) { diff --git a/phpmyfaq/admin/dashboard.php b/phpmyfaq/admin/dashboard.php index 6621397e7a..b162a32a8c 100644 --- a/phpmyfaq/admin/dashboard.php +++ b/phpmyfaq/admin/dashboard.php @@ -67,7 +67,7 @@ 'hasUserTracking' => $faqConfig->get('main.enableUserTracking'), 'adminDashboardHeaderInactiveFaqs' => Translation::get('ad_record_inactive'), 'adminDashboardInactiveFaqs' => $faq->getInactiveFaqsData(), - 'hasPermissionEditConfig' => $user->perm->hasPermission($user->getUserId(), PermissionType::CONFIGURATION_EDIT), + 'hasPermissionEditConfig' => $user->perm->hasPermission($user->getUserId(), PermissionType::CONFIGURATION_EDIT->value), 'showVersion' => $faqConfig->get('main.enableAutoUpdateHint'), ]; @@ -93,7 +93,7 @@ ]; } -if ($user->perm->hasPermission($user->getUserId(), PermissionType::CONFIGURATION_EDIT)) { +if ($user->perm->hasPermission($user->getUserId(), PermissionType::CONFIGURATION_EDIT->value)) { $api = new Api($faqConfig); $version = Filter::filterInput(INPUT_POST, 'param', FILTER_SANITIZE_SPECIAL_CHARS); diff --git a/phpmyfaq/admin/faqs.editor.php b/phpmyfaq/admin/faqs.editor.php index 915376f749..9acee8b328 100644 --- a/phpmyfaq/admin/faqs.editor.php +++ b/phpmyfaq/admin/faqs.editor.php @@ -311,7 +311,7 @@ // // Revisions // - if ($user->perm->hasPermission($currentUserId, PermissionType::REVISION_UPDATE) && $action === 'editentry') { + if ($user->perm->hasPermission($currentUserId, PermissionType::REVISION_UPDATE->value) && $action === 'editentry') { $faqRevision = new Revision($faqConfig); $revisions = $faqRevision->get($faqData['id'], $faqData['lang'], $faqData['author']); @@ -374,10 +374,10 @@ 'categoryOptions' => $categoryHelper->renderOptions($categories), 'ad_entry_locale' => Translation::get('ad_entry_locale'), 'languageOptions' => LanguageHelper::renderSelectLanguage($faqData['lang'], false, [], 'lang'), - 'hasPermissionForAddAttachments' => $user->perm->hasPermission($currentUserId, PermissionType::ATTACHMENT_ADD), + 'hasPermissionForAddAttachments' => $user->perm->hasPermission($currentUserId, PermissionType::ATTACHMENT_ADD->value), 'hasPermissionForDeleteAttachments' => $user->perm->hasPermission( $currentUserId, - PermissionType::ATTACHMENT_DELETE + PermissionType::ATTACHMENT_DELETE->value ), 'ad_menu_attachments' => Translation::get('ad_menu_attachments'), 'csrfTokenDeleteAttachment' => Token::getInstance()->getTokenString('delete-attachment'), @@ -392,7 +392,8 @@ 'allGroups' => $allGroups, 'restrictedGroups' => $restrictedGroups, 'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'), - 'groupPermissionOptions' => $user->perm->getAllGroupsOptions($groupPermission, $user), + 'groupPermissionOptions' => ($faqConfig->get('security.permLevel') === 'medium') ? + $user->perm->getAllGroupsOptions($groupPermission, $user) : '', 'ad_entry_userpermission' => Translation::get('ad_entry_userpermission'), 'allUsers' => $allUsers, 'ad_entry_all_users' => Translation::get('ad_entry_all_users'), @@ -413,7 +414,7 @@ 'msgKeepFaqDate' => Translation::get('msgKeepFaqDate'), 'msgEditFaqDat' => Translation::get('msgEditFaqDat'), 'ad_entry_status' => Translation::get('ad_entry_status'), - 'hasPermissionForApprove' => $user->perm->hasPermission($currentUserId, PermissionType::FAQ_APPROVE), + 'hasPermissionForApprove' => $user->perm->hasPermission($currentUserId, PermissionType::FAQ_APPROVE->value), 'isActive' => $isActive, 'isInActive' => $isInActive, 'ad_entry_visibility' => Translation::get('ad_entry_visibility'), diff --git a/phpmyfaq/assets/templates/admin/content/faq.editor.twig b/phpmyfaq/assets/templates/admin/content/faq.editor.twig index 369676463f..a9c5351648 100644 --- a/phpmyfaq/assets/templates/admin/content/faq.editor.twig +++ b/phpmyfaq/assets/templates/admin/content/faq.editor.twig @@ -26,7 +26,7 @@