Updated version and assets for release v21.11

Revert "Update german translation"

.env.example.complete

@@ -42,7 +42,7 @@ APP_TIMEZONE=UTC
 # overrides can be made. Defaults to disabled.
 APP_THEME=false
 
-# Trusted proxies
+# Trusted Proxies
 # Used to indicate trust of systems that proxy to the application so
 # certain header values (Such as "X-Forwarded-For") can be used from the
 # incoming proxy request to provide origin detail.
@@ -58,13 +58,6 @@ DB_DATABASE=database_database
 DB_USERNAME=database_username
 DB_PASSWORD=database_user_password
 
-# MySQL specific connection options
-# Path to Certificate Authority (CA) certificate file for your MySQL instance.
-# When this option is used host name identity verification will be performed
-# which checks the hostname, used by the client, against names within the
-# certificate itself (Common Name or Subject Alternative Name).
-MYSQL_ATTR_SSL_CA="/path/to/ca.pem"
-
 # Mail system to use
 # Can be 'smtp' or 'sendmail'
 MAIL_DRIVER=smtp
@@ -107,7 +100,8 @@ MEMCACHED_SERVERS=127.0.0.1:11211:100
 REDIS_SERVERS=127.0.0.1:6379:0
 
 # Queue driver to use
-# Can be 'sync', 'database' or 'redis'
+# Queue not really currently used but may be configurable in the future.
+# Would advise not to change this for now.
 QUEUE_CONNECTION=sync
 
 # Storage system to use
@@ -140,7 +134,7 @@ STORAGE_S3_ENDPOINT=https://my-custom-s3-compatible.service.com:8001
 STORAGE_URL=false
 
 # Authentication method to use
-# Can be 'standard', 'ldap', 'saml2' or 'oidc'
+# Can be 'standard', 'ldap' or 'saml2'
 AUTH_METHOD=standard
 
 # Social authentication configuration
@@ -223,7 +217,6 @@ LDAP_DUMP_USER_DETAILS=false
 LDAP_USER_TO_GROUPS=false
 LDAP_GROUP_ATTRIBUTE="memberOf"
 LDAP_REMOVE_FROM_GROUPS=false
-LDAP_DUMP_USER_GROUPS=false
 
 # SAML authentication configuration
 # Refer to https://www.bookstackapp.com/docs/admin/saml2-auth/
@@ -249,7 +242,6 @@ SAML2_GROUP_ATTRIBUTE=group
 SAML2_REMOVE_FROM_GROUPS=false
 
 # OpenID Connect authentication configuration
-# Refer to https://www.bookstackapp.com/docs/admin/oidc-auth/
 OIDC_NAME=SSO
 OIDC_DISPLAY_NAME_CLAIMS=name
 OIDC_CLIENT_ID=null
@@ -274,7 +266,7 @@ AVATAR_URL=
 # Enable diagrams.net integration
 # Can simply be true/false to enable/disable the integration.
 # Alternatively, It can be URL to the diagrams.net instance you want to use.
-# For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1&configure=1
+# For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1
 DRAWIO=true
 
 # Default item listing view
@@ -305,11 +297,6 @@ RECYCLE_BIN_LIFETIME=30
 # Maximum file size, in megabytes, that can be uploaded to the system.
 FILE_UPLOAD_SIZE_LIMIT=50
 
-# Export Page Size
-# Primarily used to determine page size of PDF exports.
-# Can be 'a4' or 'letter'.
-EXPORT_PAGE_SIZE=a4
-
 # Allow <script> tags in page content
 # Note, if set to 'true' the page editor may still escape scripts.
 ALLOW_CONTENT_SCRIPTS=false
@@ -332,13 +319,6 @@ ALLOW_UNTRUSTED_SERVER_FETCHING=false
 # Setting this option will also auto-adjust cookies to be SameSite=None.
 ALLOWED_IFRAME_HOSTS=null
 
-# A list of sources/hostnames that can be loaded within iframes within BookStack.
-# Space separated if multiple. BookStack host domain is auto-inferred.
-# Can be set to a lone "*" to allow all sources for iframe content (Not advised).
-# Defaults to a set of common services.
-# Current host and source for the "DRAWIO" setting will be auto-appended to the sources configured.
-ALLOWED_IFRAME_SOURCES="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"
-
 # The default and maximum item-counts for listing API requests.
 API_DEFAULT_ITEM_COUNT=100
 API_MAX_ITEM_COUNT=500

.github/ISSUE_TEMPLATE/api_request.yml

@@ -1,5 +1,6 @@
 name: New API Endpoint or API Ability
 description: Request a new endpoint or API feature be added
+title: "[API Request]: "
 labels: [":nut_and_bolt: API Request"]
 body:
   - type: textarea

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,6 @@
 name: Bug Report
 description: Create a report to help us improve or fix things
+title: "[Bug Report]: "
 labels: [":bug: Bug"]
 body:
   - type: textarea
@@ -35,15 +36,6 @@ body:
       description: Provide any additional context and screenshots here to help us solve this issue
     validations:
       required: false
-  - type: input
-    id: browserdetails
-    attributes:
-      label: Browser Details
-      description: |
-        If this is an issue that occurs when using the BookStack interface, please provide details of the browser used which presents the reported issue.
-      placeholder: (eg. Firefox 97 (64-bit) on Windows 11)
-    validations:
-      required: false
   - type: input
     id: bsversion
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,13 +1,9 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Discord Chat Support
+  - name: Discord chat support
     url: https://discord.gg/ztkBqR2
-    about: Realtime support & chat with the BookStack community and the team.
+    about: Realtime support / chat with the community and the team.
 
   - name: Debugging & Common Issues
     url: https://www.bookstackapp.com/docs/admin/debugging/
-    about: Find details on how to debug issues and view common issues with their resolutions.
-
-  - name: Official Support Plans
-    url: https://www.bookstackapp.com/support/
-    about: View our official support plans that offer assured support for business.
+    about: Find details on how to debug issues and view common issues with thier resolutions.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,5 +1,6 @@
 name: Feature Request
-description: Request a new feature or idea to be added to BookStack
+description: Request a new language to be added to CrowdIn for you to translate
+title: "[Feature Request]: "
 labels: [":hammer: Feature Request"]
 body:
   - type: textarea
@@ -12,41 +13,8 @@ body:
   - type: textarea
     id: benefits
     attributes:
-      label: Describe the benefits this would bring to existing BookStack users
-      description: |
-        Explain the measurable benefits this feature would achieve for existing BookStack users.
-        These benefits should details outcomes in terms of what this request solves/achieves, and should not be specific to implementation.
-        This helps us understand the core desired goal so that a variety of potential implementations could be explored.
-        This field is important. Lack if input here may lead to early issue closure.
-    validations:
-      required: true
-  - type: textarea
-    id: already_achieved
-    attributes:
-      label: Can the goal of this request already be achieved via other means?
-      description: |
-        Yes/No. If yes, please describe how the requested approach fits in with the existing method.
-    validations:
-      required: true
-  - type: checkboxes
-    id: confirm-search
-    attributes:
-      label: Have you searched for an existing open/closed issue?
-      description: |
-        To help us keep these issues under control, please ensure you have first [searched our issue list](https://github.com/BookStackApp/BookStack/issues?q=is%3Aissue) for any existing issues that cover the fundemental benefit/goal of your request.
-      options:
-        - label: I have searched for existing issues and none cover my fundemental request
-          required: true
-  - type: dropdown
-    id: existing_usage
-    attributes:
-      label: How long have you been using BookStack?
-      options:
-        - Not using yet, just scoping
-        - 0 to 6 months
-        - 6 months to 1 year
-        - 1 to 5 years
-        - Over 5 years
+      label: Describe the benefits this feature would bring to BookStack users
+      description: Explain the measurable benefits this feature would achieve for existing BookStack users
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/language_request.yml

@@ -1,5 +1,6 @@
 name: Language Request
 description: Request a new language to be added to CrowdIn for you to translate
+title: "[Language Request]: "
 labels: [":earth_africa: Translations"]
 assignees:
   - ssddanbrown

.github/ISSUE_TEMPLATE/support_request.yml

@@ -1,5 +1,6 @@
 name: Support Request
 description: Request support for a specific problem you have not been able to solve yourself
+title: "[Support Request]: "
 labels: [":dog2: Support"]
 body:
   - type: checkboxes

.github/translators.txt

@@ -126,7 +126,7 @@ Zenahr Barzani (Zenahr) :: German; Japanese; Dutch; German Informal
 tatsuya.info :: Japanese
 fadiapp :: Arabic
 Jakub Bouček (jakubboucek) :: Czech
-Marco (cdrfun) :: German; German Informal
+Marco (cdrfun) :: German
 10935336 :: Chinese Simplified
 孟繁阳 (FanyangMeng) :: Chinese Simplified
 Andrej Močan (andrejm) :: Slovenian
@@ -158,14 +158,14 @@ HenrijsS :: Latvian
 Pascal R-B (pborgner) :: German
 Boris (Ginfred) :: Russian
 Jonas Anker Rasmussen (jonasanker) :: Danish
-Gerwin de Keijzer (gdekeijzer) :: Dutch; German Informal; German
+Gerwin de Keijzer (gdekeijzer) :: Dutch; German; German Informal
 kometchtech :: Japanese
 Auri (Atalonica) :: Catalan
 Francesco Franchina (ffranchina) :: Italian
 Aimrane Kds (aimrane.kds) :: Arabic
 whenwesober :: Indonesian
 Rem (remkovdhoef) :: Dutch
-syn7ax69 :: Bulgarian; Turkish; German
+syn7ax69 :: Bulgarian; Turkish
 Blaade :: French
 Behzad HosseinPoor (behzad.hp) :: Persian
 Ole Aldric (Swoy) :: Norwegian Bokmal
@@ -199,47 +199,3 @@ M Nafis Al Mukhdi (mnafisalmukhdi1) :: Indonesian
 sulfo :: Danish
 Raukze :: German
 zygimantus :: Lithuanian
-marinkaberg :: Russian
-Vitaliy (gviabcua) :: Ukrainian
-mannycarreiro :: Portuguese
-Thiago Rafael Pereira de Carvalho (thiago.rafael) :: Portuguese, Brazilian
-Ken Roger Bolgnes (kenbo124) :: Norwegian Bokmal
-Nguyen Hung Phuong (hnwolf) :: Vietnamese
-Umut ERGENE (umutergene67) :: Turkish
-Tomáš Batelka (Vofy) :: Czech
-Mundo Racional (ismael.mesquita) :: Portuguese, Brazilian
-Zarik (3apuk) :: Russian
-Ali Shaatani (a.shaatani) :: Arabic
-ChacMaster :: Portuguese, Brazilian
-Saeed (saeed205) :: Persian
-Julesdevops :: French
-peter cerny (posli.to.semka) :: Slovak
-Pavel Karlin (pavelkarlin) :: Russian
-SmokingCrop :: Dutch
-Maciej Lebiest (Szwendacz) :: Polish
-DiscordDigital :: German; German Informal
-Gábor Marton (dodver) :: Hungarian
-Jasell :: Swedish
-Ghost_chu (ghostchu) :: Chinese Simplified
-Ravid Shachar (ravidshachar) :: Hebrew
-Helga Guchshenskaya (guchshenskaya) :: Russian
-daniel chou (chou0214) :: Chinese Traditional
-Manolis PATRIARCHE (m.patriarche) :: French
-Mohammed Haboubi (haboubi92) :: Arabic
-roncallyt :: Portuguese, Brazilian
-goegol :: Dutch
-msevgen :: Turkish
-Khroners :: French
-MASOUD HOSSEINY (masoudme) :: Persian
-Thomerson Roncally (roncallyt) :: Portuguese, Brazilian
-metaarch :: Bulgarian
-Xabi (xabikip) :: Basque
-pedromcsousa :: Portuguese
-Nir Louk (looknear) :: Hebrew
-Alex (qianmengnet) :: Chinese Simplified
-stothew :: German
-sgenc :: Turkish
-Shukrullo (vodiylik) :: Uzbek
-William W. (Nevnt) :: Chinese Traditional
-eamaro :: Portuguese
-Ypsilon-dev :: Arabic

.github/workflows/phpstan.yml

@@ -1,14 +1,19 @@
 name: phpstan
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - l10n_master
+  pull_request:
+    branches-ignore:
+      - l10n_master
 
 jobs:
   build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['7.4']
+        php: ['7.3']
     steps:
     - uses: actions/checkout@v1
 

.github/workflows/phpunit.yml

@@ -1,14 +1,19 @@
 name: phpunit
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - l10n_master
+  pull_request:
+    branches-ignore:
+      - l10n_master
 
 jobs:
   build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['7.3', '7.4', '8.0', '8.1']
     steps:
     - uses: actions/checkout@v1
 
@@ -31,7 +36,7 @@ jobs:
 
     - name: Start Database
       run: |
-        sudo systemctl start mysql
+        sudo /etc/init.d/mysql start
 
     - name: Setup Database
       run: |

.github/workflows/test-migrations.yml

@@ -1,14 +1,19 @@
 name: test-migrations
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - l10n_master
+  pull_request:
+    branches-ignore:
+      - l10n_master
 
 jobs:
   build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['7.3', '7.4', '8.0', '8.1']
     steps:
       - uses: actions/checkout@v1
 
@@ -31,7 +36,7 @@ jobs:
 
       - name: Start MySQL
         run: |
-          sudo systemctl start mysql
+          sudo /etc/init.d/mysql start
 
       - name: Create database & user
         run: |

.gitignore

@@ -5,10 +5,10 @@ Homestead.yaml
 .idea
 npm-debug.log
 yarn-error.log
-/public/dist
+/public/dist/*.map
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/bower
 /public/build/
 /storage/images

app/Actions/ActivityLogger.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Entities\Models\Entity;
-use BookStack\Interfaces\Loggable;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Log;
-
-class ActivityLogger
-{
-    protected $permissionService;
-
-    public function __construct(PermissionService $permissionService)
-    {
-        $this->permissionService = $permissionService;
-    }
-
-    /**
-     * Add a generic activity event to the database.
-     *
-     * @param string|Loggable $detail
-     */
-    public function add(string $type, $detail = '')
-    {
-        $detailToStore = ($detail instanceof Loggable) ? $detail->logDescriptor() : $detail;
-
-        $activity = $this->newActivityForUser($type);
-        $activity->detail = $detailToStore;
-
-        if ($detail instanceof Entity) {
-            $activity->entity_id = $detail->id;
-            $activity->entity_type = $detail->getMorphClass();
-        }
-
-        $activity->save();
-        $this->setNotification($type);
-        $this->dispatchWebhooks($type, $detail);
-    }
-
-    /**
-     * Get a new activity instance for the current user.
-     */
-    protected function newActivityForUser(string $type): Activity
-    {
-        $ip = request()->ip() ?? '';
-
-        return (new Activity())->forceFill([
-            'type'     => strtolower($type),
-            'user_id'  => user()->id,
-            'ip'       => config('app.env') === 'demo' ? '127.0.0.1' : $ip,
-        ]);
-    }
-
-    /**
-     * Removes the entity attachment from each of its activities
-     * and instead uses the 'extra' field with the entities name.
-     * Used when an entity is deleted.
-     */
-    public function removeEntity(Entity $entity)
-    {
-        $entity->activity()->update([
-            'detail'       => $entity->name,
-            'entity_id'    => null,
-            'entity_type'  => null,
-        ]);
-    }
-
-    /**
-     * Flashes a notification message to the session if an appropriate message is available.
-     */
-    protected function setNotification(string $type): void
-    {
-        $notificationTextKey = 'activities.' . $type . '_notification';
-        if (trans()->has($notificationTextKey)) {
-            $message = trans($notificationTextKey);
-            session()->flash('success', $message);
-        }
-    }
-
-    /**
-     * @param string|Loggable $detail
-     */
-    protected function dispatchWebhooks(string $type, $detail): void
-    {
-        $webhooks = Webhook::query()
-            ->whereHas('trackedEvents', function (Builder $query) use ($type) {
-                $query->where('event', '=', $type)
-                    ->orWhere('event', '=', 'all');
-            })
-            ->where('active', '=', true)
-            ->get();
-
-        foreach ($webhooks as $webhook) {
-            dispatch(new DispatchWebhookJob($webhook, $type, $detail));
-        }
-    }
-
-    /**
-     * Log out a failed login attempt, Providing the given username
-     * as part of the message if the '%u' string is used.
-     */
-    public function logFailedLogin(string $username)
-    {
-        $message = config('logging.failed_login.message');
-        if (!$message) {
-            return;
-        }
-
-        $message = str_replace('%u', $username, $message);
-        $channel = config('logging.failed_login.channel');
-        Log::channel($channel)->warning($message);
-    }
-}

app/Actions/ActivityQueries.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\Relation;
-
-class ActivityQueries
-{
-    protected $permissionService;
-
-    public function __construct(PermissionService $permissionService)
-    {
-        $this->permissionService = $permissionService;
-    }
-
-    /**
-     * Gets the latest activity.
-     */
-    public function latest(int $count = 20, int $page = 0): array
-    {
-        $activityList = $this->permissionService
-            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
-            ->orderBy('created_at', 'desc')
-            ->with(['user', 'entity'])
-            ->skip($count * $page)
-            ->take($count)
-            ->get();
-
-        return $this->filterSimilar($activityList);
-    }
-
-    /**
-     * Gets the latest activity for an entity, Filtering out similar
-     * items to prevent a message activity list.
-     */
-    public function entityActivity(Entity $entity, int $count = 20, int $page = 1): array
-    {
-        /** @var array<string, int[]> $queryIds */
-        $queryIds = [$entity->getMorphClass() => [$entity->id]];
-
-        if ($entity instanceof Book) {
-            $queryIds[(new Chapter())->getMorphClass()] = $entity->chapters()->scopes('visible')->pluck('id');
-        }
-        if ($entity instanceof Book || $entity instanceof Chapter) {
-            $queryIds[(new Page())->getMorphClass()] = $entity->pages()->scopes('visible')->pluck('id');
-        }
-
-        $query = Activity::query();
-        $query->where(function (Builder $query) use ($queryIds) {
-            foreach ($queryIds as $morphClass => $idArr) {
-                $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {
-                    $innerQuery->where('entity_type', '=', $morphClass)
-                        ->whereIn('entity_id', $idArr);
-                });
-            }
-        });
-
-        $activity = $query->orderBy('created_at', 'desc')
-            ->with(['entity' => function (Relation $query) {
-                $query->withTrashed();
-            }, 'user.avatar'])
-            ->skip($count * ($page - 1))
-            ->take($count)
-            ->get();
-
-        return $this->filterSimilar($activity);
-    }
-
-    /**
-     * Get the latest activity for a user, Filtering out similar items.
-     */
-    public function userActivity(User $user, int $count = 20, int $page = 0): array
-    {
-        $activityList = $this->permissionService
-            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
-            ->orderBy('created_at', 'desc')
-            ->where('user_id', '=', $user->id)
-            ->skip($count * $page)
-            ->take($count)
-            ->get();
-
-        return $this->filterSimilar($activityList);
-    }
-
-    /**
-     * Filters out similar activity.
-     *
-     * @param Activity[] $activities
-     */
-    protected function filterSimilar(iterable $activities): array
-    {
-        $newActivity = [];
-        $previousItem = null;
-
-        foreach ($activities as $activityItem) {
-            if (!$previousItem || !$activityItem->isSimilarTo($previousItem)) {
-                $newActivity[] = $activityItem;
-            }
-
-            $previousItem = $activityItem;
-        }
-
-        return $newActivity;
-    }
-}

app/Actions/ActivityService.php

@@ -0,0 +1,200 @@
+<?php
+
+namespace BookStack\Actions;
+
+use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Auth\User;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use BookStack\Interfaces\Loggable;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Support\Facades\Log;
+
+class ActivityService
+{
+    protected $activity;
+    protected $permissionService;
+
+    public function __construct(Activity $activity, PermissionService $permissionService)
+    {
+        $this->activity = $activity;
+        $this->permissionService = $permissionService;
+    }
+
+    /**
+     * Add activity data to database for an entity.
+     */
+    public function addForEntity(Entity $entity, string $type)
+    {
+        $activity = $this->newActivityForUser($type);
+        $entity->activity()->save($activity);
+        $this->setNotification($type);
+    }
+
+    /**
+     * Add a generic activity event to the database.
+     *
+     * @param string|Loggable $detail
+     */
+    public function add(string $type, $detail = '')
+    {
+        if ($detail instanceof Loggable) {
+            $detail = $detail->logDescriptor();
+        }
+
+        $activity = $this->newActivityForUser($type);
+        $activity->detail = $detail;
+        $activity->save();
+        $this->setNotification($type);
+    }
+
+    /**
+     * Get a new activity instance for the current user.
+     */
+    protected function newActivityForUser(string $type): Activity
+    {
+        $ip = request()->ip() ?? '';
+
+        return $this->activity->newInstance()->forceFill([
+            'type'     => strtolower($type),
+            'user_id'  => user()->id,
+            'ip'       => config('app.env') === 'demo' ? '127.0.0.1' : $ip,
+        ]);
+    }
+
+    /**
+     * Removes the entity attachment from each of its activities
+     * and instead uses the 'extra' field with the entities name.
+     * Used when an entity is deleted.
+     */
+    public function removeEntity(Entity $entity)
+    {
+        $entity->activity()->update([
+            'detail'       => $entity->name,
+            'entity_id'    => null,
+            'entity_type'  => null,
+        ]);
+    }
+
+    /**
+     * Gets the latest activity.
+     */
+    public function latest(int $count = 20, int $page = 0): array
+    {
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations($this->activity->newQuery(), 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')
+            ->with(['user', 'entity'])
+            ->skip($count * $page)
+            ->take($count)
+            ->get();
+
+        return $this->filterSimilar($activityList);
+    }
+
+    /**
+     * Gets the latest activity for an entity, Filtering out similar
+     * items to prevent a message activity list.
+     */
+    public function entityActivity(Entity $entity, int $count = 20, int $page = 1): array
+    {
+        /** @var [string => int[]] $queryIds */
+        $queryIds = [$entity->getMorphClass() => [$entity->id]];
+
+        if ($entity->isA('book')) {
+            $queryIds[(new Chapter())->getMorphClass()] = $entity->chapters()->visible()->pluck('id');
+        }
+        if ($entity->isA('book') || $entity->isA('chapter')) {
+            $queryIds[(new Page())->getMorphClass()] = $entity->pages()->visible()->pluck('id');
+        }
+
+        $query = $this->activity->newQuery();
+        $query->where(function (Builder $query) use ($queryIds) {
+            foreach ($queryIds as $morphClass => $idArr) {
+                $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {
+                    $innerQuery->where('entity_type', '=', $morphClass)
+                        ->whereIn('entity_id', $idArr);
+                });
+            }
+        });
+
+        $activity = $query->orderBy('created_at', 'desc')
+            ->with(['entity' => function (Relation $query) {
+                $query->withTrashed();
+            }, 'user.avatar'])
+            ->skip($count * ($page - 1))
+            ->take($count)
+            ->get();
+
+        return $this->filterSimilar($activity);
+    }
+
+    /**
+     * Get latest activity for a user, Filtering out similar items.
+     */
+    public function userActivity(User $user, int $count = 20, int $page = 0): array
+    {
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations($this->activity->newQuery(), 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')
+            ->where('user_id', '=', $user->id)
+            ->skip($count * $page)
+            ->take($count)
+            ->get();
+
+        return $this->filterSimilar($activityList);
+    }
+
+    /**
+     * Filters out similar activity.
+     *
+     * @param Activity[] $activities
+     *
+     * @return array
+     */
+    protected function filterSimilar(iterable $activities): array
+    {
+        $newActivity = [];
+        $previousItem = null;
+
+        foreach ($activities as $activityItem) {
+            if (!$previousItem || !$activityItem->isSimilarTo($previousItem)) {
+                $newActivity[] = $activityItem;
+            }
+
+            $previousItem = $activityItem;
+        }
+
+        return $newActivity;
+    }
+
+    /**
+     * Flashes a notification message to the session if an appropriate message is available.
+     */
+    protected function setNotification(string $type)
+    {
+        $notificationTextKey = 'activities.' . $type . '_notification';
+        if (trans()->has($notificationTextKey)) {
+            $message = trans($notificationTextKey);
+            session()->flash('success', $message);
+        }
+    }
+
+    /**
+     * Log out a failed login attempt, Providing the given username
+     * as part of the message if the '%u' string is used.
+     */
+    public function logFailedLogin(string $username)
+    {
+        $message = config('logging.failed_login.message');
+        if (!$message) {
+            return;
+        }
+
+        $message = str_replace('%u', $username, $message);
+        $channel = config('logging.failed_login.channel');
+        Log::channel($channel)->warning($message);
+    }
+}

app/Actions/ActivityType.php

@@ -53,16 +53,4 @@ class ActivityType
 
     const MFA_SETUP_METHOD = 'mfa_setup_method';
     const MFA_REMOVE_METHOD = 'mfa_remove_method';
-
-    const WEBHOOK_CREATE = 'webhook_create';
-    const WEBHOOK_UPDATE = 'webhook_update';
-    const WEBHOOK_DELETE = 'webhook_delete';
-
-    /**
-     * Get all the possible values.
-     */
-    public static function all(): array
-    {
-        return (new \ReflectionClass(static::class))->getConstants();
-    }
 }

app/Actions/CommentRepo.php

@@ -45,7 +45,7 @@ class CommentRepo
         $comment->parent_id = $parent_id;
 
         $entity->comments()->save($comment);
-        ActivityService::add(ActivityType::COMMENTED_ON, $entity);
+        ActivityService::addForEntity($entity, ActivityType::COMMENTED_ON);
 
         return $comment;
     }

app/Actions/DispatchWebhookJob.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\User;
-use BookStack\Facades\Theme;
-use BookStack\Interfaces\Loggable;
-use BookStack\Theming\ThemeEvents;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class DispatchWebhookJob implements ShouldQueue
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    protected Webhook $webhook;
-    protected string $event;
-    protected User $initiator;
-    protected int $initiatedTime;
-
-    /**
-     * @var string|Loggable
-     */
-    protected $detail;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(Webhook $webhook, string $event, $detail)
-    {
-        $this->webhook = $webhook;
-        $this->event = $event;
-        $this->detail = $detail;
-        $this->initiator = user();
-        $this->initiatedTime = time();
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $themeResponse = Theme::dispatch(ThemeEvents::WEBHOOK_CALL_BEFORE, $this->event, $this->webhook, $this->detail, $this->initiator, $this->initiatedTime);
-        $webhookData = $themeResponse ?? WebhookFormatter::getDefault($this->event, $this->webhook, $this->detail, $this->initiator, $this->initiatedTime)->format();
-        $lastError = null;
-
-        try {
-            $response = Http::asJson()
-                ->withOptions(['allow_redirects' => ['strict' => true]])
-                ->timeout($this->webhook->timeout)
-                ->post($this->webhook->endpoint, $webhookData);
-        } catch (\Exception $exception) {
-            $lastError = $exception->getMessage();
-            Log::error("Webhook call to endpoint {$this->webhook->endpoint} failed with error \"{$lastError}\"");
-        }
-
-        if (isset($response) && $response->failed()) {
-            $lastError = "Response status from endpoint was {$response->status()}";
-            Log::error("Webhook call to endpoint {$this->webhook->endpoint} failed with status {$response->status()}");
-        }
-
-        $this->webhook->last_called_at = now();
-        if ($lastError) {
-            $this->webhook->last_errored_at = now();
-            $this->webhook->last_error = $lastError;
-        }
-
-        $this->webhook->save();
-    }
-}

app/Actions/TagRepo.php

@@ -28,10 +28,10 @@ class TagRepo
                 'name',
                 ($searchTerm || $nameFilter) ? 'value' : DB::raw('COUNT(distinct value) as `values`'),
                 DB::raw('COUNT(id) as usages'),
-                DB::raw('SUM(IF(entity_type = \'page\', 1, 0)) as page_count'),
-                DB::raw('SUM(IF(entity_type = \'chapter\', 1, 0)) as chapter_count'),
-                DB::raw('SUM(IF(entity_type = \'book\', 1, 0)) as book_count'),
-                DB::raw('SUM(IF(entity_type = \'bookshelf\', 1, 0)) as shelf_count'),
+                DB::raw('SUM(IF(entity_type = \'BookStack\\\\Page\', 1, 0)) as page_count'),
+                DB::raw('SUM(IF(entity_type = \'BookStack\\\\Chapter\', 1, 0)) as chapter_count'),
+                DB::raw('SUM(IF(entity_type = \'BookStack\\\\Book\', 1, 0)) as book_count'),
+                DB::raw('SUM(IF(entity_type = \'BookStack\\\\BookShelf\', 1, 0)) as shelf_count'),
             ])
             ->orderBy($nameFilter ? 'value' : 'name');
 

app/Actions/Webhook.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Interfaces\Loggable;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-/**
- * @property int        $id
- * @property string     $name
- * @property string     $endpoint
- * @property Collection $trackedEvents
- * @property bool       $active
- * @property int        $timeout
- * @property string     $last_error
- * @property Carbon     $last_called_at
- * @property Carbon     $last_errored_at
- */
-class Webhook extends Model implements Loggable
-{
-    protected $fillable = ['name', 'endpoint', 'timeout'];
-
-    use HasFactory;
-
-    protected $casts = [
-        'last_called_at'  => 'datetime',
-        'last_errored_at' => 'datetime',
-    ];
-
-    /**
-     * Define the tracked event relation a webhook.
-     */
-    public function trackedEvents(): HasMany
-    {
-        return $this->hasMany(WebhookTrackedEvent::class);
-    }
-
-    /**
-     * Update the tracked events for a webhook from the given list of event types.
-     */
-    public function updateTrackedEvents(array $events): void
-    {
-        $this->trackedEvents()->delete();
-
-        $eventsToStore = array_intersect($events, array_values(ActivityType::all()));
-        if (in_array('all', $events)) {
-            $eventsToStore = ['all'];
-        }
-
-        $trackedEvents = [];
-        foreach ($eventsToStore as $event) {
-            $trackedEvents[] = new WebhookTrackedEvent(['event' => $event]);
-        }
-
-        $this->trackedEvents()->saveMany($trackedEvents);
-    }
-
-    /**
-     * Check if this webhook tracks the given event.
-     */
-    public function tracksEvent(string $event): bool
-    {
-        return $this->trackedEvents->pluck('event')->contains($event);
-    }
-
-    /**
-     * Get a URL for this webhook within the settings interface.
-     */
-    public function getUrl(string $path = ''): string
-    {
-        return url('/settings/webhooks/' . $this->id . '/' . ltrim($path, '/'));
-    }
-
-    /**
-     * Get the string descriptor for this item.
-     */
-    public function logDescriptor(): string
-    {
-        return "({$this->id}) {$this->name}";
-    }
-}

app/Actions/WebhookFormatter.php

@@ -1,124 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use BookStack\Interfaces\Loggable;
-use BookStack\Model;
-use Illuminate\Support\Carbon;
-
-class WebhookFormatter
-{
-    protected Webhook $webhook;
-    protected string $event;
-    protected User $initiator;
-    protected int $initiatedTime;
-
-    /**
-     * @var string|Loggable
-     */
-    protected $detail;
-
-    /**
-     * @var array{condition: callable(string, Model):bool, format: callable(Model):void}[]
-     */
-    protected $modelFormatters = [];
-
-    public function __construct(string $event, Webhook $webhook, $detail, User $initiator, int $initiatedTime)
-    {
-        $this->webhook = $webhook;
-        $this->event = $event;
-        $this->initiator = $initiator;
-        $this->initiatedTime = $initiatedTime;
-        $this->detail = is_object($detail) ? clone $detail : $detail;
-    }
-
-    public function format(): array
-    {
-        $data = [
-            'event'                    => $this->event,
-            'text'                     => $this->formatText(),
-            'triggered_at'             => Carbon::createFromTimestampUTC($this->initiatedTime)->toISOString(),
-            'triggered_by'             => $this->initiator->attributesToArray(),
-            'triggered_by_profile_url' => $this->initiator->getProfileUrl(),
-            'webhook_id'               => $this->webhook->id,
-            'webhook_name'             => $this->webhook->name,
-        ];
-
-        if (method_exists($this->detail, 'getUrl')) {
-            $data['url'] = $this->detail->getUrl();
-        }
-
-        if ($this->detail instanceof Model) {
-            $data['related_item'] = $this->formatModel();
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param callable(string, Model):bool $condition
-     * @param callable(Model):void         $format
-     */
-    public function addModelFormatter(callable $condition, callable $format): void
-    {
-        $this->modelFormatters[] = [
-            'condition' => $condition,
-            'format'    => $format,
-        ];
-    }
-
-    public function addDefaultModelFormatters(): void
-    {
-        // Load entity owner, creator, updater details
-        $this->addModelFormatter(
-            fn ($event, $model) => ($model instanceof Entity),
-            fn ($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])
-        );
-
-        // Load revision detail for page update and create events
-        $this->addModelFormatter(
-            fn ($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
-            fn ($model) => $model->load('currentRevision')
-        );
-    }
-
-    protected function formatModel(): array
-    {
-        /** @var Model $model */
-        $model = $this->detail;
-        $model->unsetRelations();
-
-        foreach ($this->modelFormatters as $formatter) {
-            if ($formatter['condition']($this->event, $model)) {
-                $formatter['format']($model);
-            }
-        }
-
-        return $model->toArray();
-    }
-
-    protected function formatText(): string
-    {
-        $textParts = [
-            $this->initiator->name,
-            trans('activities.' . $this->event),
-        ];
-
-        if ($this->detail instanceof Entity) {
-            $textParts[] = '"' . $this->detail->name . '"';
-        }
-
-        return implode(' ', $textParts);
-    }
-
-    public static function getDefault(string $event, Webhook $webhook, $detail, User $initiator, int $initiatedTime): self
-    {
-        $instance = new self($event, $webhook, $detail, $initiator, $initiatedTime);
-        $instance->addDefaultModelFormatters();
-
-        return $instance;
-    }
-}

app/Actions/WebhookTrackedEvent.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace BookStack\Actions;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property int    $id
- * @property int    $webhook_id
- * @property string $event
- */
-class WebhookTrackedEvent extends Model
-{
-    protected $fillable = ['event'];
-
-    use HasFactory;
-}

app/Api/ApiDocsGenerator.php

@@ -3,13 +3,11 @@
 namespace BookStack\Api;
 
 use BookStack\Http\Controllers\Api\ApiController;
-use Exception;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
-use Illuminate\Validation\Rules\Password;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
@@ -102,37 +100,11 @@ class ApiDocsGenerator
             $this->controllerClasses[$className] = $class;
         }
 
-        $rules = collect($class->getValidationRules()[$methodName] ?? [])->map(function ($validations) {
-            return array_map(function ($validation) {
-                return $this->getValidationAsString($validation);
-            }, $validations);
-        })->toArray();
+        $rules = $class->getValdationRules()[$methodName] ?? [];
 
         return empty($rules) ? null : $rules;
     }
 
-    /**
-     * Convert the given validation message to a readable string.
-     */
-    protected function getValidationAsString($validation): string
-    {
-        if (is_string($validation)) {
-            return $validation;
-        }
-
-        if (is_object($validation) && method_exists($validation, '__toString')) {
-            return strval($validation);
-        }
-
-        if ($validation instanceof Password) {
-            return 'min:8';
-        }
-
-        $class = get_class($validation);
-
-        throw new Exception("Cannot provide string representation of rule for class: {$class}");
-    }
-
     /**
      * Parse out the description text from a class method comment.
      */

app/Api/ListingResponseBuilder.php

@@ -2,10 +2,8 @@
 
 namespace BookStack\Api;
 
-use BookStack\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class ListingResponseBuilder
@@ -14,11 +12,6 @@ class ListingResponseBuilder
     protected $request;
     protected $fields;
 
-    /**
-     * @var array<callable>
-     */
-    protected $resultModifiers = [];
-
     protected $filterOperators = [
         'eq'   => '=',
         'ne'   => '!=',
@@ -31,7 +24,6 @@ class ListingResponseBuilder
 
     /**
      * ListingResponseBuilder constructor.
-     * The given fields will be forced visible within the model results.
      */
     public function __construct(Builder $query, Request $request, array $fields)
     {
@@ -43,16 +35,12 @@ class ListingResponseBuilder
     /**
      * Get the response from this builder.
      */
-    public function toResponse(): JsonResponse
+    public function toResponse()
     {
         $filteredQuery = $this->filterQuery($this->query);
 
         $total = $filteredQuery->count();
-        $data = $this->fetchData($filteredQuery)->each(function ($model) {
-            foreach ($this->resultModifiers as $modifier) {
-                $modifier($model);
-            }
-        });
+        $data = $this->fetchData($filteredQuery);
 
         return response()->json([
             'data'  => $data,
@@ -61,17 +49,7 @@ class ListingResponseBuilder
     }
 
     /**
-     * Add a callback to modify each element of the results.
-     *
-     * @param (callable(Model)) $modifier
-     */
-    public function modifyResults($modifier): void
-    {
-        $this->resultModifiers[] = $modifier;
-    }
-
-    /**
-     * Fetch the data to return within the response.
+     * Fetch the data to return in the response.
      */
     protected function fetchData(Builder $query): Collection
     {

app/Auth/Access/ExternalBaseUserProvider.php

@@ -4,7 +4,6 @@ namespace BookStack\Auth\Access;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
-use Illuminate\Database\Eloquent\Model;
 
 class ExternalBaseUserProvider implements UserProvider
 {
@@ -17,6 +16,8 @@ class ExternalBaseUserProvider implements UserProvider
 
     /**
      * LdapUserProvider constructor.
+     *
+     * @param $model
      */
     public function __construct(string $model)
     {
@@ -26,7 +27,7 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Create a new instance of the model.
      *
-     * @return Model
+     * @return \Illuminate\Database\Eloquent\Model
      */
     public function createModel()
     {
@@ -40,7 +41,7 @@ class ExternalBaseUserProvider implements UserProvider
      *
      * @param mixed $identifier
      *
-     * @return Authenticatable|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveById($identifier)
     {
@@ -53,7 +54,7 @@ class ExternalBaseUserProvider implements UserProvider
      * @param mixed  $identifier
      * @param string $token
      *
-     * @return Authenticatable|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveByToken($identifier, $token)
     {
@@ -63,8 +64,8 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Update the "remember me" token for the given user in storage.
      *
-     * @param Authenticatable $user
-     * @param string          $token
+     * @param \Illuminate\Contracts\Auth\Authenticatable $user
+     * @param string                                     $token
      *
      * @return void
      */
@@ -78,7 +79,7 @@ class ExternalBaseUserProvider implements UserProvider
      *
      * @param array $credentials
      *
-     * @return Authenticatable|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveByCredentials(array $credentials)
     {
@@ -93,8 +94,8 @@ class ExternalBaseUserProvider implements UserProvider
     /**
      * Validate a user against the given credentials.
      *
-     * @param Authenticatable $user
-     * @param array           $credentials
+     * @param \Illuminate\Contracts\Auth\Authenticatable $user
+     * @param array                                      $credentials
      *
      * @return bool
      */

app/Auth/Access/Guards/LdapSessionGuard.php

@@ -5,7 +5,6 @@ namespace BookStack\Auth\Access\Guards;
 use BookStack\Auth\Access\LdapService;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\User;
-use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\LdapException;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
@@ -16,7 +15,7 @@ use Illuminate\Support\Str;
 
 class LdapSessionGuard extends ExternalBaseSessionGuard
 {
-    protected LdapService $ldapService;
+    protected $ldapService;
 
     /**
      * LdapSessionGuard constructor.
@@ -60,9 +59,8 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
      * @param array $credentials
      * @param bool  $remember
      *
-     * @throws LdapException*@throws \BookStack\Exceptions\JsonDebugException
      * @throws LoginAttemptException
-     * @throws JsonDebugException
+     * @throws LdapException
      *
      * @return bool
      */
@@ -86,7 +84,7 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
             try {
                 $user = $this->createNewFromLdapAndCreds($userDetails, $credentials);
             } catch (UserRegistrationException $exception) {
-                throw new LoginAttemptException($exception->getMessage());
+                throw new LoginAttemptException($exception->message);
             }
         }
 

app/Auth/Access/LdapService.php

@@ -15,17 +15,12 @@ use Illuminate\Support\Facades\Log;
  */
 class LdapService
 {
-    protected Ldap $ldap;
-    protected GroupSyncService $groupSyncService;
-    protected UserAvatars $userAvatars;
-
-    /**
-     * @var resource
-     */
+    protected $ldap;
+    protected $groupSyncService;
     protected $ldapConnection;
-
-    protected array $config;
-    protected bool $enabled;
+    protected $userAvatars;
+    protected $config;
+    protected $enabled;
 
     /**
      * LdapService constructor.
@@ -170,7 +165,7 @@ class LdapService
      * Bind the system user to the LDAP connection using the given credentials
      * otherwise anonymous access is attempted.
      *
-     * @param resource $connection
+     * @param $connection
      *
      * @throws LdapException
      */
@@ -279,7 +274,6 @@ class LdapService
      * Get the groups a user is a part of on ldap.
      *
      * @throws LdapException
-     * @throws JsonDebugException
      */
     public function getUserGroups(string $userName): array
     {
@@ -291,17 +285,8 @@ class LdapService
         }
 
         $userGroups = $this->groupFilter($user);
-        $allGroups = $this->getGroupsRecursive($userGroups, []);
 
-        if ($this->config['dump_user_groups']) {
-            throw new JsonDebugException([
-                'details_from_ldap'             => $user,
-                'parsed_direct_user_groups'     => $userGroups,
-                'parsed_recursive_user_groups'  => $allGroups,
-            ]);
-        }
-
-        return $allGroups;
+        return $this->getGroupsRecursive($userGroups, []);
     }
 
     /**
@@ -384,7 +369,6 @@ class LdapService
      * Sync the LDAP groups to the user roles for the current user.
      *
      * @throws LdapException
-     * @throws JsonDebugException
      */
     public function syncGroups(User $user, string $username)
     {

app/Auth/Access/Oidc/OidcException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Access\Oidc;
-
-use Exception;
-
-class OidcException extends Exception
-{
-}

app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php

@@ -2,8 +2,6 @@
 
 namespace BookStack\Auth\Access\Oidc;
 
-use Exception;
-
-class OidcIssuerDiscoveryException extends Exception
+class OidcIssuerDiscoveryException extends \Exception
 {
 }

app/Auth/Access/Oidc/OidcJwtSigningKey.php

@@ -41,18 +41,16 @@ class OidcJwtSigningKey
     protected function loadFromPath(string $path)
     {
         try {
-            $key = PublicKeyLoader::load(
+            $this->key = PublicKeyLoader::load(
                 file_get_contents($path)
-            );
+            )->withPadding(RSA::SIGNATURE_PKCS1);
         } catch (\Exception $exception) {
             throw new OidcInvalidKeyException("Failed to load key from file path with error: {$exception->getMessage()}");
         }
 
-        if (!$key instanceof RSA) {
+        if (!($this->key instanceof RSA)) {
             throw new OidcInvalidKeyException('Key loaded from file path is not an RSA key as expected');
         }
-
-        $this->key = $key->withPadding(RSA::SIGNATURE_PKCS1);
     }
 
     /**
@@ -60,11 +58,8 @@ class OidcJwtSigningKey
      */
     protected function loadFromJwkArray(array $jwk)
     {
-        // 'alg' is optional for a JWK, but we will still attempt to validate if
-        // it exists otherwise presume it will be compatible.
-        $alg = $jwk['alg'] ?? null;
-        if ($jwk['kty'] !== 'RSA' || !(is_null($alg) || $alg === 'RS256')) {
-            throw new OidcInvalidKeyException("Only RS256 keys are currently supported. Found key using {$alg}");
+        if ($jwk['alg'] !== 'RS256') {
+            throw new OidcInvalidKeyException("Only RS256 keys are currently supported. Found key using {$jwk['alg']}");
         }
 
         if (empty($jwk['use'])) {
@@ -86,19 +81,14 @@ class OidcJwtSigningKey
         $n = strtr($jwk['n'] ?? '', '-_', '+/');
 
         try {
-            $key = PublicKeyLoader::load([
+            /** @var RSA $key */
+            $this->key = PublicKeyLoader::load([
                 'e' => new BigInteger(base64_decode($jwk['e']), 256),
                 'n' => new BigInteger(base64_decode($n), 256),
-            ]);
+            ])->withPadding(RSA::SIGNATURE_PKCS1);
         } catch (\Exception $exception) {
             throw new OidcInvalidKeyException("Failed to load key from JWK parameters with error: {$exception->getMessage()}");
         }
-
-        if (!$key instanceof RSA) {
-            throw new OidcInvalidKeyException('Key loaded from file path is not an RSA key as expected');
-        }
-
-        $this->key = $key->withPadding(RSA::SIGNATURE_PKCS1);
     }
 
     /**

app/Auth/Access/Oidc/OidcProviderSettings.php

@@ -164,9 +164,7 @@ class OidcProviderSettings
     protected function filterKeys(array $keys): array
     {
         return array_filter($keys, function (array $key) {
-            $alg = $key['alg'] ?? null;
-
-            return $key['kty'] === 'RSA' && $key['use'] === 'sig' && (is_null($alg) || $alg === 'RS256');
+            return $key['kty'] === 'RSA' && $key['use'] === 'sig' && $key['alg'] === 'RS256';
         });
     }
 

app/Auth/Access/Oidc/OidcService.php

@@ -7,12 +7,14 @@ use BookStack\Auth\Access\LoginService;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\User;
 use BookStack\Exceptions\JsonDebugException;
+use BookStack\Exceptions\OpenIdConnectException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
 use function config;
+use Exception;
 use Illuminate\Support\Facades\Cache;
 use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
-use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
+use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface as HttpClient;
 use function trans;
 use function url;
@@ -23,9 +25,9 @@ use function url;
  */
 class OidcService
 {
-    protected RegistrationService $registrationService;
-    protected LoginService $loginService;
-    protected HttpClient $httpClient;
+    protected $registrationService;
+    protected $loginService;
+    protected $httpClient;
 
     /**
      * OpenIdService constructor.
@@ -40,8 +42,6 @@ class OidcService
     /**
      * Initiate an authorization flow.
      *
-     * @throws OidcException
-     *
      * @return array{url: string, state: string}
      */
     public function login(): array
@@ -57,15 +57,14 @@ class OidcService
 
     /**
      * Process the Authorization response from the authorization server and
-     * return the matching, or new if registration active, user matched to the
-     * authorization server. Throws if the user cannot be auth if not authenticated.
+     * return the matching, or new if registration active, user matched to
+     * the authorization server.
+     * Returns null if not authenticated.
      *
-     * @throws JsonDebugException
-     * @throws OidcException
-     * @throws StoppedAuthenticationException
-     * @throws IdentityProviderException
+     * @throws Exception
+     * @throws ClientExceptionInterface
      */
-    public function processAuthorizeResponse(?string $authorizationCode): User
+    public function processAuthorizeResponse(?string $authorizationCode): ?User
     {
         $settings = $this->getProviderSettings();
         $provider = $this->getProvider($settings);
@@ -79,7 +78,8 @@ class OidcService
     }
 
     /**
-     * @throws OidcException
+     * @throws OidcIssuerDiscoveryException
+     * @throws ClientExceptionInterface
      */
     protected function getProviderSettings(): OidcProviderSettings
     {
@@ -100,11 +100,7 @@ class OidcService
 
         // Run discovery
         if ($config['discover'] ?? false) {
-            try {
-                $settings->discoverFromIssuer($this->httpClient, Cache::store(null), 15);
-            } catch (OidcIssuerDiscoveryException $exception) {
-                throw new OidcException('OIDC Discovery Error: ' . $exception->getMessage());
-            }
+            $settings->discoverFromIssuer($this->httpClient, Cache::store(null), 15);
         }
 
         $settings->validate();
@@ -165,8 +161,9 @@ class OidcService
      * Processes a received access token for a user. Login the user when
      * they exist, optionally registering them automatically.
      *
-     * @throws OidcException
+     * @throws OpenIdConnectException
      * @throws JsonDebugException
+     * @throws UserRegistrationException
      * @throws StoppedAuthenticationException
      */
     protected function processAccessTokenCallback(OidcAccessToken $accessToken, OidcProviderSettings $settings): User
@@ -185,28 +182,28 @@ class OidcService
         try {
             $idToken->validate($settings->clientId);
         } catch (OidcInvalidTokenException $exception) {
-            throw new OidcException("ID token validate failed with error: {$exception->getMessage()}");
+            throw new OpenIdConnectException("ID token validate failed with error: {$exception->getMessage()}");
         }
 
         $userDetails = $this->getUserDetails($idToken);
         $isLoggedIn = auth()->check();
 
         if (empty($userDetails['email'])) {
-            throw new OidcException(trans('errors.oidc_no_email_address'));
+            throw new OpenIdConnectException(trans('errors.oidc_no_email_address'));
         }
 
         if ($isLoggedIn) {
-            throw new OidcException(trans('errors.oidc_already_logged_in'));
+            throw new OpenIdConnectException(trans('errors.oidc_already_logged_in'), '/login');
         }
 
-        try {
-            $user = $this->registrationService->findOrRegister(
-                $userDetails['name'],
-                $userDetails['email'],
-                $userDetails['external_id']
-            );
-        } catch (UserRegistrationException $exception) {
-            throw new OidcException($exception->getMessage());
+        $user = $this->registrationService->findOrRegister(
+            $userDetails['name'],
+            $userDetails['email'],
+            $userDetails['external_id']
+        );
+
+        if ($user === null) {
+            throw new OpenIdConnectException(trans('errors.oidc_user_not_registered', ['name' => $userDetails['external_id']]), '/login');
         }
 
         $this->loginService->login($user, 'oidc');

app/Auth/Access/RegistrationService.php

@@ -96,8 +96,7 @@ class RegistrationService
         }
 
         // Create the user
-        $newUser = $this->userRepo->createWithoutActivity($userData, $emailConfirmed);
-        $newUser->attachDefaultRole();
+        $newUser = $this->userRepo->registerNew($userData, $emailConfirmed);
 
         // Assign social account if given
         if ($socialAccount) {

app/Auth/Access/SocialAuthService.php

@@ -12,7 +12,6 @@ use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use Laravel\Socialite\Contracts\Provider;
 use Laravel\Socialite\Contracts\User as SocialUser;
-use Laravel\Socialite\Two\GoogleProvider;
 use SocialiteProviders\Manager\SocialiteWasCalled;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
@@ -279,7 +278,7 @@ class SocialAuthService
     {
         $driver = $this->socialite->driver($driverName);
 
-        if ($driver instanceof GoogleProvider && config('services.google.select_account')) {
+        if ($driverName === 'google' && config('services.google.select_account')) {
             $driver->with(['prompt' => 'select_account']);
         }
 

app/Auth/Permissions/PermissionService.php

@@ -602,35 +602,25 @@ class PermissionService
 
     /**
      * Filter items that have entities set as a polymorphic relation.
-     * For simplicity, this will not return results attached to draft pages.
-     * Draft pages should never really have related items though.
      *
      * @param Builder|QueryBuilder $query
      */
     public function filterRestrictedEntityRelations($query, string $tableName, string $entityIdColumn, string $entityTypeColumn, string $action = 'view')
     {
         $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn, 'entityTypeColumn' => $entityTypeColumn];
-        $pageMorphClass = (new Page())->getMorphClass();
 
-        $q = $query->whereExists(function ($permissionQuery) use (&$tableDetails, $action) {
-            /** @var Builder $permissionQuery */
-            $permissionQuery->select(['role_id'])->from('joint_permissions')
-                ->whereColumn('joint_permissions.entity_id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
-                ->whereColumn('joint_permissions.entity_type', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'])
-                ->where('joint_permissions.action', '=', $action)
-                ->whereIn('joint_permissions.role_id', $this->getCurrentUserRoles())
-                ->where(function (QueryBuilder $query) {
-                    $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
-                });
-        })->where(function ($query) use ($tableDetails, $pageMorphClass) {
-            /** @var Builder $query */
-            $query->where($tableDetails['entityTypeColumn'], '!=', $pageMorphClass)
-                ->orWhereExists(function (QueryBuilder $query) use ($tableDetails, $pageMorphClass) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
-                        ->where($tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'], '=', $pageMorphClass)
-                        ->where('pages.draft', '=', false);
-                });
+        $q = $query->where(function ($query) use ($tableDetails, $action) {
+            $query->whereExists(function ($permissionQuery) use (&$tableDetails, $action) {
+                /** @var Builder $permissionQuery */
+                $permissionQuery->select(['role_id'])->from('joint_permissions')
+                    ->whereColumn('joint_permissions.entity_id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+                    ->whereColumn('joint_permissions.entity_type', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'])
+                    ->where('action', '=', $action)
+                    ->whereIn('role_id', $this->getCurrentUserRoles())
+                    ->where(function (QueryBuilder $query) {
+                        $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+                    });
+            });
         });
 
         $this->clean();
@@ -644,39 +634,25 @@ class PermissionService
      */
     public function filterRelatedEntity(string $entityClass, Builder $query, string $tableName, string $entityIdColumn): Builder
     {
-        $fullEntityIdColumn = $tableName . '.' . $entityIdColumn;
-        $instance = new $entityClass();
-        $morphClass = $instance->getMorphClass();
+        $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn];
+        $morphClass = app($entityClass)->getMorphClass();
 
-        $existsQuery = function ($permissionQuery) use ($fullEntityIdColumn, $morphClass) {
-            /** @var Builder $permissionQuery */
-            $permissionQuery->select('joint_permissions.role_id')->from('joint_permissions')
-                ->whereColumn('joint_permissions.entity_id', '=', $fullEntityIdColumn)
-                ->where('joint_permissions.entity_type', '=', $morphClass)
-                ->where('joint_permissions.action', '=', 'view')
-                ->whereIn('joint_permissions.role_id', $this->getCurrentUserRoles())
-                ->where(function (QueryBuilder $query) {
-                    $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+        $q = $query->where(function ($query) use ($tableDetails, $morphClass) {
+            $query->where(function ($query) use (&$tableDetails, $morphClass) {
+                $query->whereExists(function ($permissionQuery) use (&$tableDetails, $morphClass) {
+                    /** @var Builder $permissionQuery */
+                    $permissionQuery->select('id')->from('joint_permissions')
+                        ->whereColumn('joint_permissions.entity_id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+                        ->where('entity_type', '=', $morphClass)
+                        ->where('action', '=', 'view')
+                        ->whereIn('role_id', $this->getCurrentUserRoles())
+                        ->where(function (QueryBuilder $query) {
+                            $this->addJointHasPermissionCheck($query, $this->currentUser()->id);
+                        });
                 });
-        };
-
-        $q = $query->where(function ($query) use ($existsQuery, $fullEntityIdColumn) {
-            $query->whereExists($existsQuery)
-                ->orWhere($fullEntityIdColumn, '=', 0);
+            })->orWhere($tableDetails['entityIdColumn'], '=', 0);
         });
 
-        if ($instance instanceof Page) {
-            // Prevent visibility of non-owned draft pages
-            $q->whereExists(function (QueryBuilder $query) use ($fullEntityIdColumn) {
-                $query->select('id')->from('pages')
-                    ->whereColumn('pages.id', '=', $fullEntityIdColumn)
-                    ->where(function (QueryBuilder $query) {
-                        $query->where('pages.draft', '=', false)
-                            ->orWhere('pages.owned_by', '=', $this->currentUser()->id);
-                    });
-            });
-        }
-
         $this->clean();
 
         return $q;
@@ -690,9 +666,9 @@ class PermissionService
      */
     protected function addJointHasPermissionCheck($query, int $userIdToCheck)
     {
-        $query->where('joint_permissions.has_permission', '=', true)->orWhere(function ($query) use ($userIdToCheck) {
-            $query->where('joint_permissions.has_permission_own', '=', true)
-                ->where('joint_permissions.owned_by', '=', $userIdToCheck);
+        $query->where('has_permission', '=', true)->orWhere(function ($query) use ($userIdToCheck) {
+            $query->where('has_permission_own', '=', true)
+                ->where('owned_by', '=', $userIdToCheck);
         });
     }
 

app/Auth/Permissions/RolePermission.php

@@ -4,7 +4,6 @@ namespace BookStack\Auth\Permissions;
 
 use BookStack\Auth\Role;
 use BookStack\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * @property int $id
@@ -14,15 +13,19 @@ class RolePermission extends Model
     /**
      * The roles that belong to the permission.
      */
-    public function roles(): BelongsToMany
+    public function roles()
     {
         return $this->belongsToMany(Role::class, 'permission_role', 'permission_id', 'role_id');
     }
 
     /**
      * Get the permission object by name.
+     *
+     * @param $name
+     *
+     * @return mixed
      */
-    public static function getByName(string $name): ?RolePermission
+    public static function getByName($name)
     {
         return static::where('name', '=', $name)->first();
     }

app/Auth/Queries/AllUsersPaginatedAndSorted.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Queries;
-
-use BookStack\Auth\User;
-use Illuminate\Pagination\LengthAwarePaginator;
-
-/**
- * Get all the users with their permissions in a paginated format.
- * Note: Due to the use of email search this should only be used when
- * user is assumed to be trusted. (Admin users).
- * Email search can be abused to extract email addresses.
- */
-class AllUsersPaginatedAndSorted
-{
-    /**
-     * @param array{sort: string, order: string, search: string} $sortData
-     */
-    public function run(int $count, array $sortData): LengthAwarePaginator
-    {
-        $sort = $sortData['sort'];
-
-        $query = User::query()->select(['*'])
-            ->scopes(['withLastActivityAt'])
-            ->with(['roles', 'avatar'])
-            ->withCount('mfaValues')
-            ->orderBy($sort, $sortData['order']);
-
-        if ($sortData['search']) {
-            $term = '%' . $sortData['search'] . '%';
-            $query->where(function ($query) use ($term) {
-                $query->where('name', 'like', $term)
-                    ->orWhere('email', 'like', $term);
-            });
-        }
-
-        return $query->paginate($count);
-    }
-}

app/Auth/Queries/UserContentCounts.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Queries;
-
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
-
-/**
- * Get asset created counts for the given user.
- */
-class UserContentCounts
-{
-    /**
-     * @return array{pages: int, chapters: int, books: int, shelves: int}
-     */
-    public function run(User $user): array
-    {
-        $createdBy = ['created_by' => $user->id];
-
-        return [
-            'pages'    => Page::visible()->where($createdBy)->count(),
-            'chapters' => Chapter::visible()->where($createdBy)->count(),
-            'books'    => Book::visible()->where($createdBy)->count(),
-            'shelves'  => Bookshelf::visible()->where($createdBy)->count(),
-        ];
-    }
-}

app/Auth/Queries/UserRecentlyCreatedContent.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace BookStack\Auth\Queries;
-
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-
-/**
- * Get the recently created content for the provided user.
- */
-class UserRecentlyCreatedContent
-{
-    /**
-     * @return array{pages: Collection, chapters: Collection, books: Collection, shelves: Collection}
-     */
-    public function run(User $user, int $count): array
-    {
-        $query = function (Builder $query) use ($user, $count) {
-            return $query->orderBy('created_at', 'desc')
-                ->where('created_by', '=', $user->id)
-                ->take($count)
-                ->get();
-        };
-
-        return [
-            'pages'    => $query(Page::visible()->where('draft', '=', false)),
-            'chapters' => $query(Chapter::visible()),
-            'books'    => $query(Book::visible()),
-            'shelves'  => $query(Bookshelf::visible()),
-        ];
-    }
-}

app/Auth/Role.php

@@ -28,8 +28,6 @@ class Role extends Model implements Loggable
 
     protected $fillable = ['display_name', 'description', 'external_auth_id'];
 
-    protected $hidden = ['pivot'];
-
     /**
      * The roles that belong to the role.
      */

app/Auth/User.php

@@ -72,20 +72,22 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     protected $hidden = [
         'password', 'remember_token', 'system_name', 'email_confirmed', 'external_auth_id', 'email',
-        'created_at', 'updated_at', 'image_id', 'roles', 'avatar', 'user_id',
+        'created_at', 'updated_at', 'image_id',
     ];
 
     /**
      * This holds the user's permissions when loaded.
+     *
+     * @var ?Collection
      */
-    protected ?Collection $permissions;
+    protected $permissions;
 
     /**
      * This holds the default user when loaded.
      *
      * @var null|User
      */
-    protected static ?User $defaultUser = null;
+    protected static $defaultUser = null;
 
     /**
      * Returns the default public user.
@@ -144,7 +146,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function attachDefaultRole(): void
     {
-        $roleId = intval(setting('registration-role'));
+        $roleId = setting('registration-role');
         if ($roleId && $this->roles()->where('id', '=', $roleId)->count() === 0) {
             $this->roles()->attach($roleId);
         }

app/Auth/UserRepo.php

@@ -2,29 +2,31 @@
 
 namespace BookStack\Auth;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\UserInviteService;
+use Activity;
 use BookStack\Entities\EntityProvider;
-use BookStack\Exceptions\NotifyException;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\UserUpdateException;
-use BookStack\Facades\Activity;
 use BookStack\Uploads\UserAvatars;
 use Exception;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
 
 class UserRepo
 {
-    protected UserAvatars $userAvatar;
-    protected UserInviteService $inviteService;
+    protected $userAvatar;
 
     /**
      * UserRepo constructor.
      */
-    public function __construct(UserAvatars $userAvatar, UserInviteService $inviteService)
+    public function __construct(UserAvatars $userAvatar)
     {
         $this->userAvatar = $userAvatar;
-        $this->inviteService = $inviteService;
     }
 
     /**
@@ -52,164 +54,67 @@ class UserRepo
     }
 
     /**
-     * Create a new basic instance of user with the given pre-validated data.
-     *
-     * @param array{name: string, email: string, password: ?string, external_auth_id: ?string, language: ?string, roles: ?array} $data
+     * Get all the users with their permissions.
      */
-    public function createWithoutActivity(array $data, bool $emailConfirmed = false): User
+    public function getAllUsers(): Collection
     {
-        $user = new User();
-        $user->name = $data['name'];
-        $user->email = $data['email'];
-        $user->password = bcrypt(empty($data['password']) ? Str::random(32) : $data['password']);
-        $user->email_confirmed = $emailConfirmed;
-        $user->external_auth_id = $data['external_auth_id'] ?? '';
+        return User::query()->with('roles', 'avatar')->orderBy('name', 'asc')->get();
+    }
 
-        $user->refreshSlug();
-        $user->save();
+    /**
+     * Get all the users with their permissions in a paginated format.
+     */
+    public function getAllUsersPaginatedAndSorted(int $count, array $sortData): LengthAwarePaginator
+    {
+        $sort = $sortData['sort'];
 
-        if (!empty($data['language'])) {
-            setting()->putUser($user, 'language', $data['language']);
+        $query = User::query()->select(['*'])
+            ->withLastActivityAt()
+            ->with(['roles', 'avatar'])
+            ->withCount('mfaValues')
+            ->orderBy($sort, $sortData['order']);
+
+        if ($sortData['search']) {
+            $term = '%' . $sortData['search'] . '%';
+            $query->where(function ($query) use ($term) {
+                $query->where('name', 'like', $term)
+                    ->orWhere('email', 'like', $term);
+            });
         }
 
-        if (isset($data['roles'])) {
-            $this->setUserRoles($user, $data['roles']);
-        }
+        return $query->paginate($count);
+    }
 
+    /**
+     * Creates a new user and attaches a role to them.
+     */
+    public function registerNew(array $data, bool $emailConfirmed = false): User
+    {
+        $user = $this->create($data, $emailConfirmed);
+        $user->attachDefaultRole();
         $this->downloadAndAssignUserAvatar($user);
 
         return $user;
     }
 
     /**
-     * As per "createWithoutActivity" but records a "create" activity.
+     * Assign a user to a system-level role.
      *
-     * @param array{name: string, email: string, password: ?string, external_auth_id: ?string, language: ?string, roles: ?array} $data
+     * @throws NotFoundException
      */
-    public function create(array $data, bool $sendInvite = false): User
+    public function attachSystemRole(User $user, string $systemRoleName)
     {
-        $user = $this->createWithoutActivity($data, true);
-
-        if ($sendInvite) {
-            $this->inviteService->sendInvitation($user);
-        }
-
-        Activity::add(ActivityType::USER_CREATE, $user);
-
-        return $user;
-    }
-
-    /**
-     * Update the given user with the given data.
-     *
-     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
-     *
-     * @throws UserUpdateException
-     */
-    public function update(User $user, array $data, bool $manageUsersAllowed): User
-    {
-        if (!empty($data['name'])) {
-            $user->name = $data['name'];
-            $user->refreshSlug();
-        }
-
-        if (!empty($data['email']) && $manageUsersAllowed) {
-            $user->email = $data['email'];
-        }
-
-        if (!empty($data['external_auth_id']) && $manageUsersAllowed) {
-            $user->external_auth_id = $data['external_auth_id'];
-        }
-
-        if (isset($data['roles']) && $manageUsersAllowed) {
-            $this->setUserRoles($user, $data['roles']);
-        }
-
-        if (!empty($data['password'])) {
-            $user->password = bcrypt($data['password']);
-        }
-
-        if (!empty($data['language'])) {
-            setting()->putUser($user, 'language', $data['language']);
-        }
-
-        $user->save();
-        Activity::add(ActivityType::USER_UPDATE, $user);
-
-        return $user;
-    }
-
-    /**
-     * Remove the given user from storage, Delete all related content.
-     *
-     * @throws Exception
-     */
-    public function destroy(User $user, ?int $newOwnerId = null)
-    {
-        $this->ensureDeletable($user);
-
-        $user->socialAccounts()->delete();
-        $user->apiTokens()->delete();
-        $user->favourites()->delete();
-        $user->mfaValues()->delete();
-        $user->delete();
-
-        // Delete user profile images
-        $this->userAvatar->destroyAllForUser($user);
-
-        if (!empty($newOwnerId)) {
-            $newOwner = User::query()->find($newOwnerId);
-            if (!is_null($newOwner)) {
-                $this->migrateOwnership($user, $newOwner);
-            }
-        }
-
-        Activity::add(ActivityType::USER_DELETE, $user);
-    }
-
-    /**
-     * @throws NotifyException
-     */
-    protected function ensureDeletable(User $user): void
-    {
-        if ($this->isOnlyAdmin($user)) {
-            throw new NotifyException(trans('errors.users_cannot_delete_only_admin'), $user->getEditUrl());
-        }
-
-        if ($user->system_name === 'public') {
-            throw new NotifyException(trans('errors.users_cannot_delete_guest'), $user->getEditUrl());
-        }
-    }
-
-    /**
-     * Migrate ownership of items in the system from one user to another.
-     */
-    protected function migrateOwnership(User $fromUser, User $toUser)
-    {
-        $entities = (new EntityProvider())->all();
-        foreach ($entities as $instance) {
-            $instance->newQuery()->where('owned_by', '=', $fromUser->id)
-                ->update(['owned_by' => $toUser->id]);
-        }
-    }
-
-    /**
-     * Get an avatar image for a user and set it as their avatar.
-     * Returns early if avatars disabled or not set in config.
-     */
-    protected function downloadAndAssignUserAvatar(User $user): void
-    {
-        try {
-            $this->userAvatar->fetchAndAssignToUser($user);
-        } catch (Exception $e) {
-            Log::error('Failed to save user avatar image');
+        $role = Role::getSystemRole($systemRoleName);
+        if (is_null($role)) {
+            throw new NotFoundException("Role '{$systemRoleName}' not found");
         }
+        $user->attachRole($role);
     }
 
     /**
      * Checks if the give user is the only admin.
      */
-    protected function isOnlyAdmin(User $user): bool
+    public function isOnlyAdmin(User $user): bool
     {
         if (!$user->hasSystemRole('admin')) {
             return false;
@@ -228,7 +133,7 @@ class UserRepo
      *
      * @throws UserUpdateException
      */
-    protected function setUserRoles(User $user, array $roles)
+    public function setUserRoles(User $user, array $roles)
     {
         if ($this->demotingLastAdmin($user, $roles)) {
             throw new UserUpdateException(trans('errors.role_cannot_remove_only_admin'), $user->getEditUrl());
@@ -252,4 +157,125 @@ class UserRepo
 
         return false;
     }
+
+    /**
+     * Create a new basic instance of user.
+     */
+    public function create(array $data, bool $emailConfirmed = false): User
+    {
+        $details = [
+            'name'             => $data['name'],
+            'email'            => $data['email'],
+            'password'         => bcrypt($data['password']),
+            'email_confirmed'  => $emailConfirmed,
+            'external_auth_id' => $data['external_auth_id'] ?? '',
+        ];
+
+        $user = new User();
+        $user->forceFill($details);
+        $user->refreshSlug();
+        $user->save();
+
+        return $user;
+    }
+
+    /**
+     * Remove the given user from storage, Delete all related content.
+     *
+     * @throws Exception
+     */
+    public function destroy(User $user, ?int $newOwnerId = null)
+    {
+        $user->socialAccounts()->delete();
+        $user->apiTokens()->delete();
+        $user->favourites()->delete();
+        $user->mfaValues()->delete();
+        $user->delete();
+
+        // Delete user profile images
+        $this->userAvatar->destroyAllForUser($user);
+
+        if (!empty($newOwnerId)) {
+            $newOwner = User::query()->find($newOwnerId);
+            if (!is_null($newOwner)) {
+                $this->migrateOwnership($user, $newOwner);
+            }
+        }
+    }
+
+    /**
+     * Migrate ownership of items in the system from one user to another.
+     */
+    protected function migrateOwnership(User $fromUser, User $toUser)
+    {
+        $entities = (new EntityProvider())->all();
+        foreach ($entities as $instance) {
+            $instance->newQuery()->where('owned_by', '=', $fromUser->id)
+                ->update(['owned_by' => $toUser->id]);
+        }
+    }
+
+    /**
+     * Get the latest activity for a user.
+     */
+    public function getActivity(User $user, int $count = 20, int $page = 0): array
+    {
+        return Activity::userActivity($user, $count, $page);
+    }
+
+    /**
+     * Get the recently created content for this given user.
+     */
+    public function getRecentlyCreated(User $user, int $count = 20): array
+    {
+        $query = function (Builder $query) use ($user, $count) {
+            return $query->orderBy('created_at', 'desc')
+                ->where('created_by', '=', $user->id)
+                ->take($count)
+                ->get();
+        };
+
+        return [
+            'pages'    => $query(Page::visible()->where('draft', '=', false)),
+            'chapters' => $query(Chapter::visible()),
+            'books'    => $query(Book::visible()),
+            'shelves'  => $query(Bookshelf::visible()),
+        ];
+    }
+
+    /**
+     * Get asset created counts for the give user.
+     */
+    public function getAssetCounts(User $user): array
+    {
+        $createdBy = ['created_by' => $user->id];
+
+        return [
+            'pages'       => Page::visible()->where($createdBy)->count(),
+            'chapters'    => Chapter::visible()->where($createdBy)->count(),
+            'books'       => Book::visible()->where($createdBy)->count(),
+            'shelves'     => Bookshelf::visible()->where($createdBy)->count(),
+        ];
+    }
+
+    /**
+     * Get the roles in the system that are assignable to a user.
+     */
+    public function getAllRoles(): Collection
+    {
+        return Role::query()->orderBy('display_name', 'asc')->get();
+    }
+
+    /**
+     * Get an avatar image for a user and set it as their avatar.
+     * Returns early if avatars disabled or not set in config.
+     */
+    public function downloadAndAssignUserAvatar(User $user): void
+    {
+        try {
+            $this->userAvatar->fetchAndAssignToUser($user);
+        } catch (Exception $e) {
+            Log::error('Failed to save user avatar image');
+        }
+    }
 }

app/Config/app.php

@@ -57,13 +57,6 @@ return [
     // Space separated if multiple. BookStack host domain is auto-inferred.
     'iframe_hosts' => env('ALLOWED_IFRAME_HOSTS', null),
 
-    // A list of sources/hostnames that can be loaded within iframes within BookStack.
-    // Space separated if multiple. BookStack host domain is auto-inferred.
-    // Can be set to a lone "*" to allow all sources for iframe content (Not advised).
-    // Defaults to a set of common services.
-    // Current host and source for the "DRAWIO" setting will be auto-appended to the sources configured.
-    'iframe_sources' => env('ALLOWED_IFRAME_SOURCES', 'https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com'),
-
     // Application timezone for back-end date functions.
     'timezone' => env('APP_TIMEZONE', 'UTC'),
 
@@ -71,7 +64,7 @@ return [
     'locale' => env('APP_LANG', 'en'),
 
     // Locales available
-    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'et', 'eu', 'fa', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'lt', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'uz', 'vi', 'zh_CN', 'zh_TW'],
+    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'et', 'fa', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'lt', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW'],
 
     //  Application Fallback Locale
     'fallback_locale' => 'en',

app/Config/dompdf.php

@@ -7,10 +7,6 @@
  * Configuration should be altered via the `.env` file or environment variables.
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
-$dompdfPaperSizeMap = [
-    'a4'     => 'a4',
-    'letter' => 'letter',
-];
 
 return [
 
@@ -154,7 +150,7 @@ return [
          *
          * @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.)
          */
-        'default_paper_size' => $dompdfPaperSizeMap[env('EXPORT_PAGE_SIZE', 'a4')] ?? 'a4',
+        'default_paper_size' => 'a4',
 
         /**
          * The default font family.

app/Config/queue.php

@@ -11,7 +11,7 @@
 return [
 
     // Default driver to use for the queue
-    // Options: sync, database, redis
+    // Options: null, sync, redis
     'default' => env('QUEUE_CONNECTION', 'sync'),
 
     // Queue connection configuration

app/Config/services.php

@@ -119,7 +119,6 @@ return [
     'ldap' => [
         'server'                 => env('LDAP_SERVER', false),
         'dump_user_details'      => env('LDAP_DUMP_USER_DETAILS', false),
-        'dump_user_groups'       => env('LDAP_DUMP_USER_GROUPS', false),
         'dn'                     => env('LDAP_DN', false),
         'pass'                   => env('LDAP_PASS', false),
         'base_dn'                => env('LDAP_BASE_DN', false),

app/Config/session.php

@@ -72,7 +72,7 @@ return [
     // to the server if the browser has a HTTPS connection. This will keep
     // the cookie from being sent to you if it can not be done securely.
     'secure' => env('SESSION_SECURE_COOKIE', null)
-        ?? Str::startsWith(env('APP_URL', ''), 'https:'),
+        ?? Str::startsWith(env('APP_URL'), 'https:'),
 
     // HTTP Access Only
     // Setting this value to true will prevent JavaScript from accessing the

app/Config/snappy.php

@@ -7,10 +7,6 @@
  * Configuration should be altered via the `.env` file or environment variables.
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
-$snappyPaperSizeMap = [
-    'a4'     => 'A4',
-    'letter' => 'Letter',
-];
 
 return [
     'pdf' => [
@@ -18,8 +14,7 @@ return [
         'binary'  => file_exists(base_path('wkhtmltopdf')) ? base_path('wkhtmltopdf') : env('WKHTMLTOPDF', false),
         'timeout' => false,
         'options' => [
-            'outline'   => true,
-            'page-size' => $snappyPaperSizeMap[env('EXPORT_PAGE_SIZE', 'a4')] ?? 'A4',
+            'outline' => true,
         ],
         'env'     => [],
     ],

app/Console/Commands/CreateAdmin.php

@@ -2,14 +2,8 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Auth\Role;
 use BookStack\Auth\UserRepo;
-use BookStack\Exceptions\NotFoundException;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Str;
-use Illuminate\Validation\Rules\Password;
-use Illuminate\Validation\Rules\Unique;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 
 class CreateAdmin extends Command
@@ -22,8 +16,7 @@ class CreateAdmin extends Command
     protected $signature = 'bookstack:create-admin
                             {--email= : The email address for the new admin user}
                             {--name= : The name of the new admin user}
-                            {--password= : The password to assign to the new admin user}
-                            {--external-auth-id= : The external authentication system id for the new admin user (SAML2/LDAP/OIDC)}';
+                            {--password= : The password to assign to the new admin user}';
 
     /**
      * The console command description.
@@ -46,47 +39,51 @@ class CreateAdmin extends Command
     /**
      * Execute the console command.
      *
-     * @throws NotFoundException
+     * @throws \BookStack\Exceptions\NotFoundException
      *
      * @return mixed
      */
     public function handle()
     {
-        $details = $this->snakeCaseOptions();
-
-        if (empty($details['email'])) {
-            $details['email'] = $this->ask('Please specify an email address for the new admin user');
+        $email = trim($this->option('email'));
+        if (empty($email)) {
+            $email = $this->ask('Please specify an email address for the new admin user');
         }
-
-        if (empty($details['name'])) {
-            $details['name'] = $this->ask('Please specify a name for the new admin user');
-        }
-
-        if (empty($details['password'])) {
-            if (empty($details['external_auth_id'])) {
-                $details['password'] = $this->ask('Please specify a password for the new admin user (8 characters min)');
-            } else {
-                $details['password'] = Str::random(32);
-            }
-        }
-
-        $validator = Validator::make($details, [
-            'email'            => ['required', 'email', 'min:5', new Unique('users', 'email')],
-            'name'             => ['required', 'min:2'],
-            'password'         => ['required_without:external_auth_id', Password::default()],
-            'external_auth_id' => ['required_without:password'],
-        ]);
-
-        if ($validator->fails()) {
-            foreach ($validator->errors()->all() as $error) {
-                $this->error($error);
-            }
+        if (mb_strlen($email) < 5 || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            $this->error('Invalid email address provided');
 
             return SymfonyCommand::FAILURE;
         }
 
-        $user = $this->userRepo->createWithoutActivity($validator->validated());
-        $user->attachRole(Role::getSystemRole('admin'));
+        if ($this->userRepo->getByEmail($email) !== null) {
+            $this->error('A user with the provided email already exists!');
+
+            return SymfonyCommand::FAILURE;
+        }
+
+        $name = trim($this->option('name'));
+        if (empty($name)) {
+            $name = $this->ask('Please specify an name for the new admin user');
+        }
+        if (mb_strlen($name) < 2) {
+            $this->error('Invalid name provided');
+
+            return SymfonyCommand::FAILURE;
+        }
+
+        $password = trim($this->option('password'));
+        if (empty($password)) {
+            $password = $this->secret('Please specify a password for the new admin user');
+        }
+        if (mb_strlen($password) < 5) {
+            $this->error('Invalid password provided, Must be at least 5 characters');
+
+            return SymfonyCommand::FAILURE;
+        }
+
+        $user = $this->userRepo->create(['email' => $email, 'name' => $name, 'password' => $password]);
+        $this->userRepo->attachSystemRole($user, 'admin');
+        $this->userRepo->downloadAndAssignUserAvatar($user);
         $user->email_confirmed = true;
         $user->save();
 
@@ -94,14 +91,4 @@ class CreateAdmin extends Command
 
         return SymfonyCommand::SUCCESS;
     }
-
-    protected function snakeCaseOptions(): array
-    {
-        $returnOpts = [];
-        foreach ($this->options() as $key => $value) {
-            $returnOpts[str_replace('-', '_', $key)] = $value;
-        }
-
-        return $returnOpts;
-    }
 }

app/Console/Commands/DeleteUsers.php

@@ -15,6 +15,8 @@ class DeleteUsers extends Command
      */
     protected $signature = 'bookstack:delete-users';
 
+    protected $user;
+
     protected $userRepo;
 
     /**
@@ -24,8 +26,9 @@ class DeleteUsers extends Command
      */
     protected $description = 'Delete users that are not "admin" or system users';
 
-    public function __construct(UserRepo $userRepo)
+    public function __construct(User $user, UserRepo $userRepo)
     {
+        $this->user = $user;
         $this->userRepo = $userRepo;
         parent::__construct();
     }
@@ -35,8 +38,8 @@ class DeleteUsers extends Command
         $confirm = $this->ask('This will delete all users from the system that are not "admin" or system users. Are you sure you want to continue? (Type "yes" to continue)');
         $numDeleted = 0;
         if (strtolower(trim($confirm)) === 'yes') {
-            $totalUsers = User::query()->count();
-            $users = User::query()->whereNull('system_name')->with('roles')->get();
+            $totalUsers = $this->user->count();
+            $users = $this->user->where('system_name', '=', null)->with('roles')->get();
             foreach ($users as $user) {
                 if ($user->hasSystemRole('admin')) {
                     // don't delete users with "admin" role

app/Console/Commands/RegenerateSearch.php

@@ -49,7 +49,7 @@ class RegenerateSearch extends Command
             DB::setDefaultConnection($this->option('database'));
         }
 
-        $this->searchIndex->indexAllEntities(function (Entity $model, int $processed, int $total): void {
+        $this->searchIndex->indexAllEntities(function (Entity $model, int $processed, int $total) {
             $this->info('Indexed ' . class_basename($model) . ' entries (' . $processed . '/' . $total . ')');
         });
 

app/Entities/Models/Book.php

@@ -79,43 +79,53 @@ class Book extends Entity implements HasCoverImage
 
     /**
      * Get all pages within this book.
+     *
+     * @return HasMany
      */
-    public function pages(): HasMany
+    public function pages()
     {
         return $this->hasMany(Page::class);
     }
 
     /**
      * Get the direct child pages of this book.
+     *
+     * @return HasMany
      */
-    public function directPages(): HasMany
+    public function directPages()
     {
         return $this->pages()->where('chapter_id', '=', '0');
     }
 
     /**
      * Get all chapters within this book.
+     *
+     * @return HasMany
      */
-    public function chapters(): HasMany
+    public function chapters()
     {
         return $this->hasMany(Chapter::class);
     }
 
     /**
      * Get the shelves this book is contained within.
+     *
+     * @return BelongsToMany
      */
-    public function shelves(): BelongsToMany
+    public function shelves()
     {
         return $this->belongsToMany(Bookshelf::class, 'bookshelves_books', 'book_id', 'bookshelf_id');
     }
 
     /**
      * Get the direct child items within this book.
+     *
+     * @return Collection
      */
     public function getDirectChildren(): Collection
     {
-        $pages = $this->directPages()->scopes('visible')->get();
-        $chapters = $this->chapters()->scopes('visible')->get();
+        $pages = $this->directPages()->visible()->get();
+        $chapters = $this->chapters()->visible()->get();
 
         return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
     }

app/Entities/Models/Bookshelf.php

@@ -37,7 +37,7 @@ class Bookshelf extends Entity implements HasCoverImage
      */
     public function visibleBooks(): BelongsToMany
     {
-        return $this->books()->scopes('visible');
+        return $this->books()->visible();
     }
 
     /**

app/Entities/Models/Chapter.php

@@ -18,13 +18,11 @@ class Chapter extends BookChild
 
     public $searchFactor = 1.2;
 
-    protected $fillable = ['name', 'description', 'priority'];
+    protected $fillable = ['name', 'description', 'priority', 'book_id'];
     protected $hidden = ['restricted', 'pivot', 'deleted_at'];
 
     /**
      * Get the pages that this chapter contains.
-     *
-     * @return HasMany<Page>
      */
     public function pages(string $dir = 'ASC'): HasMany
     {
@@ -52,8 +50,7 @@ class Chapter extends BookChild
      */
     public function getVisiblePages(): Collection
     {
-        return $this->pages()
-        ->scopes('visible')
+        return $this->pages()->visible()
         ->orderBy('draft', 'desc')
         ->orderBy('priority', 'asc')
         ->get();

app/Entities/Models/Deletion.php

@@ -3,23 +3,16 @@
 namespace BookStack\Entities\Models;
 
 use BookStack\Auth\User;
-use BookStack\Interfaces\Deletable;
 use BookStack\Interfaces\Loggable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
- * @property int       $id
- * @property int       $deleted_by
- * @property string    $deletable_type
- * @property int       $deletable_id
- * @property Deletable $deletable
+ * @property Model $deletable
  */
 class Deletion extends Model implements Loggable
 {
-    protected $hidden = [];
-
     /**
      * Get the related deletable record.
      */
@@ -65,7 +58,7 @@ class Deletion extends Model implements Loggable
     /**
      * Get a URL for this specific deletion.
      */
-    public function getUrl(string $path = 'restore'): string
+    public function getUrl($path): string
     {
         return url("/settings/recycle-bin/{$this->id}/" . ltrim($path, '/'));
     }

app/Entities/Models/Entity.php

@@ -12,9 +12,7 @@ use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Entities\Tools\SearchIndex;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Facades\Permissions;
-use BookStack\Interfaces\Deletable;
 use BookStack\Interfaces\Favouritable;
-use BookStack\Interfaces\Loggable;
 use BookStack\Interfaces\Sluggable;
 use BookStack\Interfaces\Viewable;
 use BookStack\Model;
@@ -36,7 +34,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string     $slug
  * @property Carbon     $created_at
  * @property Carbon     $updated_at
- * @property Carbon     $deleted_at
  * @property int        $created_by
  * @property int        $updated_by
  * @property bool       $restricted
@@ -47,7 +44,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */
-abstract class Entity extends Model implements Sluggable, Favouritable, Viewable, Deletable, Loggable
+abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
 {
     use SoftDeletes;
     use HasCreatorAndUpdater;
@@ -123,11 +120,11 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
             return true;
         }
 
-        if (($entity instanceof BookChild) && $this instanceof Book) {
+        if (($entity->isA('chapter') || $entity->isA('page')) && $this->isA('book')) {
             return $entity->book_id === $this->id;
         }
 
-        if ($entity instanceof Page && $this instanceof Chapter) {
+        if ($entity->isA('page') && $this->isA('chapter')) {
             return $entity->chapter_id === $this->id;
         }
 
@@ -213,8 +210,6 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
     /**
      * Check if this instance or class is a certain type of entity.
      * Examples of $type are 'page', 'book', 'chapter'.
-     *
-     * @deprecated Use instanceof instead.
      */
     public static function isA(string $type): bool
     {
@@ -323,12 +318,4 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
             ->where('user_id', '=', user()->id)
             ->exists();
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function logDescriptor(): string
-    {
-        return "({$this->id}) {$this->name}";
-    }
 }

app/Entities/Models/Page.php

@@ -10,23 +10,19 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * Class Page.
  *
- * @property int          $chapter_id
- * @property string       $html
- * @property string       $markdown
- * @property string       $text
- * @property bool         $template
- * @property bool         $draft
- * @property int          $revision_count
- * @property string       $editor
- * @property Chapter      $chapter
- * @property Collection   $attachments
- * @property Collection   $revisions
- * @property PageRevision $currentRevision
+ * @property int        $chapter_id
+ * @property string     $html
+ * @property string     $markdown
+ * @property string     $text
+ * @property bool       $template
+ * @property bool       $draft
+ * @property int        $revision_count
+ * @property Chapter    $chapter
+ * @property Collection $attachments
  */
 class Page extends BookChild
 {
@@ -86,19 +82,6 @@ class Page extends BookChild
             ->orderBy('id', 'desc');
     }
 
-    /**
-     * Get the current revision for the page if existing.
-     *
-     * @return PageRevision|null
-     */
-    public function currentRevision(): HasOne
-    {
-        return $this->hasOne(PageRevision::class)
-            ->where('type', '=', 'version')
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id', 'desc');
-    }
-
     /**
      * Get all revision instances assigned to this page.
      * Includes all types of revisions.
@@ -134,6 +117,16 @@ class Page extends BookChild
         return url('/' . implode('/', $parts));
     }
 
+    /**
+     * Get the current revision for the page if existing.
+     *
+     * @return PageRevision|null
+     */
+    public function getCurrentRevision()
+    {
+        return $this->revisions()->first();
+    }
+
     /**
      * Get this page for JSON display.
      */

app/Entities/Models/PageRevision.php

@@ -10,9 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 /**
  * Class PageRevision.
  *
- * @property mixed  $id
  * @property int    $page_id
- * @property string $name
  * @property string $slug
  * @property string $book_slug
  * @property int    $created_by
@@ -22,15 +20,13 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property string $summary
  * @property string $markdown
  * @property string $html
- * @property string $text
  * @property int    $revision_number
  * @property Page   $page
  * @property-read ?User $createdBy
  */
 class PageRevision extends Model
 {
-    protected $fillable = ['name', 'text', 'summary'];
-    protected $hidden = ['html', 'markdown', 'restricted', 'text'];
+    protected $fillable = ['name', 'html', 'text', 'markdown', 'summary'];
 
     /**
      * Get the user that created the page revision.
@@ -50,16 +46,27 @@ class PageRevision extends Model
 
     /**
      * Get the url for this revision.
+     *
+     * @param null|string $path
+     *
+     * @return string
      */
-    public function getUrl(string $path = ''): string
+    public function getUrl($path = null)
     {
-        return $this->page->getUrl('/revisions/' . $this->id . '/' . ltrim($path, '/'));
+        $url = $this->page->getUrl() . '/revisions/' . $this->id;
+        if ($path) {
+            return $url . '/' . trim($path, '/');
+        }
+
+        return $url;
     }
 
     /**
      * Get the previous revision for the same page if existing.
+     *
+     * @return \BookStack\Entities\PageRevision|null
      */
-    public function getPrevious(): ?PageRevision
+    public function getPrevious()
     {
         $id = static::newQuery()->where('page_id', '=', $this->page_id)
             ->where('id', '<', $this->id)
@@ -77,9 +84,11 @@ class PageRevision extends Model
      * Included here to align with entities in similar use cases.
      * (Yup, Bit of an awkward hack).
      *
-     * @deprecated Use instanceof instead.
+     * @param $type
+     *
+     * @return bool
      */
-    public static function isA(string $type): bool
+    public static function isA($type)
     {
         return $type === 'revision';
     }

app/Entities/Repos/BaseRepo.php

@@ -11,8 +11,8 @@ use Illuminate\Http\UploadedFile;
 
 class BaseRepo
 {
-    protected TagRepo $tagRepo;
-    protected ImageRepo $imageRepo;
+    protected $tagRepo;
+    protected $imageRepo;
 
     public function __construct(TagRepo $tagRepo, ImageRepo $imageRepo)
     {
@@ -58,7 +58,6 @@ class BaseRepo
 
         if (isset($input['tags'])) {
             $this->tagRepo->saveTagsToEntity($entity, $input['tags']);
-            $entity->touch();
         }
 
         $entity->rebuildPermissions();
@@ -68,12 +67,10 @@ class BaseRepo
     /**
      * Update the given items' cover image, or clear it.
      *
-     * @param Entity&HasCoverImage $entity
-     *
      * @throws ImageUploadException
      * @throws \Exception
      */
-    public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $removeImage = false)
+    public function updateCoverImage(HasCoverImage $entity, ?UploadedFile $coverImage, bool $removeImage = false)
     {
         if ($coverImage) {
             $this->imageRepo->destroyImage($entity->cover);

app/Entities/Repos/BookRepo.php

@@ -91,7 +91,7 @@ class BookRepo
     {
         $book = new Book();
         $this->baseRepo->create($book, $input);
-        Activity::add(ActivityType::BOOK_CREATE, $book);
+        Activity::addForEntity($book, ActivityType::BOOK_CREATE);
 
         return $book;
     }
@@ -102,7 +102,7 @@ class BookRepo
     public function update(Book $book, array $input): Book
     {
         $this->baseRepo->update($book, $input);
-        Activity::add(ActivityType::BOOK_UPDATE, $book);
+        Activity::addForEntity($book, ActivityType::BOOK_UPDATE);
 
         return $book;
     }
@@ -127,7 +127,7 @@ class BookRepo
     {
         $trashCan = new TrashCan();
         $trashCan->softDestroyBook($book);
-        Activity::add(ActivityType::BOOK_DELETE, $book);
+        Activity::addForEntity($book, ActivityType::BOOK_DELETE);
 
         $trashCan->autoClearOld();
     }

app/Entities/Repos/BookshelfRepo.php

@@ -90,7 +90,7 @@ class BookshelfRepo
         $shelf = new Bookshelf();
         $this->baseRepo->create($shelf, $input);
         $this->updateBooks($shelf, $bookIds);
-        Activity::add(ActivityType::BOOKSHELF_CREATE, $shelf);
+        Activity::addForEntity($shelf, ActivityType::BOOKSHELF_CREATE);
 
         return $shelf;
     }
@@ -106,7 +106,7 @@ class BookshelfRepo
             $this->updateBooks($shelf, $bookIds);
         }
 
-        Activity::add(ActivityType::BOOKSHELF_UPDATE, $shelf);
+        Activity::addForEntity($shelf, ActivityType::BOOKSHELF_UPDATE);
 
         return $shelf;
     }
@@ -177,7 +177,7 @@ class BookshelfRepo
     {
         $trashCan = new TrashCan();
         $trashCan->softDestroyShelf($shelf);
-        Activity::add(ActivityType::BOOKSHELF_DELETE, $shelf);
+        Activity::addForEntity($shelf, ActivityType::BOOKSHELF_DELETE);
         $trashCan->autoClearOld();
     }
 }

app/Entities/Repos/ChapterRepo.php

@@ -5,12 +5,10 @@ namespace BookStack\Entities\Repos;
 use BookStack\Actions\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
 use Exception;
 
@@ -51,7 +49,7 @@ class ChapterRepo
         $chapter->book_id = $parentBook->id;
         $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
         $this->baseRepo->create($chapter, $input);
-        Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
+        Activity::addForEntity($chapter, ActivityType::CHAPTER_CREATE);
 
         return $chapter;
     }
@@ -62,7 +60,7 @@ class ChapterRepo
     public function update(Chapter $chapter, array $input): Chapter
     {
         $this->baseRepo->update($chapter, $input);
-        Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
+        Activity::addForEntity($chapter, ActivityType::CHAPTER_UPDATE);
 
         return $chapter;
     }
@@ -76,7 +74,7 @@ class ChapterRepo
     {
         $trashCan = new TrashCan();
         $trashCan->softDestroyChapter($chapter);
-        Activity::add(ActivityType::CHAPTER_DELETE, $chapter);
+        Activity::addForEntity($chapter, ActivityType::CHAPTER_DELETE);
         $trashCan->autoClearOld();
     }
 
@@ -86,43 +84,27 @@ class ChapterRepo
      * 'book:<id>' (book:5).
      *
      * @throws MoveOperationException
-     * @throws PermissionsException
      */
     public function move(Chapter $chapter, string $parentIdentifier): Book
     {
-        $parent = $this->findParentByIdentifier($parentIdentifier);
-        if (is_null($parent)) {
-            throw new MoveOperationException('Book to move chapter into not found');
-        }
-
-        if (!userCan('chapter-create', $parent)) {
-            throw new PermissionsException('User does not have permission to create a chapter within the chosen book');
-        }
-
-        $chapter->changeBook($parent->id);
-        $chapter->rebuildPermissions();
-        Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
-
-        return $parent;
-    }
-
-    /**
-     * Find a page parent entity via an identifier string in the format:
-     * {type}:{id}
-     * Example: (book:5).
-     *
-     * @throws MoveOperationException
-     */
-    public function findParentByIdentifier(string $identifier): ?Book
-    {
-        $stringExploded = explode(':', $identifier);
+        $stringExploded = explode(':', $parentIdentifier);
         $entityType = $stringExploded[0];
         $entityId = intval($stringExploded[1]);
 
         if ($entityType !== 'book') {
-            throw new MoveOperationException('Chapters can only be in books');
+            throw new MoveOperationException('Chapters can only be moved into books');
         }
 
-        return Book::visible()->where('id', '=', $entityId)->first();
+        /** @var Book $parent */
+        $parent = Book::visible()->where('id', '=', $entityId)->first();
+        if ($parent === null) {
+            throw new MoveOperationException('Book to move chapter into not found');
+        }
+
+        $chapter->changeBook($parent->id);
+        $chapter->rebuildPermissions();
+        Activity::addForEntity($chapter, ActivityType::CHAPTER_MOVE);
+
+        return $parent;
     }
 }

app/Entities/Repos/DeletionRepo.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Repos;
-
-use BookStack\Actions\ActivityType;
-use BookStack\Entities\Models\Deletion;
-use BookStack\Entities\Tools\TrashCan;
-use BookStack\Facades\Activity;
-
-class DeletionRepo
-{
-    private TrashCan $trashCan;
-
-    public function __construct(TrashCan $trashCan)
-    {
-        $this->trashCan = $trashCan;
-    }
-
-    public function restore(int $id): int
-    {
-        /** @var Deletion $deletion */
-        $deletion = Deletion::query()->findOrFail($id);
-        Activity::add(ActivityType::RECYCLE_BIN_RESTORE, $deletion);
-
-        return $this->trashCan->restoreFromDeletion($deletion);
-    }
-
-    public function destroy(int $id): int
-    {
-        /** @var Deletion $deletion */
-        $deletion = Deletion::query()->findOrFail($id);
-        Activity::add(ActivityType::RECYCLE_BIN_DESTROY, $deletion);
-
-        return $this->trashCan->destroyFromDeletion($deletion);
-    }
-}

app/Entities/Repos/PageRepo.php

@@ -10,7 +10,6 @@ use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
-use BookStack\Entities\Tools\PageEditorData;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
@@ -70,10 +69,9 @@ class PageRepo
      */
     public function getByOldSlug(string $bookSlug, string $pageSlug): ?Page
     {
-        /** @var ?PageRevision $revision */
         $revision = PageRevision::query()
             ->whereHas('page', function (Builder $query) {
-                $query->scopes('visible');
+                $query->visible();
             })
             ->where('slug', '=', $pageSlug)
             ->where('type', '=', 'version')
@@ -82,7 +80,7 @@ class PageRepo
             ->with('page')
             ->first();
 
-        return $revision->page ?? null;
+        return $revision ? $revision->page : null;
     }
 
     /**
@@ -172,7 +170,7 @@ class PageRepo
         $draft->indexForSearch();
         $draft->refresh();
 
-        Activity::add(ActivityType::PAGE_CREATE, $draft);
+        Activity::addForEntity($draft, ActivityType::PAGE_CREATE);
 
         return $draft;
     }
@@ -206,7 +204,7 @@ class PageRepo
             $this->savePageRevision($page, $summary);
         }
 
-        Activity::add(ActivityType::PAGE_UPDATE, $page);
+        Activity::addForEntity($page, ActivityType::PAGE_UPDATE);
 
         return $page;
     }
@@ -218,25 +216,11 @@ class PageRepo
         }
 
         $pageContent = new PageContent($page);
-        $currentEditor = $page->editor ?: PageEditorData::getSystemDefaultEditor();
-        $newEditor = $currentEditor;
-
-        $haveInput = isset($input['markdown']) || isset($input['html']);
-        $inputEmpty = empty($input['markdown']) && empty($input['html']);
-
-        if ($haveInput && $inputEmpty) {
-            $pageContent->setNewHTML('');
-        } elseif (!empty($input['markdown']) && is_string($input['markdown'])) {
-            $newEditor = 'markdown';
+        if (!empty($input['markdown'] ?? '')) {
             $pageContent->setNewMarkdown($input['markdown']);
         } elseif (isset($input['html'])) {
-            $newEditor = 'wysiwyg';
             $pageContent->setNewHTML($input['html']);
         }
-
-        if ($newEditor !== $currentEditor && userCan('editor-change')) {
-            $page->editor = $newEditor;
-        }
     }
 
     /**
@@ -244,12 +228,8 @@ class PageRepo
      */
     protected function savePageRevision(Page $page, string $summary = null): PageRevision
     {
-        $revision = new PageRevision();
+        $revision = new PageRevision($page->getAttributes());
 
-        $revision->name = $page->name;
-        $revision->html = $page->html;
-        $revision->markdown = $page->markdown;
-        $revision->text = $page->text;
         $revision->page_id = $page->id;
         $revision->slug = $page->slug;
         $revision->book_slug = $page->book->slug;
@@ -279,15 +259,10 @@ class PageRepo
             return $page;
         }
 
-        // Otherwise, save the data to a revision
+        // Otherwise save the data to a revision
         $draft = $this->getPageRevisionToUpdate($page);
         $draft->fill($input);
-
-        if (!empty($input['markdown'])) {
-            $draft->markdown = $input['markdown'];
-            $draft->html = '';
-        } else {
-            $draft->html = $input['html'];
+        if (setting('app-editor') !== 'markdown') {
             $draft->markdown = '';
         }
 
@@ -305,7 +280,7 @@ class PageRepo
     {
         $trashCan = new TrashCan();
         $trashCan->softDestroyPage($page);
-        Activity::add(ActivityType::PAGE_DELETE, $page);
+        Activity::addForEntity($page, ActivityType::PAGE_DELETE);
         $trashCan->autoClearOld();
     }
 
@@ -315,8 +290,6 @@ class PageRepo
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;
-
-        /** @var PageRevision $revision */
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
 
         $page->fill($revision->toArray());
@@ -336,7 +309,7 @@ class PageRepo
         $summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
         $this->savePageRevision($page, $summary);
 
-        Activity::add(ActivityType::PAGE_RESTORE, $page);
+        Activity::addForEntity($page, ActivityType::PAGE_RESTORE);
 
         return $page;
     }
@@ -352,7 +325,7 @@ class PageRepo
     public function move(Page $page, string $parentIdentifier): Entity
     {
         $parent = $this->findParentByIdentifier($parentIdentifier);
-        if (is_null($parent)) {
+        if ($parent === null) {
             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 
@@ -361,23 +334,59 @@ class PageRepo
         }
 
         $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
-        $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
-        $page->changeBook($newBookId);
+        $page->changeBook($parent instanceof Book ? $parent->id : $parent->book->id);
         $page->rebuildPermissions();
 
-        Activity::add(ActivityType::PAGE_MOVE, $page);
+        Activity::addForEntity($page, ActivityType::PAGE_MOVE);
 
         return $parent;
     }
 
     /**
-     * Find a page parent entity via an identifier string in the format:
+     * Copy an existing page in the system.
+     * Optionally providing a new parent via string identifier and a new name.
+     *
+     * @throws MoveOperationException
+     * @throws PermissionsException
+     */
+    public function copy(Page $page, string $parentIdentifier = null, string $newName = null): Page
+    {
+        $parent = $parentIdentifier ? $this->findParentByIdentifier($parentIdentifier) : $page->getParent();
+        if ($parent === null) {
+            throw new MoveOperationException('Book or chapter to move page into not found');
+        }
+
+        if (!userCan('page-create', $parent)) {
+            throw new PermissionsException('User does not have permission to create a page within the new parent');
+        }
+
+        $copyPage = $this->getNewDraftPage($parent);
+        $pageData = $page->getAttributes();
+
+        // Update name
+        if (!empty($newName)) {
+            $pageData['name'] = $newName;
+        }
+
+        // Copy tags from previous page if set
+        if ($page->tags) {
+            $pageData['tags'] = [];
+            foreach ($page->tags as $tag) {
+                $pageData['tags'][] = ['name' => $tag->name, 'value' => $tag->value];
+            }
+        }
+
+        return $this->publishDraft($copyPage, $pageData);
+    }
+
+    /**
+     * Find a page parent entity via a identifier string in the format:
      * {type}:{id}
      * Example: (book:5).
      *
      * @throws MoveOperationException
      */
-    public function findParentByIdentifier(string $identifier): ?Entity
+    protected function findParentByIdentifier(string $identifier): ?Entity
     {
         $stringExploded = explode(':', $identifier);
         $entityType = $stringExploded[0];
@@ -397,7 +406,7 @@ class PageRepo
      */
     protected function changeParent(Page $page, Entity $parent)
     {
-        $book = ($parent instanceof Chapter) ? $parent->book : $parent;
+        $book = ($parent instanceof Book) ? $parent : $parent->book;
         $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : 0;
         $page->save();
 
@@ -458,7 +467,6 @@ class PageRepo
     {
         $parent = $page->getParent();
         if ($parent instanceof Chapter) {
-            /** @var ?Page $lastPage */
             $lastPage = $parent->pages('desc')->first();
 
             return $lastPage ? $lastPage->priority + 1 : 0;

app/Entities/Tools/BookContents.php

@@ -7,6 +7,7 @@ use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\SortOperationException;
 use Illuminate\Support\Collection;
 
 class BookContents
@@ -66,7 +67,7 @@ class BookContents
         $all->each(function (Entity $entity) use ($renderPages) {
             $entity->setRelation('book', $this->book);
 
-            if ($renderPages && $entity instanceof Page) {
+            if ($renderPages && $entity->isA('page')) {
                 $entity->html = (new PageContent($entity))->render();
             }
         });
@@ -106,209 +107,111 @@ class BookContents
     }
 
     /**
-     * Sort the books content using the given sort map.
+     * Sort the books content using the given map.
+     * The map is a single-dimension collection of objects in the following format:
+     *   {
+     *     +"id": "294" (ID of item)
+     *     +"sort": 1 (Sort order index)
+     *     +"parentChapter": false (ID of parent chapter, as string, or false)
+     *     +"type": "page" (Entity type of item)
+     *     +"book": "1" (Id of book to place item in)
+     *   }.
+     *
      * Returns a list of books that were involved in the operation.
      *
-     * @returns Book[]
+     * @throws SortOperationException
      */
-    public function sortUsingMap(BookSortMap $sortMap): array
+    public function sortUsingMap(Collection $sortMap): Collection
     {
         // Load models into map
-        $modelMap = $this->loadModelsFromSortMap($sortMap);
-
-        // Sort our changes from our map to be chapters first
-        // Since they need to be process to ensure book alignment for child page changes.
-        $sortMapItems = $sortMap->all();
-        usort($sortMapItems, function (BookSortMapItem $itemA, BookSortMapItem $itemB) {
-            $aScore = $itemA->type === 'page' ? 2 : 1;
-            $bScore = $itemB->type === 'page' ? 2 : 1;
-
-            return $aScore - $bScore;
-        });
+        $this->loadModelsIntoSortMap($sortMap);
+        $booksInvolved = $this->getBooksInvolvedInSort($sortMap);
 
         // Perform the sort
-        foreach ($sortMapItems as $item) {
-            $this->applySortUpdates($item, $modelMap);
-        }
+        $sortMap->each(function ($mapItem) {
+            $this->applySortUpdates($mapItem);
+        });
 
-        /** @var Book[] $booksInvolved */
-        $booksInvolved = array_values(array_filter($modelMap, function (string $key) {
-            return strpos($key, 'book:') === 0;
-        }, ARRAY_FILTER_USE_KEY));
-
-        // Update permissions of books involved
-        foreach ($booksInvolved as $book) {
+        // Update permissions and activity.
+        $booksInvolved->each(function (Book $book) {
             $book->rebuildPermissions();
-        }
+        });
 
         return $booksInvolved;
     }
 
     /**
      * Using the given sort map item, detect changes for the related model
-     * and update it if required. Changes where permissions are lacking will
-     * be skipped and not throw an error.
-     *
-     * @param array<string, Entity> $modelMap
+     * and update it if required.
      */
-    protected function applySortUpdates(BookSortMapItem $sortMapItem, array $modelMap): void
+    protected function applySortUpdates(\stdClass $sortMapItem)
     {
         /** @var BookChild $model */
-        $model = $modelMap[$sortMapItem->type . ':' . $sortMapItem->id] ?? null;
-        if (!$model) {
-            return;
-        }
+        $model = $sortMapItem->model;
 
-        $priorityChanged = $model->priority !== $sortMapItem->sort;
-        $bookChanged = $model->book_id !== $sortMapItem->parentBookId;
-        $chapterChanged = ($model instanceof Page) && $model->chapter_id !== $sortMapItem->parentChapterId;
+        $priorityChanged = intval($model->priority) !== intval($sortMapItem->sort);
+        $bookChanged = intval($model->book_id) !== intval($sortMapItem->book);
+        $chapterChanged = ($sortMapItem->type === 'page') && intval($model->chapter_id) !== $sortMapItem->parentChapter;
 
-        // Stop if there's no change
-        if (!$priorityChanged && !$bookChanged && !$chapterChanged) {
-            return;
-        }
-
-        $currentParentKey = 'book:' . $model->book_id;
-        if ($model instanceof Page && $model->chapter_id) {
-            $currentParentKey = 'chapter:' . $model->chapter_id;
-        }
-
-        $currentParent = $modelMap[$currentParentKey] ?? null;
-        /** @var Book $newBook */
-        $newBook = $modelMap['book:' . $sortMapItem->parentBookId] ?? null;
-        /** @var ?Chapter $newChapter */
-        $newChapter = $sortMapItem->parentChapterId ? ($modelMap['chapter:' . $sortMapItem->parentChapterId] ?? null) : null;
-
-        if (!$this->isSortChangePermissible($sortMapItem, $model, $currentParent, $newBook, $newChapter)) {
-            return;
-        }
-
-        // Action the required changes
         if ($bookChanged) {
-            $model->changeBook($newBook->id);
+            $model->changeBook($sortMapItem->book);
         }
 
         if ($chapterChanged) {
-            $model->chapter_id = $newChapter->id ?? 0;
+            $model->chapter_id = intval($sortMapItem->parentChapter);
+            $model->save();
         }
 
         if ($priorityChanged) {
-            $model->priority = $sortMapItem->sort;
-        }
-
-        if ($chapterChanged || $priorityChanged) {
+            $model->priority = intval($sortMapItem->sort);
             $model->save();
         }
     }
 
     /**
-     * Check if the current user has permissions to apply the given sorting change.
-     * Is quite complex since items can gain a different parent change. Acts as a:
-     * - Update of old parent element (Change of content/order).
-     * - Update of sorted/moved element.
-     * - Deletion of element (Relative to parent upon move).
-     * - Creation of element within parent (Upon move to new parent).
+     * Load models from the database into the given sort map.
      */
-    protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChild $model, ?Entity $currentParent, ?Entity $newBook, ?Entity $newChapter): bool
+    protected function loadModelsIntoSortMap(Collection $sortMap): void
     {
-        // Stop if we can't see the current parent or new book.
-        if (!$currentParent || !$newBook) {
-            return false;
+        $keyMap = $sortMap->keyBy(function (\stdClass $sortMapItem) {
+            return  $sortMapItem->type . ':' . $sortMapItem->id;
+        });
+        $pageIds = $sortMap->where('type', '=', 'page')->pluck('id');
+        $chapterIds = $sortMap->where('type', '=', 'chapter')->pluck('id');
+
+        $pages = Page::visible()->whereIn('id', $pageIds)->get();
+        $chapters = Chapter::visible()->whereIn('id', $chapterIds)->get();
+
+        foreach ($pages as $page) {
+            $sortItem = $keyMap->get('page:' . $page->id);
+            $sortItem->model = $page;
         }
 
-        $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));
-
-            if (!$hasPermission) {
-                return false;
-            }
+        foreach ($chapters as $chapter) {
+            $sortItem = $keyMap->get('chapter:' . $chapter->id);
+            $sortItem->model = $chapter;
         }
-
-        if ($model instanceof Page) {
-            $parentPermission = ($currentParent instanceof Chapter) ? 'chapter-update' : 'book-update';
-            $hasCurrentParentPermission = userCan($parentPermission, $currentParent);
-
-            // This needs to check if there was an intended chapter location in the original sort map
-            // rather than inferring from the $newChapter since that variable may be null
-            // due to other reasons (Visibility).
-            $newParent = $sortMapItem->parentChapterId ? $newChapter : $newBook;
-            if (!$newParent) {
-                return false;
-            }
-
-            $hasPageEditPermission = userCan('page-update', $model);
-            $newParentInRightLocation = ($newParent instanceof Book || $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));
-
-            $hasPermission = $hasCurrentParentPermission
-                && $newParentInRightLocation
-                && $hasNewParentPermission
-                && $hasPageEditPermission
-                && $hasDeletePermissionIfMoving
-                && $hasCreatePermissionIfMoving;
-
-            if (!$hasPermission) {
-                return false;
-            }
-        }
-
-        return true;
     }
 
     /**
-     * Load models from the database into the given sort map.
+     * Get the books involved in a sort.
+     * The given sort map should have its models loaded first.
      *
-     * @return array<string, Entity>
+     * @throws SortOperationException
      */
-    protected function loadModelsFromSortMap(BookSortMap $sortMap): array
+    protected function getBooksInvolvedInSort(Collection $sortMap): Collection
     {
-        $modelMap = [];
-        $ids = [
-            'chapter' => [],
-            'page'    => [],
-            'book'    => [],
-        ];
+        $bookIdsInvolved = collect([$this->book->id]);
+        $bookIdsInvolved = $bookIdsInvolved->concat($sortMap->pluck('book'));
+        $bookIdsInvolved = $bookIdsInvolved->concat($sortMap->pluck('model.book_id'));
+        $bookIdsInvolved = $bookIdsInvolved->unique()->toArray();
 
-        foreach ($sortMap->all() as $sortMapItem) {
-            $ids[$sortMapItem->type][] = $sortMapItem->id;
-            $ids['book'][] = $sortMapItem->parentBookId;
-            if ($sortMapItem->parentChapterId) {
-                $ids['chapter'][] = $sortMapItem->parentChapterId;
-            }
+        $books = Book::hasPermission('update')->whereIn('id', $bookIdsInvolved)->get();
+
+        if (count($books) !== count($bookIdsInvolved)) {
+            throw new SortOperationException('Could not find all books requested in sort operation');
         }
 
-        $pages = Page::visible()->whereIn('id', array_unique($ids['page']))->get(Page::$listAttributes);
-        /** @var Page $page */
-        foreach ($pages as $page) {
-            $modelMap['page:' . $page->id] = $page;
-            $ids['book'][] = $page->book_id;
-            if ($page->chapter_id) {
-                $ids['chapter'][] = $page->chapter_id;
-            }
-        }
-
-        $chapters = Chapter::visible()->whereIn('id', array_unique($ids['chapter']))->get();
-        /** @var Chapter $chapter */
-        foreach ($chapters as $chapter) {
-            $modelMap['chapter:' . $chapter->id] = $chapter;
-            $ids['book'][] = $chapter->book_id;
-        }
-
-        $books = Book::visible()->whereIn('id', array_unique($ids['book']))->get();
-        /** @var Book $book */
-        foreach ($books as $book) {
-            $modelMap['book:' . $book->id] = $book;
-        }
-
-        return $modelMap;
+        return $books;
     }
 }

app/Entities/Tools/BookSortMap.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools;
-
-class BookSortMap
-{
-    /**
-     * @var BookSortMapItem[]
-     */
-    protected $mapData = [];
-
-    public function addItem(BookSortMapItem $mapItem): void
-    {
-        $this->mapData[] = $mapItem;
-    }
-
-    /**
-     * @return BookSortMapItem[]
-     */
-    public function all(): array
-    {
-        return $this->mapData;
-    }
-
-    public static function fromJson(string $json): self
-    {
-        $map = new BookSortMap();
-        $mapData = json_decode($json);
-
-        foreach ($mapData as $mapDataItem) {
-            $item = new BookSortMapItem(
-                intval($mapDataItem->id),
-                intval($mapDataItem->sort),
-                $mapDataItem->parentChapter ? intval($mapDataItem->parentChapter) : null,
-                $mapDataItem->type,
-                intval($mapDataItem->book)
-            );
-
-            $map->addItem($item);
-        }
-
-        return $map;
-    }
-}

app/Entities/Tools/BookSortMapItem.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools;
-
-class BookSortMapItem
-{
-    /**
-     * @var int
-     */
-    public $id;
-
-    /**
-     * @var int
-     */
-    public $sort;
-
-    /**
-     * @var ?int
-     */
-    public $parentChapterId;
-
-    /**
-     * @var string
-     */
-    public $type;
-
-    /**
-     * @var int
-     */
-    public $parentBookId;
-
-    public function __construct(int $id, int $sort, ?int $parentChapterId, string $type, int $parentBookId)
-    {
-        $this->id = $id;
-        $this->sort = $sort;
-        $this->parentChapterId = $parentChapterId;
-        $this->type = $type;
-        $this->parentBookId = $parentBookId;
-    }
-}

app/Entities/Tools/Cloner.php

@@ -1,147 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools;
-
-use BookStack\Actions\Tag;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use BookStack\Entities\Repos\BookRepo;
-use BookStack\Entities\Repos\ChapterRepo;
-use BookStack\Entities\Repos\PageRepo;
-use BookStack\Uploads\Image;
-use BookStack\Uploads\ImageService;
-use Illuminate\Http\UploadedFile;
-
-class Cloner
-{
-    /**
-     * @var PageRepo
-     */
-    protected $pageRepo;
-
-    /**
-     * @var ChapterRepo
-     */
-    protected $chapterRepo;
-
-    /**
-     * @var BookRepo
-     */
-    protected $bookRepo;
-
-    /**
-     * @var ImageService
-     */
-    protected $imageService;
-
-    public function __construct(PageRepo $pageRepo, ChapterRepo $chapterRepo, BookRepo $bookRepo, ImageService $imageService)
-    {
-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;
-        $this->bookRepo = $bookRepo;
-        $this->imageService = $imageService;
-    }
-
-    /**
-     * Clone the given page into the given parent using the provided name.
-     */
-    public function clonePage(Page $original, Entity $parent, string $newName): Page
-    {
-        $copyPage = $this->pageRepo->getNewDraftPage($parent);
-        $pageData = $original->getAttributes();
-
-        // Update name & tags
-        $pageData['name'] = $newName;
-        $pageData['tags'] = $this->entityTagsToInputArray($original);
-
-        return $this->pageRepo->publishDraft($copyPage, $pageData);
-    }
-
-    /**
-     * Clone the given page into the given parent using the provided name.
-     * Clones all child pages.
-     */
-    public function cloneChapter(Chapter $original, Book $parent, string $newName): Chapter
-    {
-        $chapterDetails = $original->getAttributes();
-        $chapterDetails['name'] = $newName;
-        $chapterDetails['tags'] = $this->entityTagsToInputArray($original);
-
-        $copyChapter = $this->chapterRepo->create($chapterDetails, $parent);
-
-        if (userCan('page-create', $copyChapter)) {
-            /** @var Page $page */
-            foreach ($original->getVisiblePages() as $page) {
-                $this->clonePage($page, $copyChapter, $page->name);
-            }
-        }
-
-        return $copyChapter;
-    }
-
-    /**
-     * Clone the given book.
-     * Clones all child chapters & pages.
-     */
-    public function cloneBook(Book $original, string $newName): Book
-    {
-        $bookDetails = $original->getAttributes();
-        $bookDetails['name'] = $newName;
-        $bookDetails['tags'] = $this->entityTagsToInputArray($original);
-
-        $copyBook = $this->bookRepo->create($bookDetails);
-
-        $directChildren = $original->getDirectChildren();
-        foreach ($directChildren as $child) {
-            if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {
-                $this->cloneChapter($child, $copyBook, $child->name);
-            }
-
-            if ($child instanceof Page && !$child->draft && userCan('page-create', $copyBook)) {
-                $this->clonePage($child, $copyBook, $child->name);
-            }
-        }
-
-        if ($original->cover) {
-            try {
-                $tmpImgFile = tmpfile();
-                $uploadedFile = $this->imageToUploadedFile($original->cover, $tmpImgFile);
-                $this->bookRepo->updateCoverImage($copyBook, $uploadedFile, false);
-            } catch (\Exception $exception) {
-            }
-        }
-
-        return $copyBook;
-    }
-
-    /**
-     * Convert an image instance to an UploadedFile instance to mimic
-     * a file being uploaded.
-     */
-    protected function imageToUploadedFile(Image $image, &$tmpFile): ?UploadedFile
-    {
-        $imgData = $this->imageService->getImageData($image);
-        $tmpImgFilePath = stream_get_meta_data($tmpFile)['uri'];
-        file_put_contents($tmpImgFilePath, $imgData);
-
-        return new UploadedFile($tmpImgFilePath, basename($image->path));
-    }
-
-    /**
-     * Convert the tags on the given entity to the raw format
-     * that's used for incoming request data.
-     */
-    protected function entityTagsToInputArray(Entity $entity): array
-    {
-        $tags = [];
-
-        /** @var Tag $tag */
-        foreach ($entity->tags as $tag) {
-            $tags[] = ['name' => $tag->name, 'value' => $tag->value];
-        }
-
-        return $tags;
-    }
-}

app/Entities/Tools/ExportFormatter.php

@@ -7,27 +7,21 @@ use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
 use BookStack\Uploads\ImageService;
-use BookStack\Util\CspService;
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
+use DomPDF;
 use Exception;
+use SnappyPDF;
 use Throwable;
 
 class ExportFormatter
 {
-    protected ImageService $imageService;
-    protected PdfGenerator $pdfGenerator;
-    protected CspService $cspService;
+    protected $imageService;
 
     /**
      * ExportService constructor.
      */
-    public function __construct(ImageService $imageService, PdfGenerator $pdfGenerator, CspService $cspService)
+    public function __construct(ImageService $imageService)
     {
         $this->imageService = $imageService;
-        $this->pdfGenerator = $pdfGenerator;
-        $this->cspService = $cspService;
     }
 
     /**
@@ -40,9 +34,8 @@ class ExportFormatter
     {
         $page->html = (new PageContent($page))->render();
         $pageHtml = view('pages.export', [
-            'page'       => $page,
-            'format'     => 'html',
-            'cspContent' => $this->cspService->getCspMetaTagValue(),
+            'page'   => $page,
+            'format' => 'html',
         ])->render();
 
         return $this->containHtml($pageHtml);
@@ -60,10 +53,9 @@ class ExportFormatter
             $page->html = (new PageContent($page))->render();
         });
         $html = view('chapters.export', [
-            'chapter'    => $chapter,
-            'pages'      => $pages,
-            'format'     => 'html',
-            'cspContent' => $this->cspService->getCspMetaTagValue(),
+            'chapter' => $chapter,
+            'pages'   => $pages,
+            'format'  => 'html',
         ])->render();
 
         return $this->containHtml($html);
@@ -81,7 +73,6 @@ class ExportFormatter
             'book'         => $book,
             'bookChildren' => $bookTree,
             'format'       => 'html',
-            'cspContent'   => $this->cspService->getCspMetaTagValue(),
         ])->render();
 
         return $this->containHtml($html);
@@ -98,7 +89,6 @@ class ExportFormatter
         $html = view('pages.export', [
             'page'   => $page,
             'format' => 'pdf',
-            'engine' => $this->pdfGenerator->getActiveEngine(),
         ])->render();
 
         return $this->htmlToPdf($html);
@@ -120,7 +110,6 @@ class ExportFormatter
             'chapter' => $chapter,
             'pages'   => $pages,
             'format'  => 'pdf',
-            'engine'  => $this->pdfGenerator->getActiveEngine(),
         ])->render();
 
         return $this->htmlToPdf($html);
@@ -138,7 +127,6 @@ class ExportFormatter
             'book'         => $book,
             'bookChildren' => $bookTree,
             'format'       => 'pdf',
-            'engine'       => $this->pdfGenerator->getActiveEngine(),
         ])->render();
 
         return $this->htmlToPdf($html);
@@ -151,61 +139,16 @@ class ExportFormatter
      */
     protected function htmlToPdf(string $html): string
     {
-        $html = $this->containHtml($html);
-        $html = $this->replaceIframesWithLinks($html);
-        $html = $this->openDetailElements($html);
-
-        return $this->pdfGenerator->fromHtml($html);
-    }
-
-    /**
-     * Within the given HTML content, Open any detail blocks.
-     */
-    protected function openDetailElements(string $html): string
-    {
-        libxml_use_internal_errors(true);
-
-        $doc = new DOMDocument();
-        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
-        $xPath = new DOMXPath($doc);
-
-        $details = $xPath->query('//details');
-        /** @var DOMElement $detail */
-        foreach ($details as $detail) {
-            $detail->setAttribute('open', 'open');
+        $containedHtml = $this->containHtml($html);
+        $useWKHTML = config('snappy.pdf.binary') !== false && config('app.allow_untrusted_server_fetching') === true;
+        if ($useWKHTML) {
+            $pdf = SnappyPDF::loadHTML($containedHtml);
+            $pdf->setOption('print-media-type', true);
+        } else {
+            $pdf = DomPDF::loadHTML($containedHtml);
         }
 
-        return $doc->saveHTML();
-    }
-
-    /**
-     * Within the given HTML content, replace any iframe elements
-     * with anchor links within paragraph blocks.
-     */
-    protected function replaceIframesWithLinks(string $html): string
-    {
-        libxml_use_internal_errors(true);
-
-        $doc = new DOMDocument();
-        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
-        $xPath = new DOMXPath($doc);
-
-        $iframes = $xPath->query('//iframe');
-        /** @var DOMElement $iframe */
-        foreach ($iframes as $iframe) {
-            $link = $iframe->getAttribute('src');
-            if (strpos($link, '//') === 0) {
-                $link = 'https:' . $link;
-            }
-
-            $anchor = $doc->createElement('a', $link);
-            $anchor->setAttribute('href', $link);
-            $paragraph = $doc->createElement('p');
-            $paragraph->appendChild($anchor);
-            $iframe->parentNode->replaceChild($paragraph, $iframe);
-        }
-
-        return $doc->saveHTML();
+        return $pdf->output();
     }
 
     /**
@@ -215,16 +158,14 @@ class ExportFormatter
      */
     protected function containHtml(string $htmlContent): string
     {
-        // Replace embed tags with images
-        $htmlContent = preg_replace("/<embed (.*?)>/i", '<img $1>', $htmlContent);
-
-        // Replace image & embed src attributes with base64 encoded data strings
         $imageTagsOutput = [];
-        preg_match_all("/<img .*?src=['\"](.*?)['\"].*?>/i", $htmlContent, $imageTagsOutput);
+        preg_match_all("/\<img.*?src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput);
+
+        // Replace image src with base64 encoded image strings
         if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) {
             foreach ($imageTagsOutput[0] as $index => $imgMatch) {
                 $oldImgTagString = $imgMatch;
-                $srcString = $imageTagsOutput[1][$index];
+                $srcString = $imageTagsOutput[2][$index];
                 $imageEncoded = $this->imageService->imageUriToBase64($srcString);
                 if ($imageEncoded === null) {
                     $imageEncoded = $srcString;
@@ -234,13 +175,14 @@ class ExportFormatter
             }
         }
 
-        // Replace any relative links with full system URL
         $linksOutput = [];
-        preg_match_all("/<a .*href=['\"](.*?)['\"].*?>/i", $htmlContent, $linksOutput);
+        preg_match_all("/\<a.*href\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $linksOutput);
+
+        // Replace image src with base64 encoded image strings
         if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) {
             foreach ($linksOutput[0] as $index => $linkMatch) {
                 $oldLinkString = $linkMatch;
-                $srcString = $linksOutput[1][$index];
+                $srcString = $linksOutput[2][$index];
                 if (strpos(trim($srcString), 'http') !== 0) {
                     $newSrcString = url($srcString);
                     $newLinkString = str_replace($srcString, $newSrcString, $oldLinkString);
@@ -249,6 +191,7 @@ class ExportFormatter
             }
         }
 
+        // Replace any relative links with system domain
         return $htmlContent;
     }
 
@@ -326,7 +269,7 @@ class ExportFormatter
             $text .= $this->pageToMarkdown($page) . "\n\n";
         }
 
-        return trim($text);
+        return $text;
     }
 
     /**
@@ -338,12 +281,12 @@ class ExportFormatter
         $text = '# ' . $book->name . "\n\n";
         foreach ($bookTree as $bookChild) {
             if ($bookChild instanceof Chapter) {
-                $text .= $this->chapterToMarkdown($bookChild) . "\n\n";
+                $text .= $this->chapterToMarkdown($bookChild);
             } else {
-                $text .= $this->pageToMarkdown($bookChild) . "\n\n";
+                $text .= $this->pageToMarkdown($bookChild);
             }
         }
 
-        return trim($text);
+        return $text;
     }
 }

app/Entities/Tools/Markdown/CheckboxConverter.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools\Markdown;
-
-use League\HTMLToMarkdown\Converter\ConverterInterface;
-use League\HTMLToMarkdown\ElementInterface;
-
-class CheckboxConverter implements ConverterInterface
-{
-    public function convert(ElementInterface $element): string
-    {
-        if (strtolower($element->getAttribute('type')) === 'checkbox') {
-            $isChecked = $element->getAttribute('checked') === 'checked';
-
-            return $isChecked ? ' [x] ' : ' [ ] ';
-        }
-
-        return $element->getValue();
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getSupportedTags(): array
-    {
-        return ['input'];
-    }
-}

app/Entities/Tools/Markdown/CustomDivConverter.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools\Markdown;
-
-use League\HTMLToMarkdown\Converter\DivConverter;
-use League\HTMLToMarkdown\ElementInterface;
-
-class CustomDivConverter extends DivConverter
-{
-    public function convert(ElementInterface $element): string
-    {
-        // Clean up draw.io diagrams
-        $drawIoDiagram = $element->getAttribute('drawio-diagram');
-        if ($drawIoDiagram) {
-            return "<div drawio-diagram=\"{$drawIoDiagram}\">{$element->getValue()}</div>\n\n";
-        }
-
-        return parent::convert($element);
-    }
-}

app/Entities/Tools/Markdown/CustomImageConverter.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools\Markdown;
-
-use League\HTMLToMarkdown\Converter\ImageConverter;
-use League\HTMLToMarkdown\ElementInterface;
-
-class CustomImageConverter extends ImageConverter
-{
-    public function convert(ElementInterface $element): string
-    {
-        $parent = $element->getParent();
-
-        // Remain as HTML if within diagram block.
-        $withinDrawing = $parent && !empty($parent->getAttribute('drawio-diagram'));
-        if ($withinDrawing) {
-            $src = e($element->getAttribute('src'));
-            $alt = e($element->getAttribute('alt'));
-
-            return "<img src=\"{$src}\" alt=\"{$alt}\"/>";
-        }
-
-        return parent::convert($element);
-    }
-}

app/Entities/Tools/Markdown/CustomParagraphConverter.php

@@ -9,7 +9,7 @@ class CustomParagraphConverter extends ParagraphConverter
 {
     public function convert(ElementInterface $element): string
     {
-        $class = e($element->getAttribute('class'));
+        $class = $element->getAttribute('class');
         if (strpos($class, 'callout') !== false) {
             return "<{$element->getTagName()} class=\"{$class}\">{$element->getValue()}</{$element->getTagName()}>\n\n";
         }

app/Entities/Tools/Markdown/HtmlToMarkdown.php

@@ -5,10 +5,12 @@ namespace BookStack\Entities\Tools\Markdown;
 use League\HTMLToMarkdown\Converter\BlockquoteConverter;
 use League\HTMLToMarkdown\Converter\CodeConverter;
 use League\HTMLToMarkdown\Converter\CommentConverter;
+use League\HTMLToMarkdown\Converter\DivConverter;
 use League\HTMLToMarkdown\Converter\EmphasisConverter;
 use League\HTMLToMarkdown\Converter\HardBreakConverter;
 use League\HTMLToMarkdown\Converter\HeaderConverter;
 use League\HTMLToMarkdown\Converter\HorizontalRuleConverter;
+use League\HTMLToMarkdown\Converter\ImageConverter;
 use League\HTMLToMarkdown\Converter\LinkConverter;
 use League\HTMLToMarkdown\Converter\ListBlockConverter;
 use League\HTMLToMarkdown\Converter\ListItemConverter;
@@ -19,7 +21,7 @@ use League\HTMLToMarkdown\HtmlConverter;
 
 class HtmlToMarkdown
 {
-    protected string $html;
+    protected $html;
 
     public function __construct(string $html)
     {
@@ -73,20 +75,18 @@ class HtmlToMarkdown
         $environment->addConverter(new BlockquoteConverter());
         $environment->addConverter(new CodeConverter());
         $environment->addConverter(new CommentConverter());
-        $environment->addConverter(new CustomDivConverter());
+        $environment->addConverter(new DivConverter());
         $environment->addConverter(new EmphasisConverter());
         $environment->addConverter(new HardBreakConverter());
         $environment->addConverter(new HeaderConverter());
         $environment->addConverter(new HorizontalRuleConverter());
-        $environment->addConverter(new CustomImageConverter());
+        $environment->addConverter(new ImageConverter());
         $environment->addConverter(new LinkConverter());
         $environment->addConverter(new ListBlockConverter());
         $environment->addConverter(new ListItemConverter());
         $environment->addConverter(new CustomParagraphConverter());
         $environment->addConverter(new PreformattedConverter());
         $environment->addConverter(new TextConverter());
-        $environment->addConverter(new CheckboxConverter());
-        $environment->addConverter(new SpacedTagFallbackConverter());
 
         return $environment;
     }

app/Entities/Tools/Markdown/MarkdownToHtml.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools\Markdown;
-
-use BookStack\Facades\Theme;
-use BookStack\Theming\ThemeEvents;
-use League\CommonMark\Block\Element\ListItem;
-use League\CommonMark\CommonMarkConverter;
-use League\CommonMark\Environment;
-use League\CommonMark\Extension\Table\TableExtension;
-use League\CommonMark\Extension\TaskList\TaskListExtension;
-
-class MarkdownToHtml
-{
-    protected string $markdown;
-
-    public function __construct(string $markdown)
-    {
-        $this->markdown = $markdown;
-    }
-
-    public function convert(): string
-    {
-        $environment = Environment::createCommonMarkEnvironment();
-        $environment->addExtension(new TableExtension());
-        $environment->addExtension(new TaskListExtension());
-        $environment->addExtension(new CustomStrikeThroughExtension());
-        $environment = Theme::dispatch(ThemeEvents::COMMONMARK_ENVIRONMENT_CONFIGURE, $environment) ?? $environment;
-        $converter = new CommonMarkConverter([], $environment);
-
-        $environment->addBlockRenderer(ListItem::class, new CustomListItemRenderer(), 10);
-
-        return $converter->convertToHtml($this->markdown);
-    }
-}

app/Entities/Tools/Markdown/SpacedTagFallbackConverter.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools\Markdown;
-
-use League\HTMLToMarkdown\Converter\ConverterInterface;
-use League\HTMLToMarkdown\ElementInterface;
-
-/**
- * For certain defined tags, add additional spacing upon the retained HTML content
- * to separate it out from anything that may be markdown soon afterwards or within.
- */
-class SpacedTagFallbackConverter implements ConverterInterface
-{
-    public function convert(ElementInterface $element): string
-    {
-        return \html_entity_decode($element->getChildrenAsString()) . "\n\n";
-    }
-
-    public function getSupportedTags(): array
-    {
-        return ['summary', 'iframe'];
-    }
-}

app/Entities/Tools/NextPreviousContentLocator.php

@@ -64,7 +64,7 @@ class NextPreviousContentLocator
         /** @var Entity $item */
         foreach ($bookTree->all() as $item) {
             $flatOrdered->push($item);
-            $childPages = $item->getAttribute('visible_pages') ?? [];
+            $childPages = $item->visible_pages ?? [];
             $flatOrdered = $flatOrdered->concat($childPages);
         }
 

app/Entities/Tools/PageContent.php

@@ -3,21 +3,27 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\Entities\Models\Page;
-use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
+use BookStack\Entities\Tools\Markdown\CustomListItemRenderer;
+use BookStack\Entities\Tools\Markdown\CustomStrikeThroughExtension;
 use BookStack\Exceptions\ImageUploadException;
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageService;
 use BookStack\Util\HtmlContentFilter;
 use DOMDocument;
-use DOMElement;
-use DOMNode;
 use DOMNodeList;
 use DOMXPath;
 use Illuminate\Support\Str;
+use League\CommonMark\Block\Element\ListItem;
+use League\CommonMark\CommonMarkConverter;
+use League\CommonMark\Environment;
+use League\CommonMark\Extension\Table\TableExtension;
+use League\CommonMark\Extension\TaskList\TaskListExtension;
 
 class PageContent
 {
-    protected Page $page;
+    protected $page;
 
     /**
      * PageContent constructor.
@@ -45,11 +51,28 @@ class PageContent
     {
         $markdown = $this->extractBase64ImagesFromMarkdown($markdown);
         $this->page->markdown = $markdown;
-        $html = (new MarkdownToHtml($markdown))->convert();
+        $html = $this->markdownToHtml($markdown);
         $this->page->html = $this->formatHtml($html);
         $this->page->text = $this->toPlainText();
     }
 
+    /**
+     * Convert the given Markdown content to a HTML string.
+     */
+    protected function markdownToHtml(string $markdown): string
+    {
+        $environment = Environment::createCommonMarkEnvironment();
+        $environment->addExtension(new TableExtension());
+        $environment->addExtension(new TaskListExtension());
+        $environment->addExtension(new CustomStrikeThroughExtension());
+        $environment = Theme::dispatch(ThemeEvents::COMMONMARK_ENVIRONMENT_CONFIGURE, $environment) ?? $environment;
+        $converter = new CommonMarkConverter([], $environment);
+
+        $environment->addBlockRenderer(ListItem::class, new CustomListItemRenderer(), 10);
+
+        return $converter->convertToHtml($markdown);
+    }
+
     /**
      * Convert all base64 image data to saved images.
      */
@@ -84,35 +107,15 @@ class PageContent
 
     /**
      * Convert all inline base64 content to uploaded image files.
-     * Regex is used to locate the start of data-uri definitions then
-     * manual looping over content is done to parse the whole data uri.
-     * Attempting to capture the whole data uri using regex can cause PHP
-     * PCRE limits to be hit with larger, multi-MB, files.
      */
     protected function extractBase64ImagesFromMarkdown(string $markdown)
     {
         $matches = [];
-        $contentLength = strlen($markdown);
-        $replacements = [];
-        preg_match_all('/!\[.*?]\(.*?(data:image\/.{1,6};base64,)/', $markdown, $matches, PREG_OFFSET_CAPTURE);
+        preg_match_all('/!\[.*?]\(.*?(data:image\/.*?)[)"\s]/', $markdown, $matches);
 
-        foreach ($matches[1] as $base64MatchPair) {
-            [$dataUri, $index] = $base64MatchPair;
-
-            for ($i = strlen($dataUri) + $index; $i < $contentLength; $i++) {
-                $char = $markdown[$i];
-                if ($char === ')' || $char === ' ' || $char === "\n" || $char === '"') {
-                    break;
-                }
-                $dataUri .= $char;
-            }
-
-            $newUrl = $this->base64ImageUriToUploadedImageUrl($dataUri);
-            $replacements[] = [$dataUri, $newUrl];
-        }
-
-        foreach ($replacements as [$dataUri, $newUrl]) {
-            $markdown = str_replace($dataUri, $newUrl, $markdown);
+        foreach ($matches[1] as $base64Match) {
+            $newUrl = $this->base64ImageUriToUploadedImageUrl($base64Match);
+            $markdown = str_replace($base64Match, $newUrl, $markdown);
         }
 
         return $markdown;
@@ -153,7 +156,7 @@ class PageContent
     /**
      * Parse a base64 image URI into the data and extension.
      *
-     * @return array{extension: string, data: string}
+     * @return array{extension: array, data: string}
      */
     protected function parseBase64ImageUri(string $uri): array
     {
@@ -190,15 +193,6 @@ class PageContent
             }
         }
 
-        // Set ids on nested header nodes
-        $nestedHeaders = $xPath->query('//body//*//h1|//body//*//h2|//body//*//h3|//body//*//h4|//body//*//h5|//body//*//h6');
-        foreach ($nestedHeaders as $nestedHeader) {
-            [$oldId, $newId] = $this->setUniqueId($nestedHeader, $idMap);
-            if ($newId && $newId !== $oldId) {
-                $this->updateLinks($xPath, '#' . $oldId, '#' . $newId);
-            }
-        }
-
         // Ensure no duplicate ids within child items
         $idElems = $xPath->query('//body//*//*[@id]');
         foreach ($idElems as $domElem) {
@@ -214,9 +208,6 @@ class PageContent
             $html .= $doc->saveHTML($childNode);
         }
 
-        // Perform required string-level tweaks
-        $html = str_replace(' ', '&nbsp;', $html);
-
         return $html;
     }
 
@@ -237,9 +228,9 @@ class PageContent
      * A map for existing ID's should be passed in to check for current existence.
      * Returns a pair of strings in the format [old_id, new_id].
      */
-    protected function setUniqueId(DOMNode $element, array &$idMap): array
+    protected function setUniqueId(\DOMNode $element, array &$idMap): array
     {
-        if (!$element instanceof DOMElement) {
+        if (get_class($element) !== 'DOMElement') {
             return ['', ''];
         }
 
@@ -251,7 +242,7 @@ class PageContent
             return [$existingId, $existingId];
         }
 
-        // Create a unique id for the element
+        // Create an unique id for the element
         // Uses the content as a basis to ensure output is the same every time
         // the same content is passed through.
         $contentId = 'bkmrk-' . mb_substr(strtolower(preg_replace('/\s+/', '-', trim($element->nodeValue))), 0, 20);
@@ -321,7 +312,7 @@ class PageContent
      */
     protected function headerNodesToLevelList(DOMNodeList $nodeList): array
     {
-        $tree = collect($nodeList)->map(function (DOMElement $header) {
+        $tree = collect($nodeList)->map(function ($header) {
             $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue));
             $text = mb_substr($text, 0, 100);
 

app/Entities/Tools/PageEditActivity.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Builder;
 
 class PageEditActivity
 {
-    protected Page $page;
+    protected $page;
 
     /**
      * PageEditActivity constructor.

app/Entities/Tools/PageEditorData.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools;
-
-use BookStack\Entities\Models\Page;
-use BookStack\Entities\Repos\PageRepo;
-use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
-use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
-
-class PageEditorData
-{
-    protected Page $page;
-    protected PageRepo $pageRepo;
-    protected string $requestedEditor;
-
-    protected array $viewData;
-    protected array $warnings;
-
-    public function __construct(Page $page, PageRepo $pageRepo, string $requestedEditor)
-    {
-        $this->page = $page;
-        $this->pageRepo = $pageRepo;
-        $this->requestedEditor = $requestedEditor;
-
-        $this->viewData = $this->build();
-    }
-
-    public function getViewData(): array
-    {
-        return $this->viewData;
-    }
-
-    public function getWarnings(): array
-    {
-        return $this->warnings;
-    }
-
-    protected function build(): array
-    {
-        $page = clone $this->page;
-        $isDraft = boolval($this->page->draft);
-        $templates = $this->pageRepo->getTemplates(10);
-        $draftsEnabled = auth()->check();
-
-        $isDraftRevision = false;
-        $this->warnings = [];
-        $editActivity = new PageEditActivity($page);
-
-        if ($editActivity->hasActiveEditing()) {
-            $this->warnings[] = $editActivity->activeEditingMessage();
-        }
-
-        // Check for a current draft version for this user
-        $userDraft = $this->pageRepo->getUserDraft($page);
-        if ($userDraft !== null) {
-            $page->forceFill($userDraft->only(['name', 'html', 'markdown']));
-            $isDraftRevision = true;
-            $this->warnings[] = $editActivity->getEditingActiveDraftMessage($userDraft);
-        }
-
-        $editorType = $this->getEditorType($page);
-        $this->updateContentForEditor($page, $editorType);
-
-        return [
-            'page'            => $page,
-            'book'            => $page->book,
-            'isDraft'         => $isDraft,
-            'isDraftRevision' => $isDraftRevision,
-            'draftsEnabled'   => $draftsEnabled,
-            'templates'       => $templates,
-            'editor'          => $editorType,
-        ];
-    }
-
-    protected function updateContentForEditor(Page $page, string $editorType): void
-    {
-        $isHtml = !empty($page->html) && empty($page->markdown);
-
-        // HTML to markdown-clean conversion
-        if ($editorType === 'markdown' && $isHtml && $this->requestedEditor === 'markdown-clean') {
-            $page->markdown = (new HtmlToMarkdown($page->html))->convert();
-        }
-
-        // Markdown to HTML conversion if we don't have HTML
-        if ($editorType === 'wysiwyg' && !$isHtml) {
-            $page->html = (new MarkdownToHtml($page->markdown))->convert();
-        }
-    }
-
-    /**
-     * Get the type of editor to show for editing the given page.
-     * Defaults based upon the current content of the page otherwise will fall back
-     * to system default but will take a requested type (if provided) if permissions allow.
-     */
-    protected function getEditorType(Page $page): string
-    {
-        $editorType = $page->editor ?: self::getSystemDefaultEditor();
-
-        // Use requested editor if valid and if we have permission
-        $requestedType = explode('-', $this->requestedEditor)[0];
-        if (($requestedType === 'markdown' || $requestedType === 'wysiwyg') && userCan('editor-change')) {
-            $editorType = $requestedType;
-        }
-
-        return $editorType;
-    }
-
-    /**
-     * Get the configured system default editor.
-     */
-    public static function getSystemDefaultEditor(): string
-    {
-        return setting('app-editor') === 'markdown' ? 'markdown' : 'wysiwyg';
-    }
-}

app/Entities/Tools/PdfGenerator.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Tools;
-
-use Barryvdh\DomPDF\Facade as DomPDF;
-use Barryvdh\Snappy\Facades\SnappyPdf;
-
-class PdfGenerator
-{
-    const ENGINE_DOMPDF = 'dompdf';
-    const ENGINE_WKHTML = 'wkhtml';
-
-    /**
-     * Generate PDF content from the given HTML content.
-     */
-    public function fromHtml(string $html): string
-    {
-        if ($this->getActiveEngine() === self::ENGINE_WKHTML) {
-            $pdf = SnappyPDF::loadHTML($html);
-            $pdf->setOption('print-media-type', true);
-        } else {
-            $pdf = DomPDF::loadHTML($html);
-        }
-
-        return $pdf->output();
-    }
-
-    /**
-     * Get the currently active PDF engine.
-     * Returns the value of an `ENGINE_` const on this class.
-     */
-    public function getActiveEngine(): string
-    {
-        $useWKHTML = config('snappy.pdf.binary') !== false && config('app.allow_untrusted_server_fetching') === true;
-
-        return $useWKHTML ? self::ENGINE_WKHTML : self::ENGINE_DOMPDF;
-    }
-}

app/Entities/Tools/PermissionsUpdater.php

@@ -35,7 +35,7 @@ class PermissionsUpdater
         $entity->save();
         $entity->rebuildPermissions();
 
-        Activity::add(ActivityType::PERMISSIONS_UPDATE, $entity);
+        Activity::addForEntity($entity, ActivityType::PERMISSIONS_UPDATE);
     }
 
     /**

app/Entities/Tools/SearchIndex.php

@@ -9,7 +9,6 @@ use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\SearchTerm;
 use DOMDocument;
 use DOMNode;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 
 class SearchIndex
@@ -68,7 +67,7 @@ class SearchIndex
      * - The number that have been processed so far.
      * - The total number of that model to be processed.
      *
-     * @param callable(Entity, int, int):void|null $progressCallback
+     * @param callable(Entity, int, int)|null $progressCallback
      */
     public function indexAllEntities(?callable $progressCallback = null)
     {
@@ -77,9 +76,7 @@ class SearchIndex
         foreach ($this->entityProvider->all() as $entityModel) {
             $indexContentField = $entityModel instanceof Page ? 'html' : 'description';
             $selectFields = ['id', 'name', $indexContentField];
-            /** @var Builder<Entity> $query */
-            $query = $entityModel->newQuery();
-            $total = $query->withTrashed()->count();
+            $total = $entityModel->newQuery()->withTrashed()->count();
             $chunkSize = 250;
             $processed = 0;
 
@@ -226,7 +223,7 @@ class SearchIndex
         if ($entity instanceof Page) {
             $bodyTermsMap = $this->generateTermScoreMapFromHtml($entity->html);
         } else {
-            $bodyTermsMap = $this->generateTermScoreMapFromText($entity->getAttribute('description') ?? '', $entity->searchFactor);
+            $bodyTermsMap = $this->generateTermScoreMapFromText($entity->description ?? '', $entity->searchFactor);
         }
 
         $mergedScoreMap = $this->mergeTermScoreMaps($nameTermsMap, $bodyTermsMap, $tagTermsMap);

app/Entities/Tools/SearchResultsFormatter.php

@@ -57,17 +57,17 @@ class SearchResultsFormatter
     protected function highlightTagsContainingTerms(array $tags, array $terms): void
     {
         foreach ($tags as $tag) {
-            $tagName = mb_strtolower($tag->name);
-            $tagValue = mb_strtolower($tag->value);
+            $tagName = strtolower($tag->name);
+            $tagValue = strtolower($tag->value);
 
             foreach ($terms as $term) {
-                $termLower = mb_strtolower($term);
+                $termLower = strtolower($term);
 
-                if (mb_strpos($tagName, $termLower) !== false) {
+                if (strpos($tagName, $termLower) !== false) {
                     $tag->setAttribute('highlight_name', true);
                 }
 
-                if (mb_strpos($tagValue, $termLower) !== false) {
+                if (strpos($tagValue, $termLower) !== false) {
                     $tag->setAttribute('highlight_value', true);
                 }
             }
@@ -84,17 +84,17 @@ class SearchResultsFormatter
     protected function getMatchPositions(string $text, array $terms): array
     {
         $matchRefs = [];
-        $text = mb_strtolower($text);
+        $text = strtolower($text);
 
         foreach ($terms as $term) {
             $offset = 0;
-            $term = mb_strtolower($term);
-            $pos = mb_strpos($text, $term, $offset);
+            $term = strtolower($term);
+            $pos = strpos($text, $term, $offset);
             while ($pos !== false) {
-                $end = $pos + mb_strlen($term);
+                $end = $pos + strlen($term);
                 $matchRefs[$pos] = $end;
                 $offset = $end;
-                $pos = mb_strpos($text, $term, $offset);
+                $pos = strpos($text, $term, $offset);
             }
         }
 
@@ -141,7 +141,7 @@ class SearchResultsFormatter
      */
     protected function formatTextUsingMatchPositions(array $matchPositions, string $originalText, int $targetLength): string
     {
-        $maxEnd = mb_strlen($originalText);
+        $maxEnd = strlen($originalText);
         $fetchAll = ($targetLength === 0);
         $contextLength = ($fetchAll ? 0 : 32);
 
@@ -165,7 +165,7 @@ class SearchResultsFormatter
                 $contextStart = $start;
                 // Trims off '$startDiff' number of characters to bring it back to the start
                 // if this current match zone.
-                $content = mb_substr($content, 0, mb_strlen($content) + $startDiff);
+                $content = substr($content, 0, strlen($content) + $startDiff);
                 $contentTextLength += $startDiff;
             }
 
@@ -176,16 +176,16 @@ class SearchResultsFormatter
             } elseif ($fetchAll) {
                 // Or fill in gap since the previous match
                 $fillLength = $contextStart - $lastEnd;
-                $content .= e(mb_substr($originalText, $lastEnd, $fillLength));
+                $content .= e(substr($originalText, $lastEnd, $fillLength));
                 $contentTextLength += $fillLength;
             }
 
             // Add our content including the bolded matching text
-            $content .= e(mb_substr($originalText, $contextStart, $start - $contextStart));
+            $content .= e(substr($originalText, $contextStart, $start - $contextStart));
             $contentTextLength += $start - $contextStart;
-            $content .= '<strong>' . e(mb_substr($originalText, $start, $end - $start)) . '</strong>';
+            $content .= '<strong>' . e(substr($originalText, $start, $end - $start)) . '</strong>';
             $contentTextLength += $end - $start;
-            $content .= e(mb_substr($originalText, $end, $contextEnd - $end));
+            $content .= e(substr($originalText, $end, $contextEnd - $end));
             $contentTextLength += $contextEnd - $end;
 
             // Update our last end position
@@ -204,7 +204,7 @@ class SearchResultsFormatter
 
         // Just copy out the content if we haven't moved along anywhere.
         if ($lastEnd === 0) {
-            $content = e(mb_substr($originalText, 0, $targetLength));
+            $content = e(substr($originalText, 0, $targetLength));
             $contentTextLength = $targetLength;
             $lastEnd = $targetLength;
         }
@@ -213,7 +213,7 @@ class SearchResultsFormatter
         $remainder = $targetLength - $contentTextLength;
         if ($remainder > 10) {
             $padEndLength = min($maxEnd - $lastEnd, $remainder);
-            $content .= e(mb_substr($originalText, $lastEnd, $padEndLength));
+            $content .= e(substr($originalText, $lastEnd, $padEndLength));
             $lastEnd += $padEndLength;
             $contentTextLength += $padEndLength;
         }
@@ -223,7 +223,7 @@ class SearchResultsFormatter
         $firstStart = $firstStart ?: 0;
         if (!$fetchAll && $remainder > 10 && $firstStart !== 0) {
             $padStart = max(0, $firstStart - $remainder);
-            $content = ($padStart === 0 ? '' : '...') . e(mb_substr($originalText, $padStart, $firstStart - $padStart)) . mb_substr($content, 4);
+            $content = ($padStart === 0 ? '' : '...') . e(substr($originalText, $padStart, $firstStart - $padStart)) . substr($content, 4);
         }
 
         // Add ellipsis if we're not at the end

app/Entities/Tools/SearchRunner.php

@@ -9,7 +9,6 @@ use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\SearchTerm;
-use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -145,13 +144,13 @@ class SearchRunner
 
         if ($entityModelInstance instanceof BookChild) {
             $relations['book'] = function (BelongsTo $query) {
-                $query->scopes('visible');
+                $query->visible();
             };
         }
 
         if ($entityModelInstance instanceof Page) {
             $relations['chapter'] = function (BelongsTo $query) {
-                $query->scopes('visible');
+                $query->visible();
             };
         }
 
@@ -357,10 +356,8 @@ class SearchRunner
                     // We have to do a raw sql query for this since otherwise PDO will quote the value and MySQL will
                     // search the value as a string which prevents being able to do number-based operations
                     // on the tag values. We ensure it has a numeric value and then cast it just to be sure.
-                    /** @var Connection $connection */
-                    $connection = $query->getConnection();
-                    $tagValue = (float) trim($connection->getPdo()->quote($tagValue), "'");
-                    $query->whereRaw("value {$tagOperator} {$tagValue}");
+                    $tagValue = (float) trim($query->getConnection()->getPdo()->quote($tagValue), "'");
+                    $query->whereRaw("value ${tagOperator} ${tagValue}");
                 } else {
                     $query->where('value', $tagOperator, $tagValue);
                 }

app/Entities/Tools/SiblingFetcher.php

@@ -5,7 +5,6 @@ namespace BookStack\Entities\Tools;
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use Illuminate\Support\Collection;
 
@@ -25,7 +24,7 @@ class SiblingFetcher
         }
 
         // Page in book or chapter
-        if (($entity instanceof Page && !$entity->chapter) || $entity instanceof Chapter) {
+        if (($entity instanceof Page && !$entity->chapter) || $entity->isA('chapter')) {
             $entities = $entity->book->getDirectChildren();
         }
 

app/Entities/Tools/TrashCan.php

@@ -15,19 +15,15 @@ use BookStack\Facades\Activity;
 use BookStack\Uploads\AttachmentService;
 use BookStack\Uploads\ImageService;
 use Exception;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 
 class TrashCan
 {
     /**
      * Send a shelf to the recycle bin.
-     *
-     * @throws NotifyException
      */
     public function softDestroyShelf(Bookshelf $shelf)
     {
-        $this->ensureDeletable($shelf);
         Deletion::createForEntity($shelf);
         $shelf->delete();
     }
@@ -39,7 +35,6 @@ class TrashCan
      */
     public function softDestroyBook(Book $book)
     {
-        $this->ensureDeletable($book);
         Deletion::createForEntity($book);
 
         foreach ($book->pages as $page) {
@@ -61,7 +56,6 @@ class TrashCan
     public function softDestroyChapter(Chapter $chapter, bool $recordDelete = true)
     {
         if ($recordDelete) {
-            $this->ensureDeletable($chapter);
             Deletion::createForEntity($chapter);
         }
 
@@ -82,47 +76,19 @@ class TrashCan
     public function softDestroyPage(Page $page, bool $recordDelete = true)
     {
         if ($recordDelete) {
-            $this->ensureDeletable($page);
             Deletion::createForEntity($page);
         }
 
-        $page->delete();
-    }
-
-    /**
-     * Ensure the given entity is deletable.
-     * Is not for permissions, but logical conditions within the application.
-     * Will throw if not deletable.
-     *
-     * @throws NotifyException
-     */
-    protected function ensureDeletable(Entity $entity): void
-    {
-        $customHomeId = intval(explode(':', setting('app-homepage', '0:'))[0]);
-        $customHomeActive = setting('app-homepage-type') === 'page';
-        $removeCustomHome = false;
-
-        // Check custom homepage usage for pages
-        if ($entity instanceof Page && $entity->id === $customHomeId) {
-            if ($customHomeActive) {
-                throw new NotifyException(trans('errors.page_custom_home_deletion'), $entity->getUrl());
+        // Check if set as custom homepage & remove setting if not used or throw error if active
+        $customHome = setting('app-homepage', '0:');
+        if (intval($page->id) === intval(explode(':', $customHome)[0])) {
+            if (setting('app-homepage-type') === 'page') {
+                throw new NotifyException(trans('errors.page_custom_home_deletion'), $page->getUrl());
             }
-            $removeCustomHome = true;
-        }
-
-        // Check custom homepage usage within chapters or books
-        if ($entity instanceof Chapter || $entity instanceof Book) {
-            if ($entity->pages()->where('id', '=', $customHomeId)->exists()) {
-                if ($customHomeActive) {
-                    throw new NotifyException(trans('errors.page_custom_home_deletion'), $entity->getUrl());
-                }
-                $removeCustomHome = true;
-            }
-        }
-
-        if ($removeCustomHome) {
             setting()->remove('app-homepage');
         }
+
+        $page->delete();
     }
 
     /**
@@ -175,9 +141,11 @@ class TrashCan
     {
         $count = 0;
         $pages = $chapter->pages()->withTrashed()->get();
-        foreach ($pages as $page) {
-            $this->destroyPage($page);
-            $count++;
+        if (count($pages)) {
+            foreach ($pages as $page) {
+                $this->destroyPage($page);
+                $count++;
+            }
         }
 
         $this->destroyCommonRelations($chapter);
@@ -215,10 +183,9 @@ class TrashCan
     {
         $counts = [];
 
+        /** @var Entity $instance */
         foreach ((new EntityProvider())->all() as $key => $instance) {
-            /** @var Builder<Entity> $query */
-            $query = $instance->newQuery();
-            $counts[$key] = $query->onlyTrashed()->count();
+            $counts[$key] = $instance->newQuery()->onlyTrashed()->count();
         }
 
         return $counts;
@@ -268,15 +235,13 @@ class TrashCan
     {
         $shouldRestore = true;
         $restoreCount = 0;
+        $parent = $deletion->deletable->getParent();
 
-        if ($deletion->deletable instanceof Entity) {
-            $parent = $deletion->deletable->getParent();
-            if ($parent && $parent->trashed()) {
-                $shouldRestore = false;
-            }
+        if ($parent && $parent->trashed()) {
+            $shouldRestore = false;
         }
 
-        if ($deletion->deletable instanceof Entity && $shouldRestore) {
+        if ($shouldRestore) {
             $restoreCount = $this->restoreEntity($deletion->deletable);
         }
 
@@ -377,9 +342,9 @@ class TrashCan
         $entity->deletions()->delete();
         $entity->favourites()->delete();
 
-        if ($entity instanceof HasCoverImage && $entity->cover()->exists()) {
+        if ($entity instanceof HasCoverImage && $entity->cover) {
             $imageService = app()->make(ImageService::class);
-            $imageService->destroy($entity->cover()->first());
+            $imageService->destroy($entity->cover);
         }
     }
 }

app/Exceptions/Handler.php

@@ -4,7 +4,6 @@ namespace BookStack\Exceptions;
 
 use Exception;
 use Illuminate\Auth\AuthenticationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -76,20 +75,15 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception when the API is in use.
      */
-    protected function renderApiException(Throwable $e): JsonResponse
+    protected function renderApiException(Exception $e): JsonResponse
     {
-        $code = 500;
+        $code = $e->getCode() === 0 ? 500 : $e->getCode();
         $headers = [];
-
         if ($e instanceof HttpException) {
             $code = $e->getStatusCode();
             $headers = $e->getHeaders();
         }
 
-        if ($e instanceof ModelNotFoundException) {
-            $code = 404;
-        }
-
         $responseData = [
             'error' => [
                 'message' => $e->getMessage(),
@@ -101,10 +95,6 @@ class Handler extends ExceptionHandler
             $code = $e->status;
         }
 
-        if (method_exists($e, 'getStatus')) {
-            $code = $e->getStatus();
-        }
-
         $responseData['error']['code'] = $code;
 
         return new JsonResponse($responseData, $code, $headers);

app/Exceptions/JsonDebugException.php

@@ -3,29 +3,24 @@
 namespace BookStack\Exceptions;
 
 use Exception;
-use Illuminate\Http\JsonResponse;
 
 class JsonDebugException extends Exception
 {
-    protected array $data;
+    protected $data;
 
     /**
      * JsonDebugException constructor.
      */
-    public function __construct(array $data)
+    public function __construct($data)
     {
         $this->data = $data;
-        parent::__construct();
     }
 
     /**
-     * Convert this exception into a response.
-     * We add a manual data conversion to UTF8 to ensure any binary data is presentable as a JSON string.
+     * Covert this exception into a response.
      */
-    public function render(): JsonResponse
+    public function render()
     {
-        $cleaned = mb_convert_encoding($this->data, 'UTF-8');
-
-        return response()->json($cleaned);
+        return response()->json($this->data);
     }
 }

app/Exceptions/NotifyException.php

@@ -9,24 +9,17 @@ class NotifyException extends Exception implements Responsable
 {
     public $message;
     public $redirectLocation;
-    protected $status;
 
-    public function __construct(string $message, string $redirectLocation = '/', int $status = 500)
+    /**
+     * NotifyException constructor.
+     */
+    public function __construct(string $message, string $redirectLocation = '/')
     {
         $this->message = $message;
         $this->redirectLocation = $redirectLocation;
-        $this->status = $status;
         parent::__construct();
     }
 
-    /**
-     * Get the desired status code for this exception.
-     */
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-
     /**
      * Send the response for this type of exception.
      *
@@ -36,11 +29,6 @@ class NotifyException extends Exception implements Responsable
     {
         $message = $this->getMessage();
 
-        // Front-end JSON handling. API-side handling managed via handler.
-        if ($request->wantsJson()) {
-            return response()->json(['error' => $message], 403);
-        }
-
         if (!empty($message)) {
             session()->flash('error', $message);
         }

app/Exceptions/OpenIdConnectException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+class OpenIdConnectException extends NotifyException
+{
+}

app/Exceptions/SortOperationException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+use Exception;
+
+class SortOperationException extends Exception
+{
+}

app/Facades/Activity.php

@@ -4,9 +4,6 @@ namespace BookStack\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
-/**
- * @see \BookStack\Actions\ActivityLogger
- */
 class Activity extends Facade
 {
     /**

app/Http/Controllers/Api/ApiController.php

@@ -15,14 +15,10 @@ abstract class ApiController extends Controller
      * Provide a paginated listing JSON response in a standard format
      * taking into account any pagination parameters passed by the user.
      */
-    protected function apiListingResponse(Builder $query, array $fields, array $modifiers = []): JsonResponse
+    protected function apiListingResponse(Builder $query, array $fields): JsonResponse
     {
         $listing = new ListingResponseBuilder($query, request(), $fields);
 
-        foreach ($modifiers as $modifier) {
-            $listing->modifyResults($modifier);
-        }
-
         return $listing->toResponse();
     }
 
@@ -30,7 +26,7 @@ abstract class ApiController extends Controller
      * Get the validation rules for this controller.
      * Defaults to a $rules property but can be a rules() method.
      */
-    public function getValidationRules(): array
+    public function getValdationRules(): array
     {
         if (method_exists($this, 'rules')) {
             return $this->rules();

app/Http/Controllers/Api/AttachmentApiController.php

@@ -87,33 +87,14 @@ class AttachmentApiController extends ApiController
             'markdown' => $attachment->markdownLink(),
         ]);
 
-        // Simply return a JSON response of the attachment for link-based attachments
-        if ($attachment->external) {
+        if (!$attachment->external) {
+            $attachmentContents = $this->attachmentService->getAttachmentFromStorage($attachment);
+            $attachment->setAttribute('content', base64_encode($attachmentContents));
+        } else {
             $attachment->setAttribute('content', $attachment->path);
-
-            return response()->json($attachment);
         }
 
-        // Build and split our core JSON, at point of content.
-        $splitter = 'CONTENT_SPLIT_LOCATION_' . time() . '_' . rand(1, 40000);
-        $attachment->setAttribute('content', $splitter);
-        $json = $attachment->toJson();
-        $jsonParts = explode($splitter, $json);
-        // Get a stream for the file data from storage
-        $stream = $this->attachmentService->streamAttachmentFromStorage($attachment);
-
-        return response()->stream(function () use ($jsonParts, $stream) {
-            // Output the pre-content JSON data
-            echo $jsonParts[0];
-
-            // Stream out our attachment data as base64 content
-            stream_filter_append($stream, 'convert.base64-encode', STREAM_FILTER_READ);
-            fpassthru($stream);
-            fclose($stream);
-
-            // Output our post-content JSON data
-            echo $jsonParts[1];
-        }, 200, ['Content-Type' => 'application/json']);
+        return response()->json($attachment);
     }
 
     /**

app/Http/Controllers/Api/BookshelfApiController.php

@@ -11,20 +11,21 @@ use Illuminate\Validation\ValidationException;
 
 class BookshelfApiController extends ApiController
 {
-    protected BookshelfRepo $bookshelfRepo;
+    /**
+     * @var BookshelfRepo
+     */
+    protected $bookshelfRepo;
 
     protected $rules = [
         'create' => [
             'name'        => ['required', 'string', 'max:255'],
             'description' => ['string', 'max:1000'],
             'books'       => ['array'],
-            'tags'        => ['array'],
         ],
         'update' => [
             'name'        => ['string', 'min:1', 'max:255'],
             'description' => ['string', 'max:1000'],
             'books'       => ['array'],
-            'tags'        => ['array'],
         ],
     ];
 
@@ -74,7 +75,7 @@ class BookshelfApiController extends ApiController
         $shelf = Bookshelf::visible()->with([
             'tags', 'cover', 'createdBy', 'updatedBy', 'ownedBy',
             'books' => function (BelongsToMany $query) {
-                $query->scopes('visible')->get(['id', 'name', 'slug']);
+                $query->visible()->get(['id', 'name', 'slug']);
             },
         ])->findOrFail($id);
 

app/Http/Controllers/Api/ChapterApiController.php

@@ -70,7 +70,7 @@ class ChapterApiController extends ApiController
     public function read(string $id)
     {
         $chapter = Chapter::visible()->with(['tags', 'createdBy', 'updatedBy', 'ownedBy', 'pages' => function (HasMany $query) {
-            $query->scopes('visible')->get(['id', 'name', 'slug']);
+            $query->visible()->get(['id', 'name', 'slug']);
         }])->findOrFail($id);
 
         return response()->json($chapter);

app/Http/Controllers/Api/PageApiController.php

@@ -12,7 +12,7 @@ use Illuminate\Http\Request;
 
 class PageApiController extends ApiController
 {
-    protected PageRepo $pageRepo;
+    protected $pageRepo;
 
     protected $rules = [
         'create' => [
@@ -24,8 +24,8 @@ class PageApiController extends ApiController
             'tags'       => ['array'],
         ],
         'update' => [
-            'book_id'    => ['integer'],
-            'chapter_id' => ['integer'],
+            'book_id'    => ['required', 'integer'],
+            'chapter_id' => ['required', 'integer'],
             'name'       => ['string', 'min:1', 'max:255'],
             'html'       => ['string'],
             'markdown'   => ['string'],
@@ -103,8 +103,6 @@ class PageApiController extends ApiController
      */
     public function update(Request $request, string $id)
     {
-        $requestData = $this->validate($request, $this->rules['update']);
-
         $page = $this->pageRepo->getById($id, []);
         $this->checkOwnablePermission('page-update', $page);
 
@@ -129,7 +127,7 @@ class PageApiController extends ApiController
             }
         }
 
-        $updatedPage = $this->pageRepo->update($page, $requestData);
+        $updatedPage = $this->pageRepo->update($page, $request->all());
 
         return response()->json($updatedPage->forJsonDisplay());
     }

app/Http/Controllers/Api/RecycleBinApiController.php

@@ -1,90 +0,0 @@
-<?php
-
-namespace BookStack\Http\Controllers\Api;
-
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Deletion;
-use BookStack\Entities\Repos\DeletionRepo;
-use Closure;
-use Illuminate\Database\Eloquent\Builder;
-
-class RecycleBinApiController extends ApiController
-{
-    public function __construct()
-    {
-        $this->middleware(function ($request, $next) {
-            $this->checkPermission('settings-manage');
-            $this->checkPermission('restrictions-manage-all');
-
-            return $next($request);
-        });
-    }
-
-    /**
-     * Get a top-level listing of the items in the recycle bin.
-     * The "deletable" property will reflect the main item deleted.
-     * For books and chapters, counts of child pages/chapters will
-     * be loaded within this "deletable" data.
-     * For chapters & pages, the parent item will be loaded within this "deletable" data.
-     * Requires permission to manage both system settings and permissions.
-     */
-    public function list()
-    {
-        return $this->apiListingResponse(Deletion::query()->with('deletable'), [
-            'id',
-            'deleted_by',
-            'created_at',
-            'updated_at',
-            'deletable_type',
-            'deletable_id',
-        ], [Closure::fromCallable([$this, 'listFormatter'])]);
-    }
-
-    /**
-     * Restore a single deletion from the recycle bin.
-     * Requires permission to manage both system settings and permissions.
-     */
-    public function restore(DeletionRepo $deletionRepo, string $deletionId)
-    {
-        $restoreCount = $deletionRepo->restore(intval($deletionId));
-
-        return response()->json(['restore_count' => $restoreCount]);
-    }
-
-    /**
-     * Remove a single deletion from the recycle bin.
-     * Use this endpoint carefully as it will entirely remove the underlying deleted items from the system.
-     * Requires permission to manage both system settings and permissions.
-     */
-    public function destroy(DeletionRepo $deletionRepo, string $deletionId)
-    {
-        $deleteCount = $deletionRepo->destroy(intval($deletionId));
-
-        return response()->json(['delete_count' => $deleteCount]);
-    }
-
-    /**
-     * Load some related details for the deletion listing.
-     */
-    protected function listFormatter(Deletion $deletion)
-    {
-        $deletable = $deletion->deletable;
-        $withTrashedQuery = fn (Builder $query) => $query->withTrashed();
-
-        if ($deletable instanceof BookChild) {
-            $parent = $deletable->getParent();
-            $parent->setAttribute('type', $parent->getType());
-            $deletable->setRelation('parent', $parent);
-        }
-
-        if ($deletable instanceof Book || $deletable instanceof Chapter) {
-            $countsToLoad = ['pages' => $withTrashedQuery];
-            if ($deletable instanceof Book) {
-                $countsToLoad['chapters'] = $withTrashedQuery;
-            }
-            $deletable->loadCount($countsToLoad);
-        }
-    }
-}

app/Http/Controllers/Api/SearchApiController.php

@@ -4,14 +4,12 @@ namespace BookStack\Http\Controllers\Api;
 
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Tools\SearchOptions;
-use BookStack\Entities\Tools\SearchResultsFormatter;
 use BookStack\Entities\Tools\SearchRunner;
 use Illuminate\Http\Request;
 
 class SearchApiController extends ApiController
 {
     protected $searchRunner;
-    protected $resultsFormatter;
 
     protected $rules = [
         'all' => [
@@ -21,10 +19,9 @@ class SearchApiController extends ApiController
         ],
     ];
 
-    public function __construct(SearchRunner $searchRunner, SearchResultsFormatter $resultsFormatter)
+    public function __construct(SearchRunner $searchRunner)
     {
         $this->searchRunner = $searchRunner;
-        $this->resultsFormatter = $resultsFormatter;
     }
 
     /**
@@ -48,7 +45,6 @@ class SearchApiController extends ApiController
         $count = min(intval($request->get('count', '0')) ?: 20, 100);
 
         $results = $this->searchRunner->searchEntities($options, 'all', $page, $count);
-        $this->resultsFormatter->format($results['results']->all(), $options);
 
         /** @var Entity $result */
         foreach ($results['results'] as $result) {
@@ -56,14 +52,9 @@ class SearchApiController extends ApiController
                 'id', 'name', 'slug', 'book_id',
                 'chapter_id', 'draft', 'template',
                 'created_at', 'updated_at',
-                'tags', 'type', 'preview_html', 'url',
+                'tags', 'type',
             ]);
             $result->setAttribute('type', $result->getType());
-            $result->setAttribute('url', $result->getUrl());
-            $result->setAttribute('preview_html', [
-                'name'    => (string) $result->getAttribute('preview_name'),
-                'content' => (string) $result->getAttribute('preview_content'),
-            ]);
         }
 
         return response()->json([