NOW MANAGED ON CODEBERG
Permissions: Updated use of helpers to use enums
Dan Brown419dbadcfd71
diff --git a/app/Activity/Controllers/WebhookController.php b/app/Activity/Controllers/WebhookController.phpindex dcca1dc41..6a65b8363 100644--- a/app/Activity/Controllers/WebhookController.php+++ b/app/Activity/Controllers/WebhookController.php@@ -6,6 +6,7 @@ use BookStack\Activity\ActivityType;use BookStack\Activity\Models\Webhook;use BookStack\Activity\Queries\WebhooksAllPaginatedAndSorted;use BookStack\Http\Controller;+use BookStack\Permissions\Permission;use BookStack\Util\SimpleListOptions;use Illuminate\Http\Request;@@ -14,7 +15,7 @@ class WebhookController extends Controllerpublic function __construct(){$this->middleware([- 'can:settings-manage',+ Permission::SettingsManage->middleware()]);}diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.phpindex a05a9d247..af9b7ecb2 100644--- a/app/Activity/Tools/CommentTree.php+++ b/app/Activity/Tools/CommentTree.php@@ -70,7 +70,7 @@ class CommentTreepublic function canUpdateAny(): bool{foreach ($this->comments as $comment) {- if (userCan('comment-update', $comment)) {+ if (userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment)) {return true;}}diff --git a/app/Activity/Tools/TagClassGenerator.php b/app/Activity/Tools/TagClassGenerator.phpindex 5bcb44113..03586eb27 100644--- a/app/Activity/Tools/TagClassGenerator.php+++ b/app/Activity/Tools/TagClassGenerator.php@@ -26,14 +26,14 @@ class TagClassGeneratorarray_push($classes, ...$this->generateClassesForTag($tag));}- if ($this->entity instanceof BookChild && userCan('view', $this->entity->book)) {+ if ($this->entity instanceof BookChild && userCan(\BookStack\Permissions\Permission::View, $this->entity->book)) {$bookTags = $this->entity->book->tags;foreach ($bookTags as $bookTag) {array_push($classes, ...$this->generateClassesForTag($bookTag, 'book-'));}}- if ($this->entity instanceof Page && $this->entity->chapter && userCan('view', $this->entity->chapter)) {+ if ($this->entity instanceof Page && $this->entity->chapter && userCan(\BookStack\Permissions\Permission::View, $this->entity->chapter)) {$chapterTags = $this->entity->chapter->tags;foreach ($chapterTags as $chapterTag) {array_push($classes, ...$this->generateClassesForTag($chapterTag, 'chapter-'));diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.phpindex d4bde300b..1fe296537 100644--- a/app/Entities/Controllers/PageController.php+++ b/app/Entities/Controllers/PageController.php@@ -342,7 +342,7 @@ class PageController extends Controller$this->showSuccessNotification(trans('entities.pages_delete_draft_success'));- if ($chapter && userCan('view', $chapter)) {+ if ($chapter && userCan(\BookStack\Permissions\Permission::View, $chapter)) {return redirect($chapter->getUrl());}diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.phpindex 6503e63cf..10b9697ed 100644--- a/app/Entities/Repos/ChapterRepo.php+++ b/app/Entities/Repos/ChapterRepo.php@@ -87,7 +87,7 @@ class ChapterRepothrow new MoveOperationException('Book to move chapter into not found');}- if (!userCan('chapter-create', $parent)) {+ if (!userCan(\BookStack\Permissions\Permission::ChapterCreate, $parent)) {throw new PermissionsException('User does not have permission to create a chapter within the chosen book');}diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.phpindex 63e8b8370..4a9efd31d 100644--- a/app/Entities/Repos/PageRepo.php+++ b/app/Entities/Repos/PageRepo.php@@ -55,7 +55,7 @@ class PageRepo}$defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;- if ($defaultTemplate && userCan('view', $defaultTemplate)) {+ if ($defaultTemplate && userCan(\BookStack\Permissions\Permission::View, $defaultTemplate)) {$page->forceFill(['html' => $defaultTemplate->html,'markdown' => $defaultTemplate->markdown,@@ -142,7 +142,7 @@ class PageRepoprotected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void{- if (isset($input['template']) && userCan('templates-manage')) {+ if (isset($input['template']) && userCan(\BookStack\Permissions\Permission::TemplatesManage)) {$page->template = ($input['template'] === 'true');}@@ -165,7 +165,7 @@ class PageRepo$pageContent->setNewHTML($input['html'], user());}- if (($newEditor !== $currentEditor || empty($page->editor)) && userCan('editor-change')) {+ if (($newEditor !== $currentEditor || empty($page->editor)) && userCan(\BookStack\Permissions\Permission::EditorChange)) {$page->editor = $newEditor->value;} elseif (empty($page->editor)) {$page->editor = $defaultEditor->value;@@ -271,7 +271,7 @@ class PageRepothrow new MoveOperationException('Book or chapter to move page into not found');}- if (!userCan('page-create', $parent)) {+ if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {throw new PermissionsException('User does not have permission to create a page within the new parent');}diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.phpindex 87aa770c0..0af25a2c1 100644--- a/app/Entities/Tools/Cloner.php+++ b/app/Entities/Tools/Cloner.php@@ -49,7 +49,7 @@ class Cloner$copyChapter = $this->chapterRepo->create($chapterDetails, $parent);- if (userCan('page-create', $copyChapter)) {+ if (userCan(\BookStack\Permissions\Permission::PageCreate, $copyChapter)) {/** @var Page $page */foreach ($original->getVisiblePages() as $page) {$this->clonePage($page, $copyChapter, $page->name);@@ -74,11 +74,11 @@ class Cloner// Clone contents$directChildren = $original->getDirectVisibleChildren();foreach ($directChildren as $child) {- if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {+ if ($child instanceof Chapter && userCan(\BookStack\Permissions\Permission::ChapterCreate, $copyBook)) {$this->cloneChapter($child, $copyBook, $child->name);}- if ($child instanceof Page && !$child->draft && userCan('page-create', $copyBook)) {+ if ($child instanceof Page && !$child->draft && userCan(\BookStack\Permissions\Permission::PageCreate, $copyBook)) {$this->clonePage($child, $copyBook, $child->name);}}@@ -86,7 +86,7 @@ class Cloner// Clone bookshelf relationships/** @var Bookshelf $shelf */foreach ($original->shelves as $shelf) {- if (userCan('bookshelf-update', $shelf)) {+ if (userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf)) {$shelf->appendBook($copyBook);}}diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.phpindex e4fe2fd25..fc32e9a43 100644--- a/app/Entities/Tools/PageEditorData.php+++ b/app/Entities/Tools/PageEditorData.php@@ -100,7 +100,7 @@ class PageEditorData// Use requested editor if valid and if we have permission$requestedType = PageEditorType::fromRequestValue($this->requestedEditor);- if ($requestedType && userCan('editor-change')) {+ if ($requestedType && userCan(\BookStack\Permissions\Permission::EditorChange)) {$editorType = $requestedType;}diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.phpindex 4ca53982a..fbf92e203 100644--- a/app/Entities/Tools/PermissionsUpdater.php+++ b/app/Entities/Tools/PermissionsUpdater.php@@ -150,7 +150,7 @@ class PermissionsUpdater/** @var Book $book */foreach ($shelfBooks as $book) {- if ($checkUserPermissions && !userCan('restrictions-manage', $book)) {+ if ($checkUserPermissions && !userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book)) {continue;}$book->permissions()->delete();diff --git a/app/Exports/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.phpindex 87f1d7eef..21f276f8a 100644--- a/app/Exports/Controllers/BookExportApiController.php+++ b/app/Exports/Controllers/BookExportApiController.php@@ -6,6 +6,7 @@ use BookStack\Entities\Queries\BookQueries;use BookStack\Exports\ExportFormatter;use BookStack\Exports\ZipExports\ZipExportBuilder;use BookStack\Http\ApiController;+use BookStack\Permissions\Permission;use Throwable;class BookExportApiController extends ApiController@@ -14,7 +15,7 @@ class BookExportApiController extends ApiControllerprotected ExportFormatter $exportFormatter,protected BookQueries $queries,) {- $this->middleware('can:content-export');+ $this->middleware(Permission::ContentExport->middleware());}/**diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.phpindex 67247598c..f6bb66666 100644--- a/app/Exports/Controllers/BookExportController.php+++ b/app/Exports/Controllers/BookExportController.php@@ -7,6 +7,7 @@ use BookStack\Exceptions\NotFoundException;use BookStack\Exports\ExportFormatter;use BookStack\Exports\ZipExports\ZipExportBuilder;use BookStack\Http\Controller;+use BookStack\Permissions\Permission;use Throwable;class BookExportController extends Controller@@ -15,7 +16,7 @@ class BookExportController extends Controllerprotected BookQueries $queries,protected ExportFormatter $exportFormatter,) {- $this->middleware('can:content-export');+ $this->middleware(Permission::ContentExport->middleware());$this->middleware('throttle:exports');}diff --git a/app/Exports/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.phpindex bccd414af..7e5a23c70 100644--- a/app/Exports/Controllers/ChapterExportApiController.php+++ b/app/Exports/Controllers/ChapterExportApiController.php@@ -6,6 +6,7 @@ use BookStack\Entities\Queries\ChapterQueries;use BookStack\Exports\ExportFormatter;use BookStack\Exports\ZipExports\ZipExportBuilder;use BookStack\Http\ApiController;+use BookStack\Permissions\Permission;use Throwable;class ChapterExportApiController extends ApiController@@ -14,7 +15,7 @@ class ChapterExportApiController extends ApiControllerprotected ExportFormatter $exportFormatter,protected ChapterQueries $queries,) {- $this->middleware('can:content-export');+ $this->middleware(Permission::ContentExport->middleware());}/**diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.phpindex 849024343..fdb2bba94 100644--- a/app/Exports/Controllers/ChapterExportController.php+++ b/app/Exports/Controllers/ChapterExportController.php@@ -7,6 +7,7 @@ use BookStack\Exceptions\NotFoundException;use BookStack\Exports\ExportFormatter;use BookStack\Exports\ZipExports\ZipExportBuilder;use BookStack\Http\Controller;+use BookStack\Permissions\Permission;use Throwable;class ChapterExportController extends Controller@@ -15,7 +16,7 @@ class ChapterExportController extends Controllerprotected ChapterQueries $queries,protected ExportFormatter $exportFormatter,) {- $this->middleware('can:content-export');+ $this->middleware(Permission::ContentExport->middleware());$this->middleware('throttle:exports');}diff --git a/app/Exports/Controllers/ImportApiController.php b/app/Exports/Controllers/ImportApiController.phpindex cac155c7c..f8eaea5a1 100644--- a/app/Exports/Controllers/ImportApiController.php+++ b/app/Exports/Controllers/ImportApiController.php@@ -8,6 +8,7 @@ use BookStack\Exceptions\ZipImportException;use BookStack\Exceptions\ZipValidationException;use BookStack\Exports\ImportRepo;use BookStack\Http\ApiController;+use BookStack\Permissions\Permission;use BookStack\Uploads\AttachmentService;use Illuminate\Http\Request;use Illuminate\Http\JsonResponse;@@ -18,7 +19,7 @@ class ImportApiController extends ApiControllerpublic function __construct(protected ImportRepo $imports,) {- $this->middleware('can:content-import');+ $this->middleware(Permission::ContentImport->middleware());}/**diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.phpindex 0d3e2414b..7ecc09a41 100644--- a/app/Exports/Controllers/ImportController.php+++ b/app/Exports/Controllers/ImportController.php@@ -8,6 +8,7 @@ use BookStack\Exceptions\ZipImportException;use BookStack\Exceptions\ZipValidationException;use BookStack\Exports\ImportRepo;use BookStack\Http\Controller;+use BookStack\Permissions\Permission;use BookStack\Uploads\AttachmentService;use Illuminate\Http\Request;@@ -16,7 +17,7 @@ class ImportController extends Controllerpublic function __construct(protected ImportRepo $imports,) {- $this->middleware('can:content-import');+ $this->middleware(Permission::ContentImport->middleware());}/**diff --git a/app/Exports/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.phpindex 73af01afa..c5b186289 100644--- a/app/Exports/Controllers/PageExportApiController.php+++ b/app/Exports/Controllers/PageExportApiController.php@@ -6,6 +6,7 @@ use BookStack\Entities\Queries\PageQueries;use BookStack\Exports\ExportFormatter;use BookStack\Exports\ZipExports\ZipExportBuilder;use BookStack\Http\ApiController;+use BookStack\Permissions\Permission;use Throwable;class PageExportApiController extends ApiController@@ -14,7 +15,7 @@ class PageExportApiController extends ApiControllerprotected ExportFormatter $exportFormatter,protected PageQueries $queries,) {- $this->middleware('can:content-export');+ $this->middleware(Permission::ContentExport->middleware());}/**diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.phpindex 145dce9dd..9bc79f247 100644--- a/app/Exports/Controllers/PageExportController.php+++ b/app/Exports/Controllers/PageExportController.php@@ -8,6 +8,7 @@ use BookStack\Exceptions\NotFoundException;use BookStack\Exports\ExportFormatter;use BookStack\Exports\ZipExports\ZipExportBuilder;use BookStack\Http\Controller;+use BookStack\Permissions\Permission;use Throwable;class PageExportController extends Controller@@ -16,7 +17,7 @@ class PageExportController extends Controllerprotected PageQueries $queries,protected ExportFormatter $exportFormatter,) {- $this->middleware('can:content-export');+ $this->middleware(Permission::ContentExport->middleware());$this->middleware('throttle:exports');}diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.phpindex 896af903a..071fa532c 100644--- a/app/Exports/ImportRepo.php+++ b/app/Exports/ImportRepo.php@@ -46,7 +46,7 @@ class ImportRepo{$query = Import::query();- if (!userCan('settings-manage')) {+ if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {$query->where('created_by', user()->id);}@@ -57,7 +57,7 @@ class ImportRepo{$query = Import::query();- if (!userCan('settings-manage')) {+ if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {$query->where('created_by', user()->id);}diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.phpindex b21248ffd..621076acc 100644--- a/app/Exports/ZipExports/ZipExportReferences.php+++ b/app/Exports/ZipExports/ZipExportReferences.php@@ -135,7 +135,7 @@ class ZipExportReferences// Find and include images if in visibility$page = $model->getPage();$pageExportModel = $this->pages[$page->id] ?? ($exportModel instanceof ZipExportPage ? $exportModel : null);- if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan('view', $page))) {+ if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan(\BookStack\Permissions\Permission::View, $page))) {if (!isset($this->images[$model->id])) {$exportImage = ZipExportImage::fromModel($model, $files);$this->images[$model->id] = $exportImage;diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.phpindex d25a1621f..09a946609 100644--- a/app/Exports/ZipExports/ZipImportRunner.php+++ b/app/Exports/ZipExports/ZipImportRunner.php@@ -288,7 +288,7 @@ class ZipImportRunner$attachments = [];if ($exportModel instanceof ZipExportBook) {- if (!userCan('book-create-all')) {+ if (!userCan(\BookStack\Permissions\Permission::BookCreateAll)) {$errors[] = trans('errors.import_perms_books');}array_push($pages, ...$exportModel->pages);@@ -317,11 +317,11 @@ class ZipImportRunnerif (count($pages) > 0) {if ($parent) {- if (!userCan('page-create', $parent)) {+ if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {$errors[] = trans('errors.import_perms_pages');}} else {- $hasPermission = userCan('page-create-all') || userCan('page-create-own');+ $hasPermission = userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn);if (!$hasPermission) {$errors[] = trans('errors.import_perms_pages');}@@ -329,13 +329,13 @@ class ZipImportRunner}if (count($images) > 0) {- if (!userCan('image-create-all')) {+ if (!userCan(\BookStack\Permissions\Permission::ImageCreateAll)) {$errors[] = trans('errors.import_perms_images');}}if (count($attachments) > 0) {- if (!userCan('attachment-create-all')) {+ if (!userCan(\BookStack\Permissions\Permission::AttachmentCreateAll)) {$errors[] = trans('errors.import_perms_attachments');}}diff --git a/app/Permissions/Permission.php b/app/Permissions/Permission.phpindex 492ca2621..a434e54fd 100644--- a/app/Permissions/Permission.php+++ b/app/Permissions/Permission.php@@ -132,4 +132,13 @@ enum Permission: stringself::Delete,];}++ /**+ * Return the application permission-check middleware-string for this permission.+ * Uses registered CheckUserHasPermission middleware.+ */+ public function middleware(): string+ {+ return 'can:' . $this->value;+ }}diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.phpindex e627d66fd..e1fd17238 100644--- a/app/Sorting/BookSorter.php+++ b/app/Sorting/BookSorter.php@@ -187,11 +187,11 @@ class BookSorter$hasNewParent = $newBook->id !== $model->book_id || ($model instanceof Page && $model->chapter_id !== ($sortMapItem->parentChapterId ?? 0));if ($model instanceof Chapter) {- $hasPermission = userCan('book-update', $currentParent)- && userCan('book-update', $newBook)- && userCan('chapter-update', $model)- && (!$hasNewParent || userCan('chapter-create', $newBook))- && (!$hasNewParent || userCan('chapter-delete', $model));+ $hasPermission = userCan(\BookStack\Permissions\Permission::BookUpdate, $currentParent)+ && userCan(\BookStack\Permissions\Permission::BookUpdate, $newBook)+ && userCan(\BookStack\Permissions\Permission::ChapterUpdate, $model)+ && (!$hasNewParent || userCan(\BookStack\Permissions\Permission::ChapterCreate, $newBook))+ && (!$hasNewParent || userCan(\BookStack\Permissions\Permission::ChapterDelete, $model));if (!$hasPermission) {return false;@@ -210,13 +210,13 @@ class BookSorterreturn false;}- $hasPageEditPermission = userCan('page-update', $model);+ $hasPageEditPermission = userCan(\BookStack\Permissions\Permission::PageUpdate, $model);$newParentInRightLocation = ($newParent instanceof Book || ($newParent instanceof Chapter && $newParent->book_id === $newBook->id));$newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';$hasNewParentPermission = userCan($newParentPermission, $newParent);- $hasDeletePermissionIfMoving = (!$hasNewParent || userCan('page-delete', $model));- $hasCreatePermissionIfMoving = (!$hasNewParent || userCan('page-create', $newParent));+ $hasDeletePermissionIfMoving = (!$hasNewParent || userCan(\BookStack\Permissions\Permission::PageDelete, $model));+ $hasCreatePermissionIfMoving = (!$hasNewParent || userCan(\BookStack\Permissions\Permission::PageCreate, $newParent));$hasPermission = $hasCurrentParentPermission&& $newParentInRightLocationdiff --git a/app/Sorting/SortRuleController.php b/app/Sorting/SortRuleController.phpindex a124ffa9c..bb5540a2a 100644--- a/app/Sorting/SortRuleController.php+++ b/app/Sorting/SortRuleController.php@@ -4,13 +4,14 @@ namespace BookStack\Sorting;use BookStack\Activity\ActivityType;use BookStack\Http\Controller;+use BookStack\Permissions\Permission;use Illuminate\Http\Request;class SortRuleController extends Controller{public function __construct(){- $this->middleware('can:settings-manage');+ $this->middleware(Permission::SettingsManage->middleware());}public function create()diff --git a/app/Uploads/Controllers/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.phpindex aff27b3b1..c9b49b890 100644--- a/app/Uploads/Controllers/DrawioImageController.php+++ b/app/Uploads/Controllers/DrawioImageController.php@@ -82,7 +82,7 @@ class DrawioImageController extends Controllerreturn $this->jsonError(trans('errors.drawing_data_not_found'), 404);}- if ($image->type !== 'drawio' || !userCan('page-view', $image->getPage())) {+ if ($image->type !== 'drawio' || !userCan(\BookStack\Permissions\Permission::PageView, $image->getPage())) {return $this->jsonError(trans('errors.drawing_data_not_found'), 404);}diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.phpindex 54ca69c5d..07e384b3a 100644--- a/app/Users/Controllers/UserAccountController.php+++ b/app/Users/Controllers/UserAccountController.php@@ -63,7 +63,7 @@ class UserAccountController extends Controller'profile_image' => array_merge(['nullable'], $this->getImageValidationRules()),]);- $this->userRepo->update($user, $validated, userCan('users-manage'));+ $this->userRepo->update($user, $validated, userCan(\BookStack\Permissions\Permission::UsersManage));// Save profile image if in requestif ($request->hasFile('profile_image')) {@@ -219,7 +219,7 @@ class UserAccountController extends Controller$this->preventAccessInDemoMode();$requestNewOwnerId = intval($request->get('new_owner_id')) ?: null;- $newOwnerId = userCan('users-manage') ? $requestNewOwnerId : null;+ $newOwnerId = userCan(\BookStack\Permissions\Permission::UsersManage) ? $requestNewOwnerId : null;$this->userRepo->destroy(user(), $newOwnerId);diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.phpindex 1efc82500..28c4a3876 100644--- a/app/Users/Controllers/UserApiController.php+++ b/app/Users/Controllers/UserApiController.php@@ -125,7 +125,7 @@ class UserApiController extends ApiController{$data = $this->validate($request, $this->rules($id)['update']);$user = $this->userRepo->getById($id);- $this->userRepo->update($user, $data, userCan('users-manage'));+ $this->userRepo->update($user, $data, userCan(\BookStack\Permissions\Permission::UsersManage));$this->singleFormatter($user);return response()->json($user);diff --git a/app/Users/Controllers/UserSearchController.php b/app/Users/Controllers/UserSearchController.phpindex b6f37bce0..a6596046a 100644--- a/app/Users/Controllers/UserSearchController.php+++ b/app/Users/Controllers/UserSearchController.php@@ -15,9 +15,9 @@ class UserSearchController extends Controllerpublic function forSelect(Request $request){$hasPermission = !user()->isGuest() && (- userCan('users-manage')- || userCan('restrictions-manage-own')- || userCan('restrictions-manage-all')+ userCan(\BookStack\Permissions\Permission::UsersManage)+ || userCan(\BookStack\Permissions\Permission::RestrictionsManageOwn)+ || userCan(\BookStack\Permissions\Permission::RestrictionsManageAll));if (!$hasPermission) {diff --git a/resources/views/attachments/manager-list.blade.php b/resources/views/attachments/manager-list.blade.phpindex 6314aa7b5..10ede4aae 100644--- a/resources/views/attachments/manager-list.blade.php+++ b/resources/views/attachments/manager-list.blade.php@@ -16,7 +16,7 @@type="button"title="{{ trans('entities.attachments_insert_link') }}"class="drag-card-action text-center text-link">@icon('link')</button>- @if(userCan('attachment-update', $attachment))+ @if(userCan(\BookStack\Permissions\Permission::AttachmentUpdate, $attachment))<button component="event-emit-select"option:event-emit-select:name="edit"option:event-emit-select:id="{{ $attachment->id }}"@@ -24,7 +24,7 @@title="{{ trans('common.edit') }}"class="drag-card-action text-center text-link">@icon('edit')</button>@endif- @if(userCan('attachment-delete', $attachment))+ @if(userCan(\BookStack\Permissions\Permission::AttachmentDelete, $attachment))<div component="dropdown" class="flex-fill relative"><button refs="dropdown@toggle"type="button"diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.phpindex 6efd1caea..7f2c8c1b7 100644--- a/resources/views/books/edit.blade.php+++ b/resources/views/books/edit.blade.php@@ -26,7 +26,7 @@</main>- @if(userCan('book-delete', $book) && userCan('book-create-all') && userCan('bookshelf-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookDelete, $book) && userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))@include('books.parts.convert-to-shelf', ['book' => $book])@endif</div>diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.phpindex 197de011d..52d23241a 100644--- a/resources/views/books/index.blade.php+++ b/resources/views/books/index.blade.php@@ -36,7 +36,7 @@<div class="actions mb-xl"><h5>{{ trans('common.actions') }}</h5><div class="icon-list text-link">- @if(userCan('book-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))<a href="{{ url("/create-book") }}" data-shortcut="new" class="icon-list-item"><span>@icon('add')</span><span>{{ trans('entities.books_create') }}</span>@@ -50,7 +50,7 @@<span>{{ trans('entities.tags_view_tags') }}</span></a>- @if(userCan('content-import'))+ @if(userCan(\BookStack\Permissions\Permission::ContentImport))<a href="{{ url('/import') }}" class="icon-list-item"><span>@icon('upload')</span><span>{{ trans('entities.import') }}</span>diff --git a/resources/views/books/parts/list.blade.php b/resources/views/books/parts/list.blade.phpindex 8b658c711..13784d24e 100644--- a/resources/views/books/parts/list.blade.php+++ b/resources/views/books/parts/list.blade.php@@ -24,7 +24,7 @@</div>@else<p class="text-muted">{{ trans('entities.books_empty') }}</p>- @if(userCan('book-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))<div class="icon-list block inline"><a href="{{ url("/create-book") }}"class="icon-list-item text-book">diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.phpindex dbb09fc9e..e28d95648 100644--- a/resources/views/books/show.blade.php+++ b/resources/views/books/show.blade.php@@ -43,13 +43,13 @@<p class="text-muted italic mb-m mt-xl">{{ trans('entities.books_empty_contents') }}</p><div class="icon-list block inline">- @if(userCan('page-create', $book))+ @if(userCan(\BookStack\Permissions\Permission::PageCreate, $book))<a href="{{ $book->getUrl('/create-page') }}" class="icon-list-item text-page"><span class="icon">@icon('page')</span><span>{{ trans('entities.books_empty_create_page') }}</span></a>@endif- @if(userCan('chapter-create', $book))+ @if(userCan(\BookStack\Permissions\Permission::ChapterCreate, $book))<a href="{{ $book->getUrl('/create-chapter') }}" class="icon-list-item text-chapter"><span class="icon">@icon('chapter')</span><span>{{ trans('entities.books_empty_add_chapter') }}</span>@@ -73,7 +73,7 @@@include('entities.meta', ['entity' => $book, 'watchOptions' => $watchOptions])@if($book->hasPermissions())<div class="active-restriction">- @if(userCan('restrictions-manage', $book))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))<a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">@icon('lock')<div>{{ trans('entities.books_permissions_active') }}</div>@@ -93,13 +93,13 @@<h5>{{ trans('common.actions') }}</h5><div class="icon-list text-link">- @if(userCan('page-create', $book))+ @if(userCan(\BookStack\Permissions\Permission::PageCreate, $book))<a href="{{ $book->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item"><span>@icon('add')</span><span>{{ trans('entities.pages_new') }}</span></a>@endif- @if(userCan('chapter-create', $book))+ @if(userCan(\BookStack\Permissions\Permission::ChapterCreate, $book))<a href="{{ $book->getUrl('/create-chapter') }}" data-shortcut="new" class="icon-list-item"><span>@icon('add')</span><span>{{ trans('entities.chapters_new') }}</span>@@ -108,7 +108,7 @@<hr class="primary-background">- @if(userCan('book-update', $book))+ @if(userCan(\BookStack\Permissions\Permission::BookUpdate, $book))<a href="{{ $book->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item"><span>@icon('edit')</span><span>{{ trans('common.edit') }}</span>@@ -118,19 +118,19 @@<span>{{ trans('common.sort') }}</span></a>@endif- @if(userCan('book-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))<a href="{{ $book->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item"><span>@icon('copy')</span><span>{{ trans('common.copy') }}</span></a>@endif- @if(userCan('restrictions-manage', $book))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))<a href="{{ $book->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item"><span>@icon('lock')</span><span>{{ trans('entities.permissions') }}</span></a>@endif- @if(userCan('book-delete', $book))+ @if(userCan(\BookStack\Permissions\Permission::BookDelete, $book))<a href="{{ $book->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item"><span>@icon('delete')</span><span>{{ trans('common.delete') }}</span>@@ -145,7 +145,7 @@@if(!user()->isGuest())@include('entities.favourite-action', ['entity' => $book])@endif- @if(userCan('content-export'))+ @if(userCan(\BookStack\Permissions\Permission::ContentExport))@include('entities.export-menu', ['entity' => $book])@endif</div>diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.phpindex 36058eff8..5ace966f5 100644--- a/resources/views/chapters/edit.blade.php+++ b/resources/views/chapters/edit.blade.php@@ -23,7 +23,7 @@</form></main>- @if(userCan('chapter-delete', $chapter) && userCan('book-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter) && userCan(\BookStack\Permissions\Permission::BookCreateAll))@include('chapters.parts.convert-to-book')@endifdiff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.phpindex 45e43ad96..da914b32d 100644--- a/resources/views/chapters/show.blade.php+++ b/resources/views/chapters/show.blade.php@@ -37,13 +37,13 @@<p class="text-muted italic mb-m mt-xl">{{ trans('entities.chapters_empty') }}</p><div class="icon-list block inline">- @if(userCan('page-create', $chapter))+ @if(userCan(\BookStack\Permissions\Permission::PageCreate, $chapter))<a href="{{ $chapter->getUrl('/create-page') }}" class="icon-list-item text-page"><span class="icon">@icon('page')</span><span>{{ trans('entities.books_empty_create_page') }}</span></a>@endif- @if(userCan('book-update', $book))+ @if(userCan(\BookStack\Permissions\Permission::BookUpdate, $book))<a href="{{ $book->getUrl('/sort') }}" class="icon-list-item text-book"><span class="icon">@icon('book')</span><span>{{ trans('entities.books_empty_sort_current_book') }}</span>@@ -71,7 +71,7 @@@if($book->hasPermissions())<div class="active-restriction">- @if(userCan('restrictions-manage', $book))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))<a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">@icon('lock')<div>{{ trans('entities.books_permissions_active') }}</div>@@ -87,7 +87,7 @@@if($chapter->hasPermissions())<div class="active-restriction">- @if(userCan('restrictions-manage', $chapter))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))<a href="{{ $chapter->getUrl('/permissions') }}" class="entity-meta-item">@icon('lock')<div>{{ trans('entities.chapters_permissions_active') }}</div>@@ -107,7 +107,7 @@<h5>{{ trans('common.actions') }}</h5><div class="icon-list text-link">- @if(userCan('page-create', $chapter))+ @if(userCan(\BookStack\Permissions\Permission::PageCreate, $chapter))<a href="{{ $chapter->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item"><span>@icon('add')</span><span>{{ trans('entities.pages_new') }}</span>@@ -116,38 +116,38 @@<hr class="primary-background"/>- @if(userCan('chapter-update', $chapter))+ @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter))<a href="{{ $chapter->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item"><span>@icon('edit')</span><span>{{ trans('common.edit') }}</span></a>@endif- @if(userCanOnAny('create', \BookStack\Entities\Models\Book::class) || userCan('chapter-create-all') || userCan('chapter-create-own'))+ @if(userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCan(\BookStack\Permissions\Permission::ChapterCreateAll) || userCan(\BookStack\Permissions\Permission::ChapterCreateOwn))<a href="{{ $chapter->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item"><span>@icon('copy')</span><span>{{ trans('common.copy') }}</span></a>@endif- @if(userCan('chapter-update', $chapter) && userCan('chapter-delete', $chapter))+ @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter) && userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))<a href="{{ $chapter->getUrl('/move') }}" data-shortcut="move" class="icon-list-item"><span>@icon('folder')</span><span>{{ trans('common.move') }}</span></a>@endif- @if(userCan('restrictions-manage', $chapter))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))<a href="{{ $chapter->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item"><span>@icon('lock')</span><span>{{ trans('entities.permissions') }}</span></a>@endif- @if(userCan('chapter-delete', $chapter))+ @if(userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))<a href="{{ $chapter->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item"><span>@icon('delete')</span><span>{{ trans('common.delete') }}</span></a>@endif- @if($chapter->book && userCan('book-update', $chapter->book))+ @if($chapter->book && userCan(\BookStack\Permissions\Permission::BookUpdate, $chapter->book))<hr class="primary-background"/><a href="{{ $chapter->book->getUrl('/sort') }}" data-shortcut="sort" class="icon-list-item"><span>@icon('sort')</span>@@ -163,7 +163,7 @@@if(!user()->isGuest())@include('entities.favourite-action', ['entity' => $chapter])@endif- @if(userCan('content-export'))+ @if(userCan(\BookStack\Permissions\Permission::ContentExport))@include('entities.export-menu', ['entity' => $chapter])@endif</div>diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.phpindex 67aac7203..10cd02035 100644--- a/resources/views/comments/comment.blade.php+++ b/resources/views/comments/comment.blade.php@@ -33,23 +33,23 @@@endif</div><div class="right-meta flex-container-row justify-flex-end items-center px-s">- @if(!$readOnly && (userCan('comment-create-all') || userCan('comment-update', $comment) || userCan('comment-delete', $comment)))+ @if(!$readOnly && (userCan(\BookStack\Permissions\Permission::CommentCreateAll) || userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment) || userCan(\BookStack\Permissions\Permission::CommentDelete, $comment)))<div class="actions mr-s">- @if(userCan('comment-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::CommentCreateAll))<button refs="page-comment@reply-button" type="button"class="text-button text-muted hover-underline text-small p-xs">@icon('reply') {{ trans('common.reply') }}</button>@endif- @if(!$comment->parent_id && (userCan('comment-update', $comment) || userCan('comment-delete', $comment)))+ @if(!$comment->parent_id && (userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment) || userCan(\BookStack\Permissions\Permission::CommentDelete, $comment)))<button refs="page-comment@archive-button"type="button"data-is-archived="{{ $comment->archived ? 'true' : 'false' }}"class="text-button text-muted hover-underline text-small p-xs">@icon('archive') {{ trans('common.' . ($comment->archived ? 'unarchive' : 'archive')) }}</button>@endif- @if(userCan('comment-update', $comment))+ @if(userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment))<button refs="page-comment@edit-button" type="button"class="text-button text-muted hover-underline text-small p-xs">@icon('edit') {{ trans('common.edit') }}</button>@endif- @if(userCan('comment-delete', $comment))+ @if(userCan(\BookStack\Permissions\Permission::CommentDelete, $comment))<div component="dropdown" class="dropdown-container"><button type="button" refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false"class="text-button text-muted hover-underline text-small p-xs">@icon('delete') {{ trans('common.delete') }}</button>@@ -100,7 +100,7 @@{!! $commentHtml !!}</div>- @if(!$readOnly && userCan('comment-update', $comment))+ @if(!$readOnly && userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment))<form novalidate refs="page-comment@form" hidden class="content pt-s px-s block"><div class="form-group description-input"><textarea refs="page-comment@input" name="html" rows="3"diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.phpindex a5f0168a5..9dc0a9b89 100644--- a/resources/views/comments/comments.blade.php+++ b/resources/views/comments/comments.blade.php@@ -22,7 +22,7 @@refs="page-comments@archived-tab"aria-selected="false">{{ trans_choice('entities.comment_archived_count', count($commentTree->getArchived())) }}</button></div>- @if ($commentTree->empty() && userCan('comment-create-all'))+ @if ($commentTree->empty() && userCan(\BookStack\Permissions\Permission::CommentCreateAll))<div refs="page-comments@add-button-container" class="ml-m flex-container-row" ><button type="button"refs="page-comments@add-comment-button"@@ -45,7 +45,7 @@<p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p>- @if(userCan('comment-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::CommentCreateAll))@include('comments.create')@if (!$commentTree->empty())<div refs="page-comments@addButtonContainer" class="ml-m flex-container-row">@@ -70,7 +70,7 @@<p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p></div>- @if(userCan('comment-create-all') || $commentTree->canUpdateAny())+ @if(userCan(\BookStack\Permissions\Permission::CommentCreateAll) || $commentTree->canUpdateAny())@push('body-end')@include('form.editor-translations')@include('entities.selector-popup')diff --git a/resources/views/entities/book-tree.blade.php b/resources/views/entities/book-tree.blade.phpindex ce016143a..bcc521306 100644--- a/resources/views/entities/book-tree.blade.php+++ b/resources/views/entities/book-tree.blade.php@@ -5,7 +5,7 @@<h5>{{ trans('entities.books_navigation') }}</h5><ul class="sidebar-page-list mt-xs menu entity-list">- @if (userCan('view', $book))+ @if (userCan(\BookStack\Permissions\Permission::View, $book))<li class="list-item-book book">@include('entities.list-item-basic', ['entity' => $book, 'classes' => ($current->matches($book)? 'selected' : '')])</li>diff --git a/resources/views/entities/breadcrumbs.blade.php b/resources/views/entities/breadcrumbs.blade.phpindex d078d9873..825909947 100644--- a/resources/views/entities/breadcrumbs.blade.php+++ b/resources/views/entities/breadcrumbs.blade.php@@ -38,7 +38,7 @@<span>@icon($crumb['icon'])</span><span>{{ $crumb['text'] }}</span></a>- @elseif($isEntity && userCan('view', $crumb))+ @elseif($isEntity && userCan(\BookStack\Permissions\Permission::View, $crumb))@if($breadcrumbCount > 0)@include('entities.breadcrumb-listing', ['entity' => $crumb])@endifdiff --git a/resources/views/home/books.blade.php b/resources/views/home/books.blade.phpindex e0d2aeb1c..afd3f30fc 100644--- a/resources/views/home/books.blade.php+++ b/resources/views/home/books.blade.php@@ -12,7 +12,7 @@<div class="actions mb-xl"><h5>{{ trans('common.actions') }}</h5><div class="icon-list text-link">- @if(userCan('book-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))<a href="{{ url("/create-book") }}" class="icon-list-item"><span>@icon('add')</span><span>{{ trans('entities.books_create') }}</span>diff --git a/resources/views/home/shelves.blade.php b/resources/views/home/shelves.blade.phpindex dd2c81b16..7a4d002a0 100644--- a/resources/views/home/shelves.blade.php+++ b/resources/views/home/shelves.blade.php@@ -12,7 +12,7 @@<div class="actions mb-xl"><h5>{{ trans('common.actions') }}</h5><div class="icon-list text-link">- @if(userCan('bookshelf-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))<a href="{{ url("/create-shelf") }}" class="icon-list-item"><span>@icon('add')</span><span>{{ trans('entities.shelves_new_action') }}</span>diff --git a/resources/views/layouts/parts/header-links.blade.php b/resources/views/layouts/parts/header-links.blade.phpindex 697f406c3..c3d2f58da 100644--- a/resources/views/layouts/parts/header-links.blade.php+++ b/resources/views/layouts/parts/header-links.blade.php@@ -2,16 +2,16 @@@if (user()->hasAppAccess())<a class="hide-over-l" href="{{ url('/search') }}">@icon('search'){{ trans('common.search') }}</a>- @if(userCanOnAny('view', \BookStack\Entities\Models\Bookshelf::class) || userCan('bookshelf-view-all') || userCan('bookshelf-view-own'))+ @if(userCanOnAny(\BookStack\Permissions\Permission::View, \BookStack\Entities\Models\Bookshelf::class) || userCan(\BookStack\Permissions\Permission::BookshelfViewAll) || userCan(\BookStack\Permissions\Permission::BookshelfViewOwn))<a href="{{ url('/shelves') }}"data-shortcut="shelves_view">@icon('bookshelf'){{ trans('entities.shelves') }}</a>@endif<a href="{{ url('/books') }}" data-shortcut="books_view">@icon('books'){{ trans('entities.books') }}</a>- @if(!user()->isGuest() && userCan('settings-manage'))+ @if(!user()->isGuest() && userCan(\BookStack\Permissions\Permission::SettingsManage))<a href="{{ url('/settings') }}"data-shortcut="settings_view">@icon('settings'){{ trans('settings.settings') }}</a>@endif- @if(!user()->isGuest() && userCan('users-manage') && !userCan('settings-manage'))+ @if(!user()->isGuest() && userCan(\BookStack\Permissions\Permission::UsersManage) && !userCan(\BookStack\Permissions\Permission::SettingsManage))<a href="{{ url('/settings/users') }}"data-shortcut="settings_view">@icon('users'){{ trans('settings.users') }}</a>@endifdiff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.phpindex ceb5dd64a..a3ea58374 100644--- a/resources/views/pages/parts/editor-toolbar.blade.php+++ b/resources/views/pages/parts/editor-toolbar.blade.php@@ -50,7 +50,7 @@<div>{{ trans('entities.pages_edit_delete_draft') }}</div></button></li>- @if(userCan('editor-change'))+ @if(userCan(\BookStack\Permissions\Permission::EditorChange))<li role="presentation"><hr></li>diff --git a/resources/views/pages/parts/editor-toolbox.blade.php b/resources/views/pages/parts/editor-toolbox.blade.phpindex 4ecac26a5..8b7a68a9a 100644--- a/resources/views/pages/parts/editor-toolbox.blade.php+++ b/resources/views/pages/parts/editor-toolbox.blade.php@@ -4,7 +4,7 @@<div class="tabs-inner flex-container-column justify-center"><button type="button" refs="editor-toolbox@toggle" title="{{ trans('entities.toggle_sidebar') }}" aria-expanded="false" class="toolbox-toggle">@icon('caret-left-circle')</button><button type="button" refs="editor-toolbox@tab-button" data-tab="tags" title="{{ trans('entities.page_tags') }}" class="active">@icon('tag')</button>- @if(userCan('attachment-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::AttachmentCreateAll))<button type="button" refs="editor-toolbox@tab-button" data-tab="files" title="{{ trans('entities.attachments') }}">@icon('attach')</button>@endif<button type="button" refs="editor-toolbox@tab-button" data-tab="templates" title="{{ trans('entities.templates') }}">@icon('template')</button>@@ -21,7 +21,7 @@</div></div>- @if(userCan('attachment-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::AttachmentCreateAll))@include('attachments.manager', ['page' => $page])@endifdiff --git a/resources/views/pages/parts/image-manager-form.blade.php b/resources/views/pages/parts/image-manager-form.blade.phpindex 452a0aaa1..2850caba9 100644--- a/resources/views/pages/parts/image-manager-form.blade.php+++ b/resources/views/pages/parts/image-manager-form.blade.php@@ -38,17 +38,17 @@<input id="name" class="input-base" type="text" name="name" value="{{ $image->name }}"></div><div class="flex-container-row justify-space-between gap-m">- @if(userCan('image-delete', $image) || userCan('image-update', $image))+ @if(userCan(\BookStack\Permissions\Permission::ImageDelete, $image) || userCan(\BookStack\Permissions\Permission::ImageUpdate, $image))<div component="dropdown"class="dropdown-container"><button refs="dropdown@toggle" type="button" class="button icon outline">@icon('more')</button><div refs="dropdown@menu" class="dropdown-menu anchor-left">- @if(userCan('image-delete', $image))+ @if(userCan(\BookStack\Permissions\Permission::ImageDelete, $image))<button type="button"id="image-manager-delete"class="text-item">{{ trans('common.delete') }}</button>@endif- @if(userCan('image-update', $image))+ @if(userCan(\BookStack\Permissions\Permission::ImageUpdate, $image))<button type="button"id="image-manager-replace"refs="dropzone@select-button"@@ -105,7 +105,7 @@@if($image->createdBy)<div>@icon('user') {{ trans('components.image_uploaded_by', ['userName' => $image->createdBy->name]) }}</div>@endif- @if(($page = $image->getPage()) && userCan('view', $page))+ @if(($page = $image->getPage()) && userCan(\BookStack\Permissions\Permission::View, $page))<div>@icon('page'){!! trans('components.image_uploaded_to', [diff --git a/resources/views/pages/parts/pointer.blade.php b/resources/views/pages/parts/pointer.blade.phpindex f6487b666..6a40c86f0 100644--- a/resources/views/pages/parts/pointer.blade.php+++ b/resources/views/pages/parts/pointer.blade.php@@ -26,11 +26,11 @@</div></div><div>- @if(userCan('page-update', $page))+ @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))<a href="{{ $page->getUrl('/edit') }}" id="pointer-edit" data-edit-href="{{ $page->getUrl('/edit') }}"class="button primary outline icon heading-edit-icon px-xs" title="{{ trans('entities.pages_edit_content_link')}}">@icon('edit')</a>@endif- @if($commentTree->enabled() && userCan('comment-create-all'))+ @if($commentTree->enabled() && userCan(\BookStack\Permissions\Permission::CommentCreateAll))<button type="button"refs="pointer@comment-button"class="button primary outline icon px-xs m-none" title="{{ trans('entities.comment_add')}}">@icon('comment')</button>diff --git a/resources/views/pages/parts/revisions-index-row.blade.php b/resources/views/pages/parts/revisions-index-row.blade.phpindex 19b924763..749cfb763 100644--- a/resources/views/pages/parts/revisions-index-row.blade.php+++ b/resources/views/pages/parts/revisions-index-row.blade.php@@ -38,7 +38,7 @@@else<a href="{{ $revision->getUrl() }}" target="_blank" rel="noopener">{{ trans('entities.pages_revisions_preview') }}</a>- @if(userCan('page-update', $revision->page))+ @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $revision->page))<span class="text-muted opacity-70"> | </span><div component="dropdown" class="dropdown-container"><a refs="dropdown@toggle" href="#" aria-haspopup="true" aria-expanded="false">{{ trans('entities.pages_revisions_restore') }}</a>@@ -58,7 +58,7 @@</div>@endif- @if(userCan('page-delete', $revision->page))+ @if(userCan(\BookStack\Permissions\Permission::PageDelete, $revision->page))<span class="text-muted opacity-70"> | </span><div component="dropdown" class="dropdown-container"><a refs="dropdown@toggle" href="#" aria-haspopup="true" aria-expanded="false">{{ trans('common.delete') }}</a>diff --git a/resources/views/pages/parts/template-manager.blade.php b/resources/views/pages/parts/template-manager.blade.phpindex ee4467552..fffc81b56 100644--- a/resources/views/pages/parts/template-manager.blade.php+++ b/resources/views/pages/parts/template-manager.blade.php@@ -1,5 +1,5 @@<div component="template-manager">- @if(userCan('templates-manage'))+ @if(userCan(\BookStack\Permissions\Permission::TemplatesManage))<p class="text-muted small mb-none">{{ trans('entities.templates_explain_set_as_template') }}</p>diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.phpindex 137d43bdb..2216cfd1f 100644--- a/resources/views/pages/show.blade.php+++ b/resources/views/pages/show.blade.php@@ -79,7 +79,7 @@@if($book->hasPermissions())<div class="active-restriction">- @if(userCan('restrictions-manage', $book))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))<a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">@icon('lock')<div>{{ trans('entities.books_permissions_active') }}</div>@@ -95,7 +95,7 @@@if($page->chapter && $page->chapter->hasPermissions())<div class="active-restriction">- @if(userCan('restrictions-manage', $page->chapter))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page->chapter))<a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">@icon('lock')<div>{{ trans('entities.chapters_permissions_active') }}</div>@@ -111,7 +111,7 @@@if($page->hasPermissions())<div class="active-restriction">- @if(userCan('restrictions-manage', $page))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))<a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">@icon('lock')<div>{{ trans('entities.pages_permissions_active') }}</div>@@ -140,20 +140,20 @@<div class="icon-list text-link">{{--User Actions--}}- @if(userCan('page-update', $page))+ @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))<a href="{{ $page->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item"><span>@icon('edit')</span><span>{{ trans('common.edit') }}</span></a>@endif- @if(userCanOnAny('create', \BookStack\Entities\Models\Book::class) || userCanOnAny('create', \BookStack\Entities\Models\Chapter::class) || userCan('page-create-all') || userCan('page-create-own'))+ @if(userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCanOnAny('create', \BookStack\Entities\Models\Chapter::class) || userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn))<a href="{{ $page->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item"><span>@icon('copy')</span><span>{{ trans('common.copy') }}</span></a>@endif- @if(userCan('page-update', $page))- @if(userCan('page-delete', $page))+ @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))+ @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))<a href="{{ $page->getUrl('/move') }}" data-shortcut="move" class="icon-list-item"><span>@icon('folder')</span><span>{{ trans('common.move') }}</span>@@ -164,13 +164,13 @@<span>@icon('history')</span><span>{{ trans('entities.revisions') }}</span></a>- @if(userCan('restrictions-manage', $page))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))<a href="{{ $page->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item"><span>@icon('lock')</span><span>{{ trans('entities.permissions') }}</span></a>@endif- @if(userCan('page-delete', $page))+ @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))<a href="{{ $page->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item"><span>@icon('delete')</span><span>{{ trans('common.delete') }}</span>@@ -185,7 +185,7 @@@if(!user()->isGuest())@include('entities.favourite-action', ['entity' => $page])@endif- @if(userCan('content-export'))+ @if(userCan(\BookStack\Permissions\Permission::ContentExport))@include('entities.export-menu', ['entity' => $page])@endif</div>diff --git a/resources/views/settings/categories/features.blade.php b/resources/views/settings/categories/features.blade.phpindex 5935e21f5..d451a0ba3 100644--- a/resources/views/settings/categories/features.blade.php+++ b/resources/views/settings/categories/features.blade.php@@ -13,7 +13,7 @@<div><label for="setting-app-public" class="setting-list-label">{{ trans('settings.app_public_access') }}</label><p class="small">{!! trans('settings.app_public_access_desc') !!}</p>- @if(userCan('users-manage'))+ @if(userCan(\BookStack\Permissions\Permission::UsersManage))<p class="small mb-none"><a href="{{ url($guestUser->getEditUrl()) }}">{!! trans('settings.app_public_access_desc_guest') !!}</a></p>diff --git a/resources/views/settings/parts/navbar.blade.php b/resources/views/settings/parts/navbar.blade.phpindex e229f5e65..cda8bdae0 100644--- a/resources/views/settings/parts/navbar.blade.php+++ b/resources/views/settings/parts/navbar.blade.php@@ -1,19 +1,19 @@<nav class="active-link-list py-m flex-container-row justify-center wrap">- @if(userCan('settings-manage'))+ @if(userCan(\BookStack\Permissions\Permission::SettingsManage))<a href="{{ url('/settings') }}" @if($selected == 'settings') class="active" @endif>@icon('settings'){{ trans('settings.settings') }}</a><a href="{{ url('/settings/maintenance') }}" @if($selected == 'maintenance') class="active" @endif>@icon('spanner'){{ trans('settings.maint') }}</a>@endif- @if(userCan('settings-manage') && userCan('users-manage'))+ @if(userCan(\BookStack\Permissions\Permission::SettingsManage) && userCan(\BookStack\Permissions\Permission::UsersManage))<a href="{{ url('/settings/audit') }}" @if($selected == 'audit') class="active" @endif>@icon('open-book'){{ trans('settings.audit') }}</a>@endif- @if(userCan('users-manage'))+ @if(userCan(\BookStack\Permissions\Permission::UsersManage))<a href="{{ url('/settings/users') }}" @if($selected == 'users') class="active" @endif>@icon('users'){{ trans('settings.users') }}</a>@endif- @if(userCan('user-roles-manage'))+ @if(userCan(\BookStack\Permissions\Permission::UserRolesManage))<a href="{{ url('/settings/roles') }}" @if($selected == 'roles') class="active" @endif>@icon('lock-open'){{ trans('settings.roles') }}</a>@endif- @if(userCan('settings-manage'))+ @if(userCan(\BookStack\Permissions\Permission::SettingsManage))<a href="{{ url('/settings/webhooks') }}" @if($selected == 'webhooks') class="active" @endif>@icon('webhooks'){{ trans('settings.webhooks') }}</a>@endif</nav>\ No newline at end of filediff --git a/resources/views/settings/roles/edit.blade.php b/resources/views/settings/roles/edit.blade.phpindex bd1dbb763..da7835e1a 100644--- a/resources/views/settings/roles/edit.blade.php+++ b/resources/views/settings/roles/edit.blade.php@@ -35,11 +35,11 @@<img class="avatar small" src="{{ $user->getAvatar(40) }}" alt="{{ $user->name }}"></div><div>- @if(userCan('users-manage') || user()->id == $user->id)+ @if(userCan(\BookStack\Permissions\Permission::UsersManage) || user()->id == $user->id)<a href="{{ url("/settings/users/{$user->id}") }}">@endif{{ $user->name }}- @if(userCan('users-manage') || user()->id == $user->id)+ @if(userCan(\BookStack\Permissions\Permission::UsersManage) || user()->id == $user->id)</a>@endif</div>diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.phpindex 85663b413..bb7c57e0f 100644--- a/resources/views/shelves/index.blade.php+++ b/resources/views/shelves/index.blade.php@@ -9,7 +9,7 @@<div class="actions mb-xl"><h5>{{ trans('common.actions') }}</h5><div class="icon-list text-link">- @if(userCan('bookshelf-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))<a href="{{ url("/create-shelf") }}" data-shortcut="new" class="icon-list-item"><span>@icon('add')</span><span>{{ trans('entities.shelves_new_action') }}</span>diff --git a/resources/views/shelves/parts/list.blade.php b/resources/views/shelves/parts/list.blade.phpindex 7f6e02a8b..5be5a7bb6 100644--- a/resources/views/shelves/parts/list.blade.php+++ b/resources/views/shelves/parts/list.blade.php@@ -29,7 +29,7 @@</div>@else<p class="text-muted">{{ trans('entities.shelves_empty') }}</p>- @if(userCan('bookshelf-create-all'))+ @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))<div class="icon-list block inline"><a href="{{ url("/create-shelf") }}"class="icon-list-item text-bookshelf">diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.phpindex 11baccaf4..633f959f3 100644--- a/resources/views/shelves/show.blade.php+++ b/resources/views/shelves/show.blade.php@@ -48,13 +48,13 @@<hr><p class="text-muted italic mt-xl mb-m">{{ trans('entities.shelves_empty_contents') }}</p><div class="icon-list inline block">- @if(userCan('book-create-all') && userCan('bookshelf-update', $shelf))+ @if(userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))<a href="{{ $shelf->getUrl('/create-book') }}" class="icon-list-item text-book"><span class="icon">@icon('add')</span><span>{{ trans('entities.books_create') }}</span></a>@endif- @if(userCan('bookshelf-update', $shelf))+ @if(userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))<a href="{{ $shelf->getUrl('/edit') }}" class="icon-list-item text-bookshelf"><span class="icon">@icon('edit')</span><span>{{ trans('entities.shelves_edit_and_assign') }}</span>@@ -82,7 +82,7 @@@include('entities.meta', ['entity' => $shelf, 'watchOptions' => null])@if($shelf->hasPermissions())<div class="active-restriction">- @if(userCan('restrictions-manage', $shelf))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))<a href="{{ $shelf->getUrl('/permissions') }}" class="entity-meta-item">@icon('lock')<div>{{ trans('entities.shelves_permissions_active') }}</div>@@ -111,7 +111,7 @@<h5>{{ trans('common.actions') }}</h5><div class="icon-list text-link">- @if(userCan('book-create-all') && userCan('bookshelf-update', $shelf))+ @if(userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))<a href="{{ $shelf->getUrl('/create-book') }}" data-shortcut="new" class="icon-list-item"><span class="icon">@icon('add')</span><span>{{ trans('entities.books_new_action') }}</span>@@ -122,21 +122,21 @@<hr class="primary-background">- @if(userCan('bookshelf-update', $shelf))+ @if(userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))<a href="{{ $shelf->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item"><span>@icon('edit')</span><span>{{ trans('common.edit') }}</span></a>@endif- @if(userCan('restrictions-manage', $shelf))+ @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))<a href="{{ $shelf->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item"><span>@icon('lock')</span><span>{{ trans('entities.permissions') }}</span></a>@endif- @if(userCan('bookshelf-delete', $shelf))+ @if(userCan(\BookStack\Permissions\Permission::BookshelfDelete, $shelf))<a href="{{ $shelf->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item"><span>@icon('delete')</span><span>{{ trans('common.delete') }}</span>diff --git a/resources/views/users/account/auth.blade.php b/resources/views/users/account/auth.blade.phpindex d6f85093b..57e6c1f9c 100644--- a/resources/views/users/account/auth.blade.php+++ b/resources/views/users/account/auth.blade.php@@ -81,7 +81,7 @@</section>@endif- @if(userCan('access-api'))+ @if(userCan(\BookStack\Permissions\Permission::AccessApi))@include('users.api-tokens.parts.list', ['user' => user(), 'context' => 'my-account'])@endif@stopdiff --git a/resources/views/users/account/delete.blade.php b/resources/views/users/account/delete.blade.phpindex 75698d919..aa051e9ad 100644--- a/resources/views/users/account/delete.blade.php+++ b/resources/views/users/account/delete.blade.php@@ -12,7 +12,7 @@<p>{{ trans('preferences.delete_my_account_desc') }}</p>- @if(userCan('users-manage'))+ @if(userCan(\BookStack\Permissions\Permission::UsersManage))<hr class="my-l"><div class="grid half gap-xl v-center">diff --git a/resources/views/users/account/layout.blade.php b/resources/views/users/account/layout.blade.phpindex f54a51c5a..df8ebc2d9 100644--- a/resources/views/users/account/layout.blade.php+++ b/resources/views/users/account/layout.blade.php@@ -12,7 +12,7 @@<a href="{{ url('/my-account/profile') }}" class="{{ $category === 'profile' ? 'active' : '' }}">@icon('user') {{ trans('preferences.profile') }}</a><a href="{{ url('/my-account/auth') }}" class="{{ $category === 'auth' ? 'active' : '' }}">@icon('security') {{ trans('preferences.auth') }}</a><a href="{{ url('/my-account/shortcuts') }}" class="{{ $category === 'shortcuts' ? 'active' : '' }}">@icon('shortcuts') {{ trans('preferences.shortcuts_interface') }}</a>- @if(userCan('receive-notifications'))+ @if(userCan(\BookStack\Permissions\Permission::ReceiveNotifications))<a href="{{ url('/my-account/notifications') }}" class="{{ $category === 'notifications' ? 'active' : '' }}">@icon('notifications') {{ trans('preferences.notifications') }}</a>@endif</nav>diff --git a/resources/views/users/account/profile.blade.php b/resources/views/users/account/profile.blade.phpindex 617c09723..778e35885 100644--- a/resources/views/users/account/profile.blade.php+++ b/resources/views/users/account/profile.blade.php@@ -35,10 +35,10 @@<p class="text-small mb-none">{{ trans('preferences.profile_email_desc') }}</p></div><div class="flex stretch-inputs">- @include('form.text', ['name' => 'email', 'disabled' => !userCan('users-manage')])+ @include('form.text', ['name' => 'email', 'disabled' => !userCan(\BookStack\Permissions\Permission::UsersManage)])</div></div>- @if(!userCan('users-manage'))+ @if(!userCan(\BookStack\Permissions\Permission::UsersManage))<p class="text-small text-muted">{{ trans('preferences.profile_email_no_permission') }}</p>@endif</div>@@ -75,7 +75,7 @@</form></section>- @if(userCan('users-manage'))+ @if(userCan(\BookStack\Permissions\Permission::UsersManage))<section class="card content-wrap auto-height"><div class="flex-container-row gap-l items-center wrap"><div class="flex">diff --git a/resources/views/users/api-tokens/parts/list.blade.php b/resources/views/users/api-tokens/parts/list.blade.phpindex 70aaa58f3..bd8dd53cc 100644--- a/resources/views/users/api-tokens/parts/list.blade.php+++ b/resources/views/users/api-tokens/parts/list.blade.php@@ -2,7 +2,7 @@<div class="flex-container-row wrap justify-space-between items-center mb-s"><h2 class="list-heading">{{ trans('settings.users_api_tokens') }}</h2><div class="text-right pt-xs">- @if(userCan('access-api'))+ @if(userCan(\BookStack\Permissions\Permission::AccessApi))<a href="{{ url('/api/docs') }}" class="button outline">{{ trans('settings.users_api_tokens_docs') }}</a><a href="{{ url('/api-tokens/' . $user->id . '/create?context=' . $context) }}" class="button outline">{{ trans('settings.users_api_tokens_create') }}</a>@endifdiff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.phpindex dafc623e1..daffc91a3 100644--- a/resources/views/users/create.blade.php+++ b/resources/views/users/create.blade.php@@ -18,7 +18,7 @@</div><div class="form-group text-right">- <a href="{{ url(userCan('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>+ <a href="{{ url(userCan(\BookStack\Permissions\Permission::UsersManage) ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a><button class="button" type="submit">{{ trans('common.save') }}</button></div>diff --git a/resources/views/users/parts/form.blade.php b/resources/views/users/parts/form.blade.phpindex bf1eb08a7..86287646f 100644--- a/resources/views/users/parts/form.blade.php+++ b/resources/views/users/parts/form.blade.php@@ -17,9 +17,9 @@@include('form.text', ['name' => 'name'])</div><div>- @if($authMethod !== 'ldap' || userCan('users-manage'))+ @if($authMethod !== 'ldap' || userCan(\BookStack\Permissions\Permission::UsersManage))<label for="email">{{ trans('auth.email') }}</label>- @include('form.text', ['name' => 'email', 'disabled' => !userCan('users-manage')])+ @include('form.text', ['name' => 'email', 'disabled' => !userCan(\BookStack\Permissions\Permission::UsersManage)])@endif</div></div>diff --git a/tests/Permissions/EntityPermissionsTest.php b/tests/Permissions/EntityPermissionsTest.phpindex 43d0cfc50..ec2756b12 100644--- a/tests/Permissions/EntityPermissionsTest.php+++ b/tests/Permissions/EntityPermissionsTest.php@@ -7,6 +7,7 @@ use BookStack\Entities\Models\Bookshelf;use BookStack\Entities\Models\Chapter;use BookStack\Entities\Models\Entity;use BookStack\Entities\Models\Page;+use BookStack\Permissions\Permission;use BookStack\Users\Models\Role;use BookStack\Users\Models\User;use Exception;@@ -25,7 +26,7 @@ class EntityPermissionsTest extends TestCase$this->viewer = $this->users->viewer();}- protected function setRestrictionsForTestRoles(Entity $entity, array $actions = [])+ protected function setRestrictionsForTestRoles(Entity $entity, array $actions = []): void{$roles = [$this->user->roles->first(),@@ -676,7 +677,7 @@ class EntityPermissionsTest extends TestCase$this->permissions->setEntityPermissions($book, ['update'], [$viewerRole], false);$this->permissions->setEntityPermissions($chapter, [], [$viewerRole], true);- $this->assertFalse(userCan('chapter-update', $chapter));+ $this->assertFalse(userCan(Permission::ChapterUpdate, $chapter));}public function test_access_to_item_allowed_if_inheritance_active_and_permission_prevented_via_role_but_allowed_via_parent()@@ -692,7 +693,7 @@ class EntityPermissionsTest extends TestCase$this->permissions->setEntityPermissions($chapter, [], [$viewerRole], true);$this->actingAs($user);- $this->assertTrue(userCan('chapter-update', $chapter));+ $this->assertTrue(userCan(Permission::ChapterUpdate, $chapter));}public function test_book_permissions_can_be_generated_without_error_if_child_chapter_is_in_recycle_bin()