Permissions: Cleanup after review of enum implementation PR

ssddanbrown · ssddanbrown · commit a70c733f2757 · 2025-09-10T11:36:54.000+01:00
diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 
 class CommentTree
 {
@@ -70,7 +71,7 @@ public function getCommentNodeForId(int $commentId): ?CommentTreeNode
     public function canUpdateAny(): bool
     {
         foreach ($this->comments as $comment) {
-            if (userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment)) {
+            if (userCan(Permission::CommentUpdate, $comment)) {
                 return true;
             }
         }
diff --git a/app/Activity/Tools/TagClassGenerator.php b/app/Activity/Tools/TagClassGenerator.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 
 class TagClassGenerator
 {
@@ -26,14 +27,14 @@ public function generate(): array
              array_push($classes, ...$this->generateClassesForTag($tag));
         }
 
-        if ($this->entity instanceof BookChild && userCan(\BookStack\Permissions\Permission::View, $this->entity->book)) {
+        if ($this->entity instanceof BookChild && userCan(Permission::BookView, $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(\BookStack\Permissions\Permission::View, $this->entity->chapter)) {
+        if ($this->entity instanceof Page && $this->entity->chapter && userCan(Permission::ChapterView, $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.php
@@ -342,7 +342,7 @@ public function destroyDraft(string $bookSlug, int $pageId)
 
         $this->showSuccessNotification(trans('entities.pages_delete_draft_success'));
 
-        if ($chapter && userCan(\BookStack\Permissions\Permission::View, $chapter)) {
+        if ($chapter && userCan(Permission::ChapterView, $chapter)) {
             return redirect($chapter->getUrl());
         }
 
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
@@ -11,6 +11,7 @@
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Permission;
 use BookStack\Util\DatabaseTransaction;
 use Exception;
 
@@ -87,7 +88,7 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
             throw new MoveOperationException('Book to move chapter into not found');
         }
 
-        if (!userCan(\BookStack\Permissions\Permission::ChapterCreate, $parent)) {
+        if (!userCan(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.php
@@ -16,6 +16,7 @@
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
 use BookStack\Util\DatabaseTransaction;
@@ -55,7 +56,7 @@ public function getNewDraftPage(Entity $parent)
         }
 
         $defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;
-        if ($defaultTemplate && userCan(\BookStack\Permissions\Permission::View, $defaultTemplate)) {
+        if ($defaultTemplate && userCan(Permission::PageView, $defaultTemplate)) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,
                 'markdown' => $defaultTemplate->markdown,
@@ -142,7 +143,7 @@ public function update(Page $page, array $input): Page
 
     protected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void
     {
-        if (isset($input['template']) && userCan(\BookStack\Permissions\Permission::TemplatesManage)) {
+        if (isset($input['template']) && userCan(Permission::TemplatesManage)) {
             $page->template = ($input['template'] === 'true');
         }
 
@@ -165,7 +166,7 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in
             $pageContent->setNewHTML($input['html'], user());
         }
 
-        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan(\BookStack\Permissions\Permission::EditorChange)) {
+        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan(Permission::EditorChange)) {
             $page->editor = $newEditor->value;
         } elseif (empty($page->editor)) {
             $page->editor = $defaultEditor->value;
@@ -271,7 +272,7 @@ public function move(Page $page, string $parentIdentifier): Entity
             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 
-        if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {
+        if (!userCan(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.php
@@ -12,6 +12,7 @@
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\PageRepo;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\UploadedFile;
@@ -49,7 +50,7 @@ public function cloneChapter(Chapter $original, Book $parent, string $newName):
 
         $copyChapter = $this->chapterRepo->create($chapterDetails, $parent);
 
-        if (userCan(\BookStack\Permissions\Permission::PageCreate, $copyChapter)) {
+        if (userCan(Permission::PageCreate, $copyChapter)) {
             /** @var Page $page */
             foreach ($original->getVisiblePages() as $page) {
                 $this->clonePage($page, $copyChapter, $page->name);
@@ -61,7 +62,7 @@ public function cloneChapter(Chapter $original, Book $parent, string $newName):
 
     /**
      * Clone the given book.
-     * Clones all child chapters & pages.
+     * Clones all child chapters and pages.
      */
     public function cloneBook(Book $original, string $newName): Book
     {
@@ -74,19 +75,19 @@ public function cloneBook(Book $original, string $newName): Book
         // Clone contents
         $directChildren = $original->getDirectVisibleChildren();
         foreach ($directChildren as $child) {
-            if ($child instanceof Chapter && userCan(\BookStack\Permissions\Permission::ChapterCreate, $copyBook)) {
+            if ($child instanceof Chapter && userCan(Permission::ChapterCreate, $copyBook)) {
                 $this->cloneChapter($child, $copyBook, $child->name);
             }
 
-            if ($child instanceof Page && !$child->draft && userCan(\BookStack\Permissions\Permission::PageCreate, $copyBook)) {
+            if ($child instanceof Page && !$child->draft && userCan(Permission::PageCreate, $copyBook)) {
                 $this->clonePage($child, $copyBook, $child->name);
             }
         }
 
         // Clone bookshelf relationships
         /** @var Bookshelf $shelf */
         foreach ($original->shelves as $shelf) {
-            if (userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf)) {
+            if (userCan(Permission::BookshelfUpdate, $shelf)) {
                 $shelf->appendBook($copyBook);
             }
         }
diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
+use BookStack\Permissions\Permission;
 
 class PageEditorData
 {
@@ -98,9 +99,9 @@ protected function getEditorType(Page $page): PageEditorType
     {
         $editorType = PageEditorType::forPage($page) ?: PageEditorType::getSystemDefault();
 
-        // Use requested editor if valid and if we have permission
+        // Use the requested editor if valid and if we have permission
         $requestedType = PageEditorType::fromRequestValue($this->requestedEditor);
-        if ($requestedType && userCan(\BookStack\Permissions\Permission::EditorChange)) {
+        if ($requestedType && userCan(Permission::EditorChange)) {
             $editorType = $requestedType;
         }
 
diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.php
@@ -150,7 +150,7 @@ public function updateBookPermissionsFromShelf(Bookshelf $shelf, $checkUserPermi
 
         /** @var Book $book */
         foreach ($shelfBooks as $book) {
-            if ($checkUserPermissions && !userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book)) {
+            if ($checkUserPermissions && !userCan(Permission::RestrictionsManage, $book)) {
                 continue;
             }
             $book->permissions()->delete();
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
@@ -16,6 +16,7 @@
 use BookStack\Exports\ZipExports\ZipExportValidator;
 use BookStack\Exports\ZipExports\ZipImportRunner;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\FileStorage;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -46,7 +47,7 @@ public function queryVisible(): Builder
     {
         $query = Import::query();
 
-        if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {
+        if (!userCan(Permission::SettingsManage)) {
             $query->where('created_by', user()->id);
         }
 
@@ -57,7 +58,7 @@ public function findVisible(int $id): Import
     {
         $query = Import::query();
 
-        if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {
+        if (!userCan(Permission::SettingsManage)) {
             $query->where('created_by', user()->id);
         }
 
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
@@ -12,6 +12,7 @@
 use BookStack\Exports\ZipExports\Models\ZipExportImage;
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\Image;
 
@@ -135,7 +136,7 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
             // 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(\BookStack\Permissions\Permission::View, $page))) {
+            if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan(Permission::PageView, $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.php
@@ -18,6 +18,7 @@
 use BookStack\Exports\ZipExports\Models\ZipExportImage;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Exports\ZipExports\Models\ZipExportTag;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
 use BookStack\Uploads\FileStorage;
@@ -288,7 +289,7 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         $attachments = [];
 
         if ($exportModel instanceof ZipExportBook) {
-            if (!userCan(\BookStack\Permissions\Permission::BookCreateAll)) {
+            if (!userCan(Permission::BookCreateAll)) {
                 $errors[] = trans('errors.import_perms_books');
             }
             array_push($pages, ...$exportModel->pages);
@@ -317,25 +318,25 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
 
         if (count($pages) > 0) {
             if ($parent) {
-                if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {
+                if (!userCan(Permission::PageCreate, $parent)) {
                     $errors[] = trans('errors.import_perms_pages');
                 }
             } else {
-                $hasPermission = userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn);
+                $hasPermission = userCan(Permission::PageCreateAll) || userCan(Permission::PageCreateOwn);
                 if (!$hasPermission) {
                     $errors[] = trans('errors.import_perms_pages');
                 }
             }
         }
 
         if (count($images) > 0) {
-            if (!userCan(\BookStack\Permissions\Permission::ImageCreateAll)) {
+            if (!userCan(Permission::ImageCreateAll)) {
                 $errors[] = trans('errors.import_perms_images');
             }
         }
 
         if (count($attachments) > 0) {
-            if (!userCan(\BookStack\Permissions\Permission::AttachmentCreateAll)) {
+            if (!userCan(Permission::AttachmentCreateAll)) {
                 $errors[] = trans('errors.import_perms_attachments');
             }
         }
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
@@ -8,6 +8,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Permissions\Permission;
 
 class BookSorter
 {
@@ -187,11 +188,11 @@ protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChi
 
         $hasNewParent = $newBook->id !== $model->book_id || ($model instanceof Page && $model->chapter_id !== ($sortMapItem->parentChapterId ?? 0));
         if ($model instanceof Chapter) {
-            $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));
+            $hasPermission = userCan(Permission::BookUpdate, $currentParent)
+                && userCan(Permission::BookUpdate, $newBook)
+                && userCan(Permission::ChapterUpdate, $model)
+                && (!$hasNewParent || userCan(Permission::ChapterCreate, $newBook))
+                && (!$hasNewParent || userCan(Permission::ChapterDelete, $model));
 
             if (!$hasPermission) {
                 return false;
@@ -210,13 +211,13 @@ protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChi
                 return false;
             }
 
-            $hasPageEditPermission = userCan(\BookStack\Permissions\Permission::PageUpdate, $model);
+            $hasPageEditPermission = userCan(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(\BookStack\Permissions\Permission::PageDelete, $model));
-            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan(\BookStack\Permissions\Permission::PageCreate, $newParent));
+            $hasDeletePermissionIfMoving = (!$hasNewParent || userCan(Permission::PageDelete, $model));
+            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan(Permission::PageCreate, $newParent));
 
             $hasPermission = $hasCurrentParentPermission
                 && $newParentInRightLocation
diff --git a/app/Uploads/Controllers/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.php
@@ -82,7 +82,7 @@ public function getAsBase64($id)
             return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
         }
 
-        if ($image->type !== 'drawio' || !userCan(\BookStack\Permissions\Permission::PageView, $image->getPage())) {
+        if ($image->type !== 'drawio' || !userCan(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.php
@@ -63,9 +63,9 @@ public function updateProfile(Request $request, ImageRepo $imageRepo)
             'profile_image'    => array_merge(['nullable'], $this->getImageValidationRules()),
         ]);
 
-        $this->userRepo->update($user, $validated, userCan(\BookStack\Permissions\Permission::UsersManage));
+        $this->userRepo->update($user, $validated, userCan(Permission::UsersManage));
 
-        // Save profile image if in request
+        // Save the profile image if in request
         if ($request->hasFile('profile_image')) {
             $imageUpload = $request->file('profile_image');
             $imageRepo->destroyImage($user->avatar);
@@ -74,7 +74,7 @@ public function updateProfile(Request $request, ImageRepo $imageRepo)
             $user->save();
         }
 
-        // Delete the profile image if reset option is in request
+        // Delete the profile image if the reset option is in request
         if ($request->has('profile_image_reset')) {
             $imageRepo->destroyImage($user->avatar);
             $user->image_id = 0;
@@ -219,7 +219,7 @@ public function destroy(Request $request)
         $this->preventAccessInDemoMode();
 
         $requestNewOwnerId = intval($request->get('new_owner_id')) ?: null;
-        $newOwnerId = userCan(\BookStack\Permissions\Permission::UsersManage) ? $requestNewOwnerId : null;
+        $newOwnerId = userCan(Permission::UsersManage) ? $requestNewOwnerId : null;
 
         $this->userRepo->destroy(user(), $newOwnerId);
 
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
@@ -125,7 +125,7 @@ public function update(Request $request, string $id)
     {
         $data = $this->validate($request, $this->rules($id)['update']);
         $user = $this->userRepo->getById($id);
-        $this->userRepo->update($user, $data, userCan(\BookStack\Permissions\Permission::UsersManage));
+        $this->userRepo->update($user, $data, userCan(Permission::UsersManage));
         $this->singleFormatter($user);
 
         return response()->json($user);
diff --git a/app/Users/Controllers/UserSearchController.php b/app/Users/Controllers/UserSearchController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Users\Controllers;
 
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
@@ -15,9 +16,9 @@ class UserSearchController extends Controller
     public function forSelect(Request $request)
     {
         $hasPermission = !user()->isGuest() && (
-            userCan(\BookStack\Permissions\Permission::UsersManage)
-                || userCan(\BookStack\Permissions\Permission::RestrictionsManageOwn)
-                || userCan(\BookStack\Permissions\Permission::RestrictionsManageAll)
+            userCan(Permission::UsersManage)
+                || userCan(Permission::RestrictionsManageOwn)
+                || userCan(Permission::RestrictionsManageAll)
         );
 
         if (!$hasPermission) {
diff --git a/resources/views/entities/book-tree.blade.php b/resources/views/entities/book-tree.blade.php
@@ -5,7 +5,7 @@ class="book-tree mb-xl"
     <h5>{{ trans('entities.books_navigation') }}</h5>
 
     <ul class="sidebar-page-list mt-xs menu entity-list">
-        @if (userCan(\BookStack\Permissions\Permission::View, $book))
+        @if (userCan(\BookStack\Permissions\Permission::BookView, $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/pages/parts/image-manager-form.blade.php b/resources/views/pages/parts/image-manager-form.blade.php
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use BookStack\Activity\Models\Comment;`
`6`	`6`	`use BookStack\Entities\Models\Page;`
	`7`	`+use BookStack\Permissions\Permission;`
`7`	`8`
`8`	`9`	`class CommentTree`
`9`	`10`	`{`
`@@ -70,7 +71,7 @@ public function getCommentNodeForId(int $commentId): ?CommentTreeNode`
`70`	`71`	`public function canUpdateAny(): bool`
`71`	`72`	`{`
`72`	`73`	`foreach ($this->comments as $comment) {`
`73`		`- if (userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment)) {`
	`74`	`+ if (userCan(Permission::CommentUpdate, $comment)) {`
`74`	`75`	`return true;`
`75`	`76`	`}`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use BookStack\Entities\Models\BookChild;`
`7`	`7`	`use BookStack\Entities\Models\Entity;`
`8`	`8`	`use BookStack\Entities\Models\Page;`
	`9`	`+use BookStack\Permissions\Permission;`
`9`	`10`
`10`	`11`	`class TagClassGenerator`
`11`	`12`	`{`
`@@ -26,14 +27,14 @@ public function generate(): array`
`26`	`27`	`array_push($classes, ...$this->generateClassesForTag($tag));`
`27`	`28`	`}`
`28`	`29`
`29`		`- if ($this->entity instanceof BookChild && userCan(\BookStack\Permissions\Permission::View, $this->entity->book)) {`
	`30`	`+ if ($this->entity instanceof BookChild && userCan(Permission::BookView, $this->entity->book)) {`
`30`	`31`	`$bookTags = $this->entity->book->tags;`
`31`	`32`	`foreach ($bookTags as $bookTag) {`
`32`	`33`	`array_push($classes, ...$this->generateClassesForTag($bookTag, 'book-'));`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`
`36`		`- if ($this->entity instanceof Page && $this->entity->chapter && userCan(\BookStack\Permissions\Permission::View, $this->entity->chapter)) {`
	`37`	`+ if ($this->entity instanceof Page && $this->entity->chapter && userCan(Permission::ChapterView, $this->entity->chapter)) {`
`37`	`38`	`$chapterTags = $this->entity->chapter->tags;`
`38`	`39`	`foreach ($chapterTags as $chapterTag) {`
`39`	`40`	`array_push($classes, ...$this->generateClassesForTag($chapterTag, 'chapter-'));`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public function destroyDraft(string $bookSlug, int $pageId)`
`342`	`342`
`343`	`343`	`$this->showSuccessNotification(trans('entities.pages_delete_draft_success'));`
`344`	`344`
`345`		`- if ($chapter && userCan(\BookStack\Permissions\Permission::View, $chapter)) {`
	`345`	`+ if ($chapter && userCan(Permission::ChapterView, $chapter)) {`
`346`	`346`	`return redirect($chapter->getUrl());`
`347`	`347`	`}`
`348`	`348`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use BookStack\Exceptions\MoveOperationException;`
`12`	`12`	`use BookStack\Exceptions\PermissionsException;`
`13`	`13`	`use BookStack\Facades\Activity;`
	`14`	`+use BookStack\Permissions\Permission;`
`14`	`15`	`use BookStack\Util\DatabaseTransaction;`
`15`	`16`	`use Exception;`
`16`	`17`
`@@ -87,7 +88,7 @@ public function move(Chapter $chapter, string $parentIdentifier): Book`
`87`	`88`	`throw new MoveOperationException('Book to move chapter into not found');`
`88`	`89`	`}`
`89`	`90`
`90`		`- if (!userCan(\BookStack\Permissions\Permission::ChapterCreate, $parent)) {`
	`91`	`+ if (!userCan(Permission::ChapterCreate, $parent)) {`
`91`	`92`	`throw new PermissionsException('User does not have permission to create a chapter within the chosen book');`
`92`	`93`	`}`
`93`	`94`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`use BookStack\Exceptions\MoveOperationException;`
`17`	`17`	`use BookStack\Exceptions\PermissionsException;`
`18`	`18`	`use BookStack\Facades\Activity;`
	`19`	`+use BookStack\Permissions\Permission;`
`19`	`20`	`use BookStack\References\ReferenceStore;`
`20`	`21`	`use BookStack\References\ReferenceUpdater;`
`21`	`22`	`use BookStack\Util\DatabaseTransaction;`
`@@ -55,7 +56,7 @@ public function getNewDraftPage(Entity $parent)`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`$defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;`
`58`		`- if ($defaultTemplate && userCan(\BookStack\Permissions\Permission::View, $defaultTemplate)) {`
	`59`	`+ if ($defaultTemplate && userCan(Permission::PageView, $defaultTemplate)) {`
`59`	`60`	`$page->forceFill([`
`60`	`61`	`'html' => $defaultTemplate->html,`
`61`	`62`	`'markdown' => $defaultTemplate->markdown,`
`@@ -142,7 +143,7 @@ public function update(Page $page, array $input): Page`
`142`	`143`
`143`	`144`	`protected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void`
`144`	`145`	`{`
`145`		`- if (isset($input['template']) && userCan(\BookStack\Permissions\Permission::TemplatesManage)) {`
	`146`	`+ if (isset($input['template']) && userCan(Permission::TemplatesManage)) {`
`146`	`147`	`$page->template = ($input['template'] === 'true');`
`147`	`148`	`}`
`148`	`149`
`@@ -165,7 +166,7 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in`
`165`	`166`	`$pageContent->setNewHTML($input['html'], user());`
`166`	`167`	`}`
`167`	`168`
`168`		`- if (($newEditor !== $currentEditor \|\| empty($page->editor)) && userCan(\BookStack\Permissions\Permission::EditorChange)) {`
	`169`	`+ if (($newEditor !== $currentEditor \|\| empty($page->editor)) && userCan(Permission::EditorChange)) {`
`169`	`170`	`$page->editor = $newEditor->value;`
`170`	`171`	`} elseif (empty($page->editor)) {`
`171`	`172`	`$page->editor = $defaultEditor->value;`
`@@ -271,7 +272,7 @@ public function move(Page $page, string $parentIdentifier): Entity`
`271`	`272`	`throw new MoveOperationException('Book or chapter to move page into not found');`
`272`	`273`	`}`
`273`	`274`
`274`		`- if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {`
	`275`	`+ if (!userCan(Permission::PageCreate, $parent)) {`
`275`	`276`	`throw new PermissionsException('User does not have permission to create a page within the new parent');`
`276`	`277`	`}`
`277`	`278`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use BookStack\Entities\Queries\EntityQueries;`
`8`	`8`	`use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;`
`9`	`9`	`use BookStack\Entities\Tools\Markdown\MarkdownToHtml;`
	`10`	`+use BookStack\Permissions\Permission;`
`10`	`11`
`11`	`12`	`class PageEditorData`
`12`	`13`	`{`
`@@ -98,9 +99,9 @@ protected function getEditorType(Page $page): PageEditorType`
`98`	`99`	`{`
`99`	`100`	`$editorType = PageEditorType::forPage($page) ?: PageEditorType::getSystemDefault();`
`100`	`101`
`101`		`- // Use requested editor if valid and if we have permission`
	`102`	`+ // Use the requested editor if valid and if we have permission`
`102`	`103`	`$requestedType = PageEditorType::fromRequestValue($this->requestedEditor);`
`103`		`- if ($requestedType && userCan(\BookStack\Permissions\Permission::EditorChange)) {`
	`104`	`+ if ($requestedType && userCan(Permission::EditorChange)) {`
`104`	`105`	`$editorType = $requestedType;`
`105`	`106`	`}`
`106`	`107`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function updateBookPermissionsFromShelf(Bookshelf $shelf, $checkUserPermi`
`150`	`150`
`151`	`151`	`/** @var Book $book */`
`152`	`152`	`foreach ($shelfBooks as $book) {`
`153`		`- if ($checkUserPermissions && !userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book)) {`
	`153`	`+ if ($checkUserPermissions && !userCan(Permission::RestrictionsManage, $book)) {`
`154`	`154`	`continue;`
`155`	`155`	`}`
`156`	`156`	`$book->permissions()->delete();`