Skip to content

Commit 7f665cb

Browse files
thorstenthorsten
committed
refactor: renamed method to check permissions (thorsten#1851)
This commit also adds the new admin FAQ overview page, which is work in progress.
1 parent 9ed5251 commit 7f665cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+721
-504
lines changed

‎phpmyfaq/admin/ajax.autosave.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
$http->addHeader();
4040

4141
if ('insertentry' === $do &&
42-
($user->perm->checkRight($user->getUserId(), 'edit_faq') || $user->perm->checkRight($user->getUserId(),
43-
'add_faq')) ||
44-
'saveentry' === $do && $user->perm->checkRight($user->getUserId(), 'edit_faq')) {
42+
($user->perm->hasPermission($user->getUserId(), 'edit_faq') || $user->perm->hasPermission($user->getUserId(),
43+
'add_faq')) ||
44+
'saveentry' === $do && $user->perm->hasPermission($user->getUserId(), 'edit_faq')) {
4545
$user = CurrentUser::getFromCookie($faqConfig);
4646
if (!$user instanceof CurrentUser) {
4747
$user = CurrentUser::getFromSession($faqConfig);

‎phpmyfaq/admin/ajax.comment.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
$http->setContentType('application/json');
3030
$http->addHeader();
3131

32-
if ('delete' === $ajaxAction && $user->perm->checkRight($user->getUserId(), 'delcomment')) {
32+
if ('delete' === $ajaxAction && $user->perm->hasPermission($user->getUserId(), 'delcomment')) {
3333
$comment = new Comments($faqConfig);
3434
$checkFaqs = [
3535
'filter' => FILTER_VALIDATE_INT,

‎phpmyfaq/admin/ajax.group.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
$http->setContentType('application/json');
3131
$http->addHeader();
3232

33-
if ($user->perm->checkRight($user->getUserId(), 'add_user') ||
34-
$user->perm->checkRight($user->getUserId(), 'edit_user') ||
35-
$user->perm->checkRight($user->getUserId(), 'delete_user') ||
36-
$user->perm->checkRight($user->getUserId(), 'editgroup')) {
33+
if ($user->perm->hasPermission($user->getUserId(), 'add_user') ||
34+
$user->perm->hasPermission($user->getUserId(), 'edit_user') ||
35+
$user->perm->hasPermission($user->getUserId(), 'delete_user') ||
36+
$user->perm->hasPermission($user->getUserId(), 'editgroup')) {
3737

3838
// pass the user id of the current user so it'll check which group he belongs to
3939
$groupList = ($user->perm instanceof MediumPermission) ? $user->perm->getAllGroups($user) : [];

‎phpmyfaq/admin/ajax.records.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
// save active FAQs
7575
case 'save_active_records':
76-
if ($user->perm->checkRight($user->getUserId(), 'approverec')) {
76+
if ($user->perm->hasPermission($user->getUserId(), 'approverec')) {
7777
if (!empty($items)) {
7878
$faq = new Faq($faqConfig);
7979

@@ -90,7 +90,7 @@
9090

9191
// save sticky FAQs
9292
case 'save_sticky_records':
93-
if ($user->perm->checkRight($user->getUserId(), 'edit_faq')) {
93+
if ($user->perm->hasPermission($user->getUserId(), 'edit_faq')) {
9494
if (!empty($items)) {
9595
$faq = new Faq($faqConfig);
9696

@@ -107,7 +107,7 @@
107107

108108
// search FAQs for suggestions
109109
case 'search_records':
110-
if ($user->perm->checkRight($user->getUserId(), 'edit_faq')) {
110+
if ($user->perm->hasPermission($user->getUserId(), 'edit_faq')) {
111111
$faqPermission = new FaqPermission($faqConfig);
112112
$faqSearch = new Search($faqConfig);
113113
$faqSearch->setCategory(new Category($faqConfig));
@@ -132,7 +132,7 @@
132132

133133
// delete FAQs
134134
case 'delete_record':
135-
if ($user->perm->checkRight($user->getUserId(), 'delete_faq')) {
135+
if ($user->perm->hasPermission($user->getUserId(), 'delete_faq')) {
136136
$recordId = Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
137137
$recordLang = Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
138138

@@ -152,7 +152,7 @@
152152

153153
// delete open questions
154154
case 'delete_question':
155-
if ($user->perm->checkRight($user->getUserId(), 'delquestion')) {
155+
if ($user->perm->hasPermission($user->getUserId(), 'delquestion')) {
156156
$checks = [
157157
'filter' => FILTER_VALIDATE_INT,
158158
'flags' => FILTER_REQUIRE_ARRAY,

‎phpmyfaq/admin/ajax.section.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
$http->setContentType('application/json');
3232
$http->addHeader();
3333

34-
if ($user->perm->checkRight($user->getUserId(), 'add_section') ||
35-
$user->perm->checkRight($user->getUserId(), 'edit_section') ||
36-
$user->perm->checkRight($user->getUserId(), 'del_section')) {
34+
if ($user->perm->hasPermission($user->getUserId(), 'add_section') ||
35+
$user->perm->hasPermission($user->getUserId(), 'edit_section') ||
36+
$user->perm->hasPermission($user->getUserId(), 'del_section')) {
3737

3838
$sectionList = ($user->perm instanceof LargePermission) ? $user->perm->getAllSections() : [];
3939

‎phpmyfaq/admin/ajax.tags.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
$tags = $oTag->getAllTags();
5050
}
5151

52-
if ($user->perm->checkRight($user->getUserId(), 'edit_faq')) {
52+
if ($user->perm->hasPermission($user->getUserId(), 'edit_faq')) {
5353
$i = 0;
5454
$tagNames = [];
5555
foreach ($tags as $tagName) {

‎phpmyfaq/admin/ajax.user.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
$http->addHeader();
4040

4141
if (
42-
$user->perm->checkRight($user->getUserId(), 'add_user') ||
43-
$user->perm->checkRight($user->getUserId(), 'edit_user') ||
44-
$user->perm->checkRight($user->getUserId(), 'delete_user')
42+
$user->perm->hasPermission($user->getUserId(), 'add_user') ||
43+
$user->perm->hasPermission($user->getUserId(), 'edit_user') ||
44+
$user->perm->hasPermission($user->getUserId(), 'delete_user')
4545
) {
4646
$user = new User($faqConfig);
4747

‎phpmyfaq/admin/backup.export.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
unset($user);
4848
}
4949

50-
if ($user->perm->checkRight($user->getUserId(), 'backup')) {
50+
if ($user->perm->hasPermission($user->getUserId(), 'backup')) {
5151
$tables = $tableNames = $faqConfig->getDb()->getTableNames(Database::getTablePrefix());
5252
$tablePrefix = (Database::getTablePrefix() !== '') ? Database::getTablePrefix() . '.phpmyfaq' : 'phpmyfaq';
5353
$tableNames = '';

‎phpmyfaq/admin/backup.import.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</header>
4040
<?php
4141

42-
if ($user->perm->checkRight($user->getUserId(), 'restore') && $csrfCheck) {
42+
if ($user->perm->hasPermission($user->getUserId(), 'restore') && $csrfCheck) {
4343
if (isset($_FILES['userfile']) && 0 === $_FILES['userfile']['error']) {
4444
$ok = 1;
4545
$fileInfo = new finfo(FILEINFO_MIME_ENCODING);

‎phpmyfaq/admin/backup.main.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
exit();
2020
}
2121

22-
if ($user->perm->checkRight($user->getUserId(), 'backup')) {
22+
if ($user->perm->hasPermission($user->getUserId(), 'backup')) {
2323
?>
2424
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
2525
<h1 class="h2">

0 commit comments

Comments
 (0)