Updated assets for release 0.7.3

.browserslistrc

@@ -1,2 +0,0 @@
->0.25%
-not op_mini all

.env.example

@@ -3,10 +3,6 @@ APP_ENV=production
 APP_DEBUG=false
 APP_KEY=SomeRandomString
 
-# The below url has to be set if using social auth options
-# or if you are not using BookStack at the root path of your domain.
-# APP_URL=http://bookstack.dev
-
 # Database details
 DB_HOST=localhost
 DB_DATABASE=database_database
@@ -16,18 +12,7 @@ DB_PASSWORD=database_user_password
 # Cache and session
 CACHE_DRIVER=file
 SESSION_DRIVER=file
-# If using Memcached, comment the above and uncomment these
-#CACHE_DRIVER=memcached
-#SESSION_DRIVER=memcached
 QUEUE_DRIVER=sync
-# A different prefix is useful when multiple BookStack instances use the same caching server
-CACHE_PREFIX=bookstack
-
-# Memcached settings
-# If using a UNIX socket path for the host, set the port to 0
-# This follows the following format: HOST:PORT:WEIGHT
-# For multiple servers separate with a comma
-MEMCACHED_SERVERS=127.0.0.1:11211:100
 
 # Storage
 STORAGE_TYPE=local
@@ -48,25 +33,11 @@ GITHUB_APP_ID=false
 GITHUB_APP_SECRET=false
 GOOGLE_APP_ID=false
 GOOGLE_APP_SECRET=false
-GOOGLE_SELECT_ACCOUNT=false
-OKTA_BASE_URL=false
-OKTA_APP_ID=false
-OKTA_APP_SECRET=false
-TWITCH_APP_ID=false
-TWITCH_APP_SECRET=false
-GITLAB_APP_ID=false
-GITLAB_APP_SECRET=false
-GITLAB_BASE_URI=false
-DISCORD_APP_ID=false
-DISCORD_APP_SECRET=false
+# URL used for social login redirects, NO TRAILING SLASH
+APP_URL=http://bookstack.dev
 
-
-# Disable default services such as Gravatar and Draw.IO
+# External services such as Gravatar
 DISABLE_EXTERNAL_SERVICES=false
-# Use custom avatar service, Sets fetch URL
-# Possible placeholders: ${hash} ${size} ${email}
-# If set, Avatars will be fetched regardless of DISABLE_EXTERNAL_SERVICES option.
-# AVATAR_URL=https://seccdn.libravatar.org/avatar/${hash}?s=${size}&d=identicon
 
 # LDAP Settings
 LDAP_SERVER=false
@@ -75,15 +46,6 @@ LDAP_DN=false
 LDAP_PASS=false
 LDAP_USER_FILTER=false
 LDAP_VERSION=false
-# Do you want to sync LDAP groups to BookStack roles for a user
-LDAP_USER_TO_GROUPS=false
-# What is the LDAP attribute for group memberships
-LDAP_GROUP_ATTRIBUTE="memberOf"
-# Would you like to remove users from roles on BookStack if they do not match on LDAP
-# If false, the ldap groups-roles sync will only add users to roles
-LDAP_REMOVE_FROM_GROUPS=false
-# Set this option to disable LDAPS Certificate Verification
-LDAP_TLS_INSECURE=false
 
 # Mail settings
 MAIL_DRIVER=smtp
@@ -92,5 +54,3 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM=null
-MAIL_FROM_NAME=null

.github/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-education, socio-economic status, nationality, personal appearance, race,
-religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-### Project Maintainer Standards
-
-Project maintainers should generally follow these additional standards:
-
-* Avoid using a negative or harsh tone in communication, Even if the other party
-is being negative themselves.
-* When providing criticism, try to make it constructive to lead the other person
-down the correct path.
-* Keep the [project definition](https://github.com/BookStackApp/BookStack#project-definition)
-in mind when deciding what's in scope of the Project.
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior. In addition, Project
-maintainers are responsible for following the standards themselves.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at the email address shown on [the profile here](https://github.com/ssddanbrown). All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,29 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Steps To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Your Configuration (please complete the following information):**
- - Exact BookStack Version (Found in settings):
- - PHP Version:
- - Hosting Method (Nginx/Apache/Docker): 
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-**Describe the feature you'd like**
-A clear description of the feature you'd like implemented in BookStack.
-
-**Describe the benefits this feature would bring to BookStack users**
-Explain the measurable benefits this feature would achieve.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.gitignore

@@ -2,23 +2,12 @@
 /node_modules
 Homestead.yaml
 .env
-.idea
-npm-debug.log
-yarn-error.log
 /public/dist
+.idea
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/bower
-/public/build/
 /storage/images
 _ide_helper.php
-/storage/debugbar
-.phpstorm.meta.php
-yarn.lock
-/bin
-nbproject
-.buildpath
-.project
-.settings/
-webpack-stats.json
+/storage/debugbar

.travis.yml

@@ -1,28 +0,0 @@
-dist: trusty
-sudo: false
-language: php
-php:
-  - 7.0.20
-  - 7.1.9
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-before_script:
-  - mysql -u root -e 'create database `bookstack-test`;'
-  - mysql -u root -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED BY 'bookstack-test';"
-  - mysql -u root -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
-  - mysql -u root -e "FLUSH PRIVILEGES;"
-  - phpenv config-rm xdebug.ini
-  - composer install --prefer-dist --no-interaction
-  - php artisan clear-compiled -n
-  - php artisan optimize -n
-  - php artisan migrate --force -n --database=mysql_testing
-  - php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
-
-after_failure:
-  - cat storage/logs/laravel.log
-
-script:
-  - phpunit

LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Dan Brown and the BookStack Project contributors
-https://github.com/BookStackApp/BookStack/graphs/contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

app/Actions/Comment.php

@@ -1,45 +0,0 @@
-<?php namespace BookStack\Actions;
-
-use BookStack\Ownable;
-
-class Comment extends Ownable
-{
-    protected $fillable = ['text', 'html', 'parent_id'];
-    protected $appends = ['created', 'updated'];
-
-    /**
-     * Get the entity that this comment belongs to
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
-     */
-    public function entity()
-    {
-        return $this->morphTo('entity');
-    }
-
-    /**
-     * Check if a comment has been updated since creation.
-     * @return bool
-     */
-    public function isUpdated()
-    {
-        return $this->updated_at->timestamp > $this->created_at->timestamp;
-    }
-
-    /**
-     * Get created date as a relative diff.
-     * @return mixed
-     */
-    public function getCreatedAttribute()
-    {
-        return $this->created_at->diffForHumans();
-    }
-
-    /**
-     * Get updated date as a relative diff.
-     * @return mixed
-     */
-    public function getUpdatedAttribute()
-    {
-        return $this->updated_at->diffForHumans();
-    }
-}

app/Actions/CommentRepo.php

@@ -1,89 +0,0 @@
-<?php namespace BookStack\Actions;
-
-use BookStack\Entities\Entity;
-
-/**
- * Class CommentRepo
- * @package BookStack\Repos
- */
-class CommentRepo
-{
-
-    /**
-     * @var \BookStack\Actions\Comment $comment
-     */
-    protected $comment;
-
-    /**
-     * CommentRepo constructor.
-     * @param \BookStack\Actions\Comment $comment
-     */
-    public function __construct(Comment $comment)
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * Get a comment by ID.
-     * @param $id
-     * @return \BookStack\Actions\Comment|\Illuminate\Database\Eloquent\Model
-     */
-    public function getById($id)
-    {
-        return $this->comment->newQuery()->findOrFail($id);
-    }
-
-    /**
-     * Create a new comment on an entity.
-     * @param \BookStack\Entities\Entity $entity
-     * @param array $data
-     * @return \BookStack\Actions\Comment
-     */
-    public function create(Entity $entity, $data = [])
-    {
-        $userId = user()->id;
-        $comment = $this->comment->newInstance($data);
-        $comment->created_by = $userId;
-        $comment->updated_by = $userId;
-        $comment->local_id = $this->getNextLocalId($entity);
-        $entity->comments()->save($comment);
-        return $comment;
-    }
-
-    /**
-     * Update an existing comment.
-     * @param \BookStack\Actions\Comment $comment
-     * @param array $input
-     * @return mixed
-     */
-    public function update($comment, $input)
-    {
-        $comment->updated_by = user()->id;
-        $comment->update($input);
-        return $comment;
-    }
-
-    /**
-     * Delete a comment from the system.
-     * @param \BookStack\Actions\Comment $comment
-     * @return mixed
-     */
-    public function delete($comment)
-    {
-        return $comment->delete();
-    }
-
-    /**
-     * Get the next local ID relative to the linked entity.
-     * @param \BookStack\Entities\Entity $entity
-     * @return int
-     */
-    protected function getNextLocalId(Entity $entity)
-    {
-        $comments = $entity->comments(false)->orderBy('local_id', 'desc')->first();
-        if ($comments === null) {
-            return 1;
-        }
-        return $comments->local_id + 1;
-    }
-}

app/Actions/Tag.php

@@ -1,21 +0,0 @@
-<?php namespace BookStack\Actions;
-
-use BookStack\Model;
-
-/**
- * Class Attribute
- * @package BookStack
- */
-class Tag extends Model
-{
-    protected $fillable = ['name', 'value', 'order'];
-
-    /**
-     * Get the entity that this tag belongs to
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
-     */
-    public function entity()
-    {
-        return $this->morphTo('entity');
-    }
-}

app/Actions/TagRepo.php

@@ -1,140 +0,0 @@
-<?php namespace BookStack\Actions;
-
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Entities\Entity;
-
-/**
- * Class TagRepo
- * @package BookStack\Repos
- */
-class TagRepo
-{
-
-    protected $tag;
-    protected $entity;
-    protected $permissionService;
-
-    /**
-     * TagRepo constructor.
-     * @param \BookStack\Actions\Tag $attr
-     * @param \BookStack\Entities\Entity $ent
-     * @param \BookStack\Auth\Permissions\PermissionService $ps
-     */
-    public function __construct(Tag $attr, Entity $ent, PermissionService $ps)
-    {
-        $this->tag = $attr;
-        $this->entity = $ent;
-        $this->permissionService = $ps;
-    }
-
-    /**
-     * Get an entity instance of its particular type.
-     * @param $entityType
-     * @param $entityId
-     * @param string $action
-     * @return \Illuminate\Database\Eloquent\Model|null|static
-     */
-    public function getEntity($entityType, $entityId, $action = 'view')
-    {
-        $entityInstance = $this->entity->getEntityInstance($entityType);
-        $searchQuery = $entityInstance->where('id', '=', $entityId)->with('tags');
-        $searchQuery = $this->permissionService->enforceEntityRestrictions($entityType, $searchQuery, $action);
-        return $searchQuery->first();
-    }
-
-    /**
-     * Get all tags for a particular entity.
-     * @param string $entityType
-     * @param int $entityId
-     * @return mixed
-     */
-    public function getForEntity($entityType, $entityId)
-    {
-        $entity = $this->getEntity($entityType, $entityId);
-        if ($entity === null) {
-            return collect();
-        }
-
-        return $entity->tags;
-    }
-
-    /**
-     * Get tag name suggestions from scanning existing tag names.
-     * If no search term is given the 50 most popular tag names are provided.
-     * @param $searchTerm
-     * @return array
-     */
-    public function getNameSuggestions($searchTerm = false)
-    {
-        $query = $this->tag->select('*', \DB::raw('count(*) as count'))->groupBy('name');
-
-        if ($searchTerm) {
-            $query = $query->where('name', 'LIKE', $searchTerm . '%')->orderBy('name', 'desc');
-        } else {
-            $query = $query->orderBy('count', 'desc')->take(50);
-        }
-
-        $query = $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
-        return $query->get(['name'])->pluck('name');
-    }
-
-    /**
-     * Get tag value suggestions from scanning existing tag values.
-     * If no search is given the 50 most popular values are provided.
-     * Passing a tagName will only find values for a tags with a particular name.
-     * @param $searchTerm
-     * @param $tagName
-     * @return array
-     */
-    public function getValueSuggestions($searchTerm = false, $tagName = false)
-    {
-        $query = $this->tag->select('*', \DB::raw('count(*) as count'))->groupBy('value');
-
-        if ($searchTerm) {
-            $query = $query->where('value', 'LIKE', $searchTerm . '%')->orderBy('value', 'desc');
-        } else {
-            $query = $query->orderBy('count', 'desc')->take(50);
-        }
-
-        if ($tagName !== false) {
-            $query = $query->where('name', '=', $tagName);
-        }
-
-        $query = $this->permissionService->filterRestrictedEntityRelations($query, 'tags', 'entity_id', 'entity_type');
-        return $query->get(['value'])->pluck('value');
-    }
-
-    /**
-     * Save an array of tags to an entity
-     * @param \BookStack\Entities\Entity $entity
-     * @param array $tags
-     * @return array|\Illuminate\Database\Eloquent\Collection
-     */
-    public function saveTagsToEntity(Entity $entity, $tags = [])
-    {
-        $entity->tags()->delete();
-        $newTags = [];
-        foreach ($tags as $tag) {
-            if (trim($tag['name']) === '') {
-                continue;
-            }
-            $newTags[] = $this->newInstanceFromInput($tag);
-        }
-
-        return $entity->tags()->saveMany($newTags);
-    }
-
-    /**
-     * Create a new Tag instance from user input.
-     * @param $input
-     * @return \BookStack\Actions\Tag
-     */
-    protected function newInstanceFromInput($input)
-    {
-        $name = trim($input['name']);
-        $value = isset($input['value']) ? trim($input['value']) : '';
-        // Any other modification or cleanup required can go here
-        $values = ['name' => $name, 'value' => $value];
-        return $this->tag->newInstance($values);
-    }
-}

app/Actions/ViewService.php

@@ -1,109 +0,0 @@
-<?php namespace BookStack\Actions;
-
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Entities\Entity;
-
-class ViewService
-{
-    protected $view;
-    protected $permissionService;
-
-    /**
-     * ViewService constructor.
-     * @param \BookStack\Actions\View $view
-     * @param \BookStack\Auth\Permissions\PermissionService $permissionService
-     */
-    public function __construct(View $view, PermissionService $permissionService)
-    {
-        $this->view = $view;
-        $this->permissionService = $permissionService;
-    }
-
-    /**
-     * Add a view to the given entity.
-     * @param Entity $entity
-     * @return int
-     */
-    public function add(Entity $entity)
-    {
-        $user = user();
-        if ($user === null || $user->isDefault()) {
-            return 0;
-        }
-        $view = $entity->views()->where('user_id', '=', $user->id)->first();
-        // Add view if model exists
-        if ($view) {
-            $view->increment('views');
-            return $view->views;
-        }
-
-        // Otherwise create new view count
-        $entity->views()->save($this->view->create([
-            'user_id' => $user->id,
-            'views' => 1
-        ]));
-
-        return 1;
-    }
-
-    /**
-     * Get the entities with the most views.
-     * @param int $count
-     * @param int $page
-     * @param Entity|false|array $filterModel
-     * @param string $action - used for permission checking
-     * @return
-     */
-    public function getPopular($count = 10, $page = 0, $filterModel = false, $action = 'view')
-    {
-        // TODO - Standardise input filter
-        $skipCount = $count * $page;
-        $query = $this->permissionService->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type', $action)
-            ->select('*', 'viewable_id', 'viewable_type', \DB::raw('SUM(views) as view_count'))
-            ->groupBy('viewable_id', 'viewable_type')
-            ->orderBy('view_count', 'desc');
-
-        if ($filterModel && is_array($filterModel)) {
-            $query->whereIn('viewable_type', $filterModel);
-        } else if ($filterModel) {
-            $query->where('viewable_type', '=', $filterModel->getMorphClass());
-        }
-
-        return $query->with('viewable')->skip($skipCount)->take($count)->get()->pluck('viewable');
-    }
-
-    /**
-     * Get all recently viewed entities for the current user.
-     * @param int $count
-     * @param int $page
-     * @param Entity|bool $filterModel
-     * @return mixed
-     */
-    public function getUserRecentlyViewed($count = 10, $page = 0, $filterModel = false)
-    {
-        $user = user();
-        if ($user === null || $user->isDefault()) {
-            return collect();
-        }
-
-        $query = $this->permissionService
-            ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
-
-        if ($filterModel) {
-            $query = $query->where('viewable_type', '=', $filterModel->getMorphClass());
-        }
-        $query = $query->where('user_id', '=', $user->id);
-
-        $viewables = $query->with('viewable')->orderBy('updated_at', 'desc')
-            ->skip($count * $page)->take($count)->get()->pluck('viewable');
-        return $viewables;
-    }
-
-    /**
-     * Reset all view counts by deleting all views.
-     */
-    public function resetAll()
-    {
-        $this->view->truncate();
-    }
-}

app/Activity.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack;
 
-use BookStack\Auth\User;
-use BookStack\Model;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * @property string  key
@@ -16,13 +15,15 @@ class Activity extends Model
 
     /**
      * Get the entity for this activity.
+     * @return bool
      */
     public function entity()
     {
-        if ($this->entity_type === '') {
-            $this->entity_type = null;
+        if ($this->entity_id) {
+            return $this->morphTo('entity')->first();
+        } else {
+            return false;
         }
-        return $this->morphTo('entity');
     }
 
     /**
@@ -31,7 +32,7 @@ class Activity extends Model
      */
     public function user()
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo('BookStack\User');
     }
 
     /**
@@ -48,8 +49,8 @@ class Activity extends Model
      * @param $activityB
      * @return bool
      */
-    public function isSimilarTo($activityB)
-    {
-        return [$this->key, $this->entity_type, $this->entity_id] === [$activityB->key, $activityB->entity_type, $activityB->entity_id];
+    public function isSimilarTo($activityB) {
+        return [$this->key, $this->entitiy_type, $this->entitiy_id] === [$activityB->key, $activityB->entitiy_type, $activityB->entitiy_id];
     }
+
 }

app/Auth/Access/EmailConfirmationService.php

@@ -1,111 +0,0 @@
-<?php namespace BookStack\Auth\Access;
-
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
-use BookStack\Exceptions\ConfirmationEmailException;
-use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Notifications\ConfirmEmail;
-use Carbon\Carbon;
-use Illuminate\Database\Connection as Database;
-
-class EmailConfirmationService
-{
-    protected $db;
-    protected $users;
-
-    /**
-     * EmailConfirmationService constructor.
-     * @param Database $db
-     * @param \BookStack\Auth\UserRepo $users
-     */
-    public function __construct(Database $db, UserRepo $users)
-    {
-        $this->db = $db;
-        $this->users = $users;
-    }
-
-    /**
-     * Create new confirmation for a user,
-     * Also removes any existing old ones.
-     * @param \BookStack\Auth\User $user
-     * @throws ConfirmationEmailException
-     */
-    public function sendConfirmation(User $user)
-    {
-        if ($user->email_confirmed) {
-            throw new ConfirmationEmailException(trans('errors.email_already_confirmed'), '/login');
-        }
-
-        $this->deleteConfirmationsByUser($user);
-        $token = $this->createEmailConfirmation($user);
-
-        $user->notify(new ConfirmEmail($token));
-    }
-
-    /**
-     * Creates a new email confirmation in the database and returns the token.
-     * @param User $user
-     * @return string
-     */
-    public function createEmailConfirmation(User $user)
-    {
-        $token = $this->getToken();
-        $this->db->table('email_confirmations')->insert([
-            'user_id' => $user->id,
-            'token' => $token,
-            'created_at' => Carbon::now(),
-            'updated_at' => Carbon::now()
-        ]);
-        return $token;
-    }
-
-    /**
-     * Gets an email confirmation by looking up the token,
-     * Ensures the token has not expired.
-     * @param string $token
-     * @return array|null|\stdClass
-     * @throws UserRegistrationException
-     */
-    public function getEmailConfirmationFromToken($token)
-    {
-        $emailConfirmation = $this->db->table('email_confirmations')->where('token', '=', $token)->first();
-
-        // If not found show error
-        if ($emailConfirmation === null) {
-            throw new UserRegistrationException(trans('errors.email_confirmation_invalid'), '/register');
-        }
-
-        // If more than a day old
-        if (Carbon::now()->subDay()->gt(new Carbon($emailConfirmation->created_at))) {
-            $user = $this->users->getById($emailConfirmation->user_id);
-            $this->sendConfirmation($user);
-            throw new UserRegistrationException(trans('errors.email_confirmation_expired'), '/register/confirm');
-        }
-
-        $emailConfirmation->user = $this->users->getById($emailConfirmation->user_id);
-        return $emailConfirmation;
-    }
-
-    /**
-     * Delete all email confirmations that belong to a user.
-     * @param \BookStack\Auth\User $user
-     * @return mixed
-     */
-    public function deleteConfirmationsByUser(User $user)
-    {
-        return $this->db->table('email_confirmations')->where('user_id', '=', $user->id)->delete();
-    }
-
-    /**
-     * Creates a unique token within the email confirmation database.
-     * @return string
-     */
-    protected function getToken()
-    {
-        $token = str_random(24);
-        while ($this->db->table('email_confirmations')->where('token', '=', $token)->exists()) {
-            $token = str_random(25);
-        }
-        return $token;
-    }
-}

app/Auth/Access/LdapService.php

@@ -1,385 +0,0 @@
-<?php namespace BookStack\Auth\Access;
-
-use BookStack\Auth\Access;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
-use BookStack\Exceptions\LdapException;
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Database\Eloquent\Builder;
-
-/**
- * Class LdapService
- * Handles any app-specific LDAP tasks.
- * @package BookStack\Services
- */
-class LdapService
-{
-
-    protected $ldap;
-    protected $ldapConnection;
-    protected $config;
-    protected $userRepo;
-    protected $enabled;
-
-    /**
-     * LdapService constructor.
-     * @param Ldap $ldap
-     * @param \BookStack\Auth\UserRepo $userRepo
-     */
-    public function __construct(Access\Ldap $ldap, UserRepo $userRepo)
-    {
-        $this->ldap = $ldap;
-        $this->config = config('services.ldap');
-        $this->userRepo = $userRepo;
-        $this->enabled = config('auth.method') === 'ldap';
-    }
-
-    /**
-     * Check if groups should be synced.
-     * @return bool
-     */
-    public function shouldSyncGroups()
-    {
-        return $this->enabled && $this->config['user_to_groups'] !== false;
-    }
-
-    /**
-     * Search for attributes for a specific user on the ldap
-     * @param string $userName
-     * @param array $attributes
-     * @return null|array
-     * @throws LdapException
-     */
-    private function getUserWithAttributes($userName, $attributes)
-    {
-        $ldapConnection = $this->getConnection();
-        $this->bindSystemUser($ldapConnection);
-
-        // Find user
-        $userFilter = $this->buildFilter($this->config['user_filter'], ['user' => $userName]);
-        $baseDn = $this->config['base_dn'];
-
-        $followReferrals = $this->config['follow_referrals'] ? 1 : 0;
-        $this->ldap->setOption($ldapConnection, LDAP_OPT_REFERRALS, $followReferrals);
-        $users = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $userFilter, $attributes);
-        if ($users['count'] === 0) {
-            return null;
-        }
-
-        return $users[0];
-    }
-
-    /**
-     * Get the details of a user from LDAP using the given username.
-     * User found via configurable user filter.
-     * @param $userName
-     * @return array|null
-     * @throws LdapException
-     */
-    public function getUserDetails($userName)
-    {
-        $emailAttr = $this->config['email_attribute'];
-        $user = $this->getUserWithAttributes($userName, ['cn', 'uid', 'dn', $emailAttr]);
-
-        if ($user === null) {
-            return null;
-        }
-
-        return [
-            'uid'   => (isset($user['uid'])) ? $user['uid'][0] : $user['dn'],
-            'name'  => $user['cn'][0],
-            'dn'    => $user['dn'],
-            'email' => (isset($user[$emailAttr])) ? (is_array($user[$emailAttr]) ? $user[$emailAttr][0] : $user[$emailAttr]) : null
-        ];
-    }
-
-    /**
-     * @param Authenticatable $user
-     * @param string          $username
-     * @param string          $password
-     * @return bool
-     * @throws LdapException
-     */
-    public function validateUserCredentials(Authenticatable $user, $username, $password)
-    {
-        $ldapUser = $this->getUserDetails($username);
-        if ($ldapUser === null) {
-            return false;
-        }
-
-        if ($ldapUser['uid'] !== $user->external_auth_id) {
-            return false;
-        }
-
-        $ldapConnection = $this->getConnection();
-        try {
-            $ldapBind = $this->ldap->bind($ldapConnection, $ldapUser['dn'], $password);
-        } catch (\ErrorException $e) {
-            $ldapBind = false;
-        }
-
-        return $ldapBind;
-    }
-
-    /**
-     * Bind the system user to the LDAP connection using the given credentials
-     * otherwise anonymous access is attempted.
-     * @param $connection
-     * @throws LdapException
-     */
-    protected function bindSystemUser($connection)
-    {
-        $ldapDn = $this->config['dn'];
-        $ldapPass = $this->config['pass'];
-
-        $isAnonymous = ($ldapDn === false || $ldapPass === false);
-        if ($isAnonymous) {
-            $ldapBind = $this->ldap->bind($connection);
-        } else {
-            $ldapBind = $this->ldap->bind($connection, $ldapDn, $ldapPass);
-        }
-
-        if (!$ldapBind) {
-            throw new LdapException(($isAnonymous ? trans('errors.ldap_fail_anonymous') : trans('errors.ldap_fail_authed')));
-        }
-    }
-
-    /**
-     * Get the connection to the LDAP server.
-     * Creates a new connection if one does not exist.
-     * @return resource
-     * @throws LdapException
-     */
-    protected function getConnection()
-    {
-        if ($this->ldapConnection !== null) {
-            return $this->ldapConnection;
-        }
-
-        // Check LDAP extension in installed
-        if (!function_exists('ldap_connect') && config('app.env') !== 'testing') {
-            throw new LdapException(trans('errors.ldap_extension_not_installed'));
-        }
-
-        // Get port from server string and protocol if specified.
-        $ldapServer = explode(':', $this->config['server']);
-        $hasProtocol = preg_match('/^ldaps{0,1}\:\/\//', $this->config['server']) === 1;
-        if (!$hasProtocol) {
-            array_unshift($ldapServer, '');
-        }
-        $hostName = $ldapServer[0] . ($hasProtocol?':':'') . $ldapServer[1];
-        $defaultPort = $ldapServer[0] === 'ldaps' ? 636 : 389;
-
-        /*
-         * Check if TLS_INSECURE is set. The handle is set to NULL due to the nature of
-         * the LDAP_OPT_X_TLS_REQUIRE_CERT option. It can only be set globally and not
-         * per handle.
-         */
-        if($this->config['tls_insecure']) {
-            $this->ldap->setOption(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
-        }
-
-        $ldapConnection = $this->ldap->connect($hostName, count($ldapServer) > 2 ? intval($ldapServer[2]) : $defaultPort);
-
-        if ($ldapConnection === false) {
-            throw new LdapException(trans('errors.ldap_cannot_connect'));
-        }
-
-        // Set any required options
-        if ($this->config['version']) {
-            $this->ldap->setVersion($ldapConnection, $this->config['version']);
-        }
-
-        $this->ldapConnection = $ldapConnection;
-        return $this->ldapConnection;
-    }
-
-    /**
-     * Build a filter string by injecting common variables.
-     * @param string $filterString
-     * @param array $attrs
-     * @return string
-     */
-    protected function buildFilter($filterString, array $attrs)
-    {
-        $newAttrs = [];
-        foreach ($attrs as $key => $attrText) {
-            $newKey = '${' . $key . '}';
-            $newAttrs[$newKey] = $this->ldap->escape($attrText);
-        }
-        return strtr($filterString, $newAttrs);
-    }
-
-    /**
-     * Get the groups a user is a part of on ldap
-     * @param string $userName
-     * @return array
-     * @throws LdapException
-     */
-    public function getUserGroups($userName)
-    {
-        $groupsAttr = $this->config['group_attribute'];
-        $user = $this->getUserWithAttributes($userName, [$groupsAttr]);
-
-        if ($user === null) {
-            return [];
-        }
-
-        $userGroups = $this->groupFilter($user);
-        $userGroups = $this->getGroupsRecursive($userGroups, []);
-        return $userGroups;
-    }
-
-    /**
-     * Get the parent groups of an array of groups
-     * @param array $groupsArray
-     * @param array $checked
-     * @return array
-     * @throws LdapException
-     */
-    private function getGroupsRecursive($groupsArray, $checked)
-    {
-        $groups_to_add = [];
-        foreach ($groupsArray as $groupName) {
-            if (in_array($groupName, $checked)) {
-                continue;
-            }
-
-            $groupsToAdd = $this->getGroupGroups($groupName);
-            $groups_to_add = array_merge($groups_to_add, $groupsToAdd);
-            $checked[] = $groupName;
-        }
-        $groupsArray = array_unique(array_merge($groupsArray, $groups_to_add), SORT_REGULAR);
-
-        if (!empty($groups_to_add)) {
-            return $this->getGroupsRecursive($groupsArray, $checked);
-        } else {
-            return $groupsArray;
-        }
-    }
-
-    /**
-     * Get the parent groups of a single group
-     * @param string $groupName
-     * @return array
-     * @throws LdapException
-     */
-    private function getGroupGroups($groupName)
-    {
-        $ldapConnection = $this->getConnection();
-        $this->bindSystemUser($ldapConnection);
-
-        $followReferrals = $this->config['follow_referrals'] ? 1 : 0;
-        $this->ldap->setOption($ldapConnection, LDAP_OPT_REFERRALS, $followReferrals);
-
-        $baseDn = $this->config['base_dn'];
-        $groupsAttr = strtolower($this->config['group_attribute']);
-
-        $groupFilter = 'CN=' . $this->ldap->escape($groupName);
-        $groups = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $groupFilter, [$groupsAttr]);
-        if ($groups['count'] === 0) {
-            return [];
-        }
-
-        $groupGroups = $this->groupFilter($groups[0]);
-        return $groupGroups;
-    }
-
-    /**
-     * Filter out LDAP CN and DN language in a ldap search return
-     * Gets the base CN (common name) of the string
-     * @param array $userGroupSearchResponse
-     * @return array
-     */
-    protected function groupFilter(array $userGroupSearchResponse)
-    {
-        $groupsAttr = strtolower($this->config['group_attribute']);
-        $ldapGroups = [];
-        $count = 0;
-
-        if (isset($userGroupSearchResponse[$groupsAttr]['count'])) {
-            $count = (int) $userGroupSearchResponse[$groupsAttr]['count'];
-        }
-
-        for ($i=0; $i<$count; $i++) {
-            $dnComponents = $this->ldap->explodeDn($userGroupSearchResponse[$groupsAttr][$i], 1);
-            if (!in_array($dnComponents[0], $ldapGroups)) {
-                $ldapGroups[] = $dnComponents[0];
-            }
-        }
-
-        return $ldapGroups;
-    }
-
-    /**
-     * Sync the LDAP groups to the user roles for the current user
-     * @param \BookStack\Auth\User $user
-     * @param string $username
-     * @throws LdapException
-     */
-    public function syncGroups(User $user, string $username)
-    {
-        $userLdapGroups = $this->getUserGroups($username);
-
-        // Get the ids for the roles from the names
-        $ldapGroupsAsRoles = $this->matchLdapGroupsToSystemsRoles($userLdapGroups);
-
-        // Sync groups
-        if ($this->config['remove_from_groups']) {
-            $user->roles()->sync($ldapGroupsAsRoles);
-            $this->userRepo->attachDefaultRole($user);
-        } else {
-            $user->roles()->syncWithoutDetaching($ldapGroupsAsRoles);
-        }
-    }
-
-    /**
-     * Match an array of group names from LDAP to BookStack system roles.
-     * Formats LDAP group names to be lower-case and hyphenated.
-     * @param array $groupNames
-     * @return \Illuminate\Support\Collection
-     */
-    protected function matchLdapGroupsToSystemsRoles(array $groupNames)
-    {
-        foreach ($groupNames as $i => $groupName) {
-            $groupNames[$i] = str_replace(' ', '-', trim(strtolower($groupName)));
-        }
-
-        $roles = Role::query()->where(function (Builder $query) use ($groupNames) {
-            $query->whereIn('name', $groupNames);
-            foreach ($groupNames as $groupName) {
-                $query->orWhere('external_auth_id', 'LIKE', '%' . $groupName . '%');
-            }
-        })->get();
-
-        $matchedRoles = $roles->filter(function (Role $role) use ($groupNames) {
-            return $this->roleMatchesGroupNames($role, $groupNames);
-        });
-
-        return $matchedRoles->pluck('id');
-    }
-
-    /**
-     * Check a role against an array of group names to see if it matches.
-     * Checked against role 'external_auth_id' if set otherwise the name of the role.
-     * @param \BookStack\Auth\Role $role
-     * @param array $groupNames
-     * @return bool
-     */
-    protected function roleMatchesGroupNames(Role $role, array $groupNames)
-    {
-        if ($role->external_auth_id) {
-            $externalAuthIds = explode(',', strtolower($role->external_auth_id));
-            foreach ($externalAuthIds as $externalAuthId) {
-                if (in_array(trim($externalAuthId), $groupNames)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        $roleName = str_replace(' ', '-', trim(strtolower($role->display_name)));
-        return in_array($roleName, $groupNames);
-    }
-}

app/Auth/Permissions/EntityPermission.php

@@ -1,19 +0,0 @@
-<?php namespace BookStack\Auth\Permissions;
-
-use BookStack\Model;
-
-class EntityPermission extends Model
-{
-
-    protected $fillable = ['role_id', 'action'];
-    public $timestamps = false;
-
-    /**
-     * Get all this restriction's attached entity.
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
-     */
-    public function restrictable()
-    {
-        return $this->morphTo('restrictable');
-    }
-}

app/Auth/Permissions/JointPermission.php

@@ -1,28 +0,0 @@
-<?php namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Role;
-use BookStack\Entities\Entity;
-use BookStack\Model;
-
-class JointPermission extends Model
-{
-    public $timestamps = false;
-
-    /**
-     * Get the role that this points to.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function role()
-    {
-        return $this->belongsTo(Role::class);
-    }
-
-    /**
-     * Get the entity this points to.
-     * @return \Illuminate\Database\Eloquent\Relations\MorphOne
-     */
-    public function entity()
-    {
-        return $this->morphOne(Entity::class, 'entity');
-    }
-}

app/Auth/Permissions/PermissionService.php

@@ -1,757 +0,0 @@
-<?php namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Permissions;
-use BookStack\Auth\Role;
-use BookStack\Entities\Book;
-use BookStack\Entities\Bookshelf;
-use BookStack\Entities\Chapter;
-use BookStack\Entities\Entity;
-use BookStack\Entities\EntityProvider;
-use BookStack\Entities\Page;
-use BookStack\Ownable;
-use Illuminate\Database\Connection;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
-use Illuminate\Support\Collection;
-
-class PermissionService
-{
-
-    protected $currentAction;
-    protected $isAdminUser;
-    protected $userRoles = false;
-    protected $currentUserModel = false;
-
-    /**
-     * @var Connection
-     */
-    protected $db;
-
-    /**
-     * @var JointPermission
-     */
-    protected $jointPermission;
-
-    /**
-     * @var Role
-     */
-    protected $role;
-
-    /**
-     * @var EntityPermission
-     */
-    protected $entityPermission;
-
-    /**
-     * @var EntityProvider
-     */
-    protected $entityProvider;
-
-    protected $entityCache;
-
-    /**
-     * PermissionService constructor.
-     * @param JointPermission $jointPermission
-     * @param EntityPermission $entityPermission
-     * @param Role $role
-     * @param Connection $db
-     * @param EntityProvider $entityProvider
-     */
-    public function __construct(
-        JointPermission $jointPermission,
-        Permissions\EntityPermission $entityPermission,
-        Role $role,
-        Connection $db,
-        EntityProvider $entityProvider
-    ) {
-        $this->db = $db;
-        $this->jointPermission = $jointPermission;
-        $this->entityPermission = $entityPermission;
-        $this->role = $role;
-        $this->entityProvider = $entityProvider;
-    }
-
-    /**
-     * Set the database connection
-     * @param Connection $connection
-     */
-    public function setConnection(Connection $connection)
-    {
-        $this->db = $connection;
-    }
-
-    /**
-     * Prepare the local entity cache and ensure it's empty
-     * @param \BookStack\Entities\Entity[] $entities
-     */
-    protected function readyEntityCache($entities = [])
-    {
-        $this->entityCache = [];
-
-        foreach ($entities as $entity) {
-            $type = $entity->getType();
-            if (!isset($this->entityCache[$type])) {
-                $this->entityCache[$type] = collect();
-            }
-            $this->entityCache[$type]->put($entity->id, $entity);
-        }
-    }
-
-    /**
-     * Get a book via ID, Checks local cache
-     * @param $bookId
-     * @return Book
-     */
-    protected function getBook($bookId)
-    {
-        if (isset($this->entityCache['book']) && $this->entityCache['book']->has($bookId)) {
-            return $this->entityCache['book']->get($bookId);
-        }
-
-        $book = $this->entityProvider->book->find($bookId);
-        if ($book === null) {
-            $book = false;
-        }
-
-        return $book;
-    }
-
-    /**
-     * Get a chapter via ID, Checks local cache
-     * @param $chapterId
-     * @return \BookStack\Entities\Book
-     */
-    protected function getChapter($chapterId)
-    {
-        if (isset($this->entityCache['chapter']) && $this->entityCache['chapter']->has($chapterId)) {
-            return $this->entityCache['chapter']->get($chapterId);
-        }
-
-        $chapter = $this->entityProvider->chapter->find($chapterId);
-        if ($chapter === null) {
-            $chapter = false;
-        }
-
-        return $chapter;
-    }
-
-    /**
-     * Get the roles for the current user;
-     * @return array|bool
-     */
-    protected function getRoles()
-    {
-        if ($this->userRoles !== false) {
-            return $this->userRoles;
-        }
-
-        $roles = [];
-
-        if (auth()->guest()) {
-            $roles[] = $this->role->getSystemRole('public')->id;
-            return $roles;
-        }
-
-
-        foreach ($this->currentUser()->roles as $role) {
-            $roles[] = $role->id;
-        }
-        return $roles;
-    }
-
-    /**
-     * Re-generate all entity permission from scratch.
-     */
-    public function buildJointPermissions()
-    {
-        $this->jointPermission->truncate();
-        $this->readyEntityCache();
-
-        // Get all roles (Should be the most limited dimension)
-        $roles = $this->role->with('permissions')->get()->all();
-
-        // Chunk through all books
-        $this->bookFetchQuery()->chunk(5, function ($books) use ($roles) {
-            $this->buildJointPermissionsForBooks($books, $roles);
-        });
-
-        // Chunk through all bookshelves
-        $this->entityProvider->bookshelf->newQuery()->select(['id', 'restricted', 'created_by'])
-            ->chunk(50, function ($shelves) use ($roles) {
-                $this->buildJointPermissionsForShelves($shelves, $roles);
-            });
-    }
-
-    /**
-     * Get a query for fetching a book with it's children.
-     * @return QueryBuilder
-     */
-    protected function bookFetchQuery()
-    {
-        return $this->entityProvider->book->newQuery()
-            ->select(['id', 'restricted', 'created_by'])->with(['chapters' => function ($query) {
-            $query->select(['id', 'restricted', 'created_by', 'book_id']);
-        }, 'pages'  => function ($query) {
-            $query->select(['id', 'restricted', 'created_by', 'book_id', 'chapter_id']);
-        }]);
-    }
-
-    /**
-     * @param Collection $shelves
-     * @param array $roles
-     * @param bool $deleteOld
-     * @throws \Throwable
-     */
-    protected function buildJointPermissionsForShelves($shelves, $roles, $deleteOld = false)
-    {
-        if ($deleteOld) {
-            $this->deleteManyJointPermissionsForEntities($shelves->all());
-        }
-        $this->createManyJointPermissions($shelves, $roles);
-    }
-
-    /**
-     * Build joint permissions for an array of books
-     * @param Collection $books
-     * @param array $roles
-     * @param bool $deleteOld
-     * @throws \Throwable
-     */
-    protected function buildJointPermissionsForBooks($books, $roles, $deleteOld = false)
-    {
-        $entities = clone $books;
-
-        /** @var Book $book */
-        foreach ($books->all() as $book) {
-            foreach ($book->getRelation('chapters') as $chapter) {
-                $entities->push($chapter);
-            }
-            foreach ($book->getRelation('pages') as $page) {
-                $entities->push($page);
-            }
-        }
-
-        if ($deleteOld) {
-            $this->deleteManyJointPermissionsForEntities($entities->all());
-        }
-        $this->createManyJointPermissions($entities, $roles);
-    }
-
-    /**
-     * Rebuild the entity jointPermissions for a particular entity.
-     * @param \BookStack\Entities\Entity $entity
-     * @throws \Throwable
-     */
-    public function buildJointPermissionsForEntity(Entity $entity)
-    {
-        $entities = [$entity];
-        if ($entity->isA('book')) {
-            $books = $this->bookFetchQuery()->where('id', '=', $entity->id)->get();
-            $this->buildJointPermissionsForBooks($books, $this->role->newQuery()->get(), true);
-            return;
-        }
-
-        if ($entity->book) {
-            $entities[] = $entity->book;
-        }
-
-        if ($entity->isA('page') && $entity->chapter_id) {
-            $entities[] = $entity->chapter;
-        }
-
-        if ($entity->isA('chapter')) {
-            foreach ($entity->pages as $page) {
-                $entities[] = $page;
-            }
-        }
-
-        $this->buildJointPermissionsForEntities(collect($entities));
-    }
-
-    /**
-     * Rebuild the entity jointPermissions for a collection of entities.
-     * @param Collection $entities
-     * @throws \Throwable
-     */
-    public function buildJointPermissionsForEntities(Collection $entities)
-    {
-        $roles = $this->role->newQuery()->get();
-        $this->deleteManyJointPermissionsForEntities($entities->all());
-        $this->createManyJointPermissions($entities, $roles);
-    }
-
-    /**
-     * Build the entity jointPermissions for a particular role.
-     * @param Role $role
-     */
-    public function buildJointPermissionForRole(Role $role)
-    {
-        $roles = [$role];
-        $this->deleteManyJointPermissionsForRoles($roles);
-
-        // Chunk through all books
-        $this->bookFetchQuery()->chunk(20, function ($books) use ($roles) {
-            $this->buildJointPermissionsForBooks($books, $roles);
-        });
-
-        // Chunk through all bookshelves
-        $this->entityProvider->bookshelf->newQuery()->select(['id', 'restricted', 'created_by'])
-            ->chunk(50, function ($shelves) use ($roles) {
-                $this->buildJointPermissionsForShelves($shelves, $roles);
-            });
-    }
-
-    /**
-     * Delete the entity jointPermissions attached to a particular role.
-     * @param Role $role
-     */
-    public function deleteJointPermissionsForRole(Role $role)
-    {
-        $this->deleteManyJointPermissionsForRoles([$role]);
-    }
-
-    /**
-     * Delete all of the entity jointPermissions for a list of entities.
-     * @param Role[] $roles
-     */
-    protected function deleteManyJointPermissionsForRoles($roles)
-    {
-        $roleIds = array_map(function ($role) {
-            return $role->id;
-        }, $roles);
-        $this->jointPermission->newQuery()->whereIn('role_id', $roleIds)->delete();
-    }
-
-    /**
-     * Delete the entity jointPermissions for a particular entity.
-     * @param Entity $entity
-     * @throws \Throwable
-     */
-    public function deleteJointPermissionsForEntity(Entity $entity)
-    {
-        $this->deleteManyJointPermissionsForEntities([$entity]);
-    }
-
-    /**
-     * Delete all of the entity jointPermissions for a list of entities.
-     * @param \BookStack\Entities\Entity[] $entities
-     * @throws \Throwable
-     */
-    protected function deleteManyJointPermissionsForEntities($entities)
-    {
-        if (count($entities) === 0) {
-            return;
-        }
-
-        $this->db->transaction(function () use ($entities) {
-
-            foreach (array_chunk($entities, 1000) as $entityChunk) {
-                $query = $this->db->table('joint_permissions');
-                foreach ($entityChunk as $entity) {
-                    $query->orWhere(function (QueryBuilder $query) use ($entity) {
-                        $query->where('entity_id', '=', $entity->id)
-                            ->where('entity_type', '=', $entity->getMorphClass());
-                    });
-                }
-                $query->delete();
-            }
-        });
-    }
-
-    /**
-     * Create & Save entity jointPermissions for many entities and jointPermissions.
-     * @param Collection $entities
-     * @param array $roles
-     * @throws \Throwable
-     */
-    protected function createManyJointPermissions($entities, $roles)
-    {
-        $this->readyEntityCache($entities);
-        $jointPermissions = [];
-
-        // Fetch Entity Permissions and create a mapping of entity restricted statuses
-        $entityRestrictedMap = [];
-        $permissionFetch = $this->entityPermission->newQuery();
-        foreach ($entities as $entity) {
-            $entityRestrictedMap[$entity->getMorphClass() . ':' . $entity->id] = boolval($entity->getRawAttribute('restricted'));
-            $permissionFetch->orWhere(function ($query) use ($entity) {
-                $query->where('restrictable_id', '=', $entity->id)->where('restrictable_type', '=', $entity->getMorphClass());
-            });
-        }
-        $permissions = $permissionFetch->get();
-
-        // Create a mapping of explicit entity permissions
-        $permissionMap = [];
-        foreach ($permissions as $permission) {
-            $key = $permission->restrictable_type . ':' . $permission->restrictable_id . ':' . $permission->role_id . ':' . $permission->action;
-            $isRestricted = $entityRestrictedMap[$permission->restrictable_type . ':' . $permission->restrictable_id];
-            $permissionMap[$key] = $isRestricted;
-        }
-
-        // Create a mapping of role permissions
-        $rolePermissionMap = [];
-        foreach ($roles as $role) {
-            foreach ($role->permissions as $permission) {
-                $rolePermissionMap[$role->getRawAttribute('id') . ':' . $permission->getRawAttribute('name')] = true;
-            }
-        }
-
-        // Create Joint Permission Data
-        foreach ($entities as $entity) {
-            foreach ($roles as $role) {
-                foreach ($this->getActions($entity) as $action) {
-                    $jointPermissions[] = $this->createJointPermissionData($entity, $role, $action, $permissionMap, $rolePermissionMap);
-                }
-            }
-        }
-
-        $this->db->transaction(function () use ($jointPermissions) {
-            foreach (array_chunk($jointPermissions, 1000) as $jointPermissionChunk) {
-                $this->db->table('joint_permissions')->insert($jointPermissionChunk);
-            }
-        });
-    }
-
-
-    /**
-     * Get the actions related to an entity.
-     * @param \BookStack\Entities\Entity $entity
-     * @return array
-     */
-    protected function getActions(Entity $entity)
-    {
-        $baseActions = ['view', 'update', 'delete'];
-        if ($entity->isA('chapter') || $entity->isA('book')) {
-            $baseActions[] = 'page-create';
-        }
-        if ($entity->isA('book')) {
-            $baseActions[] = 'chapter-create';
-        }
-        return $baseActions;
-    }
-
-    /**
-     * Create entity permission data for an entity and role
-     * for a particular action.
-     * @param Entity $entity
-     * @param Role $role
-     * @param string $action
-     * @param array $permissionMap
-     * @param array $rolePermissionMap
-     * @return array
-     */
-    protected function createJointPermissionData(Entity $entity, Role $role, $action, $permissionMap, $rolePermissionMap)
-    {
-        $permissionPrefix = (strpos($action, '-') === false ? ($entity->getType() . '-') : '') . $action;
-        $roleHasPermission = isset($rolePermissionMap[$role->getRawAttribute('id') . ':' . $permissionPrefix . '-all']);
-        $roleHasPermissionOwn = isset($rolePermissionMap[$role->getRawAttribute('id') . ':' . $permissionPrefix . '-own']);
-        $explodedAction = explode('-', $action);
-        $restrictionAction = end($explodedAction);
-
-        if ($role->system_name === 'admin') {
-            return $this->createJointPermissionDataArray($entity, $role, $action, true, true);
-        }
-
-        if ($entity->restricted) {
-            $hasAccess = $this->mapHasActiveRestriction($permissionMap, $entity, $role, $restrictionAction);
-            return $this->createJointPermissionDataArray($entity, $role, $action, $hasAccess, $hasAccess);
-        }
-
-        if ($entity->isA('book') || $entity->isA('bookshelf')) {
-            return $this->createJointPermissionDataArray($entity, $role, $action, $roleHasPermission, $roleHasPermissionOwn);
-        }
-
-        // For chapters and pages, Check if explicit permissions are set on the Book.
-        $book = $this->getBook($entity->book_id);
-        $hasExplicitAccessToParents = $this->mapHasActiveRestriction($permissionMap, $book, $role, $restrictionAction);
-        $hasPermissiveAccessToParents = !$book->restricted;
-
-        // For pages with a chapter, Check if explicit permissions are set on the Chapter
-        if ($entity->isA('page') && $entity->chapter_id !== 0 && $entity->chapter_id !== '0') {
-            $chapter = $this->getChapter($entity->chapter_id);
-            $hasPermissiveAccessToParents = $hasPermissiveAccessToParents && !$chapter->restricted;
-            if ($chapter->restricted) {
-                $hasExplicitAccessToParents = $this->mapHasActiveRestriction($permissionMap, $chapter, $role, $restrictionAction);
-            }
-        }
-
-        return $this->createJointPermissionDataArray(
-            $entity,
-            $role,
-            $action,
-            ($hasExplicitAccessToParents || ($roleHasPermission && $hasPermissiveAccessToParents)),
-            ($hasExplicitAccessToParents || ($roleHasPermissionOwn && $hasPermissiveAccessToParents))
-        );
-    }
-
-    /**
-     * Check for an active restriction in an entity map.
-     * @param $entityMap
-     * @param Entity $entity
-     * @param Role $role
-     * @param $action
-     * @return bool
-     */
-    protected function mapHasActiveRestriction($entityMap, Entity $entity, Role $role, $action)
-    {
-        $key = $entity->getMorphClass() . ':' . $entity->getRawAttribute('id') . ':' . $role->getRawAttribute('id') . ':' . $action;
-        return isset($entityMap[$key]) ? $entityMap[$key] : false;
-    }
-
-    /**
-     * Create an array of data with the information of an entity jointPermissions.
-     * Used to build data for bulk insertion.
-     * @param \BookStack\Entities\Entity $entity
-     * @param Role $role
-     * @param $action
-     * @param $permissionAll
-     * @param $permissionOwn
-     * @return array
-     */
-    protected function createJointPermissionDataArray(Entity $entity, Role $role, $action, $permissionAll, $permissionOwn)
-    {
-        return [
-            'role_id'            => $role->getRawAttribute('id'),
-            'entity_id'          => $entity->getRawAttribute('id'),
-            'entity_type'        => $entity->getMorphClass(),
-            'action'             => $action,
-            'has_permission'     => $permissionAll,
-            'has_permission_own' => $permissionOwn,
-            'created_by'         => $entity->getRawAttribute('created_by')
-        ];
-    }
-
-    /**
-     * Checks if an entity has a restriction set upon it.
-     * @param Ownable $ownable
-     * @param $permission
-     * @return bool
-     */
-    public function checkOwnableUserAccess(Ownable $ownable, $permission)
-    {
-        $explodedPermission = explode('-', $permission);
-
-        $baseQuery = $ownable->where('id', '=', $ownable->id);
-        $action = end($explodedPermission);
-        $this->currentAction = $action;
-
-        $nonJointPermissions = ['restrictions', 'image', 'attachment', 'comment'];
-
-        // Handle non entity specific jointPermissions
-        if (in_array($explodedPermission[0], $nonJointPermissions)) {
-            $allPermission = $this->currentUser() && $this->currentUser()->can($permission . '-all');
-            $ownPermission = $this->currentUser() && $this->currentUser()->can($permission . '-own');
-            $this->currentAction = 'view';
-            $isOwner = $this->currentUser() && $this->currentUser()->id === $ownable->created_by;
-            return ($allPermission || ($isOwner && $ownPermission));
-        }
-
-        // Handle abnormal create jointPermissions
-        if ($action === 'create') {
-            $this->currentAction = $permission;
-        }
-
-        $q = $this->entityRestrictionQuery($baseQuery)->count() > 0;
-        $this->clean();
-        return $q;
-    }
-
-    /**
-     * Check if an entity has restrictions set on itself or its
-     * parent tree.
-     * @param \BookStack\Entities\Entity $entity
-     * @param $action
-     * @return bool|mixed
-     */
-    public function checkIfRestrictionsSet(Entity $entity, $action)
-    {
-        $this->currentAction = $action;
-        if ($entity->isA('page')) {
-            return $entity->restricted || ($entity->chapter && $entity->chapter->restricted) || $entity->book->restricted;
-        } elseif ($entity->isA('chapter')) {
-            return $entity->restricted || $entity->book->restricted;
-        } elseif ($entity->isA('book')) {
-            return $entity->restricted;
-        }
-    }
-
-    /**
-     * The general query filter to remove all entities
-     * that the current user does not have access to.
-     * @param $query
-     * @return mixed
-     */
-    protected function entityRestrictionQuery($query)
-    {
-        $q = $query->where(function ($parentQuery) {
-            $parentQuery->whereHas('jointPermissions', function ($permissionQuery) {
-                $permissionQuery->whereIn('role_id', $this->getRoles())
-                    ->where('action', '=', $this->currentAction)
-                    ->where(function ($query) {
-                        $query->where('has_permission', '=', true)
-                            ->orWhere(function ($query) {
-                                $query->where('has_permission_own', '=', true)
-                                    ->where('created_by', '=', $this->currentUser()->id);
-                            });
-                    });
-            });
-        });
-        $this->clean();
-        return $q;
-    }
-
-    /**
-     * Get the children of a book in an efficient single query, Filtered by the permission system.
-     * @param integer $book_id
-     * @param bool $filterDrafts
-     * @param bool $fetchPageContent
-     * @return QueryBuilder
-     */
-    public function bookChildrenQuery($book_id, $filterDrafts = false, $fetchPageContent = false)
-    {
-        $entities = $this->entityProvider;
-        $pageSelect = $this->db->table('pages')->selectRaw($entities->page->entityRawQuery($fetchPageContent))
-            ->where('book_id', '=', $book_id)->where(function ($query) use ($filterDrafts) {
-            $query->where('draft', '=', 0);
-            if (!$filterDrafts) {
-                $query->orWhere(function ($query) {
-                    $query->where('draft', '=', 1)->where('created_by', '=', $this->currentUser()->id);
-                });
-            }
-        });
-        $chapterSelect = $this->db->table('chapters')->selectRaw($entities->chapter->entityRawQuery())->where('book_id', '=', $book_id);
-        $query = $this->db->query()->select('*')->from($this->db->raw("({$pageSelect->toSql()} UNION {$chapterSelect->toSql()}) AS U"))
-            ->mergeBindings($pageSelect)->mergeBindings($chapterSelect);
-
-        // Add joint permission filter
-        $whereQuery = $this->db->table('joint_permissions as jp')->selectRaw('COUNT(*)')
-            ->whereRaw('jp.entity_id=U.id')->whereRaw('jp.entity_type=U.entity_type')
-            ->where('jp.action', '=', 'view')->whereIn('jp.role_id', $this->getRoles())
-            ->where(function ($query) {
-                $query->where('jp.has_permission', '=', 1)->orWhere(function ($query) {
-                    $query->where('jp.has_permission_own', '=', 1)->where('jp.created_by', '=', $this->currentUser()->id);
-                });
-            });
-        $query->whereRaw("({$whereQuery->toSql()}) > 0")->mergeBindings($whereQuery);
-
-        $query->orderBy('draft', 'desc')->orderBy('priority', 'asc');
-        $this->clean();
-        return  $query;
-    }
-
-    /**
-     * Add restrictions for a generic entity
-     * @param string $entityType
-     * @param Builder|\BookStack\Entities\Entity $query
-     * @param string $action
-     * @return Builder
-     */
-    public function enforceEntityRestrictions($entityType, $query, $action = 'view')
-    {
-        if (strtolower($entityType) === 'page') {
-            // Prevent drafts being visible to others.
-            $query = $query->where(function ($query) {
-                $query->where('draft', '=', false);
-                if ($this->currentUser()) {
-                    $query->orWhere(function ($query) {
-                        $query->where('draft', '=', true)->where('created_by', '=', $this->currentUser()->id);
-                    });
-                }
-            });
-        }
-
-        $this->currentAction = $action;
-        return $this->entityRestrictionQuery($query);
-    }
-
-    /**
-     * Filter items that have entities set as a polymorphic relation.
-     * @param $query
-     * @param string $tableName
-     * @param string $entityIdColumn
-     * @param string $entityTypeColumn
-     * @param string $action
-     * @return mixed
-     */
-    public function filterRestrictedEntityRelations($query, $tableName, $entityIdColumn, $entityTypeColumn, $action = 'view')
-    {
-
-        $this->currentAction = $action;
-        $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn, 'entityTypeColumn' => $entityTypeColumn];
-
-        $q = $query->where(function ($query) use ($tableDetails) {
-            $query->whereExists(function ($permissionQuery) use (&$tableDetails) {
-                $permissionQuery->select('id')->from('joint_permissions')
-                    ->whereRaw('joint_permissions.entity_id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
-                    ->whereRaw('joint_permissions.entity_type=' . $tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'])
-                    ->where('action', '=', $this->currentAction)
-                    ->whereIn('role_id', $this->getRoles())
-                    ->where(function ($query) {
-                        $query->where('has_permission', '=', true)->orWhere(function ($query) {
-                            $query->where('has_permission_own', '=', true)
-                                ->where('created_by', '=', $this->currentUser()->id);
-                        });
-                    });
-            });
-        });
-        $this->clean();
-        return $q;
-    }
-
-    /**
-     * Filters pages that are a direct relation to another item.
-     * @param $query
-     * @param $tableName
-     * @param $entityIdColumn
-     * @return mixed
-     */
-    public function filterRelatedPages($query, $tableName, $entityIdColumn)
-    {
-        $this->currentAction = 'view';
-        $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn];
-
-        $pageMorphClass = $this->entityProvider->page->getMorphClass();
-        $q = $query->where(function ($query) use ($tableDetails, $pageMorphClass) {
-            $query->where(function ($query) use (&$tableDetails, $pageMorphClass) {
-                $query->whereExists(function ($permissionQuery) use (&$tableDetails, $pageMorphClass) {
-                    $permissionQuery->select('id')->from('joint_permissions')
-                        ->whereRaw('joint_permissions.entity_id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
-                        ->where('entity_type', '=', $pageMorphClass)
-                        ->where('action', '=', $this->currentAction)
-                        ->whereIn('role_id', $this->getRoles())
-                        ->where(function ($query) {
-                            $query->where('has_permission', '=', true)->orWhere(function ($query) {
-                                $query->where('has_permission_own', '=', true)
-                                    ->where('created_by', '=', $this->currentUser()->id);
-                            });
-                        });
-                });
-            })->orWhere($tableDetails['entityIdColumn'], '=', 0);
-        });
-        $this->clean();
-        return $q;
-    }
-
-    /**
-     * Get the current user
-     * @return \BookStack\Auth\User
-     */
-    private function currentUser()
-    {
-        if ($this->currentUserModel === false) {
-            $this->currentUserModel = user();
-        }
-
-        return $this->currentUserModel;
-    }
-
-    /**
-     * Clean the cached user elements.
-     */
-    private function clean()
-    {
-        $this->currentUserModel = false;
-        $this->userRoles = false;
-        $this->isAdminUser = null;
-    }
-}

app/Auth/Permissions/PermissionsRepo.php

@@ -1,154 +0,0 @@
-<?php namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Permissions;
-use BookStack\Auth\Role;
-use BookStack\Exceptions\PermissionsException;
-
-class PermissionsRepo
-{
-
-    protected $permission;
-    protected $role;
-    protected $permissionService;
-
-    protected $systemRoles = ['admin', 'public'];
-
-    /**
-     * PermissionsRepo constructor.
-     * @param RolePermission $permission
-     * @param Role $role
-     * @param \BookStack\Auth\Permissions\PermissionService $permissionService
-     */
-    public function __construct(RolePermission $permission, Role $role, Permissions\PermissionService $permissionService)
-    {
-        $this->permission = $permission;
-        $this->role = $role;
-        $this->permissionService = $permissionService;
-    }
-
-    /**
-     * Get all the user roles from the system.
-     * @return \Illuminate\Database\Eloquent\Collection|static[]
-     */
-    public function getAllRoles()
-    {
-        return $this->role->all();
-    }
-
-    /**
-     * Get all the roles except for the provided one.
-     * @param Role $role
-     * @return mixed
-     */
-    public function getAllRolesExcept(Role $role)
-    {
-        return $this->role->where('id', '!=', $role->id)->get();
-    }
-
-    /**
-     * Get a role via its ID.
-     * @param $id
-     * @return mixed
-     */
-    public function getRoleById($id)
-    {
-        return $this->role->findOrFail($id);
-    }
-
-    /**
-     * Save a new role into the system.
-     * @param array $roleData
-     * @return Role
-     */
-    public function saveNewRole($roleData)
-    {
-        $role = $this->role->newInstance($roleData);
-        $role->name = str_replace(' ', '-', strtolower($roleData['display_name']));
-        // Prevent duplicate names
-        while ($this->role->where('name', '=', $role->name)->count() > 0) {
-            $role->name .= strtolower(str_random(2));
-        }
-        $role->save();
-
-        $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
-        $this->assignRolePermissions($role, $permissions);
-        $this->permissionService->buildJointPermissionForRole($role);
-        return $role;
-    }
-
-    /**
-     * Updates an existing role.
-     * Ensure Admin role always have core permissions.
-     * @param $roleId
-     * @param $roleData
-     * @throws PermissionsException
-     */
-    public function updateRole($roleId, $roleData)
-    {
-        $role = $this->role->findOrFail($roleId);
-
-        $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
-        if ($role->system_name === 'admin') {
-            $permissions = array_merge($permissions, [
-                'users-manage',
-                'user-roles-manage',
-                'restrictions-manage-all',
-                'restrictions-manage-own',
-                'settings-manage',
-            ]);
-        }
-
-        $this->assignRolePermissions($role, $permissions);
-
-        $role->fill($roleData);
-        $role->save();
-        $this->permissionService->buildJointPermissionForRole($role);
-    }
-
-    /**
-     * Assign an list of permission names to an role.
-     * @param Role $role
-     * @param array $permissionNameArray
-     */
-    public function assignRolePermissions(Role $role, $permissionNameArray = [])
-    {
-        $permissions = [];
-        $permissionNameArray = array_values($permissionNameArray);
-        if ($permissionNameArray && count($permissionNameArray) > 0) {
-            $permissions = $this->permission->whereIn('name', $permissionNameArray)->pluck('id')->toArray();
-        }
-        $role->permissions()->sync($permissions);
-    }
-
-    /**
-     * Delete a role from the system.
-     * Check it's not an admin role or set as default before deleting.
-     * If an migration Role ID is specified the users assign to the current role
-     * will be added to the role of the specified id.
-     * @param $roleId
-     * @param $migrateRoleId
-     * @throws PermissionsException
-     */
-    public function deleteRole($roleId, $migrateRoleId)
-    {
-        $role = $this->role->findOrFail($roleId);
-
-        // Prevent deleting admin role or default registration role.
-        if ($role->system_name && in_array($role->system_name, $this->systemRoles)) {
-            throw new PermissionsException(trans('errors.role_system_cannot_be_deleted'));
-        } else if ($role->id == setting('registration-role')) {
-            throw new PermissionsException(trans('errors.role_registration_default_cannot_delete'));
-        }
-
-        if ($migrateRoleId) {
-            $newRole = $this->role->find($migrateRoleId);
-            if ($newRole) {
-                $users = $role->users->pluck('id')->toArray();
-                $newRole->users()->sync($users);
-            }
-        }
-
-        $this->permissionService->deleteJointPermissionsForRole($role);
-        $role->delete();
-    }
-}

app/Auth/Permissions/RolePermission.php

@@ -1,25 +0,0 @@
-<?php namespace BookStack\Auth\Permissions;
-
-use BookStack\Auth\Role;
-use BookStack\Model;
-
-class RolePermission extends Model
-{
-    /**
-     * The roles that belong to the permission.
-     */
-    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($name)
-    {
-        return static::where('name', '=', $name)->first();
-    }
-}

app/Auth/Role.php

@@ -1,98 +0,0 @@
-<?php namespace BookStack\Auth;
-
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Model;
-
-class Role extends Model
-{
-
-    protected $fillable = ['display_name', 'description', 'external_auth_id'];
-
-    /**
-     * The roles that belong to the role.
-     */
-    public function users()
-    {
-        return $this->belongsToMany(User::class);
-    }
-
-    /**
-     * Get all related JointPermissions.
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function jointPermissions()
-    {
-        return $this->hasMany(JointPermission::class);
-    }
-
-    /**
-     * The RolePermissions that belong to the role.
-     */
-    public function permissions()
-    {
-        return $this->belongsToMany(Permissions\RolePermission::class, 'permission_role', 'role_id', 'permission_id');
-    }
-
-    /**
-     * Check if this role has a permission.
-     * @param $permissionName
-     * @return bool
-     */
-    public function hasPermission($permissionName)
-    {
-        $permissions = $this->getRelationValue('permissions');
-        foreach ($permissions as $permission) {
-            if ($permission->getRawAttribute('name') === $permissionName) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Add a permission to this role.
-     * @param \BookStack\Auth\Permissions\RolePermission $permission
-     */
-    public function attachPermission(Permissions\RolePermission $permission)
-    {
-        $this->permissions()->attach($permission->id);
-    }
-
-    /**
-     * Detach a single permission from this role.
-     * @param \BookStack\Auth\Permissions\RolePermission $permission
-     */
-    public function detachPermission(Permissions\RolePermission $permission)
-    {
-        $this->permissions()->detach($permission->id);
-    }
-
-    /**
-     * Get the role object for the specified role.
-     * @param $roleName
-     * @return Role
-     */
-    public static function getRole($roleName)
-    {
-        return static::where('name', '=', $roleName)->first();
-    }
-
-    /**
-     * Get the role object for the specified system role.
-     * @param $roleName
-     * @return Role
-     */
-    public static function getSystemRole($roleName)
-    {
-        return static::where('system_name', '=', $roleName)->first();
-    }
-
-    /**
-     * Get all visible roles
-     * @return mixed
-     */
-    public static function visible()
-    {
-        return static::where('hidden', '=', false)->orderBy('name')->get();
-    }
-}

app/Auth/User.php

@@ -1,240 +0,0 @@
-<?php namespace BookStack\Auth;
-
-use BookStack\Model;
-use BookStack\Notifications\ResetPassword;
-use BookStack\Uploads\Image;
-use Illuminate\Auth\Authenticatable;
-use Illuminate\Auth\Passwords\CanResetPassword;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
-use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Notifications\Notifiable;
-
-class User extends Model implements AuthenticatableContract, CanResetPasswordContract
-{
-    use Authenticatable, CanResetPassword, Notifiable;
-
-    /**
-     * The database table used by the model.
-     * @var string
-     */
-    protected $table = 'users';
-
-    /**
-     * The attributes that are mass assignable.
-     * @var array
-     */
-    protected $fillable = ['name', 'email', 'image_id'];
-
-    /**
-     * The attributes excluded from the model's JSON form.
-     * @var array
-     */
-    protected $hidden = ['password', 'remember_token'];
-
-    /**
-     * This holds the user's permissions when loaded.
-     * @var array
-     */
-    protected $permissions;
-
-    /**
-     * Returns the default public user.
-     * @return User
-     */
-    public static function getDefault()
-    {
-        return static::where('system_name', '=', 'public')->first();
-    }
-
-    /**
-     * Check if the user is the default public user.
-     * @return bool
-     */
-    public function isDefault()
-    {
-        return $this->system_name === 'public';
-    }
-
-    /**
-     * The roles that belong to the user.
-     * @return BelongsToMany
-     */
-    public function roles()
-    {
-        if ($this->id === 0) {
-            return ;
-        }
-        return $this->belongsToMany(Role::class);
-    }
-
-    /**
-     * Check if the user has a role.
-     * @param $role
-     * @return mixed
-     */
-    public function hasRole($role)
-    {
-        return $this->roles->pluck('name')->contains($role);
-    }
-
-    /**
-     * Check if the user has a role.
-     * @param $role
-     * @return mixed
-     */
-    public function hasSystemRole($role)
-    {
-        return $this->roles->pluck('system_name')->contains($role);
-    }
-
-    /**
-     * Get all permissions belonging to a the current user.
-     * @param bool $cache
-     * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
-     */
-    public function permissions($cache = true)
-    {
-        if (isset($this->permissions) && $cache) {
-            return $this->permissions;
-        }
-        $this->load('roles.permissions');
-        $permissions = $this->roles->map(function ($role) {
-            return $role->permissions;
-        })->flatten()->unique();
-        $this->permissions = $permissions;
-        return $permissions;
-    }
-
-    /**
-     * Check if the user has a particular permission.
-     * @param $permissionName
-     * @return bool
-     */
-    public function can($permissionName)
-    {
-        if ($this->email === 'guest') {
-            return false;
-        }
-        return $this->permissions()->pluck('name')->contains($permissionName);
-    }
-
-    /**
-     * Attach a role to this user.
-     * @param Role $role
-     */
-    public function attachRole(Role $role)
-    {
-        $this->attachRoleId($role->id);
-    }
-
-    /**
-     * Attach a role id to this user.
-     * @param $id
-     */
-    public function attachRoleId($id)
-    {
-        $this->roles()->attach($id);
-    }
-
-    /**
-     * Get the social account associated with this user.
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function socialAccounts()
-    {
-        return $this->hasMany(SocialAccount::class);
-    }
-
-    /**
-     * Check if the user has a social account,
-     * If a driver is passed it checks for that single account type.
-     * @param bool|string $socialDriver
-     * @return bool
-     */
-    public function hasSocialAccount($socialDriver = false)
-    {
-        if ($socialDriver === false) {
-            return $this->socialAccounts()->count() > 0;
-        }
-
-        return $this->socialAccounts()->where('driver', '=', $socialDriver)->exists();
-    }
-
-    /**
-     * Returns the user's avatar,
-     * @param int $size
-     * @return string
-     */
-    public function getAvatar($size = 50)
-    {
-        $default = baseUrl('/user_avatar.png');
-        $imageId = $this->image_id;
-        if ($imageId === 0 || $imageId === '0' || $imageId === null) {
-            return $default;
-        }
-
-        try {
-            $avatar = $this->avatar ? baseUrl($this->avatar->getThumb($size, $size, false)) : $default;
-        } catch (\Exception $err) {
-            $avatar = $default;
-        }
-        return $avatar;
-    }
-
-    /**
-     * Get the avatar for the user.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function avatar()
-    {
-        return $this->belongsTo(Image::class, 'image_id');
-    }
-
-    /**
-     * Get the url for editing this user.
-     * @return string
-     */
-    public function getEditUrl()
-    {
-        return baseUrl('/settings/users/' . $this->id);
-    }
-
-    /**
-     * Get the url that links to this user's profile.
-     * @return mixed
-     */
-    public function getProfileUrl()
-    {
-        return baseUrl('/user/' . $this->id);
-    }
-
-    /**
-     * Get a shortened version of the user's name.
-     * @param int $chars
-     * @return string
-     */
-    public function getShortName($chars = 8)
-    {
-        if (strlen($this->name) <= $chars) {
-            return $this->name;
-        }
-
-        $splitName = explode(' ', $this->name);
-        if (strlen($splitName[0]) <= $chars) {
-            return $splitName[0];
-        }
-
-        return '';
-    }
-
-    /**
-     * Send the password reset notification.
-     * @param  string  $token
-     * @return void
-     */
-    public function sendPasswordResetNotification($token)
-    {
-        $this->notify(new ResetPassword($token));
-    }
-}

app/Auth/UserRepo.php

@@ -1,294 +0,0 @@
-<?php namespace BookStack\Auth;
-
-use Activity;
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Exceptions\NotFoundException;
-use BookStack\Exceptions\UserUpdateException;
-use BookStack\Uploads\Image;
-use Exception;
-use Images;
-
-class UserRepo
-{
-
-    protected $user;
-    protected $role;
-    protected $entityRepo;
-
-    /**
-     * UserRepo constructor.
-     * @param User $user
-     * @param Role $role
-     * @param EntityRepo $entityRepo
-     */
-    public function __construct(User $user, Role $role, EntityRepo $entityRepo)
-    {
-        $this->user = $user;
-        $this->role = $role;
-        $this->entityRepo = $entityRepo;
-    }
-
-    /**
-     * @param string $email
-     * @return User|null
-     */
-    public function getByEmail($email)
-    {
-        return $this->user->where('email', '=', $email)->first();
-    }
-
-    /**
-     * @param int $id
-     * @return User
-     */
-    public function getById($id)
-    {
-        return $this->user->newQuery()->findOrFail($id);
-    }
-
-    /**
-     * Get all the users with their permissions.
-     * @return \Illuminate\Database\Eloquent\Builder|static
-     */
-    public function getAllUsers()
-    {
-        return $this->user->with('roles', 'avatar')->orderBy('name', 'asc')->get();
-    }
-
-    /**
-     * Get all the users with their permissions in a paginated format.
-     * @param int $count
-     * @param $sortData
-     * @return \Illuminate\Database\Eloquent\Builder|static
-     */
-    public function getAllUsersPaginatedAndSorted($count, $sortData)
-    {
-        $query = $this->user->with('roles', 'avatar')->orderBy($sortData['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);
-    }
-
-     /**
-     * Creates a new user and attaches a role to them.
-     * @param array $data
-     * @param boolean $verifyEmail
-     * @return \BookStack\Auth\User
-     */
-    public function registerNew(array $data, $verifyEmail = false)
-    {
-        $user = $this->create($data, $verifyEmail);
-        $this->attachDefaultRole($user);
-        $this->downloadAndAssignUserAvatar($user);
-
-        return $user;
-    }
-
-    /**
-     * Give a user the default role. Used when creating a new user.
-     * @param User $user
-     */
-    public function attachDefaultRole(User $user)
-    {
-        $roleId = setting('registration-role');
-        if ($roleId !== false && $user->roles()->where('id', '=', $roleId)->count() === 0) {
-            $user->attachRoleId($roleId);
-        }
-    }
-
-    /**
-     * Assign a user to a system-level role.
-     * @param User $user
-     * @param $systemRoleName
-     * @throws NotFoundException
-     */
-    public function attachSystemRole(User $user, $systemRoleName)
-    {
-        $role = $this->role->newQuery()->where('system_name', '=', $systemRoleName)->first();
-        if ($role === null) {
-            throw new NotFoundException("Role '{$systemRoleName}' not found");
-        }
-        $user->attachRole($role);
-    }
-
-    /**
-     * Checks if the give user is the only admin.
-     * @param \BookStack\Auth\User $user
-     * @return bool
-     */
-    public function isOnlyAdmin(User $user)
-    {
-        if (!$user->hasSystemRole('admin')) {
-            return false;
-        }
-
-        $adminRole = $this->role->getSystemRole('admin');
-        if ($adminRole->users->count() > 1) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Set the assigned user roles via an array of role IDs.
-     * @param User $user
-     * @param array $roles
-     * @throws UserUpdateException
-     */
-    public function setUserRoles(User $user, array $roles)
-    {
-        if ($this->demotingLastAdmin($user, $roles)) {
-            throw new UserUpdateException(trans('errors.role_cannot_remove_only_admin'), $user->getEditUrl());
-        }
-
-        $user->roles()->sync($roles);
-    }
-
-    /**
-     * Check if the given user is the last admin and their new roles no longer
-     * contains the admin role.
-     * @param User $user
-     * @param array $newRoles
-     * @return bool
-     */
-    protected function demotingLastAdmin(User $user, array $newRoles) : bool
-    {
-        if ($this->isOnlyAdmin($user)) {
-            $adminRole = $this->role->getSystemRole('admin');
-            if (!in_array(strval($adminRole->id), $newRoles)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Create a new basic instance of user.
-     * @param array $data
-     * @param boolean $verifyEmail
-     * @return \BookStack\Auth\User
-     */
-    public function create(array $data, $verifyEmail = false)
-    {
-        return $this->user->forceCreate([
-            'name'     => $data['name'],
-            'email'    => $data['email'],
-            'password' => bcrypt($data['password']),
-            'email_confirmed' => $verifyEmail
-        ]);
-    }
-
-    /**
-     * Remove the given user from storage, Delete all related content.
-     * @param \BookStack\Auth\User $user
-     * @throws Exception
-     */
-    public function destroy(User $user)
-    {
-        $user->socialAccounts()->delete();
-        $user->delete();
-        
-        // Delete user profile images
-        $profileImages = $images = Image::where('type', '=', 'user')->where('created_by', '=', $user->id)->get();
-        foreach ($profileImages as $image) {
-            Images::destroy($image);
-        }
-    }
-
-    /**
-     * Get the latest activity for a user.
-     * @param \BookStack\Auth\User $user
-     * @param int $count
-     * @param int $page
-     * @return array
-     */
-    public function getActivity(User $user, $count = 20, $page = 0)
-    {
-        return Activity::userActivity($user, $count, $page);
-    }
-
-    /**
-     * Get the recently created content for this given user.
-     * @param \BookStack\Auth\User $user
-     * @param int $count
-     * @return mixed
-     */
-    public function getRecentlyCreated(User $user, $count = 20)
-    {
-        return [
-            'pages'    => $this->entityRepo->getRecentlyCreated('page', $count, 0, function ($query) use ($user) {
-                $query->where('created_by', '=', $user->id);
-            }),
-            'chapters' => $this->entityRepo->getRecentlyCreated('chapter', $count, 0, function ($query) use ($user) {
-                $query->where('created_by', '=', $user->id);
-            }),
-            'books'    => $this->entityRepo->getRecentlyCreated('book', $count, 0, function ($query) use ($user) {
-                $query->where('created_by', '=', $user->id);
-            })
-        ];
-    }
-
-    /**
-     * Get asset created counts for the give user.
-     * @param \BookStack\Auth\User $user
-     * @return array
-     */
-    public function getAssetCounts(User $user)
-    {
-        return [
-            'pages'    => $this->entityRepo->getUserTotalCreated('page', $user),
-            'chapters' => $this->entityRepo->getUserTotalCreated('chapter', $user),
-            'books'    => $this->entityRepo->getUserTotalCreated('book', $user),
-        ];
-    }
-
-    /**
-     * Get the roles in the system that are assignable to a user.
-     * @return mixed
-     */
-    public function getAllRoles()
-    {
-        return $this->role->all();
-    }
-
-    /**
-     * Get all the roles which can be given restricted access to
-     * other entities in the system.
-     * @return mixed
-     */
-    public function getRestrictableRoles()
-    {
-        return $this->role->where('system_name', '!=', 'admin')->get();
-    }
-
-    /**
-     * Get an avatar image for a user and set it as their avatar.
-     * Returns early if avatars disabled or not set in config.
-     * @param User $user
-     * @return bool
-     */
-    public function downloadAndAssignUserAvatar(User $user)
-    {
-        if (!Images::avatarFetchEnabled()) {
-            return false;
-        }
-
-        try {
-            $avatar = Images::saveUserAvatar($user);
-            $user->avatar()->associate($avatar);
-            $user->save();
-            return true;
-        } catch (Exception $e) {
-            \Log::error('Failed to save user avatar image');
-            return false;
-        }
-    }
-}

app/Book.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace BookStack;
+
+class Book extends Entity
+{
+
+    protected $fillable = ['name', 'description'];
+
+    public function getUrl()
+    {
+        return '/books/' . $this->slug;
+    }
+
+    public function getEditUrl()
+    {
+        return $this->getUrl() . '/edit';
+    }
+
+    public function pages()
+    {
+        return $this->hasMany('BookStack\Page');
+    }
+
+    public function chapters()
+    {
+        return $this->hasMany('BookStack\Chapter');
+    }
+
+    public function getExcerpt($length = 100)
+    {
+        return strlen($this->description) > $length ? substr($this->description, 0, $length-3) . '...' : $this->description;
+    }
+
+}

app/Chapter.php

@@ -0,0 +1,29 @@
+<?php namespace BookStack;
+
+
+class Chapter extends Entity
+{
+    protected $fillable = ['name', 'description', 'priority', 'book_id'];
+
+    public function book()
+    {
+        return $this->belongsTo('BookStack\Book');
+    }
+
+    public function pages()
+    {
+        return $this->hasMany('BookStack\Page')->orderBy('priority', 'ASC');
+    }
+
+    public function getUrl()
+    {
+        $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
+        return '/books/' . $bookSlug. '/chapter/' . $this->slug;
+    }
+
+    public function getExcerpt($length = 100)
+    {
+        return strlen($this->description) > $length ? substr($this->description, 0, $length-3) . '...' : $this->description;
+    }
+
+}

app/Console/Commands/CleanupImages.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Uploads\ImageService;
-use Illuminate\Console\Command;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class CleanupImages extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:cleanup-images
-                            {--a|all : Include images that are used in page revisions}
-                            {--f|force : Actually run the deletions}
-                            ';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Cleanup images and drawings';
-
-
-    protected $imageService;
-
-    /**
-     * Create a new command instance.
-     * @param \BookStack\Uploads\ImageService $imageService
-     */
-    public function __construct(ImageService $imageService)
-    {
-        $this->imageService = $imageService;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $checkRevisions = $this->option('all') ? false : true;
-        $dryRun = $this->option('force') ? false : true;
-
-        if (!$dryRun) {
-            $proceed = $this->confirm("This operation is destructive and is not guaranteed to be fully accurate.\nEnsure you have a backup of your images.\nAre you sure you want to proceed?");
-            if (!$proceed) {
-                return;
-            }
-        }
-
-        $deleted = $this->imageService->deleteUnusedImages($checkRevisions, $dryRun);
-        $deleteCount = count($deleted);
-
-        if ($dryRun) {
-            $this->comment('Dry run, No images have been deleted');
-            $this->comment($deleteCount . ' images found that would have been deleted');
-            $this->showDeletedImages($deleted);
-            $this->comment('Run with -f or --force to perform deletions');
-            return;
-        }
-
-        $this->showDeletedImages($deleted);
-        $this->comment($deleteCount . ' images deleted');
-    }
-
-    protected function showDeletedImages($paths)
-    {
-        if ($this->getOutput()->getVerbosity() <= OutputInterface::VERBOSITY_NORMAL) {
-            return;
-        }
-        if (count($paths) > 0) {
-            $this->line('Images to delete:');
-        }
-        foreach ($paths as $path) {
-            $this->line($path);
-        }
-    }
-}

app/Console/Commands/ClearActivity.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Actions\Activity;
-use Illuminate\Console\Command;
-
-class ClearActivity extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:clear-activity';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Clear user activity from the system';
-
-    protected $activity;
-
-    /**
-     * Create a new command instance.
-     *
-     * @param Activity $activity
-     */
-    public function __construct(Activity $activity)
-    {
-        $this->activity = $activity;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $this->activity->newQuery()->truncate();
-        $this->comment('System activity cleared');
-    }
-}

app/Console/Commands/ClearRevisions.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Entities\PageRevision;
-use Illuminate\Console\Command;
-
-class ClearRevisions extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:clear-revisions
-                            {--a|all : Include active update drafts in deletion}
-                            ';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Clear page revisions';
-
-    protected $pageRevision;
-
-    /**
-     * Create a new command instance.
-     *
-     * @param PageRevision $pageRevision
-     */
-    public function __construct(PageRevision $pageRevision)
-    {
-        $this->pageRevision = $pageRevision;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $deleteTypes = $this->option('all') ? ['version', 'update_draft'] : ['version'];
-        $this->pageRevision->newQuery()->whereIn('type', $deleteTypes)->delete();
-        $this->comment('Revisions deleted');
-    }
-}

app/Console/Commands/CreateAdmin.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Auth\UserRepo;
-use Illuminate\Console\Command;
-
-class CreateAdmin extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    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}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Add a new admin user to the system';
-
-    protected $userRepo;
-
-    /**
-     * Create a new command instance.
-     *
-     * @param UserRepo $userRepo
-     */
-    public function __construct(UserRepo $userRepo)
-    {
-        $this->userRepo = $userRepo;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function handle()
-    {
-        $email = trim($this->option('email'));
-        if (empty($email)) {
-            $email = $this->ask('Please specify an email address for the new admin user');
-        }
-        if (strlen($email) < 5 || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            return $this->error('Invalid email address provided');
-        }
-
-        if ($this->userRepo->getByEmail($email) !== null) {
-            return $this->error('A user with the provided email already exists!');
-        }
-
-        $name = trim($this->option('name'));
-        if (empty($name)) {
-            $name = $this->ask('Please specify an name for the new admin user');
-        }
-        if (strlen($name) < 2) {
-            return $this->error('Invalid name provided');
-        }
-
-        $password = trim($this->option('password'));
-        if (empty($password)) {
-            $password = $this->secret('Please specify a password for the new admin user');
-        }
-        if (strlen($password) < 5) {
-            return $this->error('Invalid password provided, Must be at least 5 characters');
-        }
-
-
-        $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();
-
-        $this->info("Admin account with email \"{$user->email}\" successfully created!");
-    }
-}

app/Console/Commands/DeleteUsers.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
-use Illuminate\Console\Command;
-
-class DeleteUsers extends Command
-{
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:delete-users';
-
-    protected $user;
-
-    protected $userRepo;
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Delete users that are not "admin" or system users.';
-
-    public function __construct(User $user, UserRepo $userRepo)
-    {
-        $this->user = $user;
-        $this->userRepo = $userRepo;
-        parent::__construct();
-    }
-
-    public function handle()
-    {
-        $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 = $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
-                    continue;
-                }
-                $this->userRepo->destroy($user);
-                ++$numDeleted;
-            }
-            $this->info("Deleted $numDeleted of $totalUsers total users.");
-        } else {
-            $this->info('Exiting...');
-        }
-    }
-}

app/Console/Commands/Inspire.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace BookStack\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Foundation\Inspiring;
+
+class Inspire extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'inspire';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Display an inspiring quote';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+    }
+}

app/Console/Commands/RegeneratePermissions.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Auth\Permissions\PermissionService;
-use Illuminate\Console\Command;
-
-class RegeneratePermissions extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:regenerate-permissions {--database= : The database connection to use.}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Regenerate all system permissions';
-
-    /**
-     * The service to handle the permission system.
-     *
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-    /**
-     * Create a new command instance.
-     *
-     * @param \BookStack\Auth\\BookStack\Auth\Permissions\PermissionService $permissionService
-     */
-    public function __construct(PermissionService $permissionService)
-    {
-        $this->permissionService = $permissionService;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $connection = \DB::getDefaultConnection();
-        if ($this->option('database') !== null) {
-            \DB::setDefaultConnection($this->option('database'));
-            $this->permissionService->setConnection(\DB::connection($this->option('database')));
-        }
-
-        $this->permissionService->buildJointPermissions();
-
-        \DB::setDefaultConnection($connection);
-        $this->comment('Permissions regenerated');
-    }
-}

app/Console/Commands/RegenerateSearch.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Entities\SearchService;
-use Illuminate\Console\Command;
-
-class RegenerateSearch extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:regenerate-search {--database= : The database connection to use.}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Re-index all content for searching';
-
-    protected $searchService;
-
-    /**
-     * Create a new command instance.
-     *
-     * @param \BookStack\Entities\SearchService $searchService
-     */
-    public function __construct(SearchService $searchService)
-    {
-        parent::__construct();
-        $this->searchService = $searchService;
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $connection = \DB::getDefaultConnection();
-        if ($this->option('database') !== null) {
-            \DB::setDefaultConnection($this->option('database'));
-            $this->searchService->setConnection(\DB::connection($this->option('database')));
-        }
-
-        $this->searchService->indexAllEntities();
-        \DB::setDefaultConnection($connection);
-        $this->comment('Search index regenerated');
-    }
-}

app/Console/Commands/ResetViews.php

@@ -4,21 +4,21 @@ namespace BookStack\Console\Commands;
 
 use Illuminate\Console\Command;
 
-class ClearViews extends Command
+class ResetViews extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'bookstack:clear-views';
+    protected $signature = 'views:reset';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Clear all view-counts for all entities.';
+    protected $description = 'Reset all view-counts for all entities.';
 
     /**
      * Create a new command instance.
@@ -37,6 +37,5 @@ class ClearViews extends Command
     public function handle()
     {
         \Views::resetAll();
-        $this->comment('Views cleared');
     }
 }

app/Console/Commands/UpgradeDatabaseEncoding.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-
-class UpgradeDatabaseEncoding extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:db-utf8mb4 {--database= : The database connection to use.}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Generate SQL commands to upgrade the database to UTF8mb4';
-
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $connection = DB::getDefaultConnection();
-        if ($this->option('database') !== null) {
-            DB::setDefaultConnection($this->option('database'));
-        }
-
-        $database = DB::getDatabaseName();
-        $tables = DB::select('SHOW TABLES');
-        $this->line('ALTER DATABASE `'.$database.'` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
-        $this->line('USE `'.$database.'`;');
-        $key = 'Tables_in_' . $database;
-        foreach ($tables as $table) {
-            $tableName = $table->$key;
-            $this->line('ALTER TABLE `'.$tableName.'` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
-        }
-
-        DB::setDefaultConnection($connection);
-    }
-}

app/Console/Kernel.php

@@ -1,4 +1,6 @@
-<?php namespace BookStack\Console;
+<?php
+
+namespace BookStack\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -11,7 +13,8 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        //
+        \BookStack\Console\Commands\Inspire::class,
+        \BookStack\Console\Commands\ResetViews::class,
     ];
 
     /**
@@ -22,16 +25,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        //
-    }
-
-    /**
-     * Register the commands for the application.
-     *
-     * @return void
-     */
-    protected function commands()
-    {
-        $this->load(__DIR__.'/Commands');
+        $schedule->command('inspire')
+                 ->hourly();
     }
 }

app/EmailConfirmation.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace BookStack;
+
+use Illuminate\Database\Eloquent\Model;
+
+class EmailConfirmation extends Model
+{
+    protected $fillable = ['user_id', 'token'];
+
+    public function user()
+    {
+        return $this->belongsTo('BookStack\User');
+    }
+}

app/Entities/Book.php

@@ -1,109 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Uploads\Image;
-
-class Book extends Entity
-{
-    public $searchFactor = 2;
-
-    protected $fillable = ['name', 'description', 'image_id'];
-
-    /**
-     * Get the morph class for this model.
-     * @return string
-     */
-    public function getMorphClass()
-    {
-        return 'BookStack\\Book';
-    }
-
-    /**
-     * Get the url for this book.
-     * @param string|bool $path
-     * @return string
-     */
-    public function getUrl($path = false)
-    {
-        if ($path !== false) {
-            return baseUrl('/books/' . urlencode($this->slug) . '/' . trim($path, '/'));
-        }
-        return baseUrl('/books/' . urlencode($this->slug));
-    }
-
-    /**
-     * Returns book cover image, if book cover not exists return default cover image.
-     * @param int $width - Width of the image
-     * @param int $height - Height of the image
-     * @return string
-     */
-    public function getBookCover($width = 440, $height = 250)
-    {
-        $default = baseUrl('/book_default_cover.png');
-        if (!$this->image_id) {
-            return $default;
-        }
-
-        try {
-            $cover = $this->cover ? baseUrl($this->cover->getThumb($width, $height, false)) : $default;
-        } catch (\Exception $err) {
-            $cover = $default;
-        }
-        return $cover;
-    }
-
-    /**
-     * Get the cover image of the book
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function cover()
-    {
-        return $this->belongsTo(Image::class, 'image_id');
-    }
-
-    /**
-     * Get all pages within this book.
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function pages()
-    {
-        return $this->hasMany(Page::class);
-    }
-
-    /**
-     * Get all chapters within this book.
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function chapters()
-    {
-        return $this->hasMany(Chapter::class);
-    }
-
-    /**
-     * Get the shelves this book is contained within.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
-    public function shelves()
-    {
-        return $this->belongsToMany(Bookshelf::class, 'bookshelves_books', 'book_id', 'bookshelf_id');
-    }
-
-    /**
-     * Get an excerpt of this book's description to the specified length or less.
-     * @param int $length
-     * @return string
-     */
-    public function getExcerpt($length = 100)
-    {
-        $description = $this->description;
-        return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description;
-    }
-
-    /**
-     * Return a generalised, common raw query that can be 'unioned' across entities.
-     * @return string
-     */
-    public function entityRawQuery()
-    {
-        return "'BookStack\\\\Book' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text,'' as html, '0' as book_id, '0' as priority, '0' as chapter_id, '0' as draft, created_by, updated_by, updated_at, created_at";
-    }
-}

app/Entities/Bookshelf.php

@@ -1,94 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Uploads\Image;
-
-class Bookshelf extends Entity
-{
-    protected $table = 'bookshelves';
-
-    public $searchFactor = 3;
-
-    protected $fillable = ['name', 'description', 'image_id'];
-
-    /**
-     * Get the morph class for this model.
-     * @return string
-     */
-    public function getMorphClass()
-    {
-        return 'BookStack\\Bookshelf';
-    }
-
-    /**
-     * Get the books in this shelf.
-     * Should not be used directly since does not take into account permissions.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
-    public function books()
-    {
-        return $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')->orderBy('order', 'asc');
-    }
-
-    /**
-     * Get the url for this bookshelf.
-     * @param string|bool $path
-     * @return string
-     */
-    public function getUrl($path = false)
-    {
-        if ($path !== false) {
-            return baseUrl('/shelves/' . urlencode($this->slug) . '/' . trim($path, '/'));
-        }
-        return baseUrl('/shelves/' . urlencode($this->slug));
-    }
-
-    /**
-     * Returns BookShelf cover image, if cover does not exists return default cover image.
-     * @param int $width - Width of the image
-     * @param int $height - Height of the image
-     * @return string
-     */
-    public function getBookCover($width = 440, $height = 250)
-    {
-        $default = baseUrl('/book_default_cover.png');
-        if (!$this->image_id) {
-            return $default;
-        }
-
-        try {
-            $cover = $this->cover ? baseUrl($this->cover->getThumb($width, $height, false)) : $default;
-        } catch (\Exception $err) {
-            $cover = $default;
-        }
-        return $cover;
-    }
-
-    /**
-     * Get the cover image of the book
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function cover()
-    {
-        return $this->belongsTo(Image::class, 'image_id');
-    }
-
-    /**
-     * Get an excerpt of this book's description to the specified length or less.
-     * @param int $length
-     * @return string
-     */
-    public function getExcerpt($length = 100)
-    {
-        $description = $this->description;
-        return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description;
-    }
-
-    /**
-     * Return a generalised, common raw query that can be 'unioned' across entities.
-     * @return string
-     */
-    public function entityRawQuery()
-    {
-        return "'BookStack\\\\BookShelf' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text,'' as html, '0' as book_id, '0' as priority, '0' as chapter_id, '0' as draft, created_by, updated_by, updated_at, created_at";
-    }
-}

app/Entities/Chapter.php

@@ -1,70 +0,0 @@
-<?php namespace BookStack\Entities;
-
-class Chapter extends Entity
-{
-    public $searchFactor = 1.3;
-
-    protected $fillable = ['name', 'description', 'priority', 'book_id'];
-
-    /**
-     * Get the morph class for this model.
-     * @return string
-     */
-    public function getMorphClass()
-    {
-        return 'BookStack\\Chapter';
-    }
-
-    /**
-     * Get the book this chapter is within.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function book()
-    {
-        return $this->belongsTo(Book::class);
-    }
-
-    /**
-     * Get the pages that this chapter contains.
-     * @param string $dir
-     * @return mixed
-     */
-    public function pages($dir = 'ASC')
-    {
-        return $this->hasMany(Page::class)->orderBy('priority', $dir);
-    }
-
-    /**
-     * Get the url of this chapter.
-     * @param string|bool $path
-     * @return string
-     */
-    public function getUrl($path = false)
-    {
-        $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
-        if ($path !== false) {
-            return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug) . '/' . trim($path, '/'));
-        }
-        return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug));
-    }
-
-    /**
-     * Get an excerpt of this chapter's description to the specified length or less.
-     * @param int $length
-     * @return string
-     */
-    public function getExcerpt($length = 100)
-    {
-        $description = $this->description;
-        return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description;
-    }
-
-    /**
-     * Return a generalised, common raw query that can be 'unioned' across entities.
-     * @return string
-     */
-    public function entityRawQuery()
-    {
-        return "'BookStack\\\\Chapter' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text, '' as html, book_id, priority, '0' as chapter_id, '0' as draft, created_by, updated_by, updated_at, created_at";
-    }
-}

app/Entities/Entity.php

@@ -1,239 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Actions\Activity;
-use BookStack\Actions\Comment;
-use BookStack\Actions\Tag;
-use BookStack\Actions\View;
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Ownable;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-/**
- * Class Entity
- * The base class for book-like items such as pages, chapters & books.
- * This is not a database model in itself but extended.
- *
- * @property integer $id
- * @property string $name
- * @property string $slug
- * @property Carbon $created_at
- * @property Carbon $updated_at
- * @property int $created_by
- * @property int $updated_by
- * @property boolean $restricted
- *
- * @package BookStack\Entities
- */
-class Entity extends Ownable
-{
-
-    /**
-     * @var string - Name of property where the main text content is found
-     */
-    public $textField = 'description';
-
-    /**
-     * @var float - Multiplier for search indexing.
-     */
-    public $searchFactor = 1.0;
-
-    /**
-     * Get the morph class for this model.
-     * Set here since, due to folder changes, the namespace used
-     * in the database no longer matches the class namespace.
-     * @return string
-     */
-    public function getMorphClass()
-    {
-        return 'BookStack\\Entity';
-    }
-
-    /**
-     * Compares this entity to another given entity.
-     * Matches by comparing class and id.
-     * @param $entity
-     * @return bool
-     */
-    public function matches($entity)
-    {
-        return [get_class($this), $this->id] === [get_class($entity), $entity->id];
-    }
-
-    /**
-     * Checks if an entity matches or contains another given entity.
-     * @param Entity $entity
-     * @return bool
-     */
-    public function matchesOrContains(Entity $entity)
-    {
-        $matches = [get_class($this), $this->id] === [get_class($entity), $entity->id];
-
-        if ($matches) {
-            return true;
-        }
-
-        if (($entity->isA('chapter') || $entity->isA('page')) && $this->isA('book')) {
-            return $entity->book_id === $this->id;
-        }
-
-        if ($entity->isA('page') && $this->isA('chapter')) {
-            return $entity->chapter_id === $this->id;
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the activity objects for this entity.
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
-    public function activity()
-    {
-        return $this->morphMany(Activity::class, 'entity')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get View objects for this entity.
-     */
-    public function views()
-    {
-        return $this->morphMany(View::class, 'viewable');
-    }
-
-    /**
-     * Get the Tag models that have been user assigned to this entity.
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
-    public function tags()
-    {
-        return $this->morphMany(Tag::class, 'entity')->orderBy('order', 'asc');
-    }
-
-    /**
-     * Get the comments for an entity
-     * @param bool $orderByCreated
-     * @return MorphMany
-     */
-    public function comments($orderByCreated = true)
-    {
-        $query = $this->morphMany(Comment::class, 'entity');
-        return $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
-    }
-
-    /**
-     * Get the related search terms.
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
-    public function searchTerms()
-    {
-        return $this->morphMany(SearchTerm::class, 'entity');
-    }
-
-    /**
-     * Get this entities restrictions.
-     */
-    public function permissions()
-    {
-        return $this->morphMany(EntityPermission::class, 'restrictable');
-    }
-
-    /**
-     * Check if this entity has a specific restriction set against it.
-     * @param $role_id
-     * @param $action
-     * @return bool
-     */
-    public function hasRestriction($role_id, $action)
-    {
-        return $this->permissions()->where('role_id', '=', $role_id)
-            ->where('action', '=', $action)->count() > 0;
-    }
-
-    /**
-     * Get the entity jointPermissions this is connected to.
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
-    public function jointPermissions()
-    {
-        return $this->morphMany(JointPermission::class, 'entity');
-    }
-
-    /**
-     * Allows checking of the exact class, Used to check entity type.
-     * Cleaner method for is_a.
-     * @param $type
-     * @return bool
-     */
-    public static function isA($type)
-    {
-        return static::getType() === strtolower($type);
-    }
-
-    /**
-     * Get entity type.
-     * @return mixed
-     */
-    public static function getType()
-    {
-        return strtolower(static::getClassName());
-    }
-
-    /**
-     * Get an instance of an entity of the given type.
-     * @param $type
-     * @return Entity
-     */
-    public static function getEntityInstance($type)
-    {
-        $types = ['Page', 'Book', 'Chapter', 'Bookshelf'];
-        $className = str_replace([' ', '-', '_'], '', ucwords($type));
-        if (!in_array($className, $types)) {
-            return null;
-        }
-
-        return app('BookStack\\Entities\\' . $className);
-    }
-
-    /**
-     * Gets a limited-length version of the entities name.
-     * @param int $length
-     * @return string
-     */
-    public function getShortName($length = 25)
-    {
-        if (mb_strlen($this->name) <= $length) {
-            return $this->name;
-        }
-        return mb_substr($this->name, 0, $length - 3) . '...';
-    }
-
-    /**
-     * Get the body text of this entity.
-     * @return mixed
-     */
-    public function getText()
-    {
-        return $this->{$this->textField};
-    }
-
-    /**
-     * Return a generalised, common raw query that can be 'unioned' across entities.
-     * @return string
-     */
-    public function entityRawQuery()
-    {
-        return '';
-    }
-
-    /**
-     * Get the url of this entity
-     * @param $path
-     * @return string
-     */
-    public function getUrl($path = '/')
-    {
-        return $path;
-    }
-}

app/Entities/EntityProvider.php

@@ -1,89 +0,0 @@
-<?php namespace BookStack\Entities;
-
-/**
- * Class EntityProvider
- *
- * Provides access to the core entity models.
- * Wrapped up in this provider since they are often used together
- * so this is a neater alternative to injecting all in individually.
- *
- * @package BookStack\Entities
- */
-class EntityProvider
-{
-
-    /**
-     * @var Bookshelf
-     */
-    public $bookshelf;
-
-    /**
-     * @var Book
-     */
-    public $book;
-
-    /**
-     * @var Chapter
-     */
-    public $chapter;
-
-    /**
-     * @var Page
-     */
-    public $page;
-
-    /**
-     * @var PageRevision
-     */
-    public $pageRevision;
-
-    /**
-     * EntityProvider constructor.
-     * @param Bookshelf $bookshelf
-     * @param Book $book
-     * @param Chapter $chapter
-     * @param Page $page
-     * @param PageRevision $pageRevision
-     */
-    public function __construct(
-        Bookshelf $bookshelf,
-        Book $book,
-        Chapter $chapter,
-        Page $page,
-        PageRevision $pageRevision
-    ) {
-        $this->bookshelf = $bookshelf;
-        $this->book = $book;
-        $this->chapter = $chapter;
-        $this->page = $page;
-        $this->pageRevision = $pageRevision;
-    }
-
-    /**
-     * Fetch all core entity types as an associated array
-     * with their basic names as the keys.
-     * @return Entity[]
-     */
-    public function all()
-    {
-        return [
-            'bookshelf' => $this->bookshelf,
-            'book' => $this->book,
-            'chapter' => $this->chapter,
-            'page' => $this->page,
-        ];
-    }
-
-    /**
-     * Get an entity instance by it's basic name.
-     * @param string $type
-     * @return Entity
-     */
-    public function get(string $type)
-    {
-        $type = strtolower($type);
-        return $this->all()[$type];
-    }
-
-
-}

app/Entities/ExportService.php

@@ -1,334 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Uploads\ImageService;
-use BookStack\Exceptions\ExportException;
-
-class ExportService
-{
-    protected $contentMatching = [
-        'video' => ["www.youtube.com", "player.vimeo.com", "www.dailymotion.com"],
-        'map' => ['maps.google.com']
-    ];
-
-    protected $entityRepo;
-    protected $imageService;
-
-    /**
-     * ExportService constructor.
-     * @param EntityRepo $entityRepo
-     * @param ImageService $imageService
-     */
-    public function __construct(EntityRepo $entityRepo, ImageService $imageService)
-    {
-        $this->entityRepo = $entityRepo;
-        $this->imageService = $imageService;
-    }
-
-    /**
-     * Convert a page to a self-contained HTML file.
-     * Includes required CSS & image content. Images are base64 encoded into the HTML.
-     * @param \BookStack\Entities\Page $page
-     * @return mixed|string
-     * @throws \Throwable
-     */
-    public function pageToContainedHtml(Page $page)
-    {
-        $this->entityRepo->renderPage($page);
-        $pageHtml = view('pages/export', [
-            'page' => $page
-        ])->render();
-        return $this->containHtml($pageHtml);
-    }
-
-    /**
-     * Convert a chapter to a self-contained HTML file.
-     * @param \BookStack\Entities\Chapter $chapter
-     * @return mixed|string
-     * @throws \Throwable
-     */
-    public function chapterToContainedHtml(Chapter $chapter)
-    {
-        $pages = $this->entityRepo->getChapterChildren($chapter);
-        $pages->each(function ($page) {
-            $page->html = $this->entityRepo->renderPage($page);
-        });
-        $html = view('chapters/export', [
-            'chapter' => $chapter,
-            'pages' => $pages
-        ])->render();
-        return $this->containHtml($html);
-    }
-
-    /**
-     * Convert a book to a self-contained HTML file.
-     * @param Book $book
-     * @return mixed|string
-     * @throws \Throwable
-     */
-    public function bookToContainedHtml(Book $book)
-    {
-        $bookTree = $this->entityRepo->getBookChildren($book, true, true);
-        $html = view('books/export', [
-            'book' => $book,
-            'bookChildren' => $bookTree
-        ])->render();
-        return $this->containHtml($html);
-    }
-
-    /**
-     * Convert a page to a PDF file.
-     * @param Page $page
-     * @param bool $isTesting
-     * @return mixed|string
-     * @throws \Throwable
-     */
-    public function pageToPdf(Page $page, bool $isTesting = false)
-    {
-        $this->entityRepo->renderPage($page);
-        $html = view('pages/pdf', [
-            'page' => $page
-        ])->render();
-        return $this->htmlToPdf($html, $isTesting);
-    }
-
-    /**
-     * Convert a chapter to a PDF file.
-     * @param \BookStack\Entities\Chapter $chapter
-     * @return mixed|string
-     * @throws \Throwable
-     */
-    public function chapterToPdf(Chapter $chapter)
-    {
-        $pages = $this->entityRepo->getChapterChildren($chapter);
-        $pages->each(function ($page) {
-            $page->html = $this->entityRepo->renderPage($page);
-        });
-        $html = view('chapters/export', [
-            'chapter' => $chapter,
-            'pages' => $pages
-        ])->render();
-        return $this->htmlToPdf($html);
-    }
-
-    /**
-     * Convert a book to a PDF file
-     * @param \BookStack\Entities\Book $book
-     * @return string
-     * @throws \Throwable
-     */
-    public function bookToPdf(Book $book)
-    {
-        $bookTree = $this->entityRepo->getBookChildren($book, true, true);
-        $html = view('books/export', [
-            'book' => $book,
-            'bookChildren' => $bookTree
-        ])->render();
-        return $this->htmlToPdf($html);
-    }
-
-    /**
-     * Convert normal webpage HTML to a PDF.
-     * @param $html
-     * @param $isTesting
-     * @return string
-     * @throws \Exception
-     */
-    protected function htmlToPdf($html, $isTesting = false)
-    {
-        $containedHtml = $this->containHtml($html, true);
-        if ($isTesting) {
-            return $containedHtml;
-        }
-        $useWKHTML = config('snappy.pdf.binary') !== false;
-        if ($useWKHTML) {
-            $pdf = \SnappyPDF::loadHTML($containedHtml);
-            $pdf->setOption('print-media-type', true);
-        } else {
-            $pdf = \DomPDF::loadHTML($containedHtml);
-        }
-        return $pdf->output();
-    }
-
-    /**
-     * Bundle of the contents of a html file to be self-contained.
-     * @param $htmlContent
-     * @param bool $isPDF
-     * @return mixed|string
-     * @throws \BookStack\Exceptions\ExportException
-     */
-    protected function containHtml(string $htmlContent, bool $isPDF = false) : string
-    {
-        $dom = $this->getDOM($htmlContent);
-        if ($dom === false) {
-            throw new ExportException(trans('errors.dom_parse_error'));
-        }
-
-        // replace image src with base64 encoded image strings
-        $images = $dom->getElementsByTagName('img');
-        foreach ($images as $img) {
-            $base64String = $this->imageService->imageUriToBase64($img->getAttribute('src'));
-            if ($base64String !== null) {
-                $img->setAttribute('src', $base64String);
-                $dom->saveHTML($img);
-            }
-        }
-
-        // replace all relative hrefs.
-        $links = $dom->getElementsByTagName('a');
-        foreach ($links as $link) {
-            $href = $link->getAttribute('href');
-            if (strpos(trim($href), 'http') !== 0) {
-                $newHref = url($href);
-                $link->setAttribute('href', $newHref);
-                $dom->saveHTML($link);
-            }
-        }
-
-        // replace all src in video, audio and iframe tags
-        $xmlDoc = new \DOMXPath($dom);
-        $srcElements = $xmlDoc->query('//video | //audio | //iframe');
-        foreach ($srcElements as $element) {
-            $element = $this->fixRelativeSrc($element);
-            $dom->saveHTML($element);
-
-            if ($isPDF) {
-                $src = $element->getAttribute('src');
-                $label = $this->getContentLabel($src);
-
-                $div = $dom->createElement('div');
-                $textNode = $dom->createTextNode($label);
-
-                $anchor = $dom->createElement('a');
-                $anchor->setAttribute('href', $src);
-                $anchor->textContent = $src;
-
-                $div->appendChild($textNode);
-                $div->appendChild($anchor);
-
-                $element->parentNode->replaceChild($div, $element);
-            }
-        }
-
-        return $dom->saveHTML();
-    }
-
-    /**
-     * Converts the page contents into simple plain text.
-     * This method filters any bad looking content to provide a nice final output.
-     * @param Page $page
-     * @return mixed
-     * @throws \BookStack\Exceptions\ExportException
-     */
-    public function pageToPlainText(Page $page)
-    {
-        $html = $this->entityRepo->renderPage($page);
-        $dom = $this->getDom($html);
-
-        if ($dom === false) {
-            throw new ExportException(trans('errors.dom_parse_error'));
-        }
-
-        // handle anchor tags.
-        $links = $dom->getElementsByTagName('a');
-        foreach ($links as $link) {
-            $href = $link->getAttribute('href');
-            if (strpos(trim($href), 'http') !== 0) {
-                $newHref = url($href);
-                $link->setAttribute('href', $newHref);
-            }
-
-            $link->textContent = trim($link->textContent . " ($href)");
-            $dom->saveHTML();
-        }
-
-        $xmlDoc = new \DOMXPath($dom);
-        $srcElements = $xmlDoc->query('//video | //audio | //iframe | //img');
-        foreach ($srcElements as $element) {
-            $element = $this->fixRelativeSrc($element);
-            $fixedSrc = $element->getAttribute('src');
-            $label = $this->getContentLabel($fixedSrc);
-            $finalLabel = "\n\n$label $fixedSrc\n\n";
-
-            $textNode = $dom->createTextNode($finalLabel);
-            $element->parentNode->replaceChild($textNode, $element);
-        }
-
-        $text = strip_tags($dom->saveHTML());
-        // Replace multiple spaces with single spaces
-        $text = preg_replace('/\ {2,}/', ' ', $text);
-        // Reduce multiple horrid whitespace characters.
-        $text = preg_replace('/(\x0A|\xA0|\x0A|\r|\n){2,}/su', "\n\n", $text);
-        $text = html_entity_decode($text);
-        // Add title
-        $text = $page->name . "\n\n" . $text;
-        return $text;
-    }
-
-    /**
-     * Convert a chapter into a plain text string.
-     * @param \BookStack\Entities\Chapter $chapter
-     * @return string
-     */
-    public function chapterToPlainText(Chapter $chapter)
-    {
-        $text = $chapter->name . "\n\n";
-        $text .= $chapter->description . "\n\n";
-        foreach ($chapter->pages as $page) {
-            $text .= $this->pageToPlainText($page);
-        }
-        return $text;
-    }
-
-    /**
-     * Convert a book into a plain text string.
-     * @param Book $book
-     * @return string
-     */
-    public function bookToPlainText(Book $book)
-    {
-        $bookTree = $this->entityRepo->getBookChildren($book, true, true);
-        $text = $book->name . "\n\n";
-        foreach ($bookTree as $bookChild) {
-            if ($bookChild->isA('chapter')) {
-                $text .= $this->chapterToPlainText($bookChild);
-            } else {
-                $text .= $this->pageToPlainText($bookChild);
-            }
-        }
-        return $text;
-    }
-
-    protected function getDom(string $htmlContent) : \DOMDocument
-    {
-        // See - https://stackoverflow.com/a/17559716/903324
-        $dom = new \DOMDocument();
-        libxml_use_internal_errors(true);
-        $dom->loadHTML($htmlContent);
-        libxml_clear_errors();
-        return $dom;
-    }
-
-    protected function fixRelativeSrc(\DOMElement $element): \DOMElement
-    {
-        $src = $element->getAttribute('src');
-        if (strpos(trim($src), 'http') !== 0) {
-            $newSrc = 'https:' . $src;
-            $element->setAttribute('src', $newSrc);
-        }
-        return $element;
-    }
-
-
-    protected function getContentLabel(string $src) : string
-    {
-        foreach ($this->contentMatching as $key => $possibleValues) {
-            foreach ($possibleValues as $value) {
-                if (strpos($src, $value)) {
-                    return trans("entities.$key");
-                }
-            }
-        }
-        return trans('entities.embedded_content');
-    }
-}

app/Entities/Page.php

@@ -1,135 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Uploads\Attachment;
-
-class Page extends Entity
-{
-    protected $fillable = ['name', 'html', 'priority', 'markdown'];
-
-    protected $simpleAttributes = ['name', 'id', 'slug'];
-
-    public $textField = 'text';
-
-    /**
-     * Get the morph class for this model.
-     * @return string
-     */
-    public function getMorphClass()
-    {
-        return 'BookStack\\Page';
-    }
-
-    /**
-     * Converts this page into a simplified array.
-     * @return mixed
-     */
-    public function toSimpleArray()
-    {
-        $array = array_intersect_key($this->toArray(), array_flip($this->simpleAttributes));
-        $array['url'] = $this->getUrl();
-        return $array;
-    }
-
-    /**
-     * Get the book this page sits in.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function book()
-    {
-        return $this->belongsTo(Book::class);
-    }
-
-    /**
-     * Get the parent item
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function parent()
-    {
-        return $this->chapter_id ? $this->chapter() : $this->book();
-    }
-
-    /**
-     * Get the chapter that this page is in, If applicable.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function chapter()
-    {
-        return $this->belongsTo(Chapter::class);
-    }
-
-    /**
-     * Check if this page has a chapter.
-     * @return bool
-     */
-    public function hasChapter()
-    {
-        return $this->chapter()->count() > 0;
-    }
-
-    /**
-     * Get the associated page revisions, ordered by created date.
-     * @return mixed
-     */
-    public function revisions()
-    {
-        return $this->hasMany(PageRevision::class)->where('type', '=', 'version')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the attachments assigned to this page.
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function attachments()
-    {
-        return $this->hasMany(Attachment::class, 'uploaded_to')->orderBy('order', 'asc');
-    }
-
-    /**
-     * Get the url for this page.
-     * @param string|bool $path
-     * @return string
-     */
-    public function getUrl($path = false)
-    {
-        $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
-        $midText = $this->draft ? '/draft/' : '/page/';
-        $idComponent = $this->draft ? $this->id : urlencode($this->slug);
-
-        if ($path !== false) {
-            return baseUrl('/books/' . urlencode($bookSlug) . $midText . $idComponent . '/' . trim($path, '/'));
-        }
-
-        return baseUrl('/books/' . urlencode($bookSlug) . $midText . $idComponent);
-    }
-
-    /**
-     * Get an excerpt of this page's content to the specified length.
-     * @param int $length
-     * @return mixed
-     */
-    public function getExcerpt($length = 100)
-    {
-        $text = strlen($this->text) > $length ? substr($this->text, 0, $length-3) . '...' : $this->text;
-        return mb_convert_encoding($text, 'UTF-8');
-    }
-
-    /**
-     * Return a generalised, common raw query that can be 'unioned' across entities.
-     * @param bool $withContent
-     * @return string
-     */
-    public function entityRawQuery($withContent = false)
-    {
-        $htmlQuery = $withContent ? 'html' : "'' as html";
-        return "'BookStack\\\\Page' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text, {$htmlQuery}, book_id, priority, chapter_id, draft, created_by, updated_by, updated_at, created_at";
-    }
-
-    /**
-     * Get the current revision for the page if existing
-     * @return \BookStack\Entities\PageRevision|null
-     */
-    public function getCurrentRevision()
-    {
-        return $this->revisions()->first();
-    }
-}

app/Entities/PageRevision.php

@@ -1,65 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Auth\User;
-use BookStack\Model;
-
-class PageRevision extends Model
-{
-    protected $fillable = ['name', 'html', 'text', 'markdown', 'summary'];
-
-    /**
-     * Get the user that created the page revision
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function createdBy()
-    {
-        return $this->belongsTo(User::class, 'created_by');
-    }
-
-    /**
-     * Get the page this revision originates from.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function page()
-    {
-        return $this->belongsTo(Page::class);
-    }
-
-    /**
-     * Get the url for this revision.
-     * @param null|string $path
-     * @return string
-     */
-    public function getUrl($path = null)
-    {
-        $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\PageRevision|null
-     */
-    public function getPrevious()
-    {
-        if ($id = static::where('page_id', '=', $this->page_id)->where('id', '<', $this->id)->max('id')) {
-            return static::find($id);
-        }
-        return null;
-    }
-
-    /**
-     * Allows checking of the exact class, Used to check entity type.
-     * Included here to align with entities in similar use cases.
-     * (Yup, Bit of an awkward hack)
-     * @param $type
-     * @return bool
-     */
-    public static function isA($type)
-    {
-        return $type === 'revision';
-    }
-}

app/Entities/Repos/EntityRepo.php

@@ -1,811 +0,0 @@
-<?php namespace BookStack\Entities\Repos;
-
-use BookStack\Actions\TagRepo;
-use BookStack\Actions\ViewService;
-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Auth\User;
-use BookStack\Entities\Book;
-use BookStack\Entities\Bookshelf;
-use BookStack\Entities\Chapter;
-use BookStack\Entities\Entity;
-use BookStack\Entities\EntityProvider;
-use BookStack\Entities\Page;
-use BookStack\Entities\SearchService;
-use BookStack\Exceptions\NotFoundException;
-use BookStack\Exceptions\NotifyException;
-use BookStack\Uploads\AttachmentService;
-use DOMDocument;
-use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
-
-class EntityRepo
-{
-
-    /**
-     * @var EntityProvider
-     */
-    protected $entityProvider;
-
-    /**
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-    /**
-     * @var ViewService
-     */
-    protected $viewService;
-
-    /**
-     * @var TagRepo
-     */
-    protected $tagRepo;
-
-    /**
-     * @var SearchService
-     */
-    protected $searchService;
-
-    /**
-     * EntityRepo constructor.
-     * @param EntityProvider $entityProvider
-     * @param ViewService $viewService
-     * @param PermissionService $permissionService
-     * @param TagRepo $tagRepo
-     * @param SearchService $searchService
-     */
-    public function __construct(
-        EntityProvider $entityProvider,
-        ViewService $viewService,
-        PermissionService $permissionService,
-        TagRepo $tagRepo,
-        SearchService $searchService
-    ) {
-        $this->entityProvider = $entityProvider;
-        $this->viewService = $viewService;
-        $this->permissionService = $permissionService;
-        $this->tagRepo = $tagRepo;
-        $this->searchService = $searchService;
-    }
-
-    /**
-     * Base query for searching entities via permission system
-     * @param string $type
-     * @param bool $allowDrafts
-     * @param string $permission
-     * @return \Illuminate\Database\Query\Builder
-     */
-    protected function entityQuery($type, $allowDrafts = false, $permission = 'view')
-    {
-        $q = $this->permissionService->enforceEntityRestrictions($type, $this->entityProvider->get($type), $permission);
-        if (strtolower($type) === 'page' && !$allowDrafts) {
-            $q = $q->where('draft', '=', false);
-        }
-        return $q;
-    }
-
-    /**
-     * Check if an entity with the given id exists.
-     * @param $type
-     * @param $id
-     * @return bool
-     */
-    public function exists($type, $id)
-    {
-        return $this->entityQuery($type)->where('id', '=', $id)->exists();
-    }
-
-    /**
-     * Get an entity by ID
-     * @param string $type
-     * @param integer $id
-     * @param bool $allowDrafts
-     * @param bool $ignorePermissions
-     * @return \BookStack\Entities\Entity
-     */
-    public function getById($type, $id, $allowDrafts = false, $ignorePermissions = false)
-    {
-        $query = $this->entityQuery($type, $allowDrafts);
-
-        if ($ignorePermissions) {
-            $query = $this->entityProvider->get($type)->newQuery();
-        }
-
-        return $query->find($id);
-    }
-
-    /**
-     * @param string $type
-     * @param []int $ids
-     * @param bool $allowDrafts
-     * @param bool $ignorePermissions
-     * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|Collection
-     */
-    public function getManyById($type, $ids, $allowDrafts = false, $ignorePermissions = false)
-    {
-        $query = $this->entityQuery($type, $allowDrafts);
-
-        if ($ignorePermissions) {
-            $query = $this->entityProvider->get($type)->newQuery();
-        }
-
-        return $query->whereIn('id', $ids)->get();
-    }
-
-    /**
-     * Get an entity by its url slug.
-     * @param string $type
-     * @param string $slug
-     * @param string|bool $bookSlug
-     * @return \BookStack\Entities\Entity
-     * @throws NotFoundException
-     */
-    public function getBySlug($type, $slug, $bookSlug = false)
-    {
-        $q = $this->entityQuery($type)->where('slug', '=', $slug);
-
-        if (strtolower($type) === 'chapter' || strtolower($type) === 'page') {
-            $q = $q->where('book_id', '=', function ($query) use ($bookSlug) {
-                $query->select('id')
-                    ->from($this->entityProvider->book->getTable())
-                    ->where('slug', '=', $bookSlug)->limit(1);
-            });
-        }
-        $entity = $q->first();
-        if ($entity === null) {
-            throw new NotFoundException(trans('errors.' . strtolower($type) . '_not_found'));
-        }
-        return $entity;
-    }
-
-
-    /**
-     * Get all entities of a type with the given permission, limited by count unless count is false.
-     * @param string $type
-     * @param integer|bool $count
-     * @param string $permission
-     * @return Collection
-     */
-    public function getAll($type, $count = 20, $permission = 'view')
-    {
-        $q = $this->entityQuery($type, false, $permission)->orderBy('name', 'asc');
-        if ($count !== false) {
-            $q = $q->take($count);
-        }
-        return $q->get();
-    }
-
-    /**
-     * Get all entities in a paginated format
-     * @param $type
-     * @param int $count
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
-     */
-    public function getAllPaginated($type, $count = 10)
-    {
-        return $this->entityQuery($type)->orderBy('name', 'asc')->paginate($count);
-    }
-
-    /**
-     * Get the most recently created entities of the given type.
-     * @param string $type
-     * @param int $count
-     * @param int $page
-     * @param bool|callable $additionalQuery
-     * @return Collection
-     */
-    public function getRecentlyCreated($type, $count = 20, $page = 0, $additionalQuery = false)
-    {
-        $query = $this->permissionService->enforceEntityRestrictions($type, $this->entityProvider->get($type))
-            ->orderBy('created_at', 'desc');
-        if (strtolower($type) === 'page') {
-            $query = $query->where('draft', '=', false);
-        }
-        if ($additionalQuery !== false && is_callable($additionalQuery)) {
-            $additionalQuery($query);
-        }
-        return $query->skip($page * $count)->take($count)->get();
-    }
-
-    /**
-     * Get the most recently updated entities of the given type.
-     * @param string $type
-     * @param int $count
-     * @param int $page
-     * @param bool|callable $additionalQuery
-     * @return Collection
-     */
-    public function getRecentlyUpdated($type, $count = 20, $page = 0, $additionalQuery = false)
-    {
-        $query = $this->permissionService->enforceEntityRestrictions($type, $this->entityProvider->get($type))
-            ->orderBy('updated_at', 'desc');
-        if (strtolower($type) === 'page') {
-            $query = $query->where('draft', '=', false);
-        }
-        if ($additionalQuery !== false && is_callable($additionalQuery)) {
-            $additionalQuery($query);
-        }
-        return $query->skip($page * $count)->take($count)->get();
-    }
-
-    /**
-     * Get the most recently viewed entities.
-     * @param string|bool $type
-     * @param int $count
-     * @param int $page
-     * @return mixed
-     */
-    public function getRecentlyViewed($type, $count = 10, $page = 0)
-    {
-        $filter = is_bool($type) ? false : $this->entityProvider->get($type);
-        return $this->viewService->getUserRecentlyViewed($count, $page, $filter);
-    }
-
-    /**
-     * Get the latest pages added to the system with pagination.
-     * @param string $type
-     * @param int $count
-     * @return mixed
-     */
-    public function getRecentlyCreatedPaginated($type, $count = 20)
-    {
-        return $this->entityQuery($type)->orderBy('created_at', 'desc')->paginate($count);
-    }
-
-    /**
-     * Get the latest pages added to the system with pagination.
-     * @param string $type
-     * @param int $count
-     * @return mixed
-     */
-    public function getRecentlyUpdatedPaginated($type, $count = 20)
-    {
-        return $this->entityQuery($type)->orderBy('updated_at', 'desc')->paginate($count);
-    }
-
-    /**
-     * Get the most popular entities base on all views.
-     * @param string|bool $type
-     * @param int $count
-     * @param int $page
-     * @return mixed
-     */
-    public function getPopular($type, $count = 10, $page = 0)
-    {
-        $filter = is_bool($type) ? false : $this->entityProvider->get($type);
-        return $this->viewService->getPopular($count, $page, $filter);
-    }
-
-    /**
-     * Get draft pages owned by the current user.
-     * @param int $count
-     * @param int $page
-     * @return Collection
-     */
-    public function getUserDraftPages($count = 20, $page = 0)
-    {
-        return $this->entityProvider->page->where('draft', '=', true)
-            ->where('created_by', '=', user()->id)
-            ->orderBy('updated_at', 'desc')
-            ->skip($count * $page)->take($count)->get();
-    }
-
-    /**
-     * Get the number of entities the given user has created.
-     * @param string $type
-     * @param User $user
-     * @return int
-     */
-    public function getUserTotalCreated(string $type, User $user)
-    {
-        return $this->entityProvider->get($type)
-            ->where('created_by', '=', $user->id)->count();
-    }
-
-    /**
-     * Get the child items for a chapter sorted by priority but
-     * with draft items floated to the top.
-     * @param \BookStack\Entities\Bookshelf $bookshelf
-     * @return \Illuminate\Database\Eloquent\Collection|static[]
-     */
-    public function getBookshelfChildren(Bookshelf $bookshelf)
-    {
-        return $this->permissionService->enforceEntityRestrictions('book', $bookshelf->books())->get();
-    }
-
-    /**
-     * Get all child objects of a book.
-     * Returns a sorted collection of Pages and Chapters.
-     * Loads the book slug onto child elements to prevent access database access for getting the slug.
-     * @param \BookStack\Entities\Book $book
-     * @param bool $filterDrafts
-     * @param bool $renderPages
-     * @return mixed
-     */
-    public function getBookChildren(Book $book, $filterDrafts = false, $renderPages = false)
-    {
-        $q = $this->permissionService->bookChildrenQuery($book->id, $filterDrafts, $renderPages)->get();
-        $entities = [];
-        $parents = [];
-        $tree = [];
-
-        foreach ($q as $index => $rawEntity) {
-            if ($rawEntity->entity_type ===  $this->entityProvider->page->getMorphClass()) {
-                $entities[$index] = $this->entityProvider->page->newFromBuilder($rawEntity);
-                if ($renderPages) {
-                    $entities[$index]->html = $rawEntity->html;
-                    $entities[$index]->html = $this->renderPage($entities[$index]);
-                };
-            } else if ($rawEntity->entity_type === $this->entityProvider->chapter->getMorphClass()) {
-                $entities[$index] = $this->entityProvider->chapter->newFromBuilder($rawEntity);
-                $key = $entities[$index]->entity_type . ':' . $entities[$index]->id;
-                $parents[$key] = $entities[$index];
-                $parents[$key]->setAttribute('pages', collect());
-            }
-            if ($entities[$index]->chapter_id === 0 || $entities[$index]->chapter_id === '0') {
-                $tree[] = $entities[$index];
-            }
-            $entities[$index]->book = $book;
-        }
-
-        foreach ($entities as $entity) {
-            if ($entity->chapter_id === 0 || $entity->chapter_id === '0') {
-                continue;
-            }
-            $parentKey = $this->entityProvider->chapter->getMorphClass() . ':' . $entity->chapter_id;
-            if (!isset($parents[$parentKey])) {
-                $tree[] = $entity;
-                continue;
-            }
-            $chapter = $parents[$parentKey];
-            $chapter->pages->push($entity);
-        }
-
-        return collect($tree);
-    }
-
-    /**
-     * Get the child items for a chapter sorted by priority but
-     * with draft items floated to the top.
-     * @param \BookStack\Entities\Chapter $chapter
-     * @return \Illuminate\Database\Eloquent\Collection|static[]
-     */
-    public function getChapterChildren(Chapter $chapter)
-    {
-        return $this->permissionService->enforceEntityRestrictions('page', $chapter->pages())
-            ->orderBy('draft', 'DESC')->orderBy('priority', 'ASC')->get();
-    }
-
-
-    /**
-     * Get the next sequential priority for a new child element in the given book.
-     * @param \BookStack\Entities\Book $book
-     * @return int
-     */
-    public function getNewBookPriority(Book $book)
-    {
-        $lastElem = $this->getBookChildren($book)->pop();
-        return $lastElem ? $lastElem->priority + 1 : 0;
-    }
-
-    /**
-     * Get a new priority for a new page to be added to the given chapter.
-     * @param \BookStack\Entities\Chapter $chapter
-     * @return int
-     */
-    public function getNewChapterPriority(Chapter $chapter)
-    {
-        $lastPage = $chapter->pages('DESC')->first();
-        return $lastPage !== null ? $lastPage->priority + 1 : 0;
-    }
-
-    /**
-     * Find a suitable slug for an entity.
-     * @param string $type
-     * @param string $name
-     * @param bool|integer $currentId
-     * @param bool|integer $bookId Only pass if type is not a book
-     * @return string
-     */
-    public function findSuitableSlug($type, $name, $currentId = false, $bookId = false)
-    {
-        $slug = $this->nameToSlug($name);
-        while ($this->slugExists($type, $slug, $currentId, $bookId)) {
-            $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
-        }
-        return $slug;
-    }
-
-    /**
-     * Check if a slug already exists in the database.
-     * @param string $type
-     * @param string $slug
-     * @param bool|integer $currentId
-     * @param bool|integer $bookId
-     * @return bool
-     */
-    protected function slugExists($type, $slug, $currentId = false, $bookId = false)
-    {
-        $query = $this->entityProvider->get($type)->where('slug', '=', $slug);
-        if (strtolower($type) === 'page' || strtolower($type) === 'chapter') {
-            $query = $query->where('book_id', '=', $bookId);
-        }
-        if ($currentId) {
-            $query = $query->where('id', '!=', $currentId);
-        }
-        return $query->count() > 0;
-    }
-
-    /**
-     * Updates entity restrictions from a request
-     * @param Request $request
-     * @param \BookStack\Entities\Entity $entity
-     * @throws \Throwable
-     */
-    public function updateEntityPermissionsFromRequest(Request $request, Entity $entity)
-    {
-        $entity->restricted = $request->get('restricted', '') === 'true';
-        $entity->permissions()->delete();
-
-        if ($request->filled('restrictions')) {
-            foreach ($request->get('restrictions') as $roleId => $restrictions) {
-                foreach ($restrictions as $action => $value) {
-                    $entity->permissions()->create([
-                        'role_id' => $roleId,
-                        'action'  => strtolower($action)
-                    ]);
-                }
-            }
-        }
-
-        $entity->save();
-        $this->permissionService->buildJointPermissionsForEntity($entity);
-    }
-
-
-
-    /**
-     * Create a new entity from request input.
-     * Used for books and chapters.
-     * @param string $type
-     * @param array $input
-     * @param bool|Book $book
-     * @return \BookStack\Entities\Entity
-     */
-    public function createFromInput($type, $input = [], $book = false)
-    {
-        $isChapter = strtolower($type) === 'chapter';
-        $entityModel = $this->entityProvider->get($type)->newInstance($input);
-        $entityModel->slug = $this->findSuitableSlug($type, $entityModel->name, false, $isChapter ? $book->id : false);
-        $entityModel->created_by = user()->id;
-        $entityModel->updated_by = user()->id;
-        $isChapter ? $book->chapters()->save($entityModel) : $entityModel->save();
-
-        if (isset($input['tags'])) {
-            $this->tagRepo->saveTagsToEntity($entityModel, $input['tags']);
-        }
-
-        $this->permissionService->buildJointPermissionsForEntity($entityModel);
-        $this->searchService->indexEntity($entityModel);
-        return $entityModel;
-    }
-
-    /**
-     * Update entity details from request input.
-     * Used for books and chapters
-     * @param string $type
-     * @param \BookStack\Entities\Entity $entityModel
-     * @param array $input
-     * @return \BookStack\Entities\Entity
-     */
-    public function updateFromInput($type, Entity $entityModel, $input = [])
-    {
-        if ($entityModel->name !== $input['name']) {
-            $entityModel->slug = $this->findSuitableSlug($type, $input['name'], $entityModel->id);
-        }
-        $entityModel->fill($input);
-        $entityModel->updated_by = user()->id;
-        $entityModel->save();
-
-        if (isset($input['tags'])) {
-            $this->tagRepo->saveTagsToEntity($entityModel, $input['tags']);
-        }
-
-        $this->permissionService->buildJointPermissionsForEntity($entityModel);
-        $this->searchService->indexEntity($entityModel);
-        return $entityModel;
-    }
-
-    /**
-     * Sync the books assigned to a shelf from a comma-separated list
-     * of book IDs.
-     * @param \BookStack\Entities\Bookshelf $shelf
-     * @param string $books
-     */
-    public function updateShelfBooks(Bookshelf $shelf, string $books)
-    {
-        $ids = explode(',', $books);
-
-        // Check books exist and match ordering
-        $bookIds = $this->entityQuery('book')->whereIn('id', $ids)->get(['id'])->pluck('id');
-        $syncData = [];
-        foreach ($ids as $index => $id) {
-            if ($bookIds->contains($id)) {
-                $syncData[$id] = ['order' => $index];
-            }
-        }
-
-        $shelf->books()->sync($syncData);
-    }
-
-    /**
-     * Change the book that an entity belongs to.
-     * @param string $type
-     * @param integer $newBookId
-     * @param Entity $entity
-     * @param bool $rebuildPermissions
-     * @return \BookStack\Entities\Entity
-     */
-    public function changeBook($type, $newBookId, Entity $entity, $rebuildPermissions = false)
-    {
-        $entity->book_id = $newBookId;
-        // Update related activity
-        foreach ($entity->activity as $activity) {
-            $activity->book_id = $newBookId;
-            $activity->save();
-        }
-        $entity->slug = $this->findSuitableSlug($type, $entity->name, $entity->id, $newBookId);
-        $entity->save();
-
-        // Update all child pages if a chapter
-        if (strtolower($type) === 'chapter') {
-            foreach ($entity->pages as $page) {
-                $this->changeBook('page', $newBookId, $page, false);
-            }
-        }
-
-        // Update permissions if applicable
-        if ($rebuildPermissions) {
-            $entity->load('book');
-            $this->permissionService->buildJointPermissionsForEntity($entity->book);
-        }
-
-        return $entity;
-    }
-
-    /**
-     * Alias method to update the book jointPermissions in the PermissionService.
-     * @param Book $book
-     */
-    public function buildJointPermissionsForBook(Book $book)
-    {
-        $this->permissionService->buildJointPermissionsForEntity($book);
-    }
-
-    /**
-     * Format a name as a url slug.
-     * @param $name
-     * @return string
-     */
-    protected function nameToSlug($name)
-    {
-        $slug = preg_replace('/[\+\/\\\?\@\}\{\.\,\=\[\]\#\&\!\*\'\;\:\$\%]/', '', mb_strtolower($name));
-        $slug = preg_replace('/\s{2,}/', ' ', $slug);
-        $slug = str_replace(' ', '-', $slug);
-        if ($slug === "") {
-            $slug = substr(md5(rand(1, 500)), 0, 5);
-        }
-        return $slug;
-    }
-
-    /**
-     * Render the page for viewing, Parsing and performing features such as page transclusion.
-     * @param Page $page
-     * @param bool $ignorePermissions
-     * @return mixed|string
-     */
-    public function renderPage(Page $page, $ignorePermissions = false)
-    {
-        $content = $page->html;
-        if (!config('app.allow_content_scripts')) {
-            $content = $this->escapeScripts($content);
-        }
-
-        $matches = [];
-        preg_match_all("/{{@\s?([0-9].*?)}}/", $content, $matches);
-        if (count($matches[0]) === 0) {
-            return $content;
-        }
-
-        $topLevelTags = ['table', 'ul', 'ol'];
-        foreach ($matches[1] as $index => $includeId) {
-            $splitInclude = explode('#', $includeId, 2);
-            $pageId = intval($splitInclude[0]);
-            if (is_nan($pageId)) {
-                continue;
-            }
-
-            $matchedPage = $this->getById('page', $pageId, false, $ignorePermissions);
-            if ($matchedPage === null) {
-                $content = str_replace($matches[0][$index], '', $content);
-                continue;
-            }
-
-            if (count($splitInclude) === 1) {
-                $content = str_replace($matches[0][$index], $matchedPage->html, $content);
-                continue;
-            }
-
-            $doc = new DOMDocument();
-            $doc->loadHTML(mb_convert_encoding('<body>'.$matchedPage->html.'</body>', 'HTML-ENTITIES', 'UTF-8'));
-            $matchingElem = $doc->getElementById($splitInclude[1]);
-            if ($matchingElem === null) {
-                $content = str_replace($matches[0][$index], '', $content);
-                continue;
-            }
-            $innerContent = '';
-            $isTopLevel = in_array(strtolower($matchingElem->nodeName), $topLevelTags);
-            if ($isTopLevel) {
-                $innerContent .= $doc->saveHTML($matchingElem);
-            } else {
-                foreach ($matchingElem->childNodes as $childNode) {
-                    $innerContent .= $doc->saveHTML($childNode);
-                }
-            }
-            $content = str_replace($matches[0][$index], trim($innerContent), $content);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Escape script tags within HTML content.
-     * @param string $html
-     * @return mixed
-     */
-    protected function escapeScripts(string $html)
-    {
-        $scriptSearchRegex = '/<script.*?>.*?<\/script>/ms';
-        $matches = [];
-        preg_match_all($scriptSearchRegex, $html, $matches);
-        if (count($matches) === 0) {
-            return $html;
-        }
-
-        foreach ($matches[0] as $match) {
-            $html = str_replace($match, htmlentities($match), $html);
-        }
-        return $html;
-    }
-
-    /**
-     * Search for image usage within page content.
-     * @param $imageString
-     * @return mixed
-     */
-    public function searchForImage($imageString)
-    {
-        $pages = $this->entityQuery('page')->where('html', 'like', '%' . $imageString . '%')->get();
-        foreach ($pages as $page) {
-            $page->url = $page->getUrl();
-            $page->html = '';
-            $page->text = '';
-        }
-        return count($pages) > 0 ? $pages : false;
-    }
-
-    /**
-     * Destroy a bookshelf instance
-     * @param \BookStack\Entities\Bookshelf $shelf
-     * @throws \Throwable
-     */
-    public function destroyBookshelf(Bookshelf $shelf)
-    {
-        $this->destroyEntityCommonRelations($shelf);
-        $shelf->delete();
-    }
-
-    /**
-     * Destroy the provided book and all its child entities.
-     * @param \BookStack\Entities\Book $book
-     * @throws NotifyException
-     * @throws \Throwable
-     */
-    public function destroyBook(Book $book)
-    {
-        foreach ($book->pages as $page) {
-            $this->destroyPage($page);
-        }
-        foreach ($book->chapters as $chapter) {
-            $this->destroyChapter($chapter);
-        }
-        $this->destroyEntityCommonRelations($book);
-        $book->delete();
-    }
-
-    /**
-     * Destroy a chapter and its relations.
-     * @param \BookStack\Entities\Chapter $chapter
-     * @throws \Throwable
-     */
-    public function destroyChapter(Chapter $chapter)
-    {
-        if (count($chapter->pages) > 0) {
-            foreach ($chapter->pages as $page) {
-                $page->chapter_id = 0;
-                $page->save();
-            }
-        }
-        $this->destroyEntityCommonRelations($chapter);
-        $chapter->delete();
-    }
-
-    /**
-     * Destroy a given page along with its dependencies.
-     * @param Page $page
-     * @throws NotifyException
-     * @throws \Throwable
-     */
-    public function destroyPage(Page $page)
-    {
-        // Check if set as custom homepage
-        $customHome = setting('app-homepage', '0:');
-        if (intval($page->id) === intval(explode(':', $customHome)[0])) {
-            throw new NotifyException(trans('errors.page_custom_home_deletion'), $page->getUrl());
-        }
-
-        $this->destroyEntityCommonRelations($page);
-
-        // Delete Attached Files
-        $attachmentService = app(AttachmentService::class);
-        foreach ($page->attachments as $attachment) {
-            $attachmentService->deleteFile($attachment);
-        }
-
-        $page->delete();
-    }
-
-    /**
-     * Destroy or handle the common relations connected to an entity.
-     * @param \BookStack\Entities\Entity $entity
-     * @throws \Throwable
-     */
-    protected function destroyEntityCommonRelations(Entity $entity)
-    {
-        \Activity::removeEntity($entity);
-        $entity->views()->delete();
-        $entity->permissions()->delete();
-        $entity->tags()->delete();
-        $entity->comments()->delete();
-        $this->permissionService->deleteJointPermissionsForEntity($entity);
-        $this->searchService->deleteEntityTerms($entity);
-    }
-
-    /**
-     * Copy the permissions of a bookshelf to all child books.
-     * Returns the number of books that had permissions updated.
-     * @param \BookStack\Entities\Bookshelf $bookshelf
-     * @return int
-     * @throws \Throwable
-     */
-    public function copyBookshelfPermissions(Bookshelf $bookshelf)
-    {
-        $shelfPermissions = $bookshelf->permissions()->get(['role_id', 'action'])->toArray();
-        $shelfBooks = $bookshelf->books()->get();
-        $updatedBookCount = 0;
-
-        foreach ($shelfBooks as $book) {
-            if (!userCan('restrictions-manage', $book)) {
-                continue;
-            }
-            $book->permissions()->delete();
-            $book->restricted = $bookshelf->restricted;
-            $book->permissions()->createMany($shelfPermissions);
-            $book->save();
-            $this->permissionService->buildJointPermissionsForEntity($book);
-            $updatedBookCount++;
-        }
-
-        return $updatedBookCount;
-    }
-}

app/Entities/Repos/PageRepo.php

@@ -1,508 +0,0 @@
-<?php namespace BookStack\Entities\Repos;
-
-use BookStack\Entities\Book;
-use BookStack\Entities\Chapter;
-use BookStack\Entities\Entity;
-use BookStack\Entities\Page;
-use BookStack\Entities\PageRevision;
-use Carbon\Carbon;
-use DOMDocument;
-use DOMXPath;
-
-class PageRepo extends EntityRepo
-{
-
-    /**
-     * Get page by slug.
-     * @param string $pageSlug
-     * @param string $bookSlug
-     * @return Page
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function getPageBySlug(string $pageSlug, string $bookSlug)
-    {
-        return $this->getBySlug('page', $pageSlug, $bookSlug);
-    }
-
-    /**
-     * Search through page revisions and retrieve the last page in the
-     * current book that has a slug equal to the one given.
-     * @param string $pageSlug
-     * @param string $bookSlug
-     * @return null|Page
-     */
-    public function getPageByOldSlug(string $pageSlug, string $bookSlug)
-    {
-        $revision = $this->entityProvider->pageRevision->where('slug', '=', $pageSlug)
-            ->whereHas('page', function ($query) {
-                $this->permissionService->enforceEntityRestrictions('page', $query);
-            })
-            ->where('type', '=', 'version')
-            ->where('book_slug', '=', $bookSlug)
-            ->orderBy('created_at', 'desc')
-            ->with('page')->first();
-        return $revision !== null ? $revision->page : null;
-    }
-
-    /**
-     * Updates a page with any fillable data and saves it into the database.
-     * @param Page $page
-     * @param int $book_id
-     * @param array $input
-     * @return Page
-     * @throws \Exception
-     */
-    public function updatePage(Page $page, int $book_id, array $input)
-    {
-        // Hold the old details to compare later
-        $oldHtml = $page->html;
-        $oldName = $page->name;
-
-        // Prevent slug being updated if no name change
-        if ($page->name !== $input['name']) {
-            $page->slug = $this->findSuitableSlug('page', $input['name'], $page->id, $book_id);
-        }
-
-        // Save page tags if present
-        if (isset($input['tags'])) {
-            $this->tagRepo->saveTagsToEntity($page, $input['tags']);
-        }
-
-        // Update with new details
-        $userId = user()->id;
-        $page->fill($input);
-        $page->html = $this->formatHtml($input['html']);
-        $page->text = $this->pageToPlainText($page);
-        if (setting('app-editor') !== 'markdown') {
-            $page->markdown = '';
-        }
-        $page->updated_by = $userId;
-        $page->revision_count++;
-        $page->save();
-
-        // Remove all update drafts for this user & page.
-        $this->userUpdatePageDraftsQuery($page, $userId)->delete();
-
-        // Save a revision after updating
-        if ($oldHtml !== $input['html'] || $oldName !== $input['name'] || $input['summary'] !== null) {
-            $this->savePageRevision($page, $input['summary']);
-        }
-
-        $this->searchService->indexEntity($page);
-
-        return $page;
-    }
-
-    /**
-     * Saves a page revision into the system.
-     * @param Page $page
-     * @param null|string $summary
-     * @return PageRevision
-     * @throws \Exception
-     */
-    public function savePageRevision(Page $page, string $summary = null)
-    {
-        $revision = $this->entityProvider->pageRevision->newInstance($page->toArray());
-        if (setting('app-editor') !== 'markdown') {
-            $revision->markdown = '';
-        }
-        $revision->page_id = $page->id;
-        $revision->slug = $page->slug;
-        $revision->book_slug = $page->book->slug;
-        $revision->created_by = user()->id;
-        $revision->created_at = $page->updated_at;
-        $revision->type = 'version';
-        $revision->summary = $summary;
-        $revision->revision_number = $page->revision_count;
-        $revision->save();
-
-        $revisionLimit = config('app.revision_limit');
-        if ($revisionLimit !== false) {
-            $revisionsToDelete = $this->entityProvider->pageRevision->where('page_id', '=', $page->id)
-                ->orderBy('created_at', 'desc')->skip(intval($revisionLimit))->take(10)->get(['id']);
-            if ($revisionsToDelete->count() > 0) {
-                $this->entityProvider->pageRevision->whereIn('id', $revisionsToDelete->pluck('id'))->delete();
-            }
-        }
-
-        return $revision;
-    }
-
-    /**
-     * Formats a page's html to be tagged correctly
-     * within the system.
-     * @param string $htmlText
-     * @return string
-     */
-    protected function formatHtml(string $htmlText)
-    {
-        if ($htmlText == '') {
-            return $htmlText;
-        }
-        libxml_use_internal_errors(true);
-        $doc = new DOMDocument();
-        $doc->loadHTML(mb_convert_encoding($htmlText, 'HTML-ENTITIES', 'UTF-8'));
-
-        $container = $doc->documentElement;
-        $body = $container->childNodes->item(0);
-        $childNodes = $body->childNodes;
-
-        // Ensure no duplicate ids are used
-        $idArray = [];
-
-        foreach ($childNodes as $index => $childNode) {
-            /** @var \DOMElement $childNode */
-            if (get_class($childNode) !== 'DOMElement') {
-                continue;
-            }
-
-            // Overwrite id if not a BookStack custom id
-            if ($childNode->hasAttribute('id')) {
-                $id = $childNode->getAttribute('id');
-                if (strpos($id, 'bkmrk') === 0 && array_search($id, $idArray) === false) {
-                    $idArray[] = $id;
-                    continue;
-                };
-            }
-
-            // 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-' . substr(strtolower(preg_replace('/\s+/', '-', trim($childNode->nodeValue))), 0, 20);
-            $newId = urlencode($contentId);
-            $loopIndex = 0;
-            while (in_array($newId, $idArray)) {
-                $newId = urlencode($contentId . '-' . $loopIndex);
-                $loopIndex++;
-            }
-
-            $childNode->setAttribute('id', $newId);
-            $idArray[] = $newId;
-        }
-
-        // Generate inner html as a string
-        $html = '';
-        foreach ($childNodes as $childNode) {
-            $html .= $doc->saveHTML($childNode);
-        }
-
-        return $html;
-    }
-
-    /**
-     * Get the plain text version of a page's content.
-     * @param \BookStack\Entities\Page $page
-     * @return string
-     */
-    public function pageToPlainText(Page $page)
-    {
-        $html = $this->renderPage($page);
-        return strip_tags($html);
-    }
-
-    /**
-     * Get a new draft page instance.
-     * @param Book $book
-     * @param Chapter|null $chapter
-     * @return \BookStack\Entities\Page
-     * @throws \Throwable
-     */
-    public function getDraftPage(Book $book, Chapter $chapter = null)
-    {
-        $page = $this->entityProvider->page->newInstance();
-        $page->name = trans('entities.pages_initial_name');
-        $page->created_by = user()->id;
-        $page->updated_by = user()->id;
-        $page->draft = true;
-
-        if ($chapter) {
-            $page->chapter_id = $chapter->id;
-        }
-
-        $book->pages()->save($page);
-        $page = $this->entityProvider->page->find($page->id);
-        $this->permissionService->buildJointPermissionsForEntity($page);
-        return $page;
-    }
-
-    /**
-     * Save a page update draft.
-     * @param Page $page
-     * @param array $data
-     * @return PageRevision|Page
-     */
-    public function updatePageDraft(Page $page, array $data = [])
-    {
-        // If the page itself is a draft simply update that
-        if ($page->draft) {
-            $page->fill($data);
-            if (isset($data['html'])) {
-                $page->text = $this->pageToPlainText($page);
-            }
-            $page->save();
-            return $page;
-        }
-
-        // Otherwise save the data to a revision
-        $userId = user()->id;
-        $drafts = $this->userUpdatePageDraftsQuery($page, $userId)->get();
-
-        if ($drafts->count() > 0) {
-            $draft = $drafts->first();
-        } else {
-            $draft = $this->entityProvider->pageRevision->newInstance();
-            $draft->page_id = $page->id;
-            $draft->slug = $page->slug;
-            $draft->book_slug = $page->book->slug;
-            $draft->created_by = $userId;
-            $draft->type = 'update_draft';
-        }
-
-        $draft->fill($data);
-        if (setting('app-editor') !== 'markdown') {
-            $draft->markdown = '';
-        }
-
-        $draft->save();
-        return $draft;
-    }
-
-    /**
-     * Publish a draft page to make it a normal page.
-     * Sets the slug and updates the content.
-     * @param Page $draftPage
-     * @param array $input
-     * @return Page
-     * @throws \Exception
-     */
-    public function publishPageDraft(Page $draftPage, array $input)
-    {
-        $draftPage->fill($input);
-
-        // Save page tags if present
-        if (isset($input['tags'])) {
-            $this->tagRepo->saveTagsToEntity($draftPage, $input['tags']);
-        }
-
-        $draftPage->slug = $this->findSuitableSlug('page', $draftPage->name, false, $draftPage->book->id);
-        $draftPage->html = $this->formatHtml($input['html']);
-        $draftPage->text = $this->pageToPlainText($draftPage);
-        $draftPage->draft = false;
-        $draftPage->revision_count = 1;
-
-        $draftPage->save();
-        $this->savePageRevision($draftPage, trans('entities.pages_initial_revision'));
-        $this->searchService->indexEntity($draftPage);
-        return $draftPage;
-    }
-
-    /**
-     * The base query for getting user update drafts.
-     * @param Page $page
-     * @param $userId
-     * @return mixed
-     */
-    protected function userUpdatePageDraftsQuery(Page $page, int $userId)
-    {
-        return $this->entityProvider->pageRevision->where('created_by', '=', $userId)
-            ->where('type', 'update_draft')
-            ->where('page_id', '=', $page->id)
-            ->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the latest updated draft revision for a particular page and user.
-     * @param Page $page
-     * @param $userId
-     * @return PageRevision|null
-     */
-    public function getUserPageDraft(Page $page, int $userId)
-    {
-        return $this->userUpdatePageDraftsQuery($page, $userId)->first();
-    }
-
-    /**
-     * Get the notification message that informs the user that they are editing a draft page.
-     * @param PageRevision $draft
-     * @return string
-     */
-    public function getUserPageDraftMessage(PageRevision $draft)
-    {
-        $message = trans('entities.pages_editing_draft_notification', ['timeDiff' => $draft->updated_at->diffForHumans()]);
-        if ($draft->page->updated_at->timestamp <= $draft->updated_at->timestamp) {
-            return $message;
-        }
-        return $message . "\n" . trans('entities.pages_draft_edited_notification');
-    }
-
-    /**
-     * A query to check for active update drafts on a particular page.
-     * @param Page $page
-     * @param int $minRange
-     * @return mixed
-     */
-    protected function activePageEditingQuery(Page $page, int $minRange = null)
-    {
-        $query = $this->entityProvider->pageRevision->where('type', '=', 'update_draft')
-            ->where('page_id', '=', $page->id)
-            ->where('updated_at', '>', $page->updated_at)
-            ->where('created_by', '!=', user()->id)
-            ->with('createdBy');
-
-        if ($minRange !== null) {
-            $query = $query->where('updated_at', '>=', Carbon::now()->subMinutes($minRange));
-        }
-
-        return $query;
-    }
-
-    /**
-     * Check if a page is being actively editing.
-     * Checks for edits since last page updated.
-     * Passing in a minuted range will check for edits
-     * within the last x minutes.
-     * @param Page $page
-     * @param int $minRange
-     * @return bool
-     */
-    public function isPageEditingActive(Page $page, int $minRange = null)
-    {
-        $draftSearch = $this->activePageEditingQuery($page, $minRange);
-        return $draftSearch->count() > 0;
-    }
-
-    /**
-     * Get a notification message concerning the editing activity on a particular page.
-     * @param Page $page
-     * @param int $minRange
-     * @return string
-     */
-    public function getPageEditingActiveMessage(Page $page, int $minRange = null)
-    {
-        $pageDraftEdits = $this->activePageEditingQuery($page, $minRange)->get();
-
-        $userMessage = $pageDraftEdits->count() > 1 ? trans('entities.pages_draft_edit_active.start_a', ['count' => $pageDraftEdits->count()]): trans('entities.pages_draft_edit_active.start_b', ['userName' => $pageDraftEdits->first()->createdBy->name]);
-        $timeMessage = $minRange === null ? trans('entities.pages_draft_edit_active.time_a') : trans('entities.pages_draft_edit_active.time_b', ['minCount'=>$minRange]);
-        return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]);
-    }
-
-    /**
-     * Parse the headers on the page to get a navigation menu
-     * @param string $pageContent
-     * @return array
-     */
-    public function getPageNav(string $pageContent)
-    {
-        if ($pageContent == '') {
-            return [];
-        }
-        libxml_use_internal_errors(true);
-        $doc = new DOMDocument();
-        $doc->loadHTML(mb_convert_encoding($pageContent, 'HTML-ENTITIES', 'UTF-8'));
-        $xPath = new DOMXPath($doc);
-        $headers = $xPath->query("//h1|//h2|//h3|//h4|//h5|//h6");
-
-        if (is_null($headers)) {
-            return [];
-        }
-
-        $tree = collect([]);
-        foreach ($headers as $header) {
-            $text = $header->nodeValue;
-            $tree->push([
-                'nodeName' => strtolower($header->nodeName),
-                'level' => intval(str_replace('h', '', $header->nodeName)),
-                'link' => '#' . $header->getAttribute('id'),
-                'text' => strlen($text) > 30 ? substr($text, 0, 27) . '...' : $text
-            ]);
-        }
-
-        // Normalise headers if only smaller headers have been used
-        if (count($tree) > 0) {
-            $minLevel = $tree->pluck('level')->min();
-            $tree = $tree->map(function ($header) use ($minLevel) {
-                $header['level'] -= ($minLevel - 2);
-                return $header;
-            });
-        }
-        return $tree->toArray();
-    }
-
-    /**
-     * Restores a revision's content back into a page.
-     * @param Page $page
-     * @param Book $book
-     * @param  int $revisionId
-     * @return Page
-     * @throws \Exception
-     */
-    public function restorePageRevision(Page $page, Book $book, int $revisionId)
-    {
-        $page->revision_count++;
-        $this->savePageRevision($page);
-        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
-        $page->fill($revision->toArray());
-        $page->slug = $this->findSuitableSlug('page', $page->name, $page->id, $book->id);
-        $page->text = $this->pageToPlainText($page);
-        $page->updated_by = user()->id;
-        $page->save();
-        $this->searchService->indexEntity($page);
-        return $page;
-    }
-
-    /**
-     * Change the page's parent to the given entity.
-     * @param Page $page
-     * @param Entity $parent
-     * @throws \Throwable
-     */
-    public function changePageParent(Page $page, Entity $parent)
-    {
-        $book = $parent->isA('book') ? $parent : $parent->book;
-        $page->chapter_id = $parent->isA('chapter') ? $parent->id : 0;
-        $page->save();
-        if ($page->book->id !== $book->id) {
-            $page = $this->changeBook('page', $book->id, $page);
-        }
-        $page->load('book');
-        $this->permissionService->buildJointPermissionsForEntity($book);
-    }
-
-    /**
-     * Create a copy of a page in a new location with a new name.
-     * @param \BookStack\Entities\Page $page
-     * @param \BookStack\Entities\Entity $newParent
-     * @param string $newName
-     * @return \BookStack\Entities\Page
-     * @throws \Throwable
-     */
-    public function copyPage(Page $page, Entity $newParent, string $newName = '')
-    {
-        $newBook = $newParent->isA('book') ? $newParent : $newParent->book;
-        $newChapter = $newParent->isA('chapter') ? $newParent : null;
-        $copyPage = $this->getDraftPage($newBook, $newChapter);
-        $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];
-            }
-        }
-
-        // Set priority
-        if ($newParent->isA('chapter')) {
-            $pageData['priority'] = $this->getNewChapterPriority($newParent);
-        } else {
-            $pageData['priority'] = $this->getNewBookPriority($newParent);
-        }
-
-        return $this->publishPageDraft($copyPage, $pageData);
-    }
-}

app/Entities/SearchService.php

@@ -1,536 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Auth\Permissions\PermissionService;
-use Illuminate\Database\Connection;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Query\Builder;
-use Illuminate\Database\Query\JoinClause;
-use Illuminate\Support\Collection;
-
-class SearchService
-{
-    /**
-     * @var SearchTerm
-     */
-    protected $searchTerm;
-
-    /**
-     * @var EntityProvider
-     */
-    protected $entityProvider;
-
-    /**
-     * @var Connection
-     */
-    protected $db;
-
-    /**
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-
-    /**
-     * Acceptable operators to be used in a query
-     * @var array
-     */
-    protected $queryOperators = ['<=', '>=', '=', '<', '>', 'like', '!='];
-
-    /**
-     * SearchService constructor.
-     * @param SearchTerm $searchTerm
-     * @param EntityProvider $entityProvider
-     * @param Connection $db
-     * @param PermissionService $permissionService
-     */
-    public function __construct(SearchTerm $searchTerm, EntityProvider $entityProvider, Connection $db, PermissionService $permissionService)
-    {
-        $this->searchTerm = $searchTerm;
-        $this->entityProvider = $entityProvider;
-        $this->db = $db;
-        $this->permissionService = $permissionService;
-    }
-
-    /**
-     * Set the database connection
-     * @param Connection $connection
-     */
-    public function setConnection(Connection $connection)
-    {
-        $this->db = $connection;
-    }
-
-    /**
-     * Search all entities in the system.
-     * @param string $searchString
-     * @param string $entityType
-     * @param int $page
-     * @param int $count - Count of each entity to search, Total returned could can be larger and not guaranteed.
-     * @param string $action
-     * @return array[int, Collection];
-     */
-    public function searchEntities($searchString, $entityType = 'all', $page = 1, $count = 20, $action = 'view')
-    {
-        $terms = $this->parseSearchString($searchString);
-        $entityTypes = array_keys($this->entityProvider->all());
-        $entityTypesToSearch = $entityTypes;
-
-        if ($entityType !== 'all') {
-            $entityTypesToSearch = $entityType;
-        } else if (isset($terms['filters']['type'])) {
-            $entityTypesToSearch = explode('|', $terms['filters']['type']);
-        }
-
-        $results = collect();
-        $total = 0;
-        $hasMore = false;
-
-        foreach ($entityTypesToSearch as $entityType) {
-            if (!in_array($entityType, $entityTypes)) {
-                continue;
-            }
-            $search = $this->searchEntityTable($terms, $entityType, $page, $count, $action);
-            $entityTotal = $this->searchEntityTable($terms, $entityType, $page, $count, $action, true);
-            if ($entityTotal > $page * $count) {
-                $hasMore = true;
-            }
-            $total += $entityTotal;
-            $results = $results->merge($search);
-        }
-
-        return [
-            'total' => $total,
-            'count' => count($results),
-            'has_more' => $hasMore,
-            'results' => $results->sortByDesc('score')->values()
-        ];
-    }
-
-
-    /**
-     * Search a book for entities
-     * @param integer $bookId
-     * @param string $searchString
-     * @return Collection
-     */
-    public function searchBook($bookId, $searchString)
-    {
-        $terms = $this->parseSearchString($searchString);
-        $entityTypes = ['page', 'chapter'];
-        $entityTypesToSearch = isset($terms['filters']['type']) ? explode('|', $terms['filters']['type']) : $entityTypes;
-
-        $results = collect();
-        foreach ($entityTypesToSearch as $entityType) {
-            if (!in_array($entityType, $entityTypes)) {
-                continue;
-            }
-            $search = $this->buildEntitySearchQuery($terms, $entityType)->where('book_id', '=', $bookId)->take(20)->get();
-            $results = $results->merge($search);
-        }
-        return $results->sortByDesc('score')->take(20);
-    }
-
-    /**
-     * Search a book for entities
-     * @param integer $chapterId
-     * @param string $searchString
-     * @return Collection
-     */
-    public function searchChapter($chapterId, $searchString)
-    {
-        $terms = $this->parseSearchString($searchString);
-        $pages = $this->buildEntitySearchQuery($terms, 'page')->where('chapter_id', '=', $chapterId)->take(20)->get();
-        return $pages->sortByDesc('score');
-    }
-
-    /**
-     * Search across a particular entity type.
-     * @param array $terms
-     * @param string $entityType
-     * @param int $page
-     * @param int $count
-     * @param string $action
-     * @param bool $getCount Return the total count of the search
-     * @return \Illuminate\Database\Eloquent\Collection|int|static[]
-     */
-    public function searchEntityTable($terms, $entityType = 'page', $page = 1, $count = 20, $action = 'view', $getCount = false)
-    {
-        $query = $this->buildEntitySearchQuery($terms, $entityType, $action);
-        if ($getCount) {
-            return $query->count();
-        }
-
-        $query = $query->skip(($page-1) * $count)->take($count);
-        return $query->get();
-    }
-
-    /**
-     * Create a search query for an entity
-     * @param array $terms
-     * @param string $entityType
-     * @param string $action
-     * @return EloquentBuilder
-     */
-    protected function buildEntitySearchQuery($terms, $entityType = 'page', $action = 'view')
-    {
-        $entity = $this->entityProvider->get($entityType);
-        $entitySelect = $entity->newQuery();
-
-        // Handle normal search terms
-        if (count($terms['search']) > 0) {
-            $subQuery = $this->db->table('search_terms')->select('entity_id', 'entity_type', \DB::raw('SUM(score) as score'));
-            $subQuery->where('entity_type', '=', $entity->getMorphClass());
-            $subQuery->where(function (Builder $query) use ($terms) {
-                foreach ($terms['search'] as $inputTerm) {
-                    $query->orWhere('term', 'like', $inputTerm .'%');
-                }
-            })->groupBy('entity_type', 'entity_id');
-            $entitySelect->join(\DB::raw('(' . $subQuery->toSql() . ') as s'), function (JoinClause $join) {
-                $join->on('id', '=', 'entity_id');
-            })->selectRaw($entity->getTable().'.*, s.score')->orderBy('score', 'desc');
-            $entitySelect->mergeBindings($subQuery);
-        }
-
-        // Handle exact term matching
-        if (count($terms['exact']) > 0) {
-            $entitySelect->where(function (EloquentBuilder $query) use ($terms, $entity) {
-                foreach ($terms['exact'] as $inputTerm) {
-                    $query->where(function (EloquentBuilder $query) use ($inputTerm, $entity) {
-                        $query->where('name', 'like', '%'.$inputTerm .'%')
-                            ->orWhere($entity->textField, 'like', '%'.$inputTerm .'%');
-                    });
-                }
-            });
-        }
-
-        // Handle tag searches
-        foreach ($terms['tags'] as $inputTerm) {
-            $this->applyTagSearch($entitySelect, $inputTerm);
-        }
-
-        // Handle filters
-        foreach ($terms['filters'] as $filterTerm => $filterValue) {
-            $functionName = camel_case('filter_' . $filterTerm);
-            if (method_exists($this, $functionName)) {
-                $this->$functionName($entitySelect, $entity, $filterValue);
-            }
-        }
-
-        return $this->permissionService->enforceEntityRestrictions($entityType, $entitySelect, $action);
-    }
-
-
-    /**
-     * Parse a search string into components.
-     * @param $searchString
-     * @return array
-     */
-    protected function parseSearchString($searchString)
-    {
-        $terms = [
-            'search' => [],
-            'exact' => [],
-            'tags' => [],
-            'filters' => []
-        ];
-
-        $patterns = [
-            'exact' => '/"(.*?)"/',
-            'tags' => '/\[(.*?)\]/',
-            'filters' => '/\{(.*?)\}/'
-        ];
-
-        // Parse special terms
-        foreach ($patterns as $termType => $pattern) {
-            $matches = [];
-            preg_match_all($pattern, $searchString, $matches);
-            if (count($matches) > 0) {
-                $terms[$termType] = $matches[1];
-                $searchString = preg_replace($pattern, '', $searchString);
-            }
-        }
-
-        // Parse standard terms
-        foreach (explode(' ', trim($searchString)) as $searchTerm) {
-            if ($searchTerm !== '') {
-                $terms['search'][] = $searchTerm;
-            }
-        }
-
-        // Split filter values out
-        $splitFilters = [];
-        foreach ($terms['filters'] as $filter) {
-            $explodedFilter = explode(':', $filter, 2);
-            $splitFilters[$explodedFilter[0]] = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
-        }
-        $terms['filters'] = $splitFilters;
-
-        return $terms;
-    }
-
-    /**
-     * Get the available query operators as a regex escaped list.
-     * @return mixed
-     */
-    protected function getRegexEscapedOperators()
-    {
-        $escapedOperators = [];
-        foreach ($this->queryOperators as $operator) {
-            $escapedOperators[] = preg_quote($operator);
-        }
-        return join('|', $escapedOperators);
-    }
-
-    /**
-     * Apply a tag search term onto a entity query.
-     * @param EloquentBuilder $query
-     * @param string $tagTerm
-     * @return mixed
-     */
-    protected function applyTagSearch(EloquentBuilder $query, $tagTerm)
-    {
-        preg_match("/^(.*?)((".$this->getRegexEscapedOperators().")(.*?))?$/", $tagTerm, $tagSplit);
-        $query->whereHas('tags', function (EloquentBuilder $query) use ($tagSplit) {
-            $tagName = $tagSplit[1];
-            $tagOperator = count($tagSplit) > 2 ? $tagSplit[3] : '';
-            $tagValue = count($tagSplit) > 3 ? $tagSplit[4] : '';
-            $validOperator = in_array($tagOperator, $this->queryOperators);
-            if (!empty($tagOperator) && !empty($tagValue) && $validOperator) {
-                if (!empty($tagName)) {
-                    $query->where('name', '=', $tagName);
-                }
-                if (is_numeric($tagValue) && $tagOperator !== 'like') {
-                    // 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.
-                    $tagValue = (float) trim($query->getConnection()->getPdo()->quote($tagValue), "'");
-                    $query->whereRaw("value ${tagOperator} ${tagValue}");
-                } else {
-                    $query->where('value', $tagOperator, $tagValue);
-                }
-            } else {
-                $query->where('name', '=', $tagName);
-            }
-        });
-        return $query;
-    }
-
-    /**
-     * Index the given entity.
-     * @param Entity $entity
-     */
-    public function indexEntity(Entity $entity)
-    {
-        $this->deleteEntityTerms($entity);
-        $nameTerms = $this->generateTermArrayFromText($entity->name, 5 * $entity->searchFactor);
-        $bodyTerms = $this->generateTermArrayFromText($entity->getText(), 1 * $entity->searchFactor);
-        $terms = array_merge($nameTerms, $bodyTerms);
-        foreach ($terms as $index => $term) {
-            $terms[$index]['entity_type'] = $entity->getMorphClass();
-            $terms[$index]['entity_id'] = $entity->id;
-        }
-        $this->searchTerm->newQuery()->insert($terms);
-    }
-
-    /**
-     * Index multiple Entities at once
-     * @param \BookStack\Entities\Entity[] $entities
-     */
-    protected function indexEntities($entities)
-    {
-        $terms = [];
-        foreach ($entities as $entity) {
-            $nameTerms = $this->generateTermArrayFromText($entity->name, 5 * $entity->searchFactor);
-            $bodyTerms = $this->generateTermArrayFromText($entity->getText(), 1 * $entity->searchFactor);
-            foreach (array_merge($nameTerms, $bodyTerms) as $term) {
-                $term['entity_id'] = $entity->id;
-                $term['entity_type'] = $entity->getMorphClass();
-                $terms[] = $term;
-            }
-        }
-
-        $chunkedTerms = array_chunk($terms, 500);
-        foreach ($chunkedTerms as $termChunk) {
-            $this->searchTerm->newQuery()->insert($termChunk);
-        }
-    }
-
-    /**
-     * Delete and re-index the terms for all entities in the system.
-     */
-    public function indexAllEntities()
-    {
-        $this->searchTerm->truncate();
-
-        foreach ($this->entityProvider->all() as $entityModel) {
-            $selectFields = ['id', 'name', $entityModel->textField];
-            $entityModel->newQuery()->select($selectFields)->chunk(1000, function ($entities) {
-                $this->indexEntities($entities);
-            });
-        }
-    }
-
-    /**
-     * Delete related Entity search terms.
-     * @param Entity $entity
-     */
-    public function deleteEntityTerms(Entity $entity)
-    {
-        $entity->searchTerms()->delete();
-    }
-
-    /**
-     * Create a scored term array from the given text.
-     * @param $text
-     * @param float|int $scoreAdjustment
-     * @return array
-     */
-    protected function generateTermArrayFromText($text, $scoreAdjustment = 1)
-    {
-        $tokenMap = []; // {TextToken => OccurrenceCount}
-        $splitChars = " \n\t.,!?:;()[]{}<>`'\"";
-        $token = strtok($text, $splitChars);
-
-        while ($token !== false) {
-            if (!isset($tokenMap[$token])) {
-                $tokenMap[$token] = 0;
-            }
-            $tokenMap[$token]++;
-            $token = strtok($splitChars);
-        }
-
-        $terms = [];
-        foreach ($tokenMap as $token => $count) {
-            $terms[] = [
-                'term' => $token,
-                'score' => $count * $scoreAdjustment
-            ];
-        }
-        return $terms;
-    }
-
-
-
-
-    /**
-     * Custom entity search filters
-     */
-
-    protected function filterUpdatedAfter(EloquentBuilder $query, Entity $model, $input)
-    {
-        try {
-            $date = date_create($input);
-        } catch (\Exception $e) {
-            return;
-        }
-        $query->where('updated_at', '>=', $date);
-    }
-
-    protected function filterUpdatedBefore(EloquentBuilder $query, Entity $model, $input)
-    {
-        try {
-            $date = date_create($input);
-        } catch (\Exception $e) {
-            return;
-        }
-        $query->where('updated_at', '<', $date);
-    }
-
-    protected function filterCreatedAfter(EloquentBuilder $query, Entity $model, $input)
-    {
-        try {
-            $date = date_create($input);
-        } catch (\Exception $e) {
-            return;
-        }
-        $query->where('created_at', '>=', $date);
-    }
-
-    protected function filterCreatedBefore(EloquentBuilder $query, Entity $model, $input)
-    {
-        try {
-            $date = date_create($input);
-        } catch (\Exception $e) {
-            return;
-        }
-        $query->where('created_at', '<', $date);
-    }
-
-    protected function filterCreatedBy(EloquentBuilder $query, Entity $model, $input)
-    {
-        if (!is_numeric($input) && $input !== 'me') {
-            return;
-        }
-        if ($input === 'me') {
-            $input = user()->id;
-        }
-        $query->where('created_by', '=', $input);
-    }
-
-    protected function filterUpdatedBy(EloquentBuilder $query, Entity $model, $input)
-    {
-        if (!is_numeric($input) && $input !== 'me') {
-            return;
-        }
-        if ($input === 'me') {
-            $input = user()->id;
-        }
-        $query->where('updated_by', '=', $input);
-    }
-
-    protected function filterInName(EloquentBuilder $query, Entity $model, $input)
-    {
-        $query->where('name', 'like', '%' .$input. '%');
-    }
-
-    protected function filterInTitle(EloquentBuilder $query, Entity $model, $input)
-    {
-        $this->filterInName($query, $model, $input);
-    }
-
-    protected function filterInBody(EloquentBuilder $query, Entity $model, $input)
-    {
-        $query->where($model->textField, 'like', '%' .$input. '%');
-    }
-
-    protected function filterIsRestricted(EloquentBuilder $query, Entity $model, $input)
-    {
-        $query->where('restricted', '=', true);
-    }
-
-    protected function filterViewedByMe(EloquentBuilder $query, Entity $model, $input)
-    {
-        $query->whereHas('views', function ($query) {
-            $query->where('user_id', '=', user()->id);
-        });
-    }
-
-    protected function filterNotViewedByMe(EloquentBuilder $query, Entity $model, $input)
-    {
-        $query->whereDoesntHave('views', function ($query) {
-            $query->where('user_id', '=', user()->id);
-        });
-    }
-
-    protected function filterSortBy(EloquentBuilder $query, Entity $model, $input)
-    {
-        $functionName = camel_case('sort_by_' . $input);
-        if (method_exists($this, $functionName)) {
-            $this->$functionName($query, $model);
-        }
-    }
-
-
-    /**
-     * Sorting filter options
-     */
-
-    protected function sortByLastCommented(EloquentBuilder $query, Entity $model)
-    {
-        $commentsTable = $this->db->getTablePrefix() . 'comments';
-        $morphClass = str_replace('\\', '\\\\', $model->getMorphClass());
-        $commentQuery = $this->db->raw('(SELECT c1.entity_id, c1.entity_type, c1.created_at as last_commented FROM '.$commentsTable.' c1 LEFT JOIN '.$commentsTable.' c2 ON (c1.entity_id = c2.entity_id AND c1.entity_type = c2.entity_type AND c1.created_at < c2.created_at) WHERE c1.entity_type = \''. $morphClass .'\' AND c2.created_at IS NULL) as comments');
-
-        $query->join($commentQuery, $model->getTable() . '.id', '=', 'comments.entity_id')->orderBy('last_commented', 'desc');
-    }
-}

app/Entities/SearchTerm.php

@@ -1,19 +0,0 @@
-<?php namespace BookStack\Entities;
-
-use BookStack\Model;
-
-class SearchTerm extends Model
-{
-
-    protected $fillable = ['term', 'entity_id', 'entity_type', 'score'];
-    public $timestamps = false;
-
-    /**
-     * Get the entity that this term belongs to
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
-     */
-    public function entity()
-    {
-        return $this->morphTo('entity');
-    }
-}

app/Entity.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace BookStack;
+
+use Illuminate\Database\Eloquent\Model;
+
+abstract class Entity extends Model
+{
+
+    use Ownable;
+
+    /**
+     * Compares this entity to another given entity.
+     * Matches by comparing class and id.
+     * @param $entity
+     * @return bool
+     */
+    public function matches($entity)
+    {
+        return [get_class($this), $this->id] === [get_class($entity), $entity->id];
+    }
+
+    /**
+     * Checks if an entity matches or contains another given entity.
+     * @param Entity $entity
+     * @return bool
+     */
+    public function matchesOrContains(Entity $entity)
+    {
+        $matches = [get_class($this), $this->id] === [get_class($entity), $entity->id];
+
+        if ($matches) return true;
+
+        if (($entity->isA('chapter') || $entity->isA('page')) && $this->isA('book')) {
+            return $entity->book_id === $this->id;
+        }
+
+        if ($entity->isA('page') && $this->isA('chapter')) {
+            return $entity->chapter_id === $this->id;
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets the activity objects for this entity.
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function activity()
+    {
+        return $this->morphMany('BookStack\Activity', 'entity')->orderBy('created_at', 'desc');
+    }
+
+    /**
+     * Get View objects for this entity.
+     * @return mixed
+     */
+    public function views()
+    {
+        return $this->morphMany('BookStack\View', 'viewable');
+    }
+
+    /**
+     * Allows checking of the exact class, Used to check entity type.
+     * Cleaner method for is_a.
+     * @param $type
+     * @return bool
+     */
+    public static function isA($type)
+    {
+        return static::getClassName() === strtolower($type);
+    }
+
+    /**
+     * Gets the class name.
+     * @return string
+     */
+    public static function getClassName()
+    {
+        return strtolower(array_slice(explode('\\', static::class), -1, 1)[0]);
+    }
+
+    /**
+     *Gets a limited-length version of the entities name.
+     * @param int $length
+     * @return string
+     */
+    public function getShortName($length = 25)
+    {
+        if(strlen($this->name) <= $length) return $this->name;
+        return substr($this->name, 0, $length-3) . '...';
+    }
+
+    /**
+     * Perform a full-text search on this entity.
+     * @param string[] $fieldsToSearch
+     * @param string[] $terms
+     * @param string[] array $wheres
+     * @return mixed
+     */
+    public static function fullTextSearch($fieldsToSearch, $terms, $wheres = [])
+    {
+        $termString = '';
+        foreach ($terms as $term) {
+            $termString .= htmlentities($term) . '* ';
+        }
+        $fields = implode(',', $fieldsToSearch);
+        $termStringEscaped = \DB::connection()->getPdo()->quote($termString);
+        $search = static::addSelect(\DB::raw('*, MATCH(name) AGAINST('.$termStringEscaped.' IN BOOLEAN MODE) AS title_relevance'));
+        $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termStringEscaped]);
+
+        // Add additional where terms
+        foreach ($wheres as $whereTerm) {
+            $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
+        }
+
+        // Load in relations
+        if (!static::isA('book')) $search = $search->with('book');
+        if (static::isA('page'))  $search = $search->with('chapter');
+
+        return $search->orderBy('title_relevance', 'desc')->get();
+    }
+
+    /**
+     * Get the url for this item.
+     * @return string
+     */
+    abstract public function getUrl();
+
+}

app/Events/Event.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace BookStack\Events;
+
+abstract class Event
+{
+    //
+}

app/Exceptions/AuthException.php

@@ -1,6 +0,0 @@
-<?php namespace BookStack\Exceptions;
-
-class AuthException extends PrettyException
-{
-
-}

app/Exceptions/ConfirmationEmailException.php

@@ -1,6 +1,4 @@
 <?php namespace BookStack\Exceptions;
 
-class ConfirmationEmailException extends NotifyException
-{
 
-}
+class ConfirmationEmailException extends NotifyException {}

app/Exceptions/ExportException.php

@@ -1,6 +0,0 @@
-<?php namespace BookStack\Exceptions;
-
-class ExportException extends PrettyException
-{
-
-}

app/Exceptions/FileUploadException.php

@@ -1,6 +0,0 @@
-<?php namespace BookStack\Exceptions;
-
-class FileUploadException extends PrettyException
-{
-
-}

app/Exceptions/Handler.php

@@ -3,13 +3,12 @@
 namespace BookStack\Exceptions;
 
 use Exception;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\AuthenticationException;
+use Illuminate\Contracts\Validation\ValidationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Validation\ValidationException;
+use PhpSpec\Exception\Example\ErrorException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Auth\Access\AuthorizationException;
 
 class Handler extends ExceptionHandler
 {
@@ -27,11 +26,10 @@ class Handler extends ExceptionHandler
 
     /**
      * Report or log an exception.
+     *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @param  \Exception $e
-     * @return mixed
-     * @throws Exception
      */
     public function report(Exception $e)
     {
@@ -49,81 +47,18 @@ class Handler extends ExceptionHandler
     {
         // Handle notify exceptions which will redirect to the
         // specified location then show a notification message.
-        if ($this->isExceptionType($e, NotifyException::class)) {
-            session()->flash('error', $this->getOriginalMessage($e));
-            return redirect($e->redirectLocation);
+        if ($e instanceof NotifyException) {
+            \Session::flash('error', $e->message);
+            return response()->redirectTo($e->redirectLocation);
         }
 
         // Handle pretty exceptions which will show a friendly application-fitting page
         // Which will include the basic message to point the user roughly to the cause.
-        if ($this->isExceptionType($e, PrettyException::class)  && !config('app.debug')) {
-            $message = $this->getOriginalMessage($e);
-            $code = ($e->getCode() === 0) ? 500 : $e->getCode();
-            return response()->view('errors/' . $code, ['message' => $message], $code);
-        }
-
-        // Handle 404 errors with a loaded session to enable showing user-specific information
-        if ($this->isExceptionType($e, NotFoundHttpException::class)) {
-            return \Route::respondWithRoute('fallback');
+        if (($e instanceof PrettyException || $e->getPrevious() instanceof PrettyException)  && !config('app.debug')) {
+            $message = ($e instanceof PrettyException) ? $e->getMessage() : $e->getPrevious()->getMessage();
+            return response()->view('errors/500', ['message' => $message], 500);
         }
 
         return parent::render($request, $e);
     }
-
-    /**
-     * Check the exception chain to compare against the original exception type.
-     * @param Exception $e
-     * @param $type
-     * @return bool
-     */
-    protected function isExceptionType(Exception $e, $type)
-    {
-        do {
-            if (is_a($e, $type)) {
-                return true;
-            }
-        } while ($e = $e->getPrevious());
-        return false;
-    }
-
-    /**
-     * Get original exception message.
-     * @param Exception $e
-     * @return string
-     */
-    protected function getOriginalMessage(Exception $e)
-    {
-        do {
-            $message = $e->getMessage();
-        } while ($e = $e->getPrevious());
-        return $message;
-    }
-
-    /**
-     * Convert an authentication exception into an unauthenticated response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Auth\AuthenticationException  $exception
-     * @return \Illuminate\Http\Response
-     */
-    protected function unauthenticated($request, AuthenticationException $exception)
-    {
-        if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthenticated.'], 401);
-        }
-
-        return redirect()->guest('login');
-    }
-
-    /**
-     * Convert a validation exception into a JSON response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Validation\ValidationException  $exception
-     * @return \Illuminate\Http\JsonResponse
-     */
-    protected function invalidJson($request, ValidationException $exception)
-    {
-        return response()->json($exception->errors(), $exception->status);
-    }
 }

app/Exceptions/HttpFetchException.php

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

app/Exceptions/ImageUploadException.php

@@ -1,6 +1,3 @@
 <?php namespace BookStack\Exceptions;
 
-class ImageUploadException extends PrettyException
-{
-
-}
+class ImageUploadException extends PrettyException {}

app/Exceptions/LdapException.php

@@ -1,6 +1,3 @@
 <?php namespace BookStack\Exceptions;
 
-class LdapException extends PrettyException
-{
-
-}
+class LdapException extends PrettyException {}

app/Exceptions/NotFoundException.php

@@ -1,14 +0,0 @@
-<?php namespace BookStack\Exceptions;
-
-class NotFoundException extends PrettyException
-{
-
-    /**
-     * NotFoundException constructor.
-     * @param string $message
-     */
-    public function __construct($message = 'Item not found')
-    {
-        parent::__construct($message, 404);
-    }
-}

app/Exceptions/NotifyException.php

@@ -1,5 +1,6 @@
 <?php namespace BookStack\Exceptions;
 
+
 class NotifyException extends \Exception
 {
 
@@ -11,10 +12,10 @@ class NotifyException extends \Exception
      * @param string $message
      * @param string    $redirectLocation
      */
-    public function __construct(string $message, string $redirectLocation = "/")
+    public function __construct($message, $redirectLocation)
     {
         $this->message = $message;
         $this->redirectLocation = $redirectLocation;
         parent::__construct();
     }
-}
+}

app/Exceptions/PermissionsException.php

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

app/Exceptions/PrettyException.php

@@ -1,6 +1,5 @@
 <?php namespace BookStack\Exceptions;
 
-class PrettyException extends \Exception
-{
+use Exception;
 
-}
+class PrettyException extends Exception {}

app/Exceptions/SocialDriverNotConfigured.php

@@ -1,6 +1,4 @@
 <?php namespace BookStack\Exceptions;
 
-class SocialDriverNotConfigured extends PrettyException
-{
 
-}
+class SocialDriverNotConfigured extends PrettyException {}

app/Exceptions/SocialSignInAccountNotUsed.php

@@ -1,6 +0,0 @@
-<?php namespace BookStack\Exceptions;
-
-class SocialSignInAccountNotUsed extends SocialSignInException
-{
-
-}

app/Exceptions/SocialSignInException.php

@@ -1,6 +1,4 @@
 <?php namespace BookStack\Exceptions;
 
-class SocialSignInException extends NotifyException
-{
 
-}
+class SocialSignInException extends NotifyException {}

app/Exceptions/UserRegistrationException.php

@@ -1,6 +1,4 @@
 <?php namespace BookStack\Exceptions;
 
-class UserRegistrationException extends NotifyException
-{
 
-}
+class UserRegistrationException extends NotifyException {}

app/Exceptions/UserUpdateException.php

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

app/Http/Controllers/AttachmentController.php

@@ -1,220 +0,0 @@
-<?php namespace BookStack\Http\Controllers;
-
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Exceptions\FileUploadException;
-use BookStack\Exceptions\NotFoundException;
-use BookStack\Uploads\Attachment;
-use BookStack\Uploads\AttachmentService;
-use Illuminate\Http\Request;
-
-class AttachmentController extends Controller
-{
-    protected $attachmentService;
-    protected $attachment;
-    protected $entityRepo;
-
-    /**
-     * AttachmentController constructor.
-     * @param \BookStack\Uploads\AttachmentService $attachmentService
-     * @param Attachment $attachment
-     * @param EntityRepo $entityRepo
-     */
-    public function __construct(AttachmentService $attachmentService, Attachment $attachment, EntityRepo $entityRepo)
-    {
-        $this->attachmentService = $attachmentService;
-        $this->attachment = $attachment;
-        $this->entityRepo = $entityRepo;
-        parent::__construct();
-    }
-
-
-    /**
-     * Endpoint at which attachments are uploaded to.
-     * @param Request $request
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
-     */
-    public function upload(Request $request)
-    {
-        $this->validate($request, [
-            'uploaded_to' => 'required|integer|exists:pages,id',
-            'file' => 'required|file'
-        ]);
-
-        $pageId = $request->get('uploaded_to');
-        $page = $this->entityRepo->getById('page', $pageId, true);
-
-        $this->checkPermission('attachment-create-all');
-        $this->checkOwnablePermission('page-update', $page);
-
-        $uploadedFile = $request->file('file');
-
-        try {
-            $attachment = $this->attachmentService->saveNewUpload($uploadedFile, $pageId);
-        } catch (FileUploadException $e) {
-            return response($e->getMessage(), 500);
-        }
-
-        return response()->json($attachment);
-    }
-
-    /**
-     * Update an uploaded attachment.
-     * @param int $attachmentId
-     * @param Request $request
-     * @return mixed
-     */
-    public function uploadUpdate($attachmentId, Request $request)
-    {
-        $this->validate($request, [
-            'uploaded_to' => 'required|integer|exists:pages,id',
-            'file' => 'required|file'
-        ]);
-
-        $pageId = $request->get('uploaded_to');
-        $page = $this->entityRepo->getById('page', $pageId, true);
-        $attachment = $this->attachment->findOrFail($attachmentId);
-
-        $this->checkOwnablePermission('page-update', $page);
-        $this->checkOwnablePermission('attachment-create', $attachment);
-        
-        if (intval($pageId) !== intval($attachment->uploaded_to)) {
-            return $this->jsonError(trans('errors.attachment_page_mismatch'));
-        }
-
-        $uploadedFile = $request->file('file');
-
-        try {
-            $attachment = $this->attachmentService->saveUpdatedUpload($uploadedFile, $attachment);
-        } catch (FileUploadException $e) {
-            return response($e->getMessage(), 500);
-        }
-
-        return response()->json($attachment);
-    }
-
-    /**
-     * Update the details of an existing file.
-     * @param $attachmentId
-     * @param Request $request
-     * @return Attachment|mixed
-     */
-    public function update($attachmentId, Request $request)
-    {
-        $this->validate($request, [
-            'uploaded_to' => 'required|integer|exists:pages,id',
-            'name' => 'required|string|min:1|max:255',
-            'link' =>  'string|min:1|max:255'
-        ]);
-
-        $pageId = $request->get('uploaded_to');
-        $page = $this->entityRepo->getById('page', $pageId, true);
-        $attachment = $this->attachment->findOrFail($attachmentId);
-
-        $this->checkOwnablePermission('page-update', $page);
-        $this->checkOwnablePermission('attachment-create', $attachment);
-
-        if (intval($pageId) !== intval($attachment->uploaded_to)) {
-            return $this->jsonError(trans('errors.attachment_page_mismatch'));
-        }
-
-        $attachment = $this->attachmentService->updateFile($attachment, $request->all());
-        return response()->json($attachment);
-    }
-
-    /**
-     * Attach a link to a page.
-     * @param Request $request
-     * @return mixed
-     */
-    public function attachLink(Request $request)
-    {
-        $this->validate($request, [
-            'uploaded_to' => 'required|integer|exists:pages,id',
-            'name' => 'required|string|min:1|max:255',
-            'link' =>  'required|string|min:1|max:255'
-        ]);
-
-        $pageId = $request->get('uploaded_to');
-        $page = $this->entityRepo->getById('page', $pageId, true);
-
-        $this->checkPermission('attachment-create-all');
-        $this->checkOwnablePermission('page-update', $page);
-
-        $attachmentName = $request->get('name');
-        $link = $request->get('link');
-        $attachment = $this->attachmentService->saveNewFromLink($attachmentName, $link, $pageId);
-
-        return response()->json($attachment);
-    }
-
-    /**
-     * Get the attachments for a specific page.
-     * @param $pageId
-     * @return mixed
-     */
-    public function listForPage($pageId)
-    {
-        $page = $this->entityRepo->getById('page', $pageId, true);
-        $this->checkOwnablePermission('page-view', $page);
-        return response()->json($page->attachments);
-    }
-
-    /**
-     * Update the attachment sorting.
-     * @param $pageId
-     * @param Request $request
-     * @return mixed
-     */
-    public function sortForPage($pageId, Request $request)
-    {
-        $this->validate($request, [
-            'files' => 'required|array',
-            'files.*.id' => 'required|integer',
-        ]);
-        $page = $this->entityRepo->getById('page', $pageId);
-        $this->checkOwnablePermission('page-update', $page);
-
-        $attachments = $request->get('files');
-        $this->attachmentService->updateFileOrderWithinPage($attachments, $pageId);
-        return response()->json(['message' => trans('entities.attachments_order_updated')]);
-    }
-
-    /**
-     * Get an attachment from storage.
-     * @param $attachmentId
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Symfony\Component\HttpFoundation\Response
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     * @throws NotFoundException
-     */
-    public function get($attachmentId)
-    {
-        $attachment = $this->attachment->findOrFail($attachmentId);
-        $page = $this->entityRepo->getById('page', $attachment->uploaded_to);
-        if ($page === null) {
-            throw new NotFoundException(trans('errors.attachment_not_found'));
-        }
-
-        $this->checkOwnablePermission('page-view', $page);
-
-        if ($attachment->external) {
-            return redirect($attachment->path);
-        }
-
-        $attachmentContents = $this->attachmentService->getAttachmentFromStorage($attachment);
-        return $this->downloadResponse($attachmentContents, $attachment->getFileName());
-    }
-
-    /**
-     * Delete a specific attachment in the system.
-     * @param $attachmentId
-     * @return mixed
-     * @throws \Exception
-     */
-    public function delete($attachmentId)
-    {
-        $attachment = $this->attachment->findOrFail($attachmentId);
-        $this->checkOwnablePermission('attachment-delete', $attachment);
-        $this->attachmentService->deleteFile($attachment);
-        return response()->json(['message' => trans('entities.attachments_deleted')]);
-    }
-}

app/Http/Controllers/Auth/AuthController.php

@@ -2,95 +2,83 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
-use BookStack\Auth\SocialAccount;
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
-use BookStack\Exceptions\SocialSignInAccountNotUsed;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Http\Request;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Http\Controllers\Controller;
-use Exception;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Laravel\Socialite\Contracts\User as SocialUser;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\EmailConfirmationService;
+use BookStack\Services\SocialAuthService;
+use BookStack\SocialAccount;
 use Validator;
+use BookStack\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ThrottlesLogins;
+use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 
-class RegisterController extends Controller
+class AuthController extends Controller
 {
     /*
     |--------------------------------------------------------------------------
-    | Register Controller
+    | Registration & Login Controller
     |--------------------------------------------------------------------------
     |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
+    | This controller handles the registration of new users, as well as the
+    | authentication of existing users. By default, this controller uses
+    | a simple trait to add these behaviors. Why don't you explore it?
     |
     */
 
-    use RegistersUsers;
+    use AuthenticatesAndRegistersUsers, ThrottlesLogins;
+
+    protected $redirectPath = '/';
+    protected $redirectAfterLogout = '/login';
+    protected $username = 'email';
+
 
     protected $socialAuthService;
     protected $emailConfirmationService;
     protected $userRepo;
 
     /**
-     * Where to redirect users after login / registration.
-     *
-     * @var string
+     * Create a new authentication controller instance.
+     * @param SocialAuthService        $socialAuthService
+     * @param EmailConfirmationService $emailConfirmationService
+     * @param UserRepo                 $userRepo
      */
-    protected $redirectTo = '/';
-    protected $redirectPath = '/';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService
-     * @param \BookStack\Auth\EmailConfirmationService $emailConfirmationService
-     * @param \BookStack\Auth\UserRepo $userRepo
-     */
-    public function __construct(\BookStack\Auth\Access\SocialAuthService $socialAuthService, \BookStack\Auth\Access\EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
+    public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
     {
-        $this->middleware('guest')->only(['getRegister', 'postRegister', 'socialRegister']);
+        $this->middleware('guest', ['only' => ['getLogin', 'postLogin', 'getRegister', 'postRegister']]);
         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;
-        $this->redirectTo = baseUrl('/');
-        $this->redirectPath = baseUrl('/');
+        $this->username = config('auth.method') === 'standard' ? 'email' : 'username';
         parent::__construct();
     }
 
     /**
      * Get a validator for an incoming registration request.
-     *
      * @param  array $data
      * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
+            'name'     => 'required|max:255',
+            'email'    => 'required|email|max:255|unique:users',
             'password' => 'required|min:6',
         ]);
     }
 
-    /**
-     * Check whether or not registrations are allowed in the app settings.
-     * @throws UserRegistrationException
-     */
     protected function checkRegistrationAllowed()
     {
-        if (!setting('registration-enabled')) {
-            throw new UserRegistrationException(trans('auth.registrations_disabled'), '/login');
+        if (!\Setting::get('registration-enabled')) {
+            throw new UserRegistrationException('Registrations are currently disabled.', '/login');
         }
     }
 
     /**
      * Show the application registration form.
-     * @return Response
-     * @throws UserRegistrationException
+     * @return \Illuminate\Http\Response
      */
     public function getRegister()
     {
@@ -101,72 +89,111 @@ class RegisterController extends Controller
 
     /**
      * Handle a registration request for the application.
-     * @param Request|\Illuminate\Http\Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
      * @throws UserRegistrationException
      */
     public function postRegister(Request $request)
     {
         $this->checkRegistrationAllowed();
-        $this->validator($request->all())->validate();
+        $validator = $this->validator($request->all());
+
+        if ($validator->fails()) {
+            $this->throwValidationException(
+                $request, $validator
+            );
+        }
 
         $userData = $request->all();
         return $this->registerUser($userData);
     }
 
+
     /**
-     * Create a new user instance after a valid registration.
-     * @param  array  $data
-     * @return \BookStack\Auth\User
+     * Overrides the action when a user is authenticated.
+     * If the user authenticated but does not exist in the user table we create them.
+     * @param Request         $request
+     * @param Authenticatable $user
+     * @return \Illuminate\Http\RedirectResponse
      */
-    protected function create(array $data)
+    protected function authenticated(Request $request, Authenticatable $user)
     {
-        return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
-        ]);
+        // Explicitly log them out for now if they do no exist.
+        if (!$user->exists) auth()->logout($user);
+
+        if (!$user->exists && $user->email === null && !$request->has('email')) {
+            $request->flash();
+            session()->flash('request-email', true);
+            return redirect('/login');
+        }
+
+        if (!$user->exists && $user->email === null && $request->has('email')) {
+            $user->email = $request->get('email');
+        }
+
+        if (!$user->exists) {
+            $user->save();
+            $this->userRepo->attachDefaultRole($user);
+            auth()->login($user);
+        }
+
+        return redirect()->intended($this->redirectPath());
+    }
+
+    /**
+     * Register a new user after a registration callback.
+     * @param $socialDriver
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws UserRegistrationException
+     */
+    protected function socialRegisterCallback($socialDriver)
+    {
+        $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver);
+        $socialAccount = $this->socialAuthService->fillSocialAccount($socialDriver, $socialUser);
+
+        // Create an array of the user data to create a new user instance
+        $userData = [
+            'name'     => $socialUser->getName(),
+            'email'    => $socialUser->getEmail(),
+            'password' => str_random(30)
+        ];
+        return $this->registerUser($userData, $socialAccount);
     }
 
     /**
      * The registrations flow for all users.
-     * @param array $userData
+     * @param array                    $userData
      * @param bool|false|SocialAccount $socialAccount
-     * @param bool $emailVerified
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws UserRegistrationException
+     * @throws \BookStack\Exceptions\ConfirmationEmailException
      */
-    protected function registerUser(array $userData, $socialAccount = false, $emailVerified = false)
+    protected function registerUser(array $userData, $socialAccount = false)
     {
-        $registrationRestrict = setting('registration-restrict');
-
-        if ($registrationRestrict) {
-            $restrictedEmailDomains = explode(',', str_replace(' ', '', $registrationRestrict));
+        if (\Setting::get('registration-restrict')) {
+            $restrictedEmailDomains = explode(',', str_replace(' ', '', \Setting::get('registration-restrict')));
             $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
             if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
-                throw new UserRegistrationException(trans('auth.registration_email_domain_invalid'), '/register');
+                throw new UserRegistrationException('That email domain does not have access to this application', '/register');
             }
         }
 
-        $newUser = $this->userRepo->registerNew($userData, $emailVerified);
+        $newUser = $this->userRepo->registerNew($userData);
         if ($socialAccount) {
             $newUser->socialAccounts()->save($socialAccount);
         }
 
-        if ((setting('registration-confirmation') || $registrationRestrict) && !$emailVerified) {
+        if (\Setting::get('registration-confirmation') || \Setting::get('registration-restrict')) {
+            $newUser->email_confirmed = false;
             $newUser->save();
-
-            try {
-                $this->emailConfirmationService->sendConfirmation($newUser);
-            } catch (Exception $e) {
-                session()->flash('error', trans('auth.email_confirm_send_error'));
-            }
-
+            $this->emailConfirmationService->sendConfirmation($newUser);
             return redirect('/register/confirm');
         }
 
+        $newUser->email_confirmed = true;
+
         auth()->login($newUser);
-        session()->flash('success', trans('auth.register_success'));
+        session()->flash('success', 'Thanks for signing up! You are now registered and signed in.');
         return redirect($this->redirectPath());
     }
 
@@ -179,6 +206,18 @@ class RegisterController extends Controller
         return view('auth/register-confirm');
     }
 
+    /**
+     * View the confirmation email as a standard web page.
+     * @param $token
+     * @return \Illuminate\View\View
+     * @throws UserRegistrationException
+     */
+    public function viewConfirmEmail($token)
+    {
+        $confirmation = $this->emailConfirmationService->getEmailConfirmationFromToken($token);
+        return view('emails/email-confirmation', ['token' => $confirmation->token]);
+    }
+
     /**
      * Confirms an email via a token and logs the user into the system.
      * @param $token
@@ -191,8 +230,8 @@ class RegisterController extends Controller
         $user = $confirmation->user;
         $user->email_confirmed = true;
         $user->save();
-        auth()->login($user);
-        session()->flash('success', trans('auth.email_confirm_success'));
+        auth()->login($confirmation->user);
+        session()->flash('success', 'Your email has been confirmed!');
         $this->emailConfirmationService->deleteConfirmationsByUser($user);
         return redirect($this->redirectPath);
     }
@@ -218,24 +257,37 @@ class RegisterController extends Controller
             'email' => 'required|email|exists:users,email'
         ]);
         $user = $this->userRepo->getByEmail($request->get('email'));
-
-        try {
-            $this->emailConfirmationService->sendConfirmation($user);
-        } catch (Exception $e) {
-            session()->flash('error', trans('auth.email_confirm_send_error'));
-            return redirect('/register/confirm');
-        }
-
-        session()->flash('success', trans('auth.email_confirm_resent'));
+        $this->emailConfirmationService->sendConfirmation($user);
+        session()->flash('success', 'Confirmation email resent, Please check your inbox.');
         return redirect('/register/confirm');
     }
 
+    /**
+     * Show the application login form.
+     * @return \Illuminate\Http\Response
+     */
+    public function getLogin()
+    {
+        $socialDrivers = $this->socialAuthService->getActiveDrivers();
+        $authMethod = config('auth.method');
+        return view('auth/login', ['socialDrivers' => $socialDrivers, 'authMethod' => $authMethod]);
+    }
+
+    /**
+     * Redirect to the relevant social site.
+     * @param $socialDriver
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function getSocialLogin($socialDriver)
+    {
+        session()->put('social-callback', 'login');
+        return $this->socialAuthService->startLogIn($socialDriver);
+    }
+
     /**
      * Redirect to the social site for authentication intended to register.
      * @param $socialDriver
      * @return mixed
-     * @throws UserRegistrationException
-     * @throws \BookStack\Exceptions\SocialDriverNotConfigured
      */
     public function socialRegister($socialDriver)
     {
@@ -247,45 +299,21 @@ class RegisterController extends Controller
     /**
      * The callback for social login services.
      * @param $socialDriver
-     * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws SocialSignInException
-     * @throws UserRegistrationException
-     * @throws \BookStack\Exceptions\SocialDriverNotConfigured
      */
-    public function socialCallback($socialDriver, Request $request)
+    public function socialCallback($socialDriver)
     {
-        if (!session()->has('social-callback')) {
-            throw new SocialSignInException(trans('errors.social_no_action_defined'), '/login');
-        }
-
-        // Check request for error information
-        if ($request->has('error') && $request->has('error_description')) {
-            throw new SocialSignInException(trans('errors.social_login_bad_response', [
-                'socialAccount' => $socialDriver,
-                'error' => $request->get('error_description'),
-            ]), '/login');
-        }
-
-        $action = session()->pull('social-callback');
-
-        // Attempt login or fall-back to register if allowed.
-        $socialUser = $this->socialAuthService->getSocialUser($socialDriver);
-        if ($action == 'login') {
-            try {
-                return $this->socialAuthService->handleLoginCallback($socialDriver, $socialUser);
-            } catch (SocialSignInAccountNotUsed $exception) {
-                if ($this->socialAuthService->driverAutoRegisterEnabled($socialDriver)) {
-                    return $this->socialRegisterCallback($socialDriver, $socialUser);
-                }
-                throw $exception;
+        if (session()->has('social-callback')) {
+            $action = session()->pull('social-callback');
+            if ($action == 'login') {
+                return $this->socialAuthService->handleLoginCallback($socialDriver);
+            } elseif ($action == 'register') {
+                return $this->socialRegisterCallback($socialDriver);
             }
+        } else {
+            throw new SocialSignInException('No action defined', '/login');
         }
-
-        if ($action == 'register') {
-            return $this->socialRegisterCallback($socialDriver, $socialUser);
-        }
-
         return redirect()->back();
     }
 
@@ -299,25 +327,4 @@ class RegisterController extends Controller
         return $this->socialAuthService->detachSocialAccount($socialDriver);
     }
 
-    /**
-     * Register a new user after a registration callback.
-     * @param string $socialDriver
-     * @param SocialUser $socialUser
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws UserRegistrationException
-     */
-    protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)
-    {
-        $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver, $socialUser);
-        $socialAccount = $this->socialAuthService->fillSocialAccount($socialDriver, $socialUser);
-        $emailVerified = $this->socialAuthService->driverAutoConfirmEmailEnabled($socialDriver);
-
-        // Create an array of the user data to create a new user instance
-        $userData = [
-            'name' => $socialUser->getName(),
-            'email' => $socialUser->getEmail(),
-            'password' => str_random(30)
-        ];
-        return $this->registerUser($userData, $socialAccount, $emailVerified);
-    }
 }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace BookStack\Http\Controllers\Auth;
-
-use BookStack\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-use Illuminate\Http\Request;
-use Password;
-
-class ForgotPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset emails and
-    | includes a trait which assists in sending these notifications from
-    | your application to your users. Feel free to explore this trait.
-    |
-    */
-
-    use SendsPasswordResetEmails;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-        parent::__construct();
-    }
-
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function sendResetLinkEmail(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email']);
-
-        // We will send the password reset link to this user. Once we have attempted
-        // to send the link, we will examine the response then see the message we
-        // need to show to the user. Finally, we'll send out a proper response.
-        $response = $this->broker()->sendResetLink(
-            $request->only('email')
-        );
-
-        if ($response === Password::RESET_LINK_SENT) {
-            $message = trans('auth.reset_password_sent_success', ['email' => $request->get('email')]);
-            session()->flash('success', $message);
-            return back()->with('status', trans($response));
-        }
-
-        // If an error was returned by the password broker, we will get this message
-        // translated so we can notify a user of the problem. We'll redirect back
-        // to where the users came from so they can attempt this process again.
-        return back()->withErrors(
-            ['email' => trans($response)]
-        );
-    }
-}

app/Http/Controllers/Auth/LoginController.php

@@ -1,145 +0,0 @@
-<?php
-
-namespace BookStack\Http\Controllers\Auth;
-
-use BookStack\Auth\Access\LdapService;
-use BookStack\Auth\Access\SocialAuthService;
-use BookStack\Auth\UserRepo;
-use BookStack\Exceptions\AuthException;
-use BookStack\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
-use Illuminate\Http\Request;
-
-class LoginController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
-
-    use AuthenticatesUsers;
-
-    /**
-     * Where to redirect users after login.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-
-    protected $redirectPath = '/';
-    protected $redirectAfterLogout = '/login';
-
-    protected $socialAuthService;
-    protected $ldapService;
-    protected $userRepo;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @param \BookStack\Auth\\BookStack\Auth\Access\SocialAuthService $socialAuthService
-     * @param LdapService $ldapService
-     * @param \BookStack\Auth\UserRepo $userRepo
-     */
-    public function __construct(SocialAuthService $socialAuthService, LdapService $ldapService, UserRepo $userRepo)
-    {
-        $this->middleware('guest', ['only' => ['getLogin', 'postLogin']]);
-        $this->socialAuthService = $socialAuthService;
-        $this->ldapService = $ldapService;
-        $this->userRepo = $userRepo;
-        $this->redirectPath = baseUrl('/');
-        $this->redirectAfterLogout = baseUrl('/login');
-        parent::__construct();
-    }
-
-    public function username()
-    {
-        return config('auth.method') === 'standard' ? 'email' : 'username';
-    }
-
-    /**
-     * Overrides the action when a user is authenticated.
-     * If the user authenticated but does not exist in the user table we create them.
-     * @param Request $request
-     * @param Authenticatable $user
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws AuthException
-     * @throws \BookStack\Exceptions\LdapException
-     */
-    protected function authenticated(Request $request, Authenticatable $user)
-    {
-        // Explicitly log them out for now if they do no exist.
-        if (!$user->exists) {
-            auth()->logout($user);
-        }
-
-        if (!$user->exists && $user->email === null && !$request->filled('email')) {
-            $request->flash();
-            session()->flash('request-email', true);
-            return redirect('/login');
-        }
-
-        if (!$user->exists && $user->email === null && $request->filled('email')) {
-            $user->email = $request->get('email');
-        }
-
-        if (!$user->exists) {
-            // Check for users with same email already
-            $alreadyUser = $user->newQuery()->where('email', '=', $user->email)->count() > 0;
-            if ($alreadyUser) {
-                throw new AuthException(trans('errors.error_user_exists_different_creds', ['email' => $user->email]));
-            }
-
-            $user->save();
-            $this->userRepo->attachDefaultRole($user);
-            auth()->login($user);
-        }
-
-        // Sync LDAP groups if required
-        if ($this->ldapService->shouldSyncGroups()) {
-            $this->ldapService->syncGroups($user, $request->get($this->username()));
-        }
-
-        $path = session()->pull('url.intended', '/');
-        $path = baseUrl($path, true);
-        return redirect($path);
-    }
-
-    /**
-     * Show the application login form.
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function getLogin(Request $request)
-    {
-        $socialDrivers = $this->socialAuthService->getActiveDrivers();
-        $authMethod = config('auth.method');
-
-        if ($request->has('email')) {
-            session()->flashInput([
-                'email' => $request->get('email'),
-                'password' => (config('app.env') === 'demo') ? $request->get('password', '') : ''
-            ]);
-        }
-
-        return view('auth/login', ['socialDrivers' => $socialDrivers, 'authMethod' => $authMethod]);
-    }
-
-    /**
-     * Redirect to the relevant social site.
-     * @param $socialDriver
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     * @throws \BookStack\Exceptions\SocialDriverNotConfigured
-     */
-    public function getSocialLogin($socialDriver)
-    {
-        session()->put('social-callback', 'login');
-        return $this->socialAuthService->startLogIn($socialDriver);
-    }
-}

app/Http/Controllers/Auth/PasswordController.php

@@ -5,7 +5,7 @@ namespace BookStack\Http\Controllers\Auth;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
-class ResetPasswordController extends Controller
+class PasswordController extends Controller
 {
     /*
     |--------------------------------------------------------------------------
@@ -23,27 +23,10 @@ class ResetPasswordController extends Controller
     protected $redirectTo = '/';
 
     /**
-     * Create a new controller instance.
-     *
-     * @return void
+     * Create a new password controller instance.
      */
     public function __construct()
     {
         $this->middleware('guest');
-        parent::__construct();
-    }
-
-    /**
-     * Get the response for a successful password reset.
-     *
-     * @param  string  $response
-     * @return \Illuminate\Http\Response
-     */
-    protected function sendResetResponse($response)
-    {
-        $message = trans('auth.reset_password_success');
-        session()->flash('success', $message);
-        return redirect($this->redirectPath())
-            ->with('status', trans($response));
     }
 }

app/Http/Controllers/BookController.php

@@ -1,64 +1,62 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
 use Activity;
-use BookStack\Auth\UserRepo;
-use BookStack\Entities\Book;
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Entities\ExportService;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
 use Views;
 
 class BookController extends Controller
 {
 
-    protected $entityRepo;
-    protected $userRepo;
-    protected $exportService;
+    protected $bookRepo;
+    protected $pageRepo;
+    protected $chapterRepo;
 
     /**
      * BookController constructor.
-     * @param EntityRepo $entityRepo
-     * @param \BookStack\Auth\UserRepo $userRepo
-     * @param \BookStack\Entities\ExportService $exportService
+     * @param BookRepo    $bookRepo
+     * @param PageRepo    $pageRepo
+     * @param ChapterRepo $chapterRepo
      */
-    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)
+    public function __construct(BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo)
     {
-        $this->entityRepo = $entityRepo;
-        $this->userRepo = $userRepo;
-        $this->exportService = $exportService;
+        $this->bookRepo = $bookRepo;
+        $this->pageRepo = $pageRepo;
+        $this->chapterRepo = $chapterRepo;
         parent::__construct();
     }
 
     /**
      * Display a listing of the book.
+     *
      * @return Response
      */
     public function index()
     {
-        $books = $this->entityRepo->getAllPaginated('book', 18);
-        $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
-        $popular = $this->entityRepo->getPopular('book', 4, 0);
-        $new = $this->entityRepo->getRecentlyCreated('book', 4, 0);
-        $booksViewType = setting()->getUser($this->currentUser, 'books_view_type', config('app.views.books', 'list'));
-        $this->setPageTitle(trans('entities.books'));
-        return view('books/index', [
-            'books' => $books,
-            'recents' => $recents,
-            'popular' => $popular,
-            'new' => $new,
-            'booksViewType' => $booksViewType
-        ]);
+        $books = $this->bookRepo->getAllPaginated(10);
+        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(4, 0) : false;
+        $popular = $this->bookRepo->getPopular(4, 0);
+        $this->setPageTitle('Books');
+        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
     }
 
     /**
      * Show the form for creating a new book.
+     *
      * @return Response
      */
     public function create()
     {
-        $this->checkPermission('book-create-all');
-        $this->setPageTitle(trans('entities.books_create'));
+        $this->checkPermission('book-create');
+        $this->setPageTitle('Create New Book');
         return view('books/create');
     }
 
@@ -70,66 +68,70 @@ class BookController extends Controller
      */
     public function store(Request $request)
     {
-        $this->checkPermission('book-create-all');
+        $this->checkPermission('book-create');
         $this->validate($request, [
-            'name' => 'required|string|max:255',
+            'name'        => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
-        $book = $this->entityRepo->createFromInput('book', $request->all());
+        $book = $this->bookRepo->newFromInput($request->all());
+        $book->slug = $this->bookRepo->findSuitableSlug($book->name);
+        $book->created_by = Auth::user()->id;
+        $book->updated_by = Auth::user()->id;
+        $book->save();
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.
+     *
      * @param $slug
      * @return Response
      */
     public function show($slug)
     {
-        $book = $this->entityRepo->getBySlug('book', $slug);
-        $this->checkOwnablePermission('book-view', $book);
-        $bookChildren = $this->entityRepo->getBookChildren($book);
+        $book = $this->bookRepo->getBySlug($slug);
+        $bookChildren = $this->bookRepo->getChildren($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());
-        return view('books/show', [
-            'book' => $book,
-            'current' => $book,
-            'bookChildren' => $bookChildren,
-            'activity' => Activity::entityActivity($book, 20, 0)
-        ]);
+        return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
     }
 
     /**
      * Show the form for editing the specified book.
+     *
      * @param $slug
      * @return Response
      */
     public function edit($slug)
     {
-        $book = $this->entityRepo->getBySlug('book', $slug);
-        $this->checkOwnablePermission('book-update', $book);
-        $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
+        $this->checkPermission('book-update');
+        $book = $this->bookRepo->getBySlug($slug);
+        $this->setPageTitle('Edit Book ' . $book->getShortName());
         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * Update the specified book in storage.
+     *
      * @param  Request $request
      * @param          $slug
      * @return Response
      */
     public function update(Request $request, $slug)
     {
-        $book = $this->entityRepo->getBySlug('book', $slug);
-        $this->checkOwnablePermission('book-update', $book);
+        $this->checkPermission('book-update');
+        $book = $this->bookRepo->getBySlug($slug);
         $this->validate($request, [
-            'name' => 'required|string|max:255',
+            'name'        => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
-         $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
-         Activity::add($book, 'book_update', $book->id);
-         return redirect($book->getUrl());
+        $book->fill($request->all());
+        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
+        $book->updated_by = Auth::user()->id;
+        $book->save();
+        Activity::add($book, 'book_update', $book->id);
+        return redirect($book->getUrl());
     }
 
     /**
@@ -139,9 +141,9 @@ class BookController extends Controller
      */
     public function showDelete($bookSlug)
     {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('book-delete', $book);
-        $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));
+        $this->checkPermission('book-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->setPageTitle('Delete Book ' . $book->getShortName());
         return view('books/delete', ['book' => $book, 'current' => $book]);
     }
 
@@ -152,11 +154,11 @@ class BookController extends Controller
      */
     public function sort($bookSlug)
     {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
-        $bookChildren = $this->entityRepo->getBookChildren($book, true);
-        $books = $this->entityRepo->getAll('book', false, 'update');
-        $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
+        $this->checkPermission('book-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $bookChildren = $this->bookRepo->getChildren($book);
+        $books = $this->bookRepo->getAll();
+        $this->setPageTitle('Sort Book ' . $book->getShortName());
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
     }
 
@@ -168,161 +170,70 @@ class BookController extends Controller
      */
     public function getSortItem($bookSlug)
     {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $bookChildren = $this->entityRepo->getBookChildren($book);
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $bookChildren = $this->bookRepo->getChildren($book);
         return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
     }
 
     /**
      * Saves an array of sort mapping to pages and chapters.
+     *
      * @param  string $bookSlug
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function saveSort($bookSlug, Request $request)
     {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
+        $this->checkPermission('book-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
 
         // Return if no map sent
-        if (!$request->filled('sort-tree')) {
+        if (!$request->has('sort-tree')) {
             return redirect($book->getUrl());
         }
 
+        $sortedBooks = [];
         // Sort pages and chapters
-        $sortMap = collect(json_decode($request->get('sort-tree')));
-        $bookIdsInvolved = collect([$book->id]);
-
-        // Load models into map
-        $sortMap->each(function ($mapItem) use ($bookIdsInvolved) {
-            $mapItem->type = ($mapItem->type === 'page' ? 'page' : 'chapter');
-            $mapItem->model = $this->entityRepo->getById($mapItem->type, $mapItem->id);
-            // Store source and target books
-            $bookIdsInvolved->push(intval($mapItem->model->book_id));
-            $bookIdsInvolved->push(intval($mapItem->book));
-        });
-
-        // Get the books involved in the sort
-        $bookIdsInvolved = $bookIdsInvolved->unique()->toArray();
-        $booksInvolved = $this->entityRepo->getManyById('book', $bookIdsInvolved, false, true);
-        // Throw permission error if invalid ids or inaccessible books given.
-        if (count($bookIdsInvolved) !== count($booksInvolved)) {
-            $this->showPermissionError();
+        $sortMap = json_decode($request->get('sort-tree'));
+        $defaultBookId = $book->id;
+        foreach ($sortMap as $index => $bookChild) {
+            $id = $bookChild->id;
+            $isPage = $bookChild->type == 'page';
+            $bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId;
+            $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
+            $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
+            $model->priority = $index;
+            if ($isPage) {
+                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
+            }
+            $model->save();
+            if (!in_array($bookId, $sortedBooks)) {
+                $sortedBooks[] = $bookId;
+            }
         }
-        // Check permissions of involved books
-        $booksInvolved->each(function (Book $book) {
-             $this->checkOwnablePermission('book-update', $book);
-        });
 
-        // Perform the sort
-        $sortMap->each(function ($mapItem) {
-            $model = $mapItem->model;
-
-            $priorityChanged = intval($model->priority) !== intval($mapItem->sort);
-            $bookChanged = intval($model->book_id) !== intval($mapItem->book);
-            $chapterChanged = ($mapItem->type === 'page') && intval($model->chapter_id) !== $mapItem->parentChapter;
-
-            if ($bookChanged) {
-                $this->entityRepo->changeBook($mapItem->type, $mapItem->book, $model);
-            }
-            if ($chapterChanged) {
-                $model->chapter_id = intval($mapItem->parentChapter);
-                $model->save();
-            }
-            if ($priorityChanged) {
-                $model->priority = intval($mapItem->sort);
-                $model->save();
-            }
-        });
-
-        // Rebuild permissions and add activity for involved books.
-        $booksInvolved->each(function (Book $book) {
-            $this->entityRepo->buildJointPermissionsForBook($book);
-            Activity::add($book, 'book_sort', $book->id);
-        });
+        // Add activity for books
+        foreach ($sortedBooks as $bookId) {
+            $updatedBook = $this->bookRepo->getById($bookId);
+            Activity::add($updatedBook, 'book_sort', $updatedBook->id);
+        }
 
         return redirect($book->getUrl());
     }
 
     /**
      * Remove the specified book from storage.
+     *
      * @param $bookSlug
      * @return Response
      */
     public function destroy($bookSlug)
     {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('book-delete', $book);
+        $this->checkPermission('book-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
         Activity::addMessage('book_delete', 0, $book->name);
-        $this->entityRepo->destroyBook($book);
+        Activity::removeEntity($book);
+        $this->bookRepo->destroyBySlug($bookSlug);
         return redirect('/books');
     }
-
-    /**
-     * Show the Restrictions view.
-     * @param $bookSlug
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showRestrict($bookSlug)
-    {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $book);
-        $roles = $this->userRepo->getRestrictableRoles();
-        return view('books/restrictions', [
-            'book' => $book,
-            'roles' => $roles
-        ]);
-    }
-
-    /**
-     * Set the restrictions for this book.
-     * @param $bookSlug
-     * @param $bookSlug
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function restrict($bookSlug, Request $request)
-    {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $book);
-        $this->entityRepo->updateEntityPermissionsFromRequest($request, $book);
-        session()->flash('success', trans('entities.books_permissions_updated'));
-        return redirect($book->getUrl());
-    }
-
-    /**
-     * Export a book as a PDF file.
-     * @param string $bookSlug
-     * @return mixed
-     */
-    public function exportPdf($bookSlug)
-    {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $pdfContent = $this->exportService->bookToPdf($book);
-        return $this->downloadResponse($pdfContent, $bookSlug . '.pdf');
-    }
-
-    /**
-     * Export a book as a contained HTML file.
-     * @param string $bookSlug
-     * @return mixed
-     */
-    public function exportHtml($bookSlug)
-    {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $htmlContent = $this->exportService->bookToContainedHtml($book);
-        return $this->downloadResponse($htmlContent, $bookSlug . '.html');
-    }
-
-    /**
-     * Export a book as a plain text file.
-     * @param $bookSlug
-     * @return mixed
-     */
-    public function exportPlainText($bookSlug)
-    {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $textContent = $this->exportService->bookToPlainText($book);
-        return $this->downloadResponse($textContent, $bookSlug . '.txt');
-    }
 }

app/Http/Controllers/BookshelfController.php

@@ -1,242 +0,0 @@
-<?php namespace BookStack\Http\Controllers;
-
-use Activity;
-use BookStack\Auth\UserRepo;
-use BookStack\Entities\Bookshelf;
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Entities\ExportService;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Views;
-
-class BookshelfController extends Controller
-{
-
-    protected $entityRepo;
-    protected $userRepo;
-    protected $exportService;
-
-    /**
-     * BookController constructor.
-     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
-     * @param UserRepo $userRepo
-     * @param \BookStack\Entities\ExportService $exportService
-     */
-    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)
-    {
-        $this->entityRepo = $entityRepo;
-        $this->userRepo = $userRepo;
-        $this->exportService = $exportService;
-        parent::__construct();
-    }
-
-    /**
-     * Display a listing of the book.
-     * @return Response
-     */
-    public function index()
-    {
-        $shelves = $this->entityRepo->getAllPaginated('bookshelf', 18);
-        $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('bookshelf', 4, 0) : false;
-        $popular = $this->entityRepo->getPopular('bookshelf', 4, 0);
-        $new = $this->entityRepo->getRecentlyCreated('bookshelf', 4, 0);
-        $shelvesViewType = setting()->getUser($this->currentUser, 'bookshelves_view_type', config('app.views.bookshelves', 'grid'));
-
-        $this->setPageTitle(trans('entities.shelves'));
-        return view('shelves/index', [
-            'shelves' => $shelves,
-            'recents' => $recents,
-            'popular' => $popular,
-            'new' => $new,
-            'shelvesViewType' => $shelvesViewType
-        ]);
-    }
-
-    /**
-     * Show the form for creating a new bookshelf.
-     * @return Response
-     */
-    public function create()
-    {
-        $this->checkPermission('bookshelf-create-all');
-        $books = $this->entityRepo->getAll('book', false, 'update');
-        $this->setPageTitle(trans('entities.shelves_create'));
-        return view('shelves/create', ['books' => $books]);
-    }
-
-    /**
-     * Store a newly created bookshelf in storage.
-     * @param  Request $request
-     * @return Response
-     */
-    public function store(Request $request)
-    {
-        $this->checkPermission('bookshelf-create-all');
-        $this->validate($request, [
-            'name' => 'required|string|max:255',
-            'description' => 'string|max:1000',
-        ]);
-
-        $bookshelf = $this->entityRepo->createFromInput('bookshelf', $request->all());
-        $this->entityRepo->updateShelfBooks($bookshelf, $request->get('books', ''));
-        Activity::add($bookshelf, 'bookshelf_create');
-
-        return redirect($bookshelf->getUrl());
-    }
-
-
-    /**
-     * Display the specified bookshelf.
-     * @param String $slug
-     * @return Response
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function show(string $slug)
-    {
-        $bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
-        $this->checkOwnablePermission('book-view', $bookshelf);
-
-        $books = $this->entityRepo->getBookshelfChildren($bookshelf);
-        Views::add($bookshelf);
-
-        $this->setPageTitle($bookshelf->getShortName());
-        return view('shelves/show', [
-            'shelf' => $bookshelf,
-            'books' => $books,
-            'activity' => Activity::entityActivity($bookshelf, 20, 0)
-        ]);
-    }
-
-    /**
-     * Show the form for editing the specified bookshelf.
-     * @param $slug
-     * @return Response
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function edit(string $slug)
-    {
-        $bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
-        $this->checkOwnablePermission('bookshelf-update', $bookshelf);
-
-        $shelfBooks = $this->entityRepo->getBookshelfChildren($bookshelf);
-        $shelfBookIds = $shelfBooks->pluck('id');
-        $books = $this->entityRepo->getAll('book', false, 'update');
-        $books = $books->filter(function ($book) use ($shelfBookIds) {
-             return !$shelfBookIds->contains($book->id);
-        });
-
-        $this->setPageTitle(trans('entities.shelves_edit_named', ['name' => $bookshelf->getShortName()]));
-        return view('shelves/edit', [
-            'shelf' => $bookshelf,
-            'books' => $books,
-            'shelfBooks' => $shelfBooks,
-        ]);
-    }
-
-
-    /**
-     * Update the specified bookshelf in storage.
-     * @param  Request $request
-     * @param string $slug
-     * @return Response
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function update(Request $request, string $slug)
-    {
-        $shelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
-        $this->checkOwnablePermission('bookshelf-update', $shelf);
-        $this->validate($request, [
-            'name' => 'required|string|max:255',
-            'description' => 'string|max:1000',
-        ]);
-
-         $shelf = $this->entityRepo->updateFromInput('bookshelf', $shelf, $request->all());
-         $this->entityRepo->updateShelfBooks($shelf, $request->get('books', ''));
-         Activity::add($shelf, 'bookshelf_update');
-
-         return redirect($shelf->getUrl());
-    }
-
-
-    /**
-     * Shows the page to confirm deletion
-     * @param $slug
-     * @return \Illuminate\View\View
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function showDelete(string $slug)
-    {
-        $bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
-        $this->checkOwnablePermission('bookshelf-delete', $bookshelf);
-
-        $this->setPageTitle(trans('entities.shelves_delete_named', ['name' => $bookshelf->getShortName()]));
-        return view('shelves/delete', ['shelf' => $bookshelf]);
-    }
-
-    /**
-     * Remove the specified bookshelf from storage.
-     * @param string $slug
-     * @return Response
-     * @throws \BookStack\Exceptions\NotFoundException
-     * @throws \Throwable
-     */
-    public function destroy(string $slug)
-    {
-        $bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug); /** @var $bookshelf Bookshelf */
-        $this->checkOwnablePermission('bookshelf-delete', $bookshelf);
-        Activity::addMessage('bookshelf_delete', 0, $bookshelf->name);
-        $this->entityRepo->destroyBookshelf($bookshelf);
-        return redirect('/shelves');
-    }
-
-    /**
-     * Show the Restrictions view.
-     * @param $slug
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function showRestrict(string $slug)
-    {
-        $bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug);
-        $this->checkOwnablePermission('restrictions-manage', $bookshelf);
-
-        $roles = $this->userRepo->getRestrictableRoles();
-        return view('shelves.restrictions', [
-            'shelf' => $bookshelf,
-            'roles' => $roles
-        ]);
-    }
-
-    /**
-     * Set the restrictions for this bookshelf.
-     * @param $slug
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function restrict(string $slug, Request $request)
-    {
-        $bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug);
-        $this->checkOwnablePermission('restrictions-manage', $bookshelf);
-
-        $this->entityRepo->updateEntityPermissionsFromRequest($request, $bookshelf);
-        session()->flash('success', trans('entities.shelves_permissions_updated'));
-        return redirect($bookshelf->getUrl());
-    }
-
-    /**
-     * Copy the permissions of a bookshelf to the child books.
-     * @param string $slug
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function copyPermissions(string $slug)
-    {
-        $bookshelf = $this->entityRepo->getBySlug('bookshelf', $slug);
-        $this->checkOwnablePermission('restrictions-manage', $bookshelf);
-
-        $updateCount = $this->entityRepo->copyBookshelfPermissions($bookshelf);
-        session()->flash('success', trans('entities.shelves_copy_permission_success', ['count' => $updateCount]));
-        return redirect($bookshelf->getUrl());
-    }
-}

app/Http/Controllers/ChapterController.php

@@ -1,34 +1,36 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
 use Activity;
-use BookStack\Auth\UserRepo;
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Entities\ExportService;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
+
+use Illuminate\Support\Facades\Auth;
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
 use Views;
 
 class ChapterController extends Controller
 {
 
-    protected $userRepo;
-    protected $entityRepo;
-    protected $exportService;
+    protected $bookRepo;
+    protected $chapterRepo;
 
     /**
      * ChapterController constructor.
-     * @param EntityRepo $entityRepo
-     * @param UserRepo $userRepo
-     * @param \BookStack\Entities\ExportService $exportService
+     * @param $bookRepo
+     * @param $chapterRepo
      */
-    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)
+    public function __construct(BookRepo $bookRepo, ChapterRepo $chapterRepo)
     {
-        $this->entityRepo = $entityRepo;
-        $this->userRepo = $userRepo;
-        $this->exportService = $exportService;
+        $this->bookRepo = $bookRepo;
+        $this->chapterRepo = $chapterRepo;
         parent::__construct();
     }
 
+
     /**
      * Show the form for creating a new chapter.
      * @param $bookSlug
@@ -36,9 +38,9 @@ class ChapterController extends Controller
      */
     public function create($bookSlug)
     {
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('chapter-create', $book);
-        $this->setPageTitle(trans('entities.chapters_create'));
+        $this->checkPermission('chapter-create');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->setPageTitle('Create New Chapter');
         return view('chapters/create', ['book' => $book, 'current' => $book]);
     }
 
@@ -50,16 +52,18 @@ class ChapterController extends Controller
      */
     public function store($bookSlug, Request $request)
     {
+        $this->checkPermission('chapter-create');
         $this->validate($request, [
             'name' => 'required|string|max:255'
         ]);
 
-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $this->checkOwnablePermission('chapter-create', $book);
-
-        $input = $request->all();
-        $input['priority'] = $this->entityRepo->getNewBookPriority($book);
-        $chapter = $this->entityRepo->createFromInput('chapter', $input, $book);
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->newFromInput($request->all());
+        $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id);
+        $chapter->priority = $this->bookRepo->getNewPriority($book);
+        $chapter->created_by = auth()->user()->id;
+        $chapter->updated_by = auth()->user()->id;
+        $book->chapters()->save($chapter);
         Activity::add($chapter, 'chapter_create', $book->id);
         return redirect($chapter->getUrl());
     }
@@ -72,19 +76,12 @@ class ChapterController extends Controller
      */
     public function show($bookSlug, $chapterSlug)
     {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->checkOwnablePermission('chapter-view', $chapter);
-        $sidebarTree = $this->entityRepo->getBookChildren($chapter->book);
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($chapter);
         $this->setPageTitle($chapter->getShortName());
-        $pages = $this->entityRepo->getChapterChildren($chapter);
-        return view('chapters/show', [
-            'book' => $chapter->book,
-            'chapter' => $chapter,
-            'current' => $chapter,
-            'sidebarTree' => $sidebarTree,
-            'pages' => $pages
-        ]);
+        return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter, 'sidebarTree' => $sidebarTree]);
     }
 
     /**
@@ -95,10 +92,11 @@ class ChapterController extends Controller
      */
     public function edit($bookSlug, $chapterSlug)
     {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->checkOwnablePermission('chapter-update', $chapter);
-        $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));
-        return view('chapters/edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
+        $this->checkPermission('chapter-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        $this->setPageTitle('Edit Chapter' . $chapter->getShortName());
+        return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
@@ -107,15 +105,17 @@ class ChapterController extends Controller
      * @param          $bookSlug
      * @param          $chapterSlug
      * @return Response
-     * @throws \BookStack\Exceptions\NotFoundException
      */
     public function update(Request $request, $bookSlug, $chapterSlug)
     {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->checkOwnablePermission('chapter-update', $chapter);
-
-        $this->entityRepo->updateFromInput('chapter', $chapter, $request->all());
-        Activity::add($chapter, 'chapter_update', $chapter->book->id);
+        $this->checkPermission('chapter-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        $chapter->fill($request->all());
+        $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->id);
+        $chapter->updated_by = auth()->user()->id;
+        $chapter->save();
+        Activity::add($chapter, 'chapter_update', $book->id);
         return redirect($chapter->getUrl());
     }
 
@@ -127,10 +127,11 @@ class ChapterController extends Controller
      */
     public function showDelete($bookSlug, $chapterSlug)
     {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->checkOwnablePermission('chapter-delete', $chapter);
-        $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));
-        return view('chapters/delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
+        $this->checkPermission('chapter-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        $this->setPageTitle('Delete Chapter' . $chapter->getShortName());
+        return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
@@ -141,141 +142,11 @@ class ChapterController extends Controller
      */
     public function destroy($bookSlug, $chapterSlug)
     {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $book = $chapter->book;
-        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkPermission('chapter-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         Activity::addMessage('chapter_delete', $book->id, $chapter->name);
-        $this->entityRepo->destroyChapter($chapter);
+        $this->chapterRepo->destroy($chapter);
         return redirect($book->getUrl());
     }
-
-    /**
-     * Show the page for moving a chapter.
-     * @param $bookSlug
-     * @param $chapterSlug
-     * @return mixed
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function showMove($bookSlug, $chapterSlug)
-    {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
-        $this->checkOwnablePermission('chapter-update', $chapter);
-        return view('chapters/move', [
-            'chapter' => $chapter,
-            'book' => $chapter->book
-        ]);
-    }
-
-    /**
-     * Perform the move action for a chapter.
-     * @param $bookSlug
-     * @param $chapterSlug
-     * @param Request $request
-     * @return mixed
-     * @throws \BookStack\Exceptions\NotFoundException
-     */
-    public function move($bookSlug, $chapterSlug, Request $request)
-    {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->checkOwnablePermission('chapter-update', $chapter);
-
-        $entitySelection = $request->get('entity_selection', null);
-        if ($entitySelection === null || $entitySelection === '') {
-            return redirect($chapter->getUrl());
-        }
-
-        $stringExploded = explode(':', $entitySelection);
-        $entityType = $stringExploded[0];
-        $entityId = intval($stringExploded[1]);
-
-        $parent = false;
-
-        if ($entityType == 'book') {
-            $parent = $this->entityRepo->getById('book', $entityId);
-        }
-
-        if ($parent === false || $parent === null) {
-            session()->flash('error', trans('errors.selected_book_not_found'));
-            return redirect()->back();
-        }
-
-        $this->entityRepo->changeBook('chapter', $parent->id, $chapter, true);
-        Activity::add($chapter, 'chapter_move', $chapter->book->id);
-        session()->flash('success', trans('entities.chapter_move_success', ['bookName' => $parent->name]));
-
-        return redirect($chapter->getUrl());
-    }
-
-    /**
-     * Show the Restrictions view.
-     * @param $bookSlug
-     * @param $chapterSlug
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showRestrict($bookSlug, $chapterSlug)
-    {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $chapter);
-        $roles = $this->userRepo->getRestrictableRoles();
-        return view('chapters/restrictions', [
-            'chapter' => $chapter,
-            'roles' => $roles
-        ]);
-    }
-
-    /**
-     * Set the restrictions for this chapter.
-     * @param $bookSlug
-     * @param $chapterSlug
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function restrict($bookSlug, $chapterSlug, Request $request)
-    {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $chapter);
-        $this->entityRepo->updateEntityPermissionsFromRequest($request, $chapter);
-        session()->flash('success', trans('entities.chapters_permissions_success'));
-        return redirect($chapter->getUrl());
-    }
-
-    /**
-     * Exports a chapter to pdf .
-     * @param string $bookSlug
-     * @param string $chapterSlug
-     * @return \Illuminate\Http\Response
-     */
-    public function exportPdf($bookSlug, $chapterSlug)
-    {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $pdfContent = $this->exportService->chapterToPdf($chapter);
-        return $this->downloadResponse($pdfContent, $chapterSlug . '.pdf');
-    }
-
-    /**
-     * Export a chapter to a self-contained HTML file.
-     * @param string $bookSlug
-     * @param string $chapterSlug
-     * @return \Illuminate\Http\Response
-     */
-    public function exportHtml($bookSlug, $chapterSlug)
-    {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $containedHtml = $this->exportService->chapterToContainedHtml($chapter);
-        return $this->downloadResponse($containedHtml, $chapterSlug . '.html');
-    }
-
-    /**
-     * Export a chapter to a simple plaintext .txt file.
-     * @param string $bookSlug
-     * @param string $chapterSlug
-     * @return \Illuminate\Http\Response
-     */
-    public function exportPlainText($bookSlug, $chapterSlug)
-    {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-        $chapterText = $this->exportService->chapterToPlainText($chapter);
-        return $this->downloadResponse($chapterText, $chapterSlug . '.txt');
-    }
 }

app/Http/Controllers/CommentController.php

@@ -1,93 +0,0 @@
-<?php namespace BookStack\Http\Controllers;
-
-use Activity;
-use BookStack\Actions\CommentRepo;
-use BookStack\Entities\Repos\EntityRepo;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Http\Request;
-
-class CommentController extends Controller
-{
-    protected $entityRepo;
-    protected $commentRepo;
-
-    /**
-     * CommentController constructor.
-     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
-     * @param \BookStack\Actions\CommentRepo $commentRepo
-     */
-    public function __construct(EntityRepo $entityRepo, CommentRepo $commentRepo)
-    {
-        $this->entityRepo = $entityRepo;
-        $this->commentRepo = $commentRepo;
-        parent::__construct();
-    }
-
-    /**
-     * Save a new comment for a Page
-     * @param Request $request
-     * @param integer $pageId
-     * @param null|integer $commentId
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
-     */
-    public function savePageComment(Request $request, $pageId, $commentId = null)
-    {
-        $this->validate($request, [
-            'text' => 'required|string',
-            'html' => 'required|string',
-        ]);
-
-        try {
-            $page = $this->entityRepo->getById('page', $pageId, true);
-        } catch (ModelNotFoundException $e) {
-            return response('Not found', 404);
-        }
-
-        $this->checkOwnablePermission('page-view', $page);
-
-        // Prevent adding comments to draft pages
-        if ($page->draft) {
-            return $this->jsonError(trans('errors.cannot_add_comment_to_draft'), 400);
-        }
-
-        // Create a new comment.
-        $this->checkPermission('comment-create-all');
-        $comment = $this->commentRepo->create($page, $request->only(['html', 'text', 'parent_id']));
-        Activity::add($page, 'commented_on', $page->book->id);
-        return view('comments/comment', ['comment' => $comment]);
-    }
-
-    /**
-     * Update an existing comment.
-     * @param Request $request
-     * @param integer $commentId
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function update(Request $request, $commentId)
-    {
-        $this->validate($request, [
-            'text' => 'required|string',
-            'html' => 'required|string',
-        ]);
-
-        $comment = $this->commentRepo->getById($commentId);
-        $this->checkOwnablePermission('page-view', $comment->entity);
-        $this->checkOwnablePermission('comment-update', $comment);
-
-        $comment = $this->commentRepo->update($comment, $request->only(['html', 'text']));
-        return view('comments/comment', ['comment' => $comment]);
-    }
-
-    /**
-     * Delete a comment from the system.
-     * @param integer $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function destroy($id)
-    {
-        $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission('comment-delete', $comment);
-        $this->commentRepo->delete($comment);
-        return response()->json(['message' => trans('entities.comment_deleted')]);
-    }
-}

app/Http/Controllers/Controller.php

@@ -2,13 +2,14 @@
 
 namespace BookStack\Http\Controllers;
 
-use BookStack\Auth\User;
-use BookStack\Ownable;
+use HttpRequestException;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Http\Exceptions\HttpResponseException;
-use Illuminate\Http\Request;
+use Illuminate\Http\Exception\HttpResponseException;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+use BookStack\User;
 
 abstract class Controller extends BaseController
 {
@@ -28,21 +29,17 @@ abstract class Controller extends BaseController
      */
     public function __construct()
     {
-        $this->middleware(function ($request, $next) {
+        // Get a user instance for the current user
+        $user = auth()->user();
+        if (!$user) $user = User::getDefault();
 
-            // Get a user instance for the current user
-            $user = user();
+        // Share variables with views
+        view()->share('signedIn', auth()->check());
+        view()->share('currentUser', $user);
 
-            // Share variables with controllers
-            $this->currentUser = $user;
-            $this->signedIn = auth()->check();
-
-            // Share variables with views
-            view()->share('signedIn', $this->signedIn);
-            view()->share('currentUser', $user);
-
-            return $next($request);
-        });
+        // Share variables with controllers
+        $this->currentUser = $user;
+        $this->signedIn = auth()->check();
     }
 
     /**
@@ -51,9 +48,7 @@ abstract class Controller extends BaseController
      */
     protected function preventAccessForDemoUsers()
     {
-        if (config('app.env') === 'demo') {
-            $this->showPermissionError();
-        }
+        if (config('app.env') === 'demo') $this->showPermissionError();
     }
 
     /**
@@ -66,46 +61,30 @@ abstract class Controller extends BaseController
     }
 
     /**
-     * On a permission error redirect to home and display.
+     * On a permission error redirect to home and display
      * the error as a notification.
      */
     protected function showPermissionError()
     {
-        if (request()->wantsJson()) {
-            $response = response()->json(['error' => trans('errors.permissionJson')], 403);
-        } else {
-            $response = redirect('/');
-            session()->flash('error', trans('errors.permission'));
-        }
-
-        throw new HttpResponseException($response);
+        Session::flash('error', trans('errors.permission'));
+        throw new HttpResponseException(
+            redirect('/')
+        );
     }
 
     /**
      * Checks for a permission.
-     * @param string $permissionName
+     *
+     * @param $permissionName
      * @return bool|\Illuminate\Http\RedirectResponse
      */
     protected function checkPermission($permissionName)
     {
-        if (!user() || !user()->can($permissionName)) {
+        if (!$this->currentUser || !$this->currentUser->can($permissionName)) {
             $this->showPermissionError();
         }
-        return true;
-    }
 
-    /**
-     * Check the current user's permissions against an ownable item.
-     * @param $permission
-     * @param Ownable $ownable
-     * @return bool
-     */
-    protected function checkOwnablePermission($permission, Ownable $ownable)
-    {
-        if (userCan($permission, $ownable)) {
-            return true;
-        }
-        return $this->showPermissionError();
+        return true;
     }
 
     /**
@@ -117,51 +96,8 @@ abstract class Controller extends BaseController
     protected function checkPermissionOr($permissionName, $callback)
     {
         $callbackResult = $callback();
-        if ($callbackResult === false) {
-            $this->checkPermission($permissionName);
-        }
+        if ($callbackResult === false) $this->checkPermission($permissionName);
         return true;
     }
 
-    /**
-     * Send back a json error message.
-     * @param string $messageText
-     * @param int $statusCode
-     * @return mixed
-     */
-    protected function jsonError($messageText = "", $statusCode = 500)
-    {
-        return response()->json(['message' => $messageText], $statusCode);
-    }
-
-    /**
-     * Create the response for when a request fails validation.
-     * @param  \Illuminate\Http\Request  $request
-     * @param  array  $errors
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    protected function buildFailedValidationResponse(Request $request, array $errors)
-    {
-        if ($request->expectsJson()) {
-            return response()->json(['validation' => $errors], 422);
-        }
-
-        return redirect()->to($this->getRedirectUrl())
-            ->withInput($request->input())
-            ->withErrors($errors, $this->errorBag());
-    }
-
-    /**
-     * Create a response that forces a download in the browser.
-     * @param string $content
-     * @param string $fileName
-     * @return \Illuminate\Http\Response
-     */
-    protected function downloadResponse(string $content, string $fileName)
-    {
-        return response()->make($content, 200, [
-            'Content-Type'        => 'application/octet-stream',
-            'Content-Disposition' => 'attachment; filename="' . $fileName . '"'
-        ]);
-    }
 }

app/Http/Controllers/HomeController.php

@@ -1,134 +1,41 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
 use Activity;
-use BookStack\Entities\Repos\EntityRepo;
-use Illuminate\Http\Response;
+use Illuminate\Http\Request;
+
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
 use Views;
 
 class HomeController extends Controller
 {
-    protected $entityRepo;
+
+    protected $activityService;
+    protected $bookRepo;
 
     /**
      * HomeController constructor.
-     * @param EntityRepo $entityRepo
+     * @param BookRepo        $bookRepo
      */
-    public function __construct(EntityRepo $entityRepo)
+    public function __construct(BookRepo $bookRepo)
     {
-        $this->entityRepo = $entityRepo;
+        $this->bookRepo = $bookRepo;
         parent::__construct();
     }
 
 
     /**
      * Display the homepage.
+     *
      * @return Response
      */
     public function index()
     {
-        $activity = Activity::latest(10);
-        $draftPages = $this->signedIn ? $this->entityRepo->getUserDraftPages(6) : [];
-        $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
-        $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);
-        $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
-
-        $homepageOptions = ['default', 'books', 'bookshelves', 'page'];
-        $homepageOption = setting('app-homepage-type', 'default');
-        if (!in_array($homepageOption, $homepageOptions)) {
-            $homepageOption = 'default';
-        }
-
-        $commonData = [
-            'activity' => $activity,
-            'recents' => $recents,
-            'recentlyUpdatedPages' => $recentlyUpdatedPages,
-            'draftPages' => $draftPages,
-        ];
-
-        if ($homepageOption === 'bookshelves') {
-            $shelves = $this->entityRepo->getAllPaginated('bookshelf', 18);
-            $shelvesViewType = setting()->getUser($this->currentUser, 'bookshelves_view_type', config('app.views.bookshelves', 'grid'));
-            $data = array_merge($commonData, ['shelves' => $shelves, 'shelvesViewType' => $shelvesViewType]);
-            return view('common.home-shelves', $data);
-        }
-
-        if ($homepageOption === 'books') {
-            $books = $this->entityRepo->getAllPaginated('book', 18);
-            $booksViewType = setting()->getUser($this->currentUser, 'books_view_type', config('app.views.books', 'list'));
-            $data = array_merge($commonData, ['books' => $books, 'booksViewType' => $booksViewType]);
-            return view('common.home-book', $data);
-        }
-
-        if ($homepageOption === 'page') {
-            $homepageSetting = setting('app-homepage', '0:');
-            $id = intval(explode(':', $homepageSetting)[0]);
-            $customHomepage = $this->entityRepo->getById('page', $id, false, true);
-            $this->entityRepo->renderPage($customHomepage, true);
-            return view('common.home-custom', array_merge($commonData, ['customHomepage' => $customHomepage]));
-        }
-
-        return view('common.home', $commonData);
+        $activity = Activity::latest();
+        $recents = $this->signedIn ? Views::getUserRecentlyViewed(10, 0) : $this->bookRepo->getLatest(10);
+        return view('home', ['activity' => $activity, 'recents' => $recents]);
     }
 
-    /**
-     * Get a js representation of the current translations
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
-     * @throws \Exception
-     */
-    public function getTranslations()
-    {
-        $locale = app()->getLocale();
-        $cacheKey = 'GLOBAL_TRANSLATIONS_' . $locale;
-
-        if (cache()->has($cacheKey) && config('app.env') !== 'development') {
-            $resp = cache($cacheKey);
-        } else {
-            $translations = [
-                // Get only translations which might be used in JS
-                'common' => trans('common'),
-                'components' => trans('components'),
-                'entities' => trans('entities'),
-                'errors' => trans('errors')
-            ];
-            $resp = 'window.translations = ' . json_encode($translations);
-            cache()->put($cacheKey, $resp, 120);
-        }
-
-        return response($resp, 200, [
-            'Content-Type' => 'application/javascript'
-        ]);
-    }
-
-    /**
-     * Get custom head HTML, Used in ajax calls to show in editor.
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function customHeadContent()
-    {
-        return view('partials/custom-head-content');
-    }
-
-    /**
-     * Show the view for /robots.txt
-     * @return $this
-     */
-    public function getRobots()
-    {
-        $sitePublic = setting('app-public', false);
-        $allowRobots = config('app.allow_robots');
-        if ($allowRobots === null) {
-            $allowRobots = $sitePublic;
-        }
-        return response()
-            ->view('common/robots', ['allowRobots' => $allowRobots])
-            ->header('Content-Type', 'text/plain');
-    }
-
-    /**
-     * Show the route for 404 responses.
-     */
-    public function getNotFound()
-    {
-        return response()->view('errors/404', [], 404);
-    }
 }

app/Http/Controllers/ImageController.php

@@ -1,12 +1,16 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
-use BookStack\Entities\Repos\EntityRepo;
 use BookStack\Exceptions\ImageUploadException;
-use BookStack\Repos\PageRepo;
-use BookStack\Uploads\Image;
-use BookStack\Uploads\ImageRepo;
+use BookStack\Repos\ImageRepo;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Intervention\Image\Facades\Image as ImageTool;
+use Illuminate\Support\Facades\DB;
+use BookStack\Image;
+use BookStack\Repos\PageRepo;
 
 class ImageController extends Controller
 {
@@ -16,8 +20,8 @@ class ImageController extends Controller
 
     /**
      * ImageController constructor.
-     * @param Image $image
-     * @param File $file
+     * @param Image     $image
+     * @param File      $file
      * @param ImageRepo $imageRepo
      */
     public function __construct(Image $image, File $file, ImageRepo $imageRepo)
@@ -28,24 +32,9 @@ class ImageController extends Controller
         parent::__construct();
     }
 
-    /**
-     * Provide an image file from storage.
-     * @param string $path
-     * @return mixed
-     */
-    public function showImage(string $path)
-    {
-        $path = storage_path('uploads/images/' . $path);
-        if (!file_exists($path)) {
-            abort(404);
-        }
-
-        return response()->file($path);
-    }
 
     /**
      * Get all images for a specific type, Paginated
-     * @param string $type
      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      */
@@ -55,24 +44,6 @@ class ImageController extends Controller
         return response()->json($imgData);
     }
 
-    /**
-     * Search through images within a particular type.
-     * @param $type
-     * @param int $page
-     * @param Request $request
-     * @return mixed
-     */
-    public function searchByType(Request $request, $type, $page = 0)
-    {
-        $this->validate($request, [
-            'term' => 'required|string'
-        ]);
-
-        $searchTerm = $request->get('term');
-        $imgData = $this->imageRepo->searchPaginatedByType($type, $searchTerm, $page, 24);
-        return response()->json($imgData);
-    }
-
     /**
      * Get all images for a user.
      * @param int $page
@@ -84,78 +55,24 @@ class ImageController extends Controller
         return response()->json($imgData);
     }
 
-    /**
-     * Get gallery images with a specific filter such as book or page
-     * @param $filter
-     * @param int $page
-     * @param Request $request
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
-     */
-    public function getGalleryFiltered(Request $request, $filter, $page = 0)
-    {
-        $this->validate($request, [
-            'page_id' => 'required|integer'
-        ]);
-
-        $validFilters = collect(['page', 'book']);
-        if (!$validFilters->contains($filter)) {
-            return response('Invalid filter', 500);
-        }
-
-        $pageId = $request->get('page_id');
-        $imgData = $this->imageRepo->getGalleryFiltered(strtolower($filter), $pageId, $page, 24);
-
-        return response()->json($imgData);
-    }
 
     /**
      * Handles image uploads for use on pages.
-     * @param string $type
+     * @param string  $type
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
-     * @throws \Exception
      */
     public function uploadByType($type, Request $request)
     {
-        $this->checkPermission('image-create-all');
+        $this->checkPermission('image-create');
         $this->validate($request, [
-            'file' => 'is_image'
+            'file' => 'image|mimes:jpeg,gif,png'
         ]);
 
-        if (!$this->imageRepo->isValidType($type)) {
-            return $this->jsonError(trans('errors.image_upload_type_error'));
-        }
-
         $imageUpload = $request->file('file');
 
         try {
-            $uploadedTo = $request->get('uploaded_to', 0);
-            $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
-        } catch (ImageUploadException $e) {
-            return response($e->getMessage(), 500);
-        }
-
-
-        return response()->json($image);
-    }
-
-    /**
-     * Upload a drawing to the system.
-     * @param Request $request
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
-     */
-    public function uploadDrawing(Request $request)
-    {
-        $this->validate($request, [
-            'image' => 'required|string',
-            'uploaded_to' => 'required|integer'
-        ]);
-        $this->checkPermission('image-create-all');
-        $imageBase64Data = $request->get('image');
-
-        try {
-            $uploadedTo = $request->get('uploaded_to', 0);
-            $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
+            $image = $this->imageRepo->saveNew($imageUpload, $type);
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
         }
@@ -163,23 +80,6 @@ class ImageController extends Controller
         return response()->json($image);
     }
 
-    /**
-     * Get the content of an image based64 encoded.
-     * @param $id
-     * @return \Illuminate\Http\JsonResponse|mixed
-     */
-    public function getBase64Image($id)
-    {
-        $image = $this->imageRepo->getById($id);
-        $imageData = $this->imageRepo->getImageData($image);
-        if ($imageData === null) {
-            return $this->jsonError("Image data could not be found");
-        }
-        return response()->json([
-            'content' => base64_encode($imageData)
-        ]);
-    }
-
     /**
      * Generate a sized thumbnail for an image.
      * @param $id
@@ -187,12 +87,10 @@ class ImageController extends Controller
      * @param $height
      * @param $crop
      * @return \Illuminate\Http\JsonResponse
-     * @throws ImageUploadException
-     * @throws \Exception
      */
     public function getThumbnail($id, $width, $height, $crop)
     {
-        $this->checkPermission('image-create-all');
+        $this->checkPermission('image-create');
         $image = $this->imageRepo->getById($id);
         $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false');
         return response()->json(['url' => $thumbnailUrl]);
@@ -200,48 +98,46 @@ class ImageController extends Controller
 
     /**
      * Update image details
-     * @param integer $imageId
+     * @param         $imageId
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
-     * @throws ImageUploadException
-     * @throws \Exception
      */
     public function update($imageId, Request $request)
     {
+        $this->checkPermission('image-update');
         $this->validate($request, [
             'name' => 'required|min:2|string'
         ]);
         $image = $this->imageRepo->getById($imageId);
-        $this->checkOwnablePermission('image-update', $image);
         $image = $this->imageRepo->updateImageDetails($image, $request->all());
         return response()->json($image);
     }
 
-    /**
-     * Show the usage of an image on pages.
-     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
-     * @param $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function usage(EntityRepo $entityRepo, $id)
-    {
-        $image = $this->imageRepo->getById($id);
-        $pageSearch = $entityRepo->searchForImage($image->url);
-        return response()->json($pageSearch);
-    }
 
     /**
      * Deletes an image and all thumbnail/image files
-     * @param int $id
+     * @param PageRepo $pageRepo
+     * @param Request  $request
+     * @param int      $id
      * @return \Illuminate\Http\JsonResponse
-     * @throws \Exception
      */
-    public function destroy($id)
+    public function destroy(PageRepo $pageRepo, Request $request, $id)
     {
+        $this->checkPermission('image-delete');
         $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission('image-delete', $image);
+
+        // Check if this image is used on any pages
+        $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
+        if (!$isForced) {
+            $pageSearch = $pageRepo->searchForImage($image->url);
+            if ($pageSearch !== false) {
+                return response()->json($pageSearch, 400);
+            }
+        }
 
         $this->imageRepo->destroyImage($image);
-        return response()->json(trans('components.images_deleted'));
+        return response()->json('Image Deleted');
     }
+
+
 }

app/Http/Controllers/PageController.php

@@ -1,150 +1,79 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
 use Activity;
-use BookStack\Auth\UserRepo;
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Entities\ExportService;
-use BookStack\Entities\Repos\PageRepo;
-use BookStack\Exceptions\NotFoundException;
-use GatherContent\Htmldiff\Htmldiff;
+use BookStack\Services\ExportService;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
+
+use Illuminate\Support\Facades\Auth;
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
 use Views;
 
 class PageController extends Controller
 {
 
     protected $pageRepo;
+    protected $bookRepo;
+    protected $chapterRepo;
     protected $exportService;
-    protected $userRepo;
 
     /**
      * PageController constructor.
-     * @param \BookStack\Entities\Repos\PageRepo $pageRepo
-     * @param \BookStack\Entities\ExportService $exportService
-     * @param UserRepo $userRepo
+     * @param PageRepo      $pageRepo
+     * @param BookRepo      $bookRepo
+     * @param ChapterRepo   $chapterRepo
+     * @param ExportService $exportService
      */
-    public function __construct(PageRepo $pageRepo, ExportService $exportService, UserRepo $userRepo)
+    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService)
     {
         $this->pageRepo = $pageRepo;
+        $this->bookRepo = $bookRepo;
+        $this->chapterRepo = $chapterRepo;
         $this->exportService = $exportService;
-        $this->userRepo = $userRepo;
         parent::__construct();
     }
 
     /**
      * Show the form for creating a new page.
-     * @param string $bookSlug
-     * @param string $chapterSlug
+     *
+     * @param      $bookSlug
+     * @param bool $chapterSlug
      * @return Response
      * @internal param bool $pageSlug
-     * @throws NotFoundException
      */
-    public function create($bookSlug, $chapterSlug = null)
+    public function create($bookSlug, $chapterSlug = false)
     {
-        if ($chapterSlug !== null) {
-            $chapter = $this->pageRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-            $book = $chapter->book;
-        } else {
-            $chapter = null;
-            $book = $this->pageRepo->getBySlug('book', $bookSlug);
-        }
-
-        $parent = $chapter ? $chapter : $book;
-        $this->checkOwnablePermission('page-create', $parent);
-
-        // Redirect to draft edit screen if signed in
-        if ($this->signedIn) {
-            $draft = $this->pageRepo->getDraftPage($book, $chapter);
-            return redirect($draft->getUrl());
-        }
-
-        // Otherwise show the edit view if they're a guest
-        $this->setPageTitle(trans('entities.pages_new'));
-        return view('pages/guest-create', ['parent' => $parent]);
+        $this->checkPermission('page-create');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
+        $this->setPageTitle('Create New Page');
+        return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
     }
 
     /**
-     * Create a new page as a guest user.
-     * @param Request $request
-     * @param string $bookSlug
-     * @param string|null $chapterSlug
-     * @return mixed
-     * @throws NotFoundException
-     */
-    public function createAsGuest(Request $request, $bookSlug, $chapterSlug = null)
-    {
-        $this->validate($request, [
-            'name' => 'required|string|max:255'
-        ]);
-
-        if ($chapterSlug !== null) {
-            $chapter = $this->pageRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
-            $book = $chapter->book;
-        } else {
-            $chapter = null;
-            $book = $this->pageRepo->getBySlug('book', $bookSlug);
-        }
-
-        $parent = $chapter ? $chapter : $book;
-        $this->checkOwnablePermission('page-create', $parent);
-
-        $page = $this->pageRepo->getDraftPage($book, $chapter);
-        $this->pageRepo->publishPageDraft($page, [
-            'name' => $request->get('name'),
-            'html' => ''
-        ]);
-        return redirect($page->getUrl('/edit'));
-    }
-
-    /**
-     * Show form to continue editing a draft page.
-     * @param string $bookSlug
-     * @param int $pageId
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function editDraft($bookSlug, $pageId)
-    {
-        $draft = $this->pageRepo->getById('page', $pageId, true);
-        $this->checkOwnablePermission('page-create', $draft->parent);
-        $this->setPageTitle(trans('entities.pages_edit_draft'));
-
-        $draftsEnabled = $this->signedIn;
-        return view('pages/edit', [
-            'page' => $draft,
-            'book' => $draft->book,
-            'isDraft' => true,
-            'draftsEnabled' => $draftsEnabled
-        ]);
-    }
-
-    /**
-     * Store a new page by changing a draft into a page.
+     * Store a newly created page in storage.
+     *
      * @param  Request $request
-     * @param  string $bookSlug
-     * @param  int $pageId
+     * @param          $bookSlug
      * @return Response
      */
-    public function store(Request $request, $bookSlug, $pageId)
+    public function store(Request $request, $bookSlug)
     {
+        $this->checkPermission('page-create');
         $this->validate($request, [
-            'name' => 'required|string|max:255'
+            'name'   => 'required|string|max:255'
         ]);
 
         $input = $request->all();
-        $draftPage = $this->pageRepo->getById('page', $pageId, true);
-        $book = $draftPage->book;
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapterId = ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) ? $request->get('chapter') : null;
+        $input['priority'] = $this->bookRepo->getNewPriority($book);
 
-        $parent = $draftPage->parent;
-        $this->checkOwnablePermission('page-create', $parent);
-
-        if ($parent->isA('chapter')) {
-            $input['priority'] = $this->pageRepo->getNewChapterPriority($parent);
-        } else {
-            $input['priority'] = $this->pageRepo->getNewBookPriority($parent);
-        }
-
-        $page = $this->pageRepo->publishPageDraft($draftPage, $input);
+        $page = $this->pageRepo->saveNew($input, $book, $chapterId);
 
         Activity::add($page, 'page_create', $book->id);
         return redirect($page->getUrl());
@@ -152,558 +81,201 @@ class PageController extends Controller
 
     /**
      * Display the specified page.
-     * If the page is not found via the slug the revisions are searched for a match.
-     * @param string $bookSlug
-     * @param string $pageSlug
+     *
+     * @param $bookSlug
+     * @param $pageSlug
      * @return Response
-     * @throws NotFoundException
      */
     public function show($bookSlug, $pageSlug)
     {
-        try {
-            $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        } catch (NotFoundException $e) {
-            $page = $this->pageRepo->getPageByOldSlug($pageSlug, $bookSlug);
-            if ($page === null) {
-                throw $e;
-            }
-            return redirect($page->getUrl());
-        }
-
-        $this->checkOwnablePermission('page-view', $page);
-
-        $page->html = $this->pageRepo->renderPage($page);
-        $sidebarTree = $this->pageRepo->getBookChildren($page->book);
-        $pageNav = $this->pageRepo->getPageNav($page->html);
-
-        // check if the comment's are enabled
-        $commentsEnabled = !setting('app-disable-comments');
-        if ($commentsEnabled) {
-            $page->load(['comments.createdBy']);
-        }
-
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($page);
         $this->setPageTitle($page->getShortName());
-        return view('pages/show', [
-            'page' => $page,'book' => $page->book,
-            'current' => $page,
-            'sidebarTree' => $sidebarTree,
-            'commentsEnabled' => $commentsEnabled,
-            'pageNav' => $pageNav
-        ]);
-    }
-
-    /**
-     * Get page from an ajax request.
-     * @param int $pageId
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function getPageAjax($pageId)
-    {
-        $page = $this->pageRepo->getById('page', $pageId);
-        return response()->json($page);
+        return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page, 'sidebarTree' => $sidebarTree]);
     }
 
     /**
      * Show the form for editing the specified page.
-     * @param string $bookSlug
-     * @param string $pageSlug
+     *
+     * @param $bookSlug
+     * @param $pageSlug
      * @return Response
-     * @throws NotFoundException
      */
     public function edit($bookSlug, $pageSlug)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        $this->setPageTitle(trans('entities.pages_editing_named', ['pageName'=>$page->getShortName()]));
-        $page->isDraft = false;
-
-        // Check for active editing
-        $warnings = [];
-        if ($this->pageRepo->isPageEditingActive($page, 60)) {
-            $warnings[] = $this->pageRepo->getPageEditingActiveMessage($page, 60);
-        }
-
-        // Check for a current draft version for this user
-        $userPageDraft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id);
-        if ($userPageDraft !== null) {
-            $page->name = $userPageDraft->name;
-            $page->html = $userPageDraft->html;
-            $page->markdown = $userPageDraft->markdown;
-            $page->isDraft = true;
-            $warnings [] = $this->pageRepo->getUserPageDraftMessage($userPageDraft);
-        }
-
-        if (count($warnings) > 0) {
-            session()->flash('warning', implode("\n", $warnings));
-        }
-
-        $draftsEnabled = $this->signedIn;
-        return view('pages/edit', [
-            'page' => $page,
-            'book' => $page->book,
-            'current' => $page,
-            'draftsEnabled' => $draftsEnabled
-        ]);
+        $this->checkPermission('page-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $this->setPageTitle('Editing Page ' . $page->getShortName());
+        return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]);
     }
 
     /**
      * Update the specified page in storage.
+     *
      * @param  Request $request
-     * @param  string $bookSlug
-     * @param  string $pageSlug
+     * @param          $bookSlug
+     * @param          $pageSlug
      * @return Response
      */
     public function update(Request $request, $bookSlug, $pageSlug)
     {
+        $this->checkPermission('page-update');
         $this->validate($request, [
-            'name' => 'required|string|max:255'
+            'name'   => 'required|string|max:255'
         ]);
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        $this->pageRepo->updatePage($page, $page->book->id, $request->all());
-        Activity::add($page, 'page_update', $page->book->id);
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $this->pageRepo->updatePage($page, $book->id, $request->all());
+        Activity::add($page, 'page_update', $book->id);
         return redirect($page->getUrl());
     }
 
-    /**
-     * Save a draft update as a revision.
-     * @param Request $request
-     * @param int $pageId
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function saveDraft(Request $request, $pageId)
-    {
-        $page = $this->pageRepo->getById('page', $pageId, true);
-        $this->checkOwnablePermission('page-update', $page);
-
-        if (!$this->signedIn) {
-            return response()->json([
-                'status' => 'error',
-                'message' => trans('errors.guests_cannot_save_drafts'),
-            ], 500);
-        }
-
-        $draft = $this->pageRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
-
-        $updateTime = $draft->updated_at->timestamp;
-        return response()->json([
-            'status'    => 'success',
-            'message'   => trans('entities.pages_edit_draft_save_at'),
-            'timestamp' => $updateTime
-        ]);
-    }
-
     /**
      * Redirect from a special link url which
      * uses the page id rather than the name.
-     * @param int $pageId
+     * @param $pageId
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function redirectFromLink($pageId)
     {
-        $page = $this->pageRepo->getById('page', $pageId);
+        $page = $this->pageRepo->getById($pageId);
         return redirect($page->getUrl());
     }
 
     /**
      * Show the deletion page for the specified page.
-     * @param string $bookSlug
-     * @param string $pageSlug
+     * @param $bookSlug
+     * @param $pageSlug
      * @return \Illuminate\View\View
      */
     public function showDelete($bookSlug, $pageSlug)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-delete', $page);
-        $this->setPageTitle(trans('entities.pages_delete_named', ['pageName'=>$page->getShortName()]));
-        return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);
-    }
-
-
-    /**
-     * Show the deletion page for the specified page.
-     * @param string $bookSlug
-     * @param int $pageId
-     * @return \Illuminate\View\View
-     * @throws NotFoundException
-     */
-    public function showDeleteDraft($bookSlug, $pageId)
-    {
-        $page = $this->pageRepo->getById('page', $pageId, true);
-        $this->checkOwnablePermission('page-update', $page);
-        $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName'=>$page->getShortName()]));
-        return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);
+        $this->checkPermission('page-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $this->setPageTitle('Delete Page ' . $page->getShortName());
+        return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
     }
 
     /**
      * Remove the specified page from storage.
-     * @param string $bookSlug
-     * @param string $pageSlug
+     *
+     * @param $bookSlug
+     * @param $pageSlug
      * @return Response
      * @internal param int $id
      */
     public function destroy($bookSlug, $pageSlug)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $book = $page->book;
-        $this->checkOwnablePermission('page-delete', $page);
-        $this->pageRepo->destroyPage($page);
-
+        $this->checkPermission('page-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         Activity::addMessage('page_delete', $book->id, $page->name);
-        session()->flash('success', trans('entities.pages_delete_success'));
-        return redirect($book->getUrl());
-    }
-
-    /**
-     * Remove the specified draft page from storage.
-     * @param string $bookSlug
-     * @param int $pageId
-     * @return Response
-     * @throws NotFoundException
-     */
-    public function destroyDraft($bookSlug, $pageId)
-    {
-        $page = $this->pageRepo->getById('page', $pageId, true);
-        $book = $page->book;
-        $this->checkOwnablePermission('page-update', $page);
-        session()->flash('success', trans('entities.pages_delete_draft_success'));
-        $this->pageRepo->destroyPage($page);
+        $this->pageRepo->destroy($page);
         return redirect($book->getUrl());
     }
 
     /**
      * Shows the last revisions for this page.
-     * @param string $bookSlug
-     * @param string $pageSlug
+     * @param $bookSlug
+     * @param $pageSlug
      * @return \Illuminate\View\View
      */
     public function showRevisions($bookSlug, $pageSlug)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));
-        return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]);
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $this->setPageTitle('Revisions For ' . $page->getShortName());
+        return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]);
     }
 
     /**
      * Shows a preview of a single revision
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revisionId
+     * @param $bookSlug
+     * @param $pageSlug
+     * @param $revisionId
      * @return \Illuminate\View\View
      */
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
-        if ($revision === null) {
-            abort(404);
-        }
-
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $revision = $this->pageRepo->getRevisionById($revisionId);
         $page->fill($revision->toArray());
-        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
-
-        return view('pages/revision', [
-            'page' => $page,
-            'book' => $page->book,
-            'revision' => $revision
-        ]);
-    }
-
-    /**
-     * Shows the changes of a single revision
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revisionId
-     * @return \Illuminate\View\View
-     */
-    public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
-        if ($revision === null) {
-            abort(404);
-        }
-
-        $prev = $revision->getPrevious();
-        $prevContent = ($prev === null) ? '' : $prev->html;
-        $diff = (new Htmldiff)->diff($prevContent, $revision->html);
-
-        $page->fill($revision->toArray());
-        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
-
-        return view('pages/revision', [
-            'page' => $page,
-            'book' => $page->book,
-            'diff' => $diff,
-            'revision' => $revision
-        ]);
+        $this->setPageTitle('Page Revision For ' . $page->getShortName());
+        return view('pages/revision', ['page' => $page, 'book' => $book]);
     }
 
     /**
      * Restores a page using the content of the specified revision.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revisionId
+     * @param $bookSlug
+     * @param $pageSlug
+     * @param $revisionId
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function restoreRevision($bookSlug, $pageSlug, $revisionId)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        $page = $this->pageRepo->restorePageRevision($page, $page->book, $revisionId);
-        Activity::add($page, 'page_restore', $page->book->id);
+        $this->checkPermission('page-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->pageRepo->restoreRevision($page, $book, $revisionId);
+        Activity::add($page, 'page_restore', $book->id);
         return redirect($page->getUrl());
     }
 
-
     /**
-     * Deletes a revision using the id of the specified revision.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revId
-     * @throws NotFoundException
-     * @throws BadRequestException
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function destroyRevision($bookSlug, $pageSlug, $revId)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-delete', $page);
-
-        $revision = $page->revisions()->where('id', '=', $revId)->first();
-        if ($revision === null) {
-            throw new NotFoundException("Revision #{$revId} not found");
-        }
-
-        // Get the current revision for the page
-        $currentRevision = $page->getCurrentRevision();
-
-        // Check if its the latest revision, cannot delete latest revision.
-        if (intval($currentRevision->id) === intval($revId)) {
-            session()->flash('error', trans('entities.revision_cannot_delete_latest'));
-            return response()->view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page], 400);
-        }
-
-        $revision->delete();
-        session()->flash('success', trans('entities.revision_delete_success'));
-        return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]);
-    }
-
-    /**
-     * Exports a page to a PDF.
+     * Exports a page to pdf format using barryvdh/laravel-dompdf wrapper.
      * https://github.com/barryvdh/laravel-dompdf
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param Request $request
+     * @param $bookSlug
+     * @param $pageSlug
      * @return \Illuminate\Http\Response
      */
-    public function exportPdf($bookSlug, $pageSlug, Request $request)
+    public function exportPdf($bookSlug, $pageSlug)
     {
-        $isTesting = $request->query('isTesting');
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $page->html = $this->pageRepo->renderPage($page);
-        $pdfContent = $this->exportService->pageToPdf($page, !empty($isTesting));
-        return $this->downloadResponse($pdfContent, $pageSlug . '.pdf');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $pdfContent = $this->exportService->pageToPdf($page);
+        return response()->make($pdfContent, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.pdf'
+        ]);
     }
 
     /**
      * Export a page to a self-contained HTML file.
-     * @param string $bookSlug
-     * @param string $pageSlug
+     * @param $bookSlug
+     * @param $pageSlug
      * @return \Illuminate\Http\Response
      */
     public function exportHtml($bookSlug, $pageSlug)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $page->html = $this->pageRepo->renderPage($page);
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $containedHtml = $this->exportService->pageToContainedHtml($page);
-        return $this->downloadResponse($containedHtml, $pageSlug . '.html');
+        return response()->make($containedHtml, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.html'
+        ]);
     }
 
     /**
      * Export a page to a simple plaintext .txt file.
-     * @param string $bookSlug
-     * @param string $pageSlug
+     * @param $bookSlug
+     * @param $pageSlug
      * @return \Illuminate\Http\Response
      */
     public function exportPlainText($bookSlug, $pageSlug)
     {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $pageText = $this->exportService->pageToPlainText($page);
-        return $this->downloadResponse($pageText, $pageSlug . '.txt');
-    }
-
-    /**
-     * Show a listing of recently created pages
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showRecentlyCreated()
-    {
-        $pages = $this->pageRepo->getRecentlyCreatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-created'));
-        return view('pages/detailed-listing', [
-            'title' => trans('entities.recently_created_pages'),
-            'pages' => $pages
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $containedHtml = $this->exportService->pageToPlainText($page);
+        return response()->make($containedHtml, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.txt'
         ]);
     }
 
-    /**
-     * Show a listing of recently created pages
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showRecentlyUpdated()
-    {
-        $pages = $this->pageRepo->getRecentlyUpdatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-updated'));
-        return view('pages/detailed-listing', [
-            'title' => trans('entities.recently_updated_pages'),
-            'pages' => $pages
-        ]);
-    }
-
-    /**
-     * Show the Restrictions view.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showRestrict($bookSlug, $pageSlug)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
-        $roles = $this->userRepo->getRestrictableRoles();
-        return view('pages/restrictions', [
-            'page'  => $page,
-            'roles' => $roles
-        ]);
-    }
-
-    /**
-     * Show the view to choose a new parent to move a page into.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return mixed
-     * @throws NotFoundException
-     */
-    public function showMove($bookSlug, $pageSlug)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        return view('pages/move', [
-            'book' => $page->book,
-            'page' => $page
-        ]);
-    }
-
-    /**
-     * Does the action of moving the location of a page
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param Request $request
-     * @return mixed
-     * @throws NotFoundException
-     */
-    public function move($bookSlug, $pageSlug, Request $request)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-
-        $entitySelection = $request->get('entity_selection', null);
-        if ($entitySelection === null || $entitySelection === '') {
-            return redirect($page->getUrl());
-        }
-
-        $stringExploded = explode(':', $entitySelection);
-        $entityType = $stringExploded[0];
-        $entityId = intval($stringExploded[1]);
-
-
-        try {
-            $parent = $this->pageRepo->getById($entityType, $entityId);
-        } catch (\Exception $e) {
-            session()->flash(trans('entities.selected_book_chapter_not_found'));
-            return redirect()->back();
-        }
-
-        $this->checkOwnablePermission('page-create', $parent);
-
-        $this->pageRepo->changePageParent($page, $parent);
-        Activity::add($page, 'page_move', $page->book->id);
-        session()->flash('success', trans('entities.pages_move_success', ['parentName' => $parent->name]));
-
-        return redirect($page->getUrl());
-    }
-
-    /**
-     * Show the view to copy a page.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return mixed
-     * @throws NotFoundException
-     */
-    public function showCopy($bookSlug, $pageSlug)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        session()->flashInput(['name' => $page->name]);
-        return view('pages/copy', [
-            'book' => $page->book,
-            'page' => $page
-        ]);
-    }
-
-    /**
-     * Create a copy of a page within the requested target destination.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param Request $request
-     * @return mixed
-     * @throws NotFoundException
-     */
-    public function copy($bookSlug, $pageSlug, Request $request)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-
-        $entitySelection = $request->get('entity_selection', null);
-        if ($entitySelection === null || $entitySelection === '') {
-            $parent = $page->chapter ? $page->chapter : $page->book;
-        } else {
-            $stringExploded = explode(':', $entitySelection);
-            $entityType = $stringExploded[0];
-            $entityId = intval($stringExploded[1]);
-
-            try {
-                $parent = $this->pageRepo->getById($entityType, $entityId);
-            } catch (\Exception $e) {
-                session()->flash(trans('entities.selected_book_chapter_not_found'));
-                return redirect()->back();
-            }
-        }
-
-        $this->checkOwnablePermission('page-create', $parent);
-
-        $pageCopy = $this->pageRepo->copyPage($page, $parent, $request->get('name', ''));
-
-        Activity::add($pageCopy, 'page_create', $pageCopy->book->id);
-        session()->flash('success', trans('entities.pages_copy_success'));
-
-        return redirect($pageCopy->getUrl());
-    }
-
-    /**
-     * Set the permissions for this page.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws NotFoundException
-     */
-    public function restrict($bookSlug, $pageSlug, Request $request)
-    {
-        $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
-        $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);
-        session()->flash('success', trans('entities.pages_permissions_success'));
-        return redirect($page->getUrl());
-    }
 }

app/Http/Controllers/PermissionController.php

@@ -1,133 +0,0 @@
-<?php namespace BookStack\Http\Controllers;
-
-use BookStack\Auth\Permissions\PermissionsRepo;
-use BookStack\Exceptions\PermissionsException;
-use Illuminate\Http\Request;
-
-class PermissionController extends Controller
-{
-
-    protected $permissionsRepo;
-
-    /**
-     * PermissionController constructor.
-     * @param \BookStack\Auth\Permissions\PermissionsRepo $permissionsRepo
-     */
-    public function __construct(PermissionsRepo $permissionsRepo)
-    {
-        $this->permissionsRepo = $permissionsRepo;
-        parent::__construct();
-    }
-
-    /**
-     * Show a listing of the roles in the system.
-     */
-    public function listRoles()
-    {
-        $this->checkPermission('user-roles-manage');
-        $roles = $this->permissionsRepo->getAllRoles();
-        return view('settings/roles/index', ['roles' => $roles]);
-    }
-
-    /**
-     * Show the form to create a new role
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function createRole()
-    {
-        $this->checkPermission('user-roles-manage');
-        return view('settings/roles/create');
-    }
-
-    /**
-     * Store a new role in the system.
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function storeRole(Request $request)
-    {
-        $this->checkPermission('user-roles-manage');
-        $this->validate($request, [
-            'display_name' => 'required|min:3|max:200',
-            'description' => 'max:250'
-        ]);
-
-        $this->permissionsRepo->saveNewRole($request->all());
-        session()->flash('success', trans('settings.role_create_success'));
-        return redirect('/settings/roles');
-    }
-
-    /**
-     * Show the form for editing a user role.
-     * @param $id
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     * @throws PermissionsException
-     */
-    public function editRole($id)
-    {
-        $this->checkPermission('user-roles-manage');
-        $role = $this->permissionsRepo->getRoleById($id);
-        if ($role->hidden) {
-            throw new PermissionsException(trans('errors.role_cannot_be_edited'));
-        }
-        return view('settings/roles/edit', ['role' => $role]);
-    }
-
-    /**
-     * Updates a user role.
-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws PermissionsException
-     */
-    public function updateRole($id, Request $request)
-    {
-        $this->checkPermission('user-roles-manage');
-        $this->validate($request, [
-            'display_name' => 'required|min:3|max:200',
-            'description' => 'max:250'
-        ]);
-
-        $this->permissionsRepo->updateRole($id, $request->all());
-        session()->flash('success', trans('settings.role_update_success'));
-        return redirect('/settings/roles');
-    }
-
-    /**
-     * Show the view to delete a role.
-     * Offers the chance to migrate users.
-     * @param $id
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showDeleteRole($id)
-    {
-        $this->checkPermission('user-roles-manage');
-        $role = $this->permissionsRepo->getRoleById($id);
-        $roles = $this->permissionsRepo->getAllRolesExcept($role);
-        $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);
-        $roles->prepend($blankRole);
-        return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]);
-    }
-
-    /**
-     * Delete a role from the system,
-     * Migrate from a previous role if set.
-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function deleteRole($id, Request $request)
-    {
-        $this->checkPermission('user-roles-manage');
-
-        try {
-            $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
-        } catch (PermissionsException $e) {
-            session()->flash('error', $e->getMessage());
-            return redirect()->back();
-        }
-
-        session()->flash('success', trans('settings.role_delete_success'));
-        return redirect('/settings/roles');
-    }
-}

app/Http/Controllers/SearchController.php

@@ -1,27 +1,32 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
-use BookStack\Actions\ViewService;
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Entities\SearchService;
 use Illuminate\Http\Request;
 
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
+
 class SearchController extends Controller
 {
-    protected $entityRepo;
-    protected $viewService;
-    protected $searchService;
+    protected $pageRepo;
+    protected $bookRepo;
+    protected $chapterRepo;
 
     /**
      * SearchController constructor.
-     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
-     * @param ViewService $viewService
-     * @param SearchService $searchService
+     * @param $pageRepo
+     * @param $bookRepo
+     * @param $chapterRepo
      */
-    public function __construct(EntityRepo $entityRepo, ViewService $viewService, SearchService $searchService)
+    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo)
     {
-        $this->entityRepo = $entityRepo;
-        $this->viewService = $viewService;
-        $this->searchService = $searchService;
+        $this->pageRepo = $pageRepo;
+        $this->bookRepo = $bookRepo;
+        $this->chapterRepo = $chapterRepo;
         parent::__construct();
     }
 
@@ -31,26 +36,19 @@ class SearchController extends Controller
      * @return \Illuminate\View\View
      * @internal param string $searchTerm
      */
-    public function search(Request $request)
+    public function searchAll(Request $request)
     {
+        if (!$request->has('term')) {
+            return redirect()->back();
+        }
         $searchTerm = $request->get('term');
-        $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
-
-        $page = intval($request->get('page', '0')) ?: 1;
-        $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
-
-        $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
-
-        return view('search/all', [
-            'entities'   => $results['results'],
-            'totalResults' => $results['total'],
-            'searchTerm' => $searchTerm,
-            'hasNextPage' => $results['has_more'],
-            'nextPageLink' => $nextPageLink
-        ]);
+        $pages = $this->pageRepo->getBySearch($searchTerm);
+        $books = $this->bookRepo->getBySearch($searchTerm);
+        $chapters = $this->chapterRepo->getBySearch($searchTerm);
+        $this->setPageTitle('Search For ' . $searchTerm);
+        return view('search/all', ['pages' => $pages, 'books' => $books, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
     }
 
-
     /**
      * Searches all entities within a book.
      * @param Request $request
@@ -60,48 +58,14 @@ class SearchController extends Controller
      */
     public function searchBook(Request $request, $bookId)
     {
-        $term = $request->get('term', '');
-        $results = $this->searchService->searchBook($bookId, $term);
-        return view('partials/entity-list', ['entities' => $results]);
-    }
-
-    /**
-     * Searches all entities within a chapter.
-     * @param Request $request
-     * @param integer $chapterId
-     * @return \Illuminate\View\View
-     * @internal param string $searchTerm
-     */
-    public function searchChapter(Request $request, $chapterId)
-    {
-        $term = $request->get('term', '');
-        $results = $this->searchService->searchChapter($chapterId, $term);
-        return view('partials/entity-list', ['entities' => $results]);
-    }
-
-    /**
-     * Search for a list of entities and return a partial HTML response of matching entities.
-     * Returns the most popular entities if no search is provided.
-     * @param Request $request
-     * @return mixed
-     */
-    public function searchEntitiesAjax(Request $request)
-    {
-        $entityTypes = $request->filled('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']);
-        $searchTerm =  $request->get('term', false);
-        $permission = $request->get('permission', 'view');
-
-        // Search for entities otherwise show most popular
-        if ($searchTerm !== false) {
-            $searchTerm .= ' {type:'. implode('|', $entityTypes->toArray()) .'}';
-            $entities = $this->searchService->searchEntities($searchTerm, 'all', 1, 20, $permission)['results'];
-        } else {
-            $entityNames = $entityTypes->map(function ($type) {
-                return 'BookStack\\' . ucfirst($type); // TODO - Extract this elsewhere, too specific and stringy
-            })->toArray();
-            $entities = $this->viewService->getPopular(20, 0, $entityNames, $permission);
+        if (!$request->has('term')) {
+            return redirect()->back();
         }
-
-        return view('search/entity-ajax-list', ['entities' => $entities]);
+        $searchTerm = $request->get('term');
+        $searchWhereTerms = [['book_id', '=', $bookId]];
+        $pages = $this->pageRepo->getBySearch($searchTerm, $searchWhereTerms);
+        $chapters = $this->chapterRepo->getBySearch($searchTerm, $searchWhereTerms);
+        return view('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
     }
+
 }

app/Http/Controllers/SettingController.php

@@ -1,91 +1,48 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
-use BookStack\Uploads\ImageService;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
+
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
 use Setting;
 
 class SettingController extends Controller
 {
     /**
      * Display a listing of the settings.
+     *
      * @return Response
      */
     public function index()
     {
-        $this->checkPermission('settings-manage');
-        $this->setPageTitle(trans('settings.settings'));
-
-        // Get application version
-        $version = trim(file_get_contents(base_path('version')));
-
-        return view('settings/index', ['version' => $version]);
+        $this->checkPermission('settings-update');
+        $this->setPageTitle('Settings');
+        return view('settings/index');
     }
 
+
     /**
      * Update the specified settings in storage.
-     * @param  Request $request
+     *
+     * @param  Request  $request
      * @return Response
      */
     public function update(Request $request)
     {
         $this->preventAccessForDemoUsers();
-        $this->checkPermission('settings-manage');
+        $this->checkPermission('settings-update');
 
         // Cycles through posted settings and update them
-        foreach ($request->all() as $name => $value) {
-            if (strpos($name, 'setting-') !== 0) {
-                continue;
-            }
+        foreach($request->all() as $name => $value) {
+            if(strpos($name, 'setting-') !== 0) continue;
             $key = str_replace('setting-', '', trim($name));
             Setting::put($key, $value);
         }
 
-        session()->flash('success', trans('settings.settings_save_success'));
+        session()->flash('success', 'Settings Saved');
         return redirect('/settings');
     }
 
-    /**
-     * Show the page for application maintenance.
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showMaintenance()
-    {
-        $this->checkPermission('settings-manage');
-        $this->setPageTitle(trans('settings.maint'));
-
-        // Get application version
-        $version = trim(file_get_contents(base_path('version')));
-
-        return view('settings/maintenance', ['version' => $version]);
-    }
-
-    /**
-     * Action to clean-up images in the system.
-     * @param Request $request
-     * @param ImageService $imageService
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function cleanupImages(Request $request, ImageService $imageService)
-    {
-        $this->checkPermission('settings-manage');
-
-        $checkRevisions = !($request->get('ignore_revisions', 'false') === 'true');
-        $dryRun = !($request->has('confirm'));
-
-        $imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun);
-        $deleteCount = count($imagesToDelete);
-        if ($deleteCount === 0) {
-            session()->flash('warning', trans('settings.maint_image_cleanup_nothing_found'));
-            return redirect('/settings/maintenance')->withInput();
-        }
-
-        if ($dryRun) {
-            session()->flash('cleanup-images-warning', trans('settings.maint_image_cleanup_warning', ['count' => $deleteCount]));
-        } else {
-            session()->flash('success', trans('settings.maint_image_cleanup_success', ['count' => $deleteCount]));
-        }
-
-        return redirect('/settings/maintenance#image-cleanup')->withInput();
-    }
 }

app/Http/Controllers/TagController.php

@@ -1,57 +0,0 @@
-<?php namespace BookStack\Http\Controllers;
-
-use BookStack\Actions\TagRepo;
-use Illuminate\Http\Request;
-
-class TagController extends Controller
-{
-
-    protected $tagRepo;
-
-    /**
-     * TagController constructor.
-     * @param $tagRepo
-     */
-    public function __construct(TagRepo $tagRepo)
-    {
-        $this->tagRepo = $tagRepo;
-        parent::__construct();
-    }
-
-    /**
-     * Get all the Tags for a particular entity
-     * @param $entityType
-     * @param $entityId
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function getForEntity($entityType, $entityId)
-    {
-        $tags = $this->tagRepo->getForEntity($entityType, $entityId);
-        return response()->json($tags);
-    }
-
-    /**
-     * Get tag name suggestions from a given search term.
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function getNameSuggestions(Request $request)
-    {
-        $searchTerm = $request->get('search', false);
-        $suggestions = $this->tagRepo->getNameSuggestions($searchTerm);
-        return response()->json($suggestions);
-    }
-
-    /**
-     * Get tag value suggestions from a given search term.
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function getValueSuggestions(Request $request)
-    {
-        $searchTerm = $request->get('search', false);
-        $tagName = $request->get('name', false);
-        $suggestions = $this->tagRepo->getValueSuggestions($searchTerm, $tagName);
-        return response()->json($suggestions);
-    }
-}

app/Http/Controllers/UserController.php

@@ -1,11 +1,14 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
 
-use BookStack\Auth\Access\SocialAuthService;
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
-use BookStack\Exceptions\UserUpdateException;
 use Illuminate\Http\Request;
+
 use Illuminate\Http\Response;
+use BookStack\Http\Requests;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\SocialAuthService;
+use BookStack\User;
 
 class UserController extends Controller
 {
@@ -27,21 +30,13 @@ class UserController extends Controller
 
     /**
      * Display a listing of the users.
-     * @param Request $request
      * @return Response
      */
-    public function index(Request $request)
+    public function index()
     {
-        $this->checkPermission('users-manage');
-        $listDetails = [
-            'order' => $request->get('order', 'asc'),
-            'search' => $request->get('search', ''),
-            'sort' => $request->get('sort', 'name'),
-        ];
-        $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
-        $this->setPageTitle(trans('settings.users'));
-        $users->appends($listDetails);
-        return view('users/index', ['users' => $users, 'listDetails' => $listDetails]);
+        $users = $this->user->all();
+        $this->setPageTitle('Users');
+        return view('users/index', ['users' => $users]);
     }
 
     /**
@@ -50,24 +45,23 @@ class UserController extends Controller
      */
     public function create()
     {
-        $this->checkPermission('users-manage');
+        $this->checkPermission('user-create');
         $authMethod = config('auth.method');
-        $roles = $this->userRepo->getAllRoles();
-        return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);
+        return view('users/create', ['authMethod' => $authMethod]);
     }
 
     /**
      * Store a newly created user in storage.
      * @param  Request $request
      * @return Response
-     * @throws UserUpdateException
      */
     public function store(Request $request)
     {
-        $this->checkPermission('users-manage');
+        $this->checkPermission('user-create');
         $validationRules = [
             'name'             => 'required',
-            'email'            => 'required|email|unique:users,email'
+            'email'            => 'required|email|unique:users,email',
+            'role'             => 'required|exists:roles,id'
         ];
 
         $authMethod = config('auth.method');
@@ -79,6 +73,7 @@ class UserController extends Controller
         }
         $this->validate($request, $validationRules);
 
+
         $user = $this->user->fill($request->all());
 
         if ($authMethod === 'standard') {
@@ -88,50 +83,49 @@ class UserController extends Controller
         }
 
         $user->save();
+        $user->attachRoleId($request->get('role'));
 
-        if ($request->filled('roles')) {
-            $roles = $request->get('roles');
-            $this->userRepo->setUserRoles($user, $roles);
+        // Get avatar from gravatar and save
+        if (!config('services.disable_services')) {
+            $avatar = \Images::saveUserGravatar($user);
+            $user->avatar()->associate($avatar);
+            $user->save();
         }
 
-        $this->userRepo->downloadAndAssignUserAvatar($user);
-
-        return redirect('/settings/users');
+        return redirect('/users');
     }
 
+
     /**
      * Show the form for editing the specified user.
      * @param  int              $id
-     * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService
+     * @param SocialAuthService $socialAuthService
      * @return Response
      */
     public function edit($id, SocialAuthService $socialAuthService)
     {
-        $this->checkPermissionOr('users-manage', function () use ($id) {
+        $this->checkPermissionOr('user-update', function () use ($id) {
             return $this->currentUser->id == $id;
         });
 
+        $authMethod = config('auth.method');
+
         $user = $this->user->findOrFail($id);
-
-        $authMethod = ($user->system_name) ? 'system' : config('auth.method');
-
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
-        $this->setPageTitle(trans('settings.user_profile'));
-        $roles = $this->userRepo->getAllRoles();
-        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
+        $this->setPageTitle('User Profile');
+        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod]);
     }
 
     /**
      * Update the specified user in storage.
      * @param  Request $request
-     * @param  int $id
+     * @param  int     $id
      * @return Response
-     * @throws UserUpdateException
      */
     public function update(Request $request, $id)
     {
         $this->preventAccessForDemoUsers();
-        $this->checkPermissionOr('users-manage', function () use ($id) {
+        $this->checkPermissionOr('user-update', function () use ($id) {
             return $this->currentUser->id == $id;
         });
 
@@ -140,56 +134,47 @@ class UserController extends Controller
             'email'            => 'min:2|email|unique:users,email,' . $id,
             'password'         => 'min:5|required_with:password_confirm',
             'password-confirm' => 'same:password|required_with:password',
-            'setting'          => 'array'
+            'role'             => 'exists:roles,id'
+        ], [
+            'password-confirm.required_with' => 'Password confirmation required'
         ]);
 
-        $user = $this->userRepo->getById($id);
+        $user = $this->user->findOrFail($id);
         $user->fill($request->all());
 
         // Role updates
-        if (userCan('users-manage') && $request->filled('roles')) {
-            $roles = $request->get('roles');
-            $this->userRepo->setUserRoles($user, $roles);
+        if ($this->currentUser->can('user-update') && $request->has('role')) {
+            $user->attachRoleId($request->get('role'));
         }
 
         // Password updates
-        if ($request->filled('password')) {
+        if ($request->has('password') && $request->get('password') != '') {
             $password = $request->get('password');
             $user->password = bcrypt($password);
         }
 
         // External auth id updates
-        if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) {
+        if ($this->currentUser->can('user-update') && $request->has('external_auth_id')) {
             $user->external_auth_id = $request->get('external_auth_id');
         }
 
-        // Save an user-specific settings
-        if ($request->filled('setting')) {
-            foreach ($request->get('setting') as $key => $value) {
-                setting()->putUser($user, $key, $value);
-            }
-        }
-
         $user->save();
-        session()->flash('success', trans('settings.users_edit_success'));
-
-        $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
-        return redirect($redirectUrl);
+        return redirect('/users');
     }
 
     /**
      * Show the user delete page.
-     * @param int $id
+     * @param $id
      * @return \Illuminate\View\View
      */
     public function delete($id)
     {
-        $this->checkPermissionOr('users-manage', function () use ($id) {
+        $this->checkPermissionOr('user-delete', function () use ($id) {
             return $this->currentUser->id == $id;
         });
 
-        $user = $this->userRepo->getById($id);
-        $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));
+        $user = $this->user->findOrFail($id);
+        $this->setPageTitle('Delete User ' . $user->name);
         return view('users/delete', ['user' => $user]);
     }
 
@@ -197,95 +182,21 @@ class UserController extends Controller
      * Remove the specified user from storage.
      * @param  int $id
      * @return Response
-     * @throws \Exception
      */
     public function destroy($id)
     {
         $this->preventAccessForDemoUsers();
-        $this->checkPermissionOr('users-manage', function () use ($id) {
+        $this->checkPermissionOr('user-delete', function () use ($id) {
             return $this->currentUser->id == $id;
         });
 
         $user = $this->userRepo->getById($id);
-
         if ($this->userRepo->isOnlyAdmin($user)) {
-            session()->flash('error', trans('errors.users_cannot_delete_only_admin'));
+            session()->flash('error', 'You cannot delete the only admin');
             return redirect($user->getEditUrl());
         }
-
-        if ($user->system_name === 'public') {
-            session()->flash('error', trans('errors.users_cannot_delete_guest'));
-            return redirect($user->getEditUrl());
-        }
-
         $this->userRepo->destroy($user);
-        session()->flash('success', trans('settings.users_delete_success'));
 
-        return redirect('/settings/users');
-    }
-
-    /**
-     * Show the user profile page
-     * @param $id
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showProfilePage($id)
-    {
-        $user = $this->userRepo->getById($id);
-        $userActivity = $this->userRepo->getActivity($user);
-        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5, 0);
-        $assetCounts = $this->userRepo->getAssetCounts($user);
-        return view('users/profile', [
-            'user' => $user,
-            'activity' => $userActivity,
-            'recentlyCreated' => $recentlyCreated,
-            'assetCounts' => $assetCounts
-        ]);
-    }
-
-    /**
-     * Update the user's preferred book-list display setting.
-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function switchBookView($id, Request $request)
-    {
-        $this->checkPermissionOr('users-manage', function () use ($id) {
-            return $this->currentUser->id == $id;
-        });
-
-        $viewType = $request->get('view_type');
-        if (!in_array($viewType, ['grid', 'list'])) {
-            $viewType = 'list';
-        }
-
-        $user = $this->user->findOrFail($id);
-        setting()->putUser($user, 'books_view_type', $viewType);
-
-        return redirect()->back(302, [], "/settings/users/$id");
-    }
-
-    /**
-     * Update the user's preferred shelf-list display setting.
-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function switchShelfView($id, Request $request)
-    {
-        $this->checkPermissionOr('users-manage', function () use ($id) {
-            return $this->currentUser->id == $id;
-        });
-
-        $viewType = $request->get('view_type');
-        if (!in_array($viewType, ['grid', 'list'])) {
-            $viewType = 'list';
-        }
-
-        $user = $this->userRepo->getById($id);
-        setting()->putUser($user, 'bookshelves_view_type', $viewType);
-
-        return redirect()->back(302, [], "/settings/users/$id");
+        return redirect('/users');
     }
 }

app/Http/Kernel.php

@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http;
+<?php
+
+namespace BookStack\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -7,36 +9,15 @@ class Kernel extends HttpKernel
     /**
      * The application's global HTTP middleware stack.
      *
-     * These middleware are run during every request to your application.
-     *
      * @var array
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \BookStack\Http\Middleware\TrimStrings::class,
-        \BookStack\Http\Middleware\TrustProxies::class,
-    ];
-
-    /**
-     * The application's route middleware groups.
-     *
-     * @var array
-     */
-    protected $middlewareGroups = [
-        'web' => [
-            \BookStack\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \BookStack\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \BookStack\Http\Middleware\Localization::class
-        ],
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-        ],
+        \BookStack\Http\Middleware\EncryptCookies::class,
+        \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+        \Illuminate\Session\Middleware\StartSession::class,
+        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        \BookStack\Http\Middleware\VerifyCsrfToken::class,
     ];
 
     /**
@@ -47,9 +28,7 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'can'        => \Illuminate\Auth\Middleware\Authorize::class,
         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'perm'       => \BookStack\Http\Middleware\PermissionMiddleware::class
     ];
 }

app/Http/Middleware/Authenticate.php

@@ -4,17 +4,21 @@ namespace BookStack\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use BookStack\Exceptions\UserRegistrationException;
+use Setting;
 
 class Authenticate
 {
     /**
      * The Guard implementation.
+     *
      * @var Guard
      */
     protected $auth;
 
     /**
      * Create a new filter instance.
+     *
      * @param  Guard $auth
      */
     public function __construct(Guard $auth)
@@ -24,24 +28,22 @@ class Authenticate
 
     /**
      * Handle an incoming request.
+     *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @return mixed
      */
     public function handle($request, Closure $next)
     {
-        if ($this->auth->check()) {
-            $requireConfirmation = (setting('registration-confirmation') || setting('registration-restrict'));
-            if ($requireConfirmation && !$this->auth->user()->email_confirmed) {
-                return redirect('/register/confirm/awaiting');
-            }
+        if(auth()->check() && auth()->user()->email_confirmed == false) {
+            return redirect()->guest('/register/confirm/awaiting');
         }
 
-        if ($this->auth->guest() && !setting('app-public')) {
+        if ($this->auth->guest() && !Setting::get('app-public')) {
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
             } else {
-                return redirect()->guest(baseUrl('/login'));
+                return redirect()->guest('/login');
             }
         }
 

app/Http/Middleware/EncryptCookies.php

@@ -2,9 +2,9 @@
 
 namespace BookStack\Http\Middleware;
 
-use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
+use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
 
-class EncryptCookies extends Middleware
+class EncryptCookies extends BaseEncrypter
 {
     /**
      * The names of the cookies that should not be encrypted.

app/Http/Middleware/Localization.php

@@ -1,56 +0,0 @@
-<?php namespace BookStack\Http\Middleware;
-
-use Carbon\Carbon;
-use Closure;
-use Illuminate\Http\Request;
-
-class Localization
-{
-
-    protected $rtlLocales = ['ar'];
-
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $defaultLang = config('app.locale');
-
-        if (user()->isDefault() && config('app.auto_detect_locale')) {
-            $locale = $this->autoDetectLocale($request, $defaultLang);
-        } else {
-            $locale = setting()->getUser(user(), 'language', $defaultLang);
-        }
-
-        // Set text direction
-        if (in_array($locale, $this->rtlLocales)) {
-            config()->set('app.rtl', true);
-        }
-
-        app()->setLocale($locale);
-        Carbon::setLocale($locale);
-        return $next($request);
-    }
-
-    /**
-     * Autodetect the visitors locale by matching locales in their headers
-     * against the locales supported by BookStack.
-     * @param Request $request
-     * @param string $default
-     * @return string
-     */
-    protected function autoDetectLocale(Request $request, string $default)
-    {
-        $availableLocales = config('app.locales');
-        foreach ($request->getLanguages() as $lang) {
-            if (in_array($lang, $availableLocales)) {
-                return $lang;
-            }
-        }
-        return $default;
-    }
-}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Middleware;
+<?php
+
+namespace BookStack\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
@@ -32,8 +34,7 @@ class RedirectIfAuthenticated
      */
     public function handle($request, Closure $next)
     {
-        $requireConfirmation = setting('registration-confirmation');
-        if ($this->auth->check() && (!$requireConfirmation || ($requireConfirmation && $this->auth->user()->email_confirmed))) {
+        if ($this->auth->check()) {
             return redirect('/');
         }
 

app/Http/Middleware/TrimStrings.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace BookStack\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
-
-class TrimStrings extends Middleware
-{
-    /**
-     * The names of the attributes that should not be trimmed.
-     *
-     * @var array
-     */
-    protected $except = [
-        'password',
-        'password_confirmation',
-        'password-confirm',
-    ];
-}

app/Http/Middleware/TrustProxies.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace BookStack\Http\Middleware;
-
-use Closure;
-use Fideloper\Proxy\TrustProxies as Middleware;
-use Illuminate\Http\Request;
-
-class TrustProxies extends Middleware
-{
-    /**
-     * The trusted proxies for this application.
-     *
-     * @var array
-     */
-    protected $proxies;
-
-    /**
-     * The current proxy header mappings.
-     *
-     * @var array
-     */
-    protected $headers = [
-        Request::HEADER_FORWARDED => 'FORWARDED',
-        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
-        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
-        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
-        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
-    ];
-
-    /**
-     * Handle the request, Set the correct user-configured proxy information.
-     * @param Request $request
-     * @param Closure $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $setProxies = config('app.proxies');
-        if ($setProxies !== '**' && $setProxies !== '*' && $setProxies !== '') {
-            $setProxies = explode(',', $setProxies);
-        }
-        $this->proxies = $setProxies;
-
-        return parent::handle($request, $next);
-    }
-}

app/Http/Middleware/VerifyCsrfToken.php

@@ -2,9 +2,9 @@
 
 namespace BookStack\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 
-class VerifyCsrfToken extends Middleware
+class VerifyCsrfToken extends BaseVerifier
 {
     /**
      * The URIs that should be excluded from CSRF verification.

app/Http/routes.php

@@ -0,0 +1,113 @@
+<?php
+
+// Authenticated routes...
+Route::group(['middleware' => 'auth'], function () {
+
+    Route::group(['prefix' => 'books'], function () {
+
+        // Books
+        Route::get('/', 'BookController@index');
+        Route::get('/create', 'BookController@create');
+        Route::post('/', 'BookController@store');
+        Route::get('/{slug}/edit', 'BookController@edit');
+        Route::put('/{slug}', 'BookController@update');
+        Route::delete('/{id}', 'BookController@destroy');
+        Route::get('/{slug}/sort-item', 'BookController@getSortItem');
+        Route::get('/{slug}', 'BookController@show');
+        Route::get('/{slug}/delete', 'BookController@showDelete');
+        Route::get('/{bookSlug}/sort', 'BookController@sort');
+        Route::put('/{bookSlug}/sort', 'BookController@saveSort');
+
+        // Pages
+        Route::get('/{bookSlug}/page/create', 'PageController@create');
+        Route::post('/{bookSlug}/page', 'PageController@store');
+        Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show');
+        Route::get('/{bookSlug}/page/{pageSlug}/export/pdf', 'PageController@exportPdf');
+        Route::get('/{bookSlug}/page/{pageSlug}/export/html', 'PageController@exportHtml');
+        Route::get('/{bookSlug}/page/{pageSlug}/export/plaintext', 'PageController@exportPlainText');
+        Route::get('/{bookSlug}/page/{pageSlug}/edit', 'PageController@edit');
+        Route::get('/{bookSlug}/page/{pageSlug}/delete', 'PageController@showDelete');
+        Route::put('/{bookSlug}/page/{pageSlug}', 'PageController@update');
+        Route::delete('/{bookSlug}/page/{pageSlug}', 'PageController@destroy');
+
+        // Revisions
+        Route::get('/{bookSlug}/page/{pageSlug}/revisions', 'PageController@showRevisions');
+        Route::get('/{bookSlug}/page/{pageSlug}/revisions/{revId}', 'PageController@showRevision');
+        Route::get('/{bookSlug}/page/{pageSlug}/revisions/{revId}/restore', 'PageController@restoreRevision');
+
+        // Chapters
+        Route::get('/{bookSlug}/chapter/{chapterSlug}/create-page', 'PageController@create');
+        Route::get('/{bookSlug}/chapter/create', 'ChapterController@create');
+        Route::post('/{bookSlug}/chapter/create', 'ChapterController@store');
+        Route::get('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@show');
+        Route::put('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@update');
+        Route::get('/{bookSlug}/chapter/{chapterSlug}/edit', 'ChapterController@edit');
+        Route::get('/{bookSlug}/chapter/{chapterSlug}/delete', 'ChapterController@showDelete');
+        Route::delete('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@destroy');
+
+    });
+
+    // Users
+    Route::get('/users', 'UserController@index');
+    Route::get('/users/create', 'UserController@create');
+    Route::get('/users/{id}/delete', 'UserController@delete');
+    Route::post('/users/create', 'UserController@store');
+    Route::get('/users/{id}', 'UserController@edit');
+    Route::put('/users/{id}', 'UserController@update');
+    Route::delete('/users/{id}', 'UserController@destroy');
+
+    // Image routes
+    Route::group(['prefix' => 'images'], function() {
+        // Get for user images
+        Route::get('/user/all', 'ImageController@getAllForUserType');
+        Route::get('/user/all/{page}', 'ImageController@getAllForUserType');
+        // Standard get, update and deletion for all types
+        Route::get('/thumb/{id}/{width}/{height}/{crop}', 'ImageController@getThumbnail');
+        Route::put('/update/{imageId}', 'ImageController@update');
+        Route::post('/{type}/upload', 'ImageController@uploadByType');
+        Route::get('/{type}/all', 'ImageController@getAllByType');
+        Route::get('/{type}/all/{page}', 'ImageController@getAllByType');
+        Route::delete('/{imageId}', 'ImageController@destroy');
+    });
+
+    // Links
+    Route::get('/link/{id}', 'PageController@redirectFromLink');
+
+    // Search
+    Route::get('/search/all', 'SearchController@searchAll');
+    Route::get('/search/book/{bookId}', 'SearchController@searchBook');
+
+    // Other Pages
+    Route::get('/', 'HomeController@index');
+    Route::get('/home', 'HomeController@index');
+
+    // Settings
+    Route::get('/settings', 'SettingController@index');
+    Route::post('/settings', 'SettingController@update');
+
+});
+
+// Login using social authentication
+Route::get('/login/service/{socialDriver}', 'Auth\AuthController@getSocialLogin');
+Route::get('/login/service/{socialDriver}/callback', 'Auth\AuthController@socialCallback');
+Route::get('/login/service/{socialDriver}/detach', 'Auth\AuthController@detachSocialAccount');
+
+// Login/Logout routes
+Route::get('/login', 'Auth\AuthController@getLogin');
+Route::post('/login', 'Auth\AuthController@postLogin');
+Route::get('/logout', 'Auth\AuthController@getLogout');
+Route::get('/register', 'Auth\AuthController@getRegister');
+Route::get('/register/confirm', 'Auth\AuthController@getRegisterConfirmation');
+Route::get('/register/confirm/awaiting', 'Auth\AuthController@showAwaitingConfirmation');
+Route::post('/register/confirm/resend', 'Auth\AuthController@resendConfirmation');
+Route::get('/register/confirm/{token}', 'Auth\AuthController@confirmEmail');
+Route::get('/register/confirm/{token}/email', 'Auth\AuthController@viewConfirmEmail');
+Route::get('/register/service/{socialDriver}', 'Auth\AuthController@socialRegister');
+Route::post('/register', 'Auth\AuthController@postRegister');
+
+// Password reset link request routes...
+Route::get('/password/email', 'Auth\PasswordController@getEmail');
+Route::post('/password/email', 'Auth\PasswordController@postEmail');
+// Password reset routes...
+Route::get('/password/reset/{token}', 'Auth\PasswordController@getReset');
+Route::post('/password/reset', 'Auth\PasswordController@postReset');

app/Image.php

@@ -1,20 +1,23 @@
-<?php namespace BookStack\Uploads;
+<?php
 
-use BookStack\Ownable;
+namespace BookStack;
+
+
+use Illuminate\Database\Eloquent\Model;
 use Images;
 
-class Image extends Ownable
+class Image extends Model
 {
+    use Ownable;
 
     protected $fillable = ['name'];
 
     /**
      * Get a thumbnail for this image.
-     * @param  int $width
-     * @param  int $height
+     * @param  int       $width
+     * @param  int       $height
      * @param bool|false $keepRatio
      * @return string
-     * @throws \Exception
      */
     public function getThumb($width, $height, $keepRatio = false)
     {

app/Jobs/Job.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace BookStack\Jobs;
+
+use Illuminate\Bus\Queueable;
+
+abstract class Job
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Queueable Jobs
+    |--------------------------------------------------------------------------
+    |
+    | This job base class provides a central location to place any logic that
+    | is shared across all of your jobs. The trait included with the class
+    | provides access to the "queueOn" and "delay" queue helper methods.
+    |
+    */
+
+    use Queueable;
+}

app/Model.php

@@ -1,18 +0,0 @@
-<?php namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model as EloquentModel;
-
-class Model extends EloquentModel
-{
-
-    /**
-     * Provides public access to get the raw attribute value from the model.
-     * Used in areas where no mutations are required but performance is critical.
-     * @param $key
-     * @return mixed
-     */
-    public function getRawAttribute($key)
-    {
-        return parent::getAttributeFromArray($key);
-    }
-}