Merge branch 'master' into release for version v0.10

+language: php
+php:
+  - 7.0
+
+cache:
+  directories:
+    - vendor
+
+addons:
+  mariadb: '10.0'
+
+before_install:
+  - npm install -g npm@latest
+
+before_script:
+  - mysql -e 'create database `bookstack-test`;'
+  - composer config -g github-oauth.github.com $GITHUB_ACCESS_TOKEN
+  - phpenv config-rm xdebug.ini
+  - composer self-update
+  - composer install --prefer-dist --no-interaction
+  - npm install
+  - ./node_modules/.bin/gulp
+  - php artisan migrate --force -n --database=mysql_testing
+  - php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
+
+script:
+  - vendor/bin/phpunit
\ No newline at end of file

@@ -2,8 +2,6 @@
 
 
 namespace BookStack;
 namespace BookStack;
 
 
-use Illuminate\Database\Eloquent\Model;
-
 /**
 /**
  * @property string  key
  * @property string  key
  * @property \User   user
  * @property \User   user
@@ -28,7 +26,7 @@ class Activity extends Model
      */
      */
     public function user()
     public function user()
     {
     {
-        return $this->belongsTo('BookStack\User');
+        return $this->belongsTo(User::class);
     }
     }
 
 
     /**
     /**

-<?php
-
-namespace BookStack;
+<?php namespace BookStack;
 
 
 class Book extends Entity
 class Book extends Entity
 {
 {
 
 
     protected $fillable = ['name', 'description'];
     protected $fillable = ['name', 'description'];
 
 
+    /**
+     * Get the url for this book.
+     * @return string
+     */
     public function getUrl()
     public function getUrl()
     {
     {
         return '/books/' . $this->slug;
         return '/books/' . $this->slug;
     }
     }
 
 
+    /*
+     * Get the edit url for this book.
+     * @return string
+     */
     public function getEditUrl()
     public function getEditUrl()
     {
     {
         return $this->getUrl() . '/edit';
         return $this->getUrl() . '/edit';
     }
     }
 
 
+    /**
+     * Get all pages within this book.
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
     public function pages()
     public function pages()
     {
     {
-        return $this->hasMany('BookStack\Page');
+        return $this->hasMany(Page::class);
     }
     }
 
 
+    /**
+     * Get all chapters within this book.
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
     public function chapters()
     public function chapters()
     {
     {
-        return $this->hasMany('BookStack\Chapter');
+        return $this->hasMany(Chapter::class);
     }
     }
 
 
+    /**
+     * Get an excerpt of this book's description to the specified length or less.
+     * @param int $length
+     * @return string
+     */
     public function getExcerpt($length = 100)
     public function getExcerpt($length = 100)
     {
     {
-        return strlen($this->description) > $length ? substr($this->description, 0, $length-3) . '...' : $this->description;
+        $description = $this->description;
+        return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description;
     }
     }
 
 
 }
 }

@@ -5,25 +5,43 @@ class Chapter extends Entity
 {
 {
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
 
 
+    /**
+     * Get the book this chapter is within.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
     public function book()
     public function book()
     {
     {
-        return $this->belongsTo('BookStack\Book');
+        return $this->belongsTo(Book::class);
     }
     }
 
 
+    /**
+     * Get the pages that this chapter contains.
+     * @return mixed
+     */
     public function pages()
     public function pages()
     {
     {
-        return $this->hasMany('BookStack\Page')->orderBy('priority', 'ASC');
+        return $this->hasMany(Page::class)->orderBy('priority', 'ASC');
     }
     }
 
 
+    /**
+     * Get the url of this chapter.
+     * @return string
+     */
     public function getUrl()
     public function getUrl()
     {
     {
         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
         return '/books/' . $bookSlug. '/chapter/' . $this->slug;
         return '/books/' . $bookSlug. '/chapter/' . $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)
     public function getExcerpt($length = 100)
     {
     {
-        return strlen($this->description) > $length ? substr($this->description, 0, $length-3) . '...' : $this->description;
+        $description = $this->description;
+        return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description;
     }
     }
 
 
 }
 }

+<?php
+
+namespace BookStack\Console\Commands;
+
+use BookStack\Services\PermissionService;
+use Illuminate\Console\Command;
+
+class RegeneratePermissions extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'permissions:regen';
+
+    /**
+     * 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 PermissionService $permissionService
+     */
+    public function __construct(PermissionService $permissionService)
+    {
+        $this->permissionService = $permissionService;
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->permissionService->buildJointPermissions();
+    }
+}

@@ -15,6 +15,7 @@ class Kernel extends ConsoleKernel
     protected $commands = [
     protected $commands = [
         \BookStack\Console\Commands\Inspire::class,
         \BookStack\Console\Commands\Inspire::class,
         \BookStack\Console\Commands\ResetViews::class,
         \BookStack\Console\Commands\ResetViews::class,
+        \BookStack\Console\Commands\RegeneratePermissions::class,
     ];
     ];
 
 
     /**
     /**

-<?php
-
-namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model;
+<?php namespace BookStack;
 
 
 class EmailConfirmation extends Model
 class EmailConfirmation extends Model
 {
 {
     protected $fillable = ['user_id', 'token'];
     protected $fillable = ['user_id', 'token'];
 
 
+    /**
+     * Get the user that this confirmation is attached to.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
     public function user()
     public function user()
     {
     {
-        return $this->belongsTo('BookStack\User');
+        return $this->belongsTo(User::class);
     }
     }
+    
 }
 }

 <?php namespace BookStack;
 <?php namespace BookStack;
 
 
 
 
-abstract class Entity extends Ownable
+class Entity extends Ownable
 {
 {
 
 
     /**
     /**
@@ -43,7 +43,7 @@ abstract class Entity extends Ownable
      */
      */
     public function activity()
     public function activity()
     {
     {
-        return $this->morphMany('BookStack\Activity', 'entity')->orderBy('created_at', 'desc');
+        return $this->morphMany(Activity::class, 'entity')->orderBy('created_at', 'desc');
     }
     }
 
 
     /**
     /**
@@ -51,15 +51,24 @@ abstract class Entity extends Ownable
      */
      */
     public function views()
     public function views()
     {
     {
-        return $this->morphMany('BookStack\View', 'viewable');
+        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 this entities restrictions.
      * Get this entities restrictions.
      */
      */
-    public function restrictions()
+    public function permissions()
     {
     {
-        return $this->morphMany('BookStack\Restriction', 'restrictable');
+        return $this->morphMany(EntityPermission::class, 'restrictable');
     }
     }
 
 
     /**
     /**
@@ -70,7 +79,28 @@ abstract class Entity extends Ownable
      */
      */
     public function hasRestriction($role_id, $action)
     public function hasRestriction($role_id, $action)
     {
     {
-        return $this->restrictions->where('role_id', $role_id)->where('action', $action)->count() > 0;
+        return $this->permissions()->where('role_id', '=', $role_id)
+            ->where('action', '=', $action)->count() > 0;
+    }
+
+    /**
+     * Check if this entity has live (active) restrictions in place.
+     * @param $role_id
+     * @param $action
+     * @return bool
+     */
+    public function hasActiveRestriction($role_id, $action)
+    {
+        return $this->getRawAttribute('restricted') && $this->hasRestriction($role_id, $action);
+    }
+
+    /**
+     * Get the entity jointPermissions this is connected to.
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function jointPermissions()
+    {
+        return $this->morphMany(JointPermission::class, 'entity');
     }
     }
 
 
     /**
     /**
@@ -81,7 +111,32 @@ abstract class Entity extends Ownable
      */
      */
     public static function isA($type)
     public static function isA($type)
     {
     {
-        return static::getClassName() === strtolower($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'];
+        $className = str_replace([' ', '-', '_'], '', ucwords($type));
+        if (!in_array($className, $types)) {
+            return null;
+        }
+
+        return app('BookStack\\' . $className);
     }
     }
 
 
     /**
     /**
@@ -102,54 +157,54 @@ abstract class Entity extends Ownable
      * @param string[] array $wheres
      * @param string[] array $wheres
      * @return mixed
      * @return mixed
      */
      */
-    public static function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
+    public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
     {
     {
         $exactTerms = [];
         $exactTerms = [];
-        foreach ($terms as $key => $term) {
-            $term = htmlentities($term, ENT_QUOTES);
-            $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
-            if (preg_match('/\s/', $term)) {
-                $exactTerms[] = '%' . $term . '%';
-                $term = '"' . $term . '"';
-            } else {
-                $term = '' . $term . '*';
+        if (count($terms) === 0) {
+            $search = $this;
+            $orderBy = 'updated_at';
+        } else {
+            foreach ($terms as $key => $term) {
+                $term = htmlentities($term, ENT_QUOTES);
+                $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
+                if (preg_match('/\s/', $term)) {
+                    $exactTerms[] = '%' . $term . '%';
+                    $term = '"' . $term . '"';
+                } else {
+                    $term = '' . $term . '*';
+                }
+                if ($term !== '*') $terms[$key] = $term;
             }
             }
-            if ($term !== '*') $terms[$key] = $term;
-        }
-        $termString = implode(' ', $terms);
-        $fields = implode(',', $fieldsToSearch);
-        $search = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
-        $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
-
-        // Ensure at least one exact term matches if in search
-        if (count($exactTerms) > 0) {
-            $search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
-                foreach ($exactTerms as $exactTerm) {
-                    foreach ($fieldsToSearch as $field) {
-                        $query->orWhere($field, 'like', $exactTerm);
+            $termString = implode(' ', $terms);
+            $fields = implode(',', $fieldsToSearch);
+            $search = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
+            $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
+
+            // Ensure at least one exact term matches if in search
+            if (count($exactTerms) > 0) {
+                $search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
+                    foreach ($exactTerms as $exactTerm) {
+                        foreach ($fieldsToSearch as $field) {
+                            $query->orWhere($field, 'like', $exactTerm);
+                        }
                     }
                     }
-                }
-            });
-        }
+                });
+            }
+            $orderBy = 'title_relevance';
+        };
 
 
         // Add additional where terms
         // Add additional where terms
         foreach ($wheres as $whereTerm) {
         foreach ($wheres as $whereTerm) {
             $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
             $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
         }
         }
         // Load in relations
         // Load in relations
-        if (static::isA('page')) {
+        if ($this->isA('page')) {
             $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
             $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
-        } else if (static::isA('chapter')) {
+        } else if ($this->isA('chapter')) {
             $search = $search->with('book');
             $search = $search->with('book');
         }
         }
 
 
-        return $search->orderBy('title_relevance', 'desc');
+        return $search->orderBy($orderBy, 'desc');
     }
     }
-
-    /**
-     * Get the url for this item.
-     * @return string
-     */
-    abstract public function getUrl();
-
+    
 }
 }

-<?php
+<?php namespace BookStack;
 
 
-namespace BookStack;
 
 
-use Illuminate\Database\Eloquent\Model;
-
-class Restriction extends Model
+class EntityPermission extends Model
 {
 {
 
 
     protected $fillable = ['role_id', 'action'];
     protected $fillable = ['role_id', 'action'];
@@ -16,6 +13,6 @@ class Restriction extends Model
      */
      */
     public function restrictable()
     public function restrictable()
     {
     {
-        return $this->morphTo();
+        return $this->morphTo('restrictable');
     }
     }
 }
 }

@@ -71,11 +71,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
             'description' => 'string|max:1000'
         ]);
         ]);
-        $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();
+        $book = $this->bookRepo->createFromInput($request->all());
         Activity::add($book, 'book_create', $book->id);
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
         return redirect($book->getUrl());
     }
     }
@@ -88,6 +84,7 @@ class BookController extends Controller
     public function show($slug)
     public function show($slug)
     {
     {
         $book = $this->bookRepo->getBySlug($slug);
         $book = $this->bookRepo->getBySlug($slug);
+        $this->checkOwnablePermission('book-view', $book);
         $bookChildren = $this->bookRepo->getChildren($book);
         $bookChildren = $this->bookRepo->getChildren($book);
         Views::add($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());
         $this->setPageTitle($book->getShortName());
@@ -121,10 +118,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
             'description' => 'string|max:1000'
         ]);
         ]);
-        $book->fill($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->bookRepo->updateFromInput($book, $request->all());
         Activity::add($book, 'book_update', $book->id);
         Activity::add($book, 'book_update', $book->id);
         return redirect($book->getUrl());
         return redirect($book->getUrl());
     }
     }
@@ -209,6 +203,7 @@ class BookController extends Controller
         // Add activity for books
         // Add activity for books
         foreach ($sortedBooks as $bookId) {
         foreach ($sortedBooks as $bookId) {
             $updatedBook = $this->bookRepo->getById($bookId);
             $updatedBook = $this->bookRepo->getById($bookId);
+            $this->bookRepo->updateBookPermissions($updatedBook);
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
         }
 
 
@@ -226,7 +221,7 @@ class BookController extends Controller
         $this->checkOwnablePermission('book-delete', $book);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::removeEntity($book);
         Activity::removeEntity($book);
-        $this->bookRepo->destroyBySlug($bookSlug);
+        $this->bookRepo->destroy($book);
         return redirect('/books');
         return redirect('/books');
     }
     }
 
 
@@ -257,7 +252,7 @@ class BookController extends Controller
     {
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
         $this->checkOwnablePermission('restrictions-manage', $book);
-        $this->bookRepo->updateRestrictionsFromRequest($request, $book);
+        $this->bookRepo->updateEntityPermissionsFromRequest($request, $book);
         session()->flash('success', 'Book Restrictions Updated');
         session()->flash('success', 'Book Restrictions Updated');
         return redirect($book->getUrl());
         return redirect($book->getUrl());
     }
     }

@@ -57,12 +57,9 @@ class ChapterController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
         $this->checkOwnablePermission('chapter-create', $book);
 
 
-        $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);
+        $input = $request->all();
+        $input['priority'] = $this->bookRepo->getNewPriority($book);
+        $chapter = $this->chapterRepo->createFromInput($request->all(), $book);
         Activity::add($chapter, 'chapter_create', $book->id);
         Activity::add($chapter, 'chapter_create', $book->id);
         return redirect($chapter->getUrl());
         return redirect($chapter->getUrl());
     }
     }
@@ -77,6 +74,7 @@ class ChapterController extends Controller
     {
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        $this->checkOwnablePermission('chapter-view', $chapter);
         $sidebarTree = $this->bookRepo->getChildren($book);
         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($chapter);
         Views::add($chapter);
         $this->setPageTitle($chapter->getShortName());
         $this->setPageTitle($chapter->getShortName());
@@ -186,7 +184,7 @@ class ChapterController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
-        $this->chapterRepo->updateRestrictionsFromRequest($request, $chapter);
+        $this->chapterRepo->updateEntityPermissionsFromRequest($request, $chapter);
         session()->flash('success', 'Chapter Restrictions Updated');
         session()->flash('success', 'Chapter Restrictions Updated');
         return redirect($chapter->getUrl());
         return redirect($chapter->getUrl());
     }
     }

@@ -110,4 +110,15 @@ abstract class Controller extends BaseController
         return true;
         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);
+    }
+
 }
 }

@@ -69,10 +69,10 @@ class PageController extends Controller
     {
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $draft = $this->pageRepo->getById($pageId, true);
         $draft = $this->pageRepo->getById($pageId, true);
-        $this->checkOwnablePermission('page-create', $draft);
+        $this->checkOwnablePermission('page-create', $book);
         $this->setPageTitle('Edit Page Draft');
         $this->setPageTitle('Edit Page Draft');
 
 
-        return view('pages/create', ['draft' => $draft, 'book' => $book]);
+        return view('pages/edit', ['page' => $draft, 'book' => $book, 'isDraft' => true]);
     }
     }
 
 
     /**
     /**
@@ -128,6 +128,8 @@ class PageController extends Controller
             return redirect($page->getUrl());
             return redirect($page->getUrl());
         }
         }
 
 
+        $this->checkOwnablePermission('page-view', $page);
+
         $sidebarTree = $this->bookRepo->getChildren($book);
         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($page);
         Views::add($page);
         $this->setPageTitle($page->getShortName());
         $this->setPageTitle($page->getShortName());
@@ -449,7 +451,7 @@ class PageController extends Controller
     }
     }
 
 
     /**
     /**
-     * Set the restrictions for this page.
+     * Set the permissions for this page.
      * @param $bookSlug
      * @param $bookSlug
      * @param $pageSlug
      * @param $pageSlug
      * @param Request $request
      * @param Request $request
@@ -460,8 +462,8 @@ class PageController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $this->checkOwnablePermission('restrictions-manage', $page);
         $this->checkOwnablePermission('restrictions-manage', $page);
-        $this->pageRepo->updateRestrictionsFromRequest($request, $page);
-        session()->flash('success', 'Page Restrictions Updated');
+        $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);
+        session()->flash('success', 'Page Permissions Updated');
         return redirect($page->getUrl());
         return redirect($page->getUrl());
     }
     }
 
 

@@ -2,6 +2,7 @@
 
 
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Repos\PermissionsRepo;
 use BookStack\Repos\PermissionsRepo;
+use BookStack\Services\PermissionService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use BookStack\Http\Requests;
 use BookStack\Http\Requests;
 
 
@@ -62,11 +63,13 @@ class PermissionController extends Controller
      * Show the form for editing a user role.
      * Show the form for editing a user role.
      * @param $id
      * @param $id
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws PermissionsException
      */
      */
     public function editRole($id)
     public function editRole($id)
     {
     {
         $this->checkPermission('user-roles-manage');
         $this->checkPermission('user-roles-manage');
         $role = $this->permissionsRepo->getRoleById($id);
         $role = $this->permissionsRepo->getRoleById($id);
+        if ($role->hidden) throw new PermissionsException('This role cannot be edited');
         return view('settings/roles/edit', ['role' => $role]);
         return view('settings/roles/edit', ['role' => $role]);
     }
     }
 
 

+<?php namespace BookStack\Http\Controllers;
+
+use BookStack\Repos\TagRepo;
+use Illuminate\Http\Request;
+use BookStack\Http\Requests;
+
+class TagController extends Controller
+{
+
+    protected $tagRepo;
+
+    /**
+     * TagController constructor.
+     * @param $tagRepo
+     */
+    public function __construct(TagRepo $tagRepo)
+    {
+        $this->tagRepo = $tagRepo;
+    }
+
+    /**
+     * Get all the Tags for a particular entity
+     * @param $entityType
+     * @param $entityId
+     */
+    public function getForEntity($entityType, $entityId)
+    {
+        $tags = $this->tagRepo->getForEntity($entityType, $entityId);
+        return response()->json($tags);
+    }
+
+    /**
+     * Update the tags for a particular entity.
+     * @param $entityType
+     * @param $entityId
+     * @param Request $request
+     * @return mixed
+     */
+    public function updateForEntity($entityType, $entityId, Request $request)
+    {
+        $entity = $this->tagRepo->getEntity($entityType, $entityId, 'update');
+        if ($entity === null) return $this->jsonError("Entity not found", 404);
+
+        $inputTags = $request->input('tags');
+        $tags = $this->tagRepo->saveTagsToEntity($entity, $inputTags);
+        return response()->json([
+            'tags' => $tags,
+            'message' => 'Tags successfully updated'
+        ]);
+    }
+
+    /**
+     * Get tag name suggestions from a given search term.
+     * @param Request $request
+     */
+    public function getNameSuggestions(Request $request)
+    {
+        $searchTerm = $request->get('search');
+        $suggestions = $this->tagRepo->getNameSuggestions($searchTerm);
+        return response()->json($suggestions);
+    }
+
+    /**
+     * Get tag value suggestions from a given search term.
+     * @param Request $request
+     */
+    public function getValueSuggestions(Request $request)
+    {
+        $searchTerm = $request->get('search');
+        $suggestions = $this->tagRepo->getValueSuggestions($searchTerm);
+        return response()->json($suggestions);
+    }
+
+}

@@ -31,14 +31,21 @@ class UserController extends Controller
 
 
     /**
     /**
      * Display a listing of the users.
      * Display a listing of the users.
+     * @param Request $request
      * @return Response
      * @return Response
      */
      */
-    public function index()
+    public function index(Request $request)
     {
     {
         $this->checkPermission('users-manage');
         $this->checkPermission('users-manage');
-        $users = $this->userRepo->getAllUsers();
+        $listDetails = [
+            'order' => $request->has('order') ? $request->get('order') : 'asc',
+            'search' => $request->has('search') ? $request->get('search') : '',
+            'sort' => $request->has('sort') ? $request->get('sort') : 'name',
+        ];
+        $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
         $this->setPageTitle('Users');
         $this->setPageTitle('Users');
-        return view('users/index', ['users' => $users]);
+        $users->appends($listDetails);
+        return view('users/index', ['users' => $users, 'listDetails' => $listDetails]);
     }
     }
 
 
     /**
     /**
@@ -49,7 +56,8 @@ class UserController extends Controller
     {
     {
         $this->checkPermission('users-manage');
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');
         $authMethod = config('auth.method');
-        return view('users/create', ['authMethod' => $authMethod]);
+        $roles = $this->userRepo->getAssignableRoles();
+        return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);
     }
     }
 
 
     /**
     /**
@@ -117,7 +125,8 @@ class UserController extends Controller
         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $this->setPageTitle('User Profile');
         $this->setPageTitle('User Profile');
-        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod]);
+        $roles = $this->userRepo->getAssignableRoles();
+        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
     }
     }
 
 
     /**
     /**
@@ -198,11 +207,14 @@ class UserController extends Controller
         });
         });
 
 
         $user = $this->userRepo->getById($id);
         $user = $this->userRepo->getById($id);
+
         if ($this->userRepo->isOnlyAdmin($user)) {
         if ($this->userRepo->isOnlyAdmin($user)) {
             session()->flash('error', 'You cannot delete the only admin');
             session()->flash('error', 'You cannot delete the only admin');
             return redirect($user->getEditUrl());
             return redirect($user->getEditUrl());
         }
         }
+
         $this->userRepo->destroy($user);
         $this->userRepo->destroy($user);
+        session()->flash('success', 'User successfully removed');
 
 
         return redirect('/settings/users');
         return redirect('/settings/users');
     }
     }

@@ -28,7 +28,7 @@ Route::group(['middleware' => 'auth'], function () {
         // Pages
         // Pages
         Route::get('/{bookSlug}/page/create', 'PageController@create');
         Route::get('/{bookSlug}/page/create', 'PageController@create');
         Route::get('/{bookSlug}/draft/{pageId}', 'PageController@editDraft');
         Route::get('/{bookSlug}/draft/{pageId}', 'PageController@editDraft');
-        Route::post('/{bookSlug}/page/{pageId}', 'PageController@store');
+        Route::post('/{bookSlug}/draft/{pageId}', 'PageController@store');
         Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show');
         Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show');
         Route::get('/{bookSlug}/page/{pageSlug}/export/pdf', 'PageController@exportPdf');
         Route::get('/{bookSlug}/page/{pageSlug}/export/pdf', 'PageController@exportPdf');
         Route::get('/{bookSlug}/page/{pageSlug}/export/html', 'PageController@exportHtml');
         Route::get('/{bookSlug}/page/{pageSlug}/export/html', 'PageController@exportHtml');
@@ -80,11 +80,19 @@ Route::group(['middleware' => 'auth'], function () {
         Route::delete('/{imageId}', 'ImageController@destroy');
         Route::delete('/{imageId}', 'ImageController@destroy');
     });
     });
 
 
-    // Ajax routes
+    // AJAX routes
     Route::put('/ajax/page/{id}/save-draft', 'PageController@saveDraft');
     Route::put('/ajax/page/{id}/save-draft', 'PageController@saveDraft');
     Route::get('/ajax/page/{id}', 'PageController@getPageAjax');
     Route::get('/ajax/page/{id}', 'PageController@getPageAjax');
     Route::delete('/ajax/page/{id}', 'PageController@ajaxDestroy');
     Route::delete('/ajax/page/{id}', 'PageController@ajaxDestroy');
 
 
+    // Tag routes (AJAX)
+    Route::group(['prefix' => 'ajax/tags'], function() {
+        Route::get('/get/{entityType}/{entityId}', 'TagController@getForEntity');
+        Route::get('/suggest/names', 'TagController@getNameSuggestions');
+        Route::get('/suggest/values', 'TagController@getValueSuggestions');
+        Route::post('/update/{entityType}/{entityId}', 'TagController@updateForEntity');
+    });
+
     // Links
     // Links
     Route::get('/link/{id}', 'PageController@redirectFromLink');
     Route::get('/link/{id}', 'PageController@redirectFromLink');
 
 

+<?php namespace BookStack;
+
+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');
+    }
+}

+<?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);
+    }
+
+}
\ No newline at end of file

 <?php namespace BookStack;
 <?php namespace BookStack;
 
 
-use Illuminate\Database\Eloquent\Model;
 
 
 abstract class Ownable extends Model
 abstract class Ownable extends Model
 {
 {
@@ -10,7 +9,7 @@ abstract class Ownable extends Model
      */
      */
     public function createdBy()
     public function createdBy()
     {
     {
-        return $this->belongsTo('BookStack\User', 'created_by');
+        return $this->belongsTo(User::class, 'created_by');
     }
     }
 
 
     /**
     /**
@@ -19,7 +18,7 @@ abstract class Ownable extends Model
      */
      */
     public function updatedBy()
     public function updatedBy()
     {
     {
-        return $this->belongsTo('BookStack\User', 'updated_by');
+        return $this->belongsTo(User::class, 'updated_by');
     }
     }
 
 
     /**
     /**

-<?php
+<?php namespace BookStack;
 
 
-namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model;
 
 
 class Page extends Entity
 class Page extends Entity
 {
 {
@@ -10,6 +7,10 @@ class Page extends Entity
 
 
     protected $simpleAttributes = ['name', 'id', 'slug'];
     protected $simpleAttributes = ['name', 'id', 'slug'];
 
 
+    /**
+     * Converts this page into a simplified array.
+     * @return mixed
+     */
     public function toSimpleArray()
     public function toSimpleArray()
     {
     {
         $array = array_intersect_key($this->toArray(), array_flip($this->simpleAttributes));
         $array = array_intersect_key($this->toArray(), array_flip($this->simpleAttributes));
@@ -17,26 +18,46 @@ class Page extends Entity
         return $array;
         return $array;
     }
     }
 
 
+    /**
+     * Get the book this page sits in.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
     public function book()
     public function book()
     {
     {
-        return $this->belongsTo('BookStack\Book');
+        return $this->belongsTo(Book::class);
     }
     }
 
 
+    /**
+     * Get the chapter that this page is in, If applicable.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
     public function chapter()
     public function chapter()
     {
     {
-        return $this->belongsTo('BookStack\Chapter');
+        return $this->belongsTo(Chapter::class);
     }
     }
 
 
+    /**
+     * Check if this page has a chapter.
+     * @return bool
+     */
     public function hasChapter()
     public function hasChapter()
     {
     {
         return $this->chapter()->count() > 0;
         return $this->chapter()->count() > 0;
     }
     }
 
 
+    /**
+     * Get the associated page revisions, ordered by created date.
+     * @return mixed
+     */
     public function revisions()
     public function revisions()
     {
     {
-        return $this->hasMany('BookStack\PageRevision')->where('type', '=', 'version')->orderBy('created_at', 'desc');
+        return $this->hasMany(PageRevision::class)->where('type', '=', 'version')->orderBy('created_at', 'desc');
     }
     }
 
 
+    /**
+     * Get the url for this page.
+     * @return string
+     */
     public function getUrl()
     public function getUrl()
     {
     {
         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
@@ -45,6 +66,11 @@ class Page extends Entity
         return '/books/' . $bookSlug . $midText . $idComponent;
         return '/books/' . $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)
     public function getExcerpt($length = 100)
     {
     {
         $text = strlen($this->text) > $length ? substr($this->text, 0, $length-3) . '...' : $this->text;
         $text = strlen($this->text) > $length ? substr($this->text, 0, $length-3) . '...' : $this->text;

 <?php namespace BookStack;
 <?php namespace BookStack;
 
 
-use Illuminate\Database\Eloquent\Model;
 
 
 class PageRevision extends Model
 class PageRevision extends Model
 {
 {
@@ -12,7 +11,7 @@ class PageRevision extends Model
      */
      */
     public function createdBy()
     public function createdBy()
     {
     {
-        return $this->belongsTo('BookStack\User', 'created_by');
+        return $this->belongsTo(User::class, 'created_by');
     }
     }
 
 
     /**
     /**
@@ -21,7 +20,7 @@ class PageRevision extends Model
      */
      */
     public function page()
     public function page()
     {
     {
-        return $this->belongsTo('BookStack\Page');
+        return $this->belongsTo(Page::class);
     }
     }
 
 
     /**
     /**

@@ -3,6 +3,7 @@
 namespace BookStack\Providers;
 namespace BookStack\Providers;
 
 
 use Auth;
 use Auth;
+use BookStack\Services\LdapService;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\ServiceProvider;
 
 
 class AuthServiceProvider extends ServiceProvider
 class AuthServiceProvider extends ServiceProvider
@@ -25,7 +26,7 @@ class AuthServiceProvider extends ServiceProvider
     public function register()
     public function register()
     {
     {
         Auth::provider('ldap', function($app, array $config) {
         Auth::provider('ldap', function($app, array $config) {
-            return new LdapUserProvider($config['model'], $app['BookStack\Services\LdapService']);
+            return new LdapUserProvider($config['model'], $app[LdapService::class]);
         });
         });
     }
     }
 }
 }

@@ -2,11 +2,18 @@
 
 
 namespace BookStack\Providers;
 namespace BookStack\Providers;
 
 
+use BookStack\Activity;
 use BookStack\Services\ImageService;
 use BookStack\Services\ImageService;
+use BookStack\Services\PermissionService;
 use BookStack\Services\ViewService;
 use BookStack\Services\ViewService;
+use BookStack\Setting;
+use BookStack\View;
+use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Contracts\Filesystem\Factory;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\ServiceProvider;
 use BookStack\Services\ActivityService;
 use BookStack\Services\ActivityService;
 use BookStack\Services\SettingService;
 use BookStack\Services\SettingService;
+use Intervention\Image\ImageManager;
 
 
 class CustomFacadeProvider extends ServiceProvider
 class CustomFacadeProvider extends ServiceProvider
 {
 {
@@ -29,30 +36,30 @@ class CustomFacadeProvider extends ServiceProvider
     {
     {
         $this->app->bind('activity', function() {
         $this->app->bind('activity', function() {
             return new ActivityService(
             return new ActivityService(
-                $this->app->make('BookStack\Activity'),
-                $this->app->make('BookStack\Services\RestrictionService')
+                $this->app->make(Activity::class),
+                $this->app->make(PermissionService::class)
             );
             );
         });
         });
 
 
         $this->app->bind('views', function() {
         $this->app->bind('views', function() {
             return new ViewService(
             return new ViewService(
-                $this->app->make('BookStack\View'),
-                $this->app->make('BookStack\Services\RestrictionService')
+                $this->app->make(View::class),
+                $this->app->make(PermissionService::class)
             );
             );
         });
         });
 
 
         $this->app->bind('setting', function() {
         $this->app->bind('setting', function() {
             return new SettingService(
             return new SettingService(
-                $this->app->make('BookStack\Setting'),
-                $this->app->make('Illuminate\Contracts\Cache\Repository')
+                $this->app->make(Setting::class),
+                $this->app->make(Repository::class)
             );
             );
         });
         });
 
 
         $this->app->bind('images', function() {
         $this->app->bind('images', function() {
             return new ImageService(
             return new ImageService(
-                $this->app->make('Intervention\Image\ImageManager'),
-                $this->app->make('Illuminate\Contracts\Filesystem\Factory'),
-                $this->app->make('Illuminate\Contracts\Cache\Repository')
+                $this->app->make(ImageManager::class),
+                $this->app->make(Factory::class),
+                $this->app->make(Repository::class)
             );
             );
         });
         });
     }
     }

 <?php namespace BookStack\Repos;
 <?php namespace BookStack\Repos;
 
 
+use Alpha\B;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use BookStack\Book;
 use BookStack\Book;
@@ -29,7 +30,7 @@ class BookRepo extends EntityRepo
      */
      */
     private function bookQuery()
     private function bookQuery()
     {
     {
-        return $this->restrictionService->enforceBookRestrictions($this->book, 'view');
+        return $this->permissionService->enforceBookRestrictions($this->book, 'view');
     }
     }
 
 
     /**
     /**
@@ -123,21 +124,43 @@ class BookRepo extends EntityRepo
 
 
     /**
     /**
      * Get a new book instance from request input.
      * Get a new book instance from request input.
+     * @param array $input
+     * @return Book
+     */
+    public function createFromInput($input)
+    {
+        $book = $this->book->newInstance($input);
+        $book->slug = $this->findSuitableSlug($book->name);
+        $book->created_by = auth()->user()->id;
+        $book->updated_by = auth()->user()->id;
+        $book->save();
+        $this->permissionService->buildJointPermissionsForEntity($book);
+        return $book;
+    }
+
+    /**
+     * Update the given book from user input.
+     * @param Book $book
      * @param $input
      * @param $input
      * @return Book
      * @return Book
      */
      */
-    public function newFromInput($input)
+    public function updateFromInput(Book $book, $input)
     {
     {
-        return $this->book->newInstance($input);
+        $book->fill($input);
+        $book->slug = $this->findSuitableSlug($book->name, $book->id);
+        $book->updated_by = auth()->user()->id;
+        $book->save();
+        $this->permissionService->buildJointPermissionsForEntity($book);
+        return $book;
     }
     }
 
 
     /**
     /**
-     * Destroy a book identified by the given slug.
-     * @param $bookSlug
+     * Destroy the given book.
+     * @param Book $book
+     * @throws \Exception
      */
      */
-    public function destroyBySlug($bookSlug)
+    public function destroy(Book $book)
     {
     {
-        $book = $this->getBySlug($bookSlug);
         foreach ($book->pages as $page) {
         foreach ($book->pages as $page) {
             $this->pageRepo->destroy($page);
             $this->pageRepo->destroy($page);
         }
         }
@@ -145,11 +168,21 @@ class BookRepo extends EntityRepo
             $this->chapterRepo->destroy($chapter);
             $this->chapterRepo->destroy($chapter);
         }
         }
         $book->views()->delete();
         $book->views()->delete();
-        $book->restrictions()->delete();
+        $book->permissions()->delete();
+        $this->permissionService->deleteJointPermissionsForEntity($book);
         $book->delete();
         $book->delete();
     }
     }
 
 
     /**
     /**
+     * Alias method to update the book jointPermissions in the PermissionService.
+     * @param Book $book
+     */
+    public function updateBookPermissions(Book $book)
+    {
+        $this->permissionService->buildJointPermissionsForEntity($book);
+    }
+
+    /**
      * Get the next child element priority.
      * Get the next child element priority.
      * @param Book $book
      * @param Book $book
      * @return int
      * @return int
@@ -204,7 +237,7 @@ class BookRepo extends EntityRepo
     public function getChildren(Book $book, $filterDrafts = false)
     public function getChildren(Book $book, $filterDrafts = false)
     {
     {
         $pageQuery = $book->pages()->where('chapter_id', '=', 0);
         $pageQuery = $book->pages()->where('chapter_id', '=', 0);
-        $pageQuery = $this->restrictionService->enforcePageRestrictions($pageQuery, 'view');
+        $pageQuery = $this->permissionService->enforcePageRestrictions($pageQuery, 'view');
 
 
         if ($filterDrafts) {
         if ($filterDrafts) {
             $pageQuery = $pageQuery->where('draft', '=', false);
             $pageQuery = $pageQuery->where('draft', '=', false);
@@ -213,10 +246,10 @@ class BookRepo extends EntityRepo
         $pages = $pageQuery->get();
         $pages = $pageQuery->get();
 
 
         $chapterQuery = $book->chapters()->with(['pages' => function($query) use ($filterDrafts) {
         $chapterQuery = $book->chapters()->with(['pages' => function($query) use ($filterDrafts) {
-            $this->restrictionService->enforcePageRestrictions($query, 'view');
+            $this->permissionService->enforcePageRestrictions($query, 'view');
             if ($filterDrafts) $query->where('draft', '=', false);
             if ($filterDrafts) $query->where('draft', '=', false);
         }]);
         }]);
-        $chapterQuery = $this->restrictionService->enforceChapterRestrictions($chapterQuery, 'view');
+        $chapterQuery = $this->permissionService->enforceChapterRestrictions($chapterQuery, 'view');
         $chapters = $chapterQuery->get();
         $chapters = $chapterQuery->get();
         $children = $pages->merge($chapters);
         $children = $pages->merge($chapters);
         $bookSlug = $book->slug;
         $bookSlug = $book->slug;
@@ -253,8 +286,9 @@ class BookRepo extends EntityRepo
     public function getBySearch($term, $count = 20, $paginationAppends = [])
     public function getBySearch($term, $count = 20, $paginationAppends = [])
     {
     {
         $terms = $this->prepareSearchTerms($term);
         $terms = $this->prepareSearchTerms($term);
-        $books = $this->restrictionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms))
-            ->paginate($count)->appends($paginationAppends);
+        $bookQuery = $this->permissionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms));
+        $bookQuery = $this->addAdvancedSearchQueries($bookQuery, $term);
+        $books = $bookQuery->paginate($count)->appends($paginationAppends);
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($books as $book) {
         foreach ($books as $book) {
             //highlight
             //highlight

@@ -2,6 +2,7 @@
 
 
 
 
 use Activity;
 use Activity;
+use BookStack\Book;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use BookStack\Chapter;
 use BookStack\Chapter;
@@ -9,12 +10,12 @@ use BookStack\Chapter;
 class ChapterRepo extends EntityRepo
 class ChapterRepo extends EntityRepo
 {
 {
     /**
     /**
-     * Base query for getting chapters, Takes restrictions into account.
+     * Base query for getting chapters, Takes permissions into account.
      * @return mixed
      * @return mixed
      */
      */
     private function chapterQuery()
     private function chapterQuery()
     {
     {
-        return $this->restrictionService->enforceChapterRestrictions($this->chapter, 'view');
+        return $this->permissionService->enforceChapterRestrictions($this->chapter, 'view');
     }
     }
 
 
     /**
     /**
@@ -66,7 +67,7 @@ class ChapterRepo extends EntityRepo
      */
      */
     public function getChildren(Chapter $chapter)
     public function getChildren(Chapter $chapter)
     {
     {
-        $pages = $this->restrictionService->enforcePageRestrictions($chapter->pages())->get();
+        $pages = $this->permissionService->enforcePageRestrictions($chapter->pages())->get();
         // Sort items with drafts first then by priority.
         // Sort items with drafts first then by priority.
         return $pages->sortBy(function($child, $key) {
         return $pages->sortBy(function($child, $key) {
             $score = $child->priority;
             $score = $child->priority;
@@ -78,11 +79,18 @@ class ChapterRepo extends EntityRepo
     /**
     /**
      * Create a new chapter from request input.
      * Create a new chapter from request input.
      * @param $input
      * @param $input
-     * @return $this
+     * @param Book $book
+     * @return Chapter
      */
      */
-    public function newFromInput($input)
+    public function createFromInput($input, Book $book)
     {
     {
-        return $this->chapter->fill($input);
+        $chapter = $this->chapter->newInstance($input);
+        $chapter->slug = $this->findSuitableSlug($chapter->name, $book->id);
+        $chapter->created_by = auth()->user()->id;
+        $chapter->updated_by = auth()->user()->id;
+        $chapter = $book->chapters()->save($chapter);
+        $this->permissionService->buildJointPermissionsForEntity($chapter);
+        return $chapter;
     }
     }
 
 
     /**
     /**
@@ -99,7 +107,8 @@ class ChapterRepo extends EntityRepo
         }
         }
         Activity::removeEntity($chapter);
         Activity::removeEntity($chapter);
         $chapter->views()->delete();
         $chapter->views()->delete();
-        $chapter->restrictions()->delete();
+        $chapter->permissions()->delete();
+        $this->permissionService->deleteJointPermissionsForEntity($chapter);
         $chapter->delete();
         $chapter->delete();
     }
     }
 
 
@@ -159,8 +168,9 @@ class ChapterRepo extends EntityRepo
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     {
     {
         $terms = $this->prepareSearchTerms($term);
         $terms = $this->prepareSearchTerms($term);
-        $chapters = $this->restrictionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms))
-            ->paginate($count)->appends($paginationAppends);
+        $chapterQuery = $this->permissionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms));
+        $chapterQuery = $this->addAdvancedSearchQueries($chapterQuery, $term);
+        $chapters = $chapterQuery->paginate($count)->appends($paginationAppends);
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($chapters as $chapter) {
         foreach ($chapters as $chapter) {
             //highlight
             //highlight

@@ -4,8 +4,9 @@ use BookStack\Book;
 use BookStack\Chapter;
 use BookStack\Chapter;
 use BookStack\Entity;
 use BookStack\Entity;
 use BookStack\Page;
 use BookStack\Page;
-use BookStack\Services\RestrictionService;
+use BookStack\Services\PermissionService;
 use BookStack\User;
 use BookStack\User;
+use Illuminate\Support\Facades\Log;
 
 
 class EntityRepo
 class EntityRepo
 {
 {
@@ -26,9 +27,15 @@ class EntityRepo
     public $page;
     public $page;
 
 
     /**
     /**
-     * @var RestrictionService
+     * @var PermissionService
      */
      */
-    protected $restrictionService;
+    protected $permissionService;
+
+    /**
+     * Acceptable operators to be used in a query
+     * @var array
+     */
+    protected $queryOperators = ['<=', '>=', '=', '<', '>', 'like', '!='];
 
 
     /**
     /**
      * EntityService constructor.
      * EntityService constructor.
@@ -38,7 +45,7 @@ class EntityRepo
         $this->book = app(Book::class);
         $this->book = app(Book::class);
         $this->chapter = app(Chapter::class);
         $this->chapter = app(Chapter::class);
         $this->page = app(Page::class);
         $this->page = app(Page::class);
-        $this->restrictionService = app(RestrictionService::class);
+        $this->permissionService = app(PermissionService::class);
     }
     }
 
 
     /**
     /**
@@ -50,7 +57,7 @@ class EntityRepo
      */
      */
     public function getRecentlyCreatedBooks($count = 20, $page = 0, $additionalQuery = false)
     public function getRecentlyCreatedBooks($count = 20, $page = 0, $additionalQuery = false)
     {
     {
-        $query = $this->restrictionService->enforceBookRestrictions($this->book)
+        $query = $this->permissionService->enforceBookRestrictions($this->book)
             ->orderBy('created_at', 'desc');
             ->orderBy('created_at', 'desc');
         if ($additionalQuery !== false && is_callable($additionalQuery)) {
         if ($additionalQuery !== false && is_callable($additionalQuery)) {
             $additionalQuery($query);
             $additionalQuery($query);
@@ -66,7 +73,7 @@ class EntityRepo
      */
      */
     public function getRecentlyUpdatedBooks($count = 20, $page = 0)
     public function getRecentlyUpdatedBooks($count = 20, $page = 0)
     {
     {
-        return $this->restrictionService->enforceBookRestrictions($this->book)
+        return $this->permissionService->enforceBookRestrictions($this->book)
             ->orderBy('updated_at', 'desc')->skip($page * $count)->take($count)->get();
             ->orderBy('updated_at', 'desc')->skip($page * $count)->take($count)->get();
     }
     }
 
 
@@ -79,7 +86,7 @@ class EntityRepo
      */
      */
     public function getRecentlyCreatedPages($count = 20, $page = 0, $additionalQuery = false)
     public function getRecentlyCreatedPages($count = 20, $page = 0, $additionalQuery = false)
     {
     {
-        $query = $this->restrictionService->enforcePageRestrictions($this->page)
+        $query = $this->permissionService->enforcePageRestrictions($this->page)
             ->orderBy('created_at', 'desc')->where('draft', '=', false);
             ->orderBy('created_at', 'desc')->where('draft', '=', false);
         if ($additionalQuery !== false && is_callable($additionalQuery)) {
         if ($additionalQuery !== false && is_callable($additionalQuery)) {
             $additionalQuery($query);
             $additionalQuery($query);
@@ -96,7 +103,7 @@ class EntityRepo
      */
      */
     public function getRecentlyCreatedChapters($count = 20, $page = 0, $additionalQuery = false)
     public function getRecentlyCreatedChapters($count = 20, $page = 0, $additionalQuery = false)
     {
     {
-        $query = $this->restrictionService->enforceChapterRestrictions($this->chapter)
+        $query = $this->permissionService->enforceChapterRestrictions($this->chapter)
             ->orderBy('created_at', 'desc');
             ->orderBy('created_at', 'desc');
         if ($additionalQuery !== false && is_callable($additionalQuery)) {
         if ($additionalQuery !== false && is_callable($additionalQuery)) {
             $additionalQuery($query);
             $additionalQuery($query);
@@ -112,7 +119,7 @@ class EntityRepo
      */
      */
     public function getRecentlyUpdatedPages($count = 20, $page = 0)
     public function getRecentlyUpdatedPages($count = 20, $page = 0)
     {
     {
-        return $this->restrictionService->enforcePageRestrictions($this->page)
+        return $this->permissionService->enforcePageRestrictions($this->page)
             ->where('draft', '=', false)
             ->where('draft', '=', false)
             ->orderBy('updated_at', 'desc')->with('book')->skip($page * $count)->take($count)->get();
             ->orderBy('updated_at', 'desc')->with('book')->skip($page * $count)->take($count)->get();
     }
     }
@@ -136,14 +143,14 @@ class EntityRepo
      * @param $request
      * @param $request
      * @param Entity $entity
      * @param Entity $entity
      */
      */
-    public function updateRestrictionsFromRequest($request, Entity $entity)
+    public function updateEntityPermissionsFromRequest($request, Entity $entity)
     {
     {
         $entity->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
         $entity->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
-        $entity->restrictions()->delete();
+        $entity->permissions()->delete();
         if ($request->has('restrictions')) {
         if ($request->has('restrictions')) {
             foreach ($request->get('restrictions') as $roleId => $restrictions) {
             foreach ($request->get('restrictions') as $roleId => $restrictions) {
                 foreach ($restrictions as $action => $value) {
                 foreach ($restrictions as $action => $value) {
-                    $entity->restrictions()->create([
+                    $entity->permissions()->create([
                         'role_id' => $roleId,
                         'role_id' => $roleId,
                         'action'  => strtolower($action)
                         'action'  => strtolower($action)
                     ]);
                     ]);
@@ -151,6 +158,7 @@ class EntityRepo
             }
             }
         }
         }
         $entity->save();
         $entity->save();
+        $this->permissionService->buildJointPermissionsForEntity($entity);
     }
     }
 
 
     /**
     /**
@@ -162,6 +170,7 @@ class EntityRepo
      */
      */
     protected function prepareSearchTerms($termString)
     protected function prepareSearchTerms($termString)
     {
     {
+        $termString = $this->cleanSearchTermString($termString);
         preg_match_all('/"(.*?)"/', $termString, $matches);
         preg_match_all('/"(.*?)"/', $termString, $matches);
         if (count($matches[1]) > 0) {
         if (count($matches[1]) > 0) {
             $terms = $matches[1];
             $terms = $matches[1];
@@ -173,5 +182,93 @@ class EntityRepo
         return $terms;
         return $terms;
     }
     }
 
 
+    /**
+     * Removes any special search notation that should not
+     * be used in a full-text search.
+     * @param $termString
+     * @return mixed
+     */
+    protected function cleanSearchTermString($termString)
+    {
+        // Strip tag searches
+        $termString = preg_replace('/\[.*?\]/', '', $termString);
+        // Reduced multiple spacing into single spacing
+        $termString = preg_replace("/\s{2,}/", " ", $termString);
+        return $termString;
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * Parses advanced search notations and adds them to the db query.
+     * @param $query
+     * @param $termString
+     * @return mixed
+     */
+    protected function addAdvancedSearchQueries($query, $termString)
+    {
+        $escapedOperators = $this->getRegexEscapedOperators();
+        // Look for tag searches
+        preg_match_all("/\[(.*?)((${escapedOperators})(.*?))?\]/", $termString, $tags);
+        if (count($tags[0]) > 0) {
+            $this->applyTagSearches($query, $tags);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Apply extracted tag search terms onto a entity query.
+     * @param $query
+     * @param $tags
+     * @return mixed
+     */
+    protected function applyTagSearches($query, $tags) {
+        $query->where(function($query) use ($tags) {
+            foreach ($tags[1] as $index => $tagName) {
+                $query->whereHas('tags', function($query) use ($tags, $index, $tagName) {
+                    $tagOperator = $tags[3][$index];
+                    $tagValue = $tags[4][$index];
+                    if (!empty($tagOperator) && !empty($tagValue) && in_array($tagOperator, $this->queryOperators)) {
+                        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->where('name', '=', $tagName)->whereRaw("value ${tagOperator} ${tagValue}");
+                        } else {
+                            $query->where('name', '=', $tagName)->where('value', $tagOperator, $tagValue);
+                        }
+                    } else {
+                        $query->where('name', '=', $tagName);
+                    }
+                });
+            }
+        });
+        return $query;
+    }
+
+}
+
+
+
+
+
+
+
+
+
+
+
 
 
-}
\ No newline at end of file

@@ -4,7 +4,7 @@
 use BookStack\Image;
 use BookStack\Image;
 use BookStack\Page;
 use BookStack\Page;
 use BookStack\Services\ImageService;
 use BookStack\Services\ImageService;
-use BookStack\Services\RestrictionService;
+use BookStack\Services\PermissionService;
 use Setting;
 use Setting;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 
@@ -20,14 +20,14 @@ class ImageRepo
      * ImageRepo constructor.
      * ImageRepo constructor.
      * @param Image $image
      * @param Image $image
      * @param ImageService $imageService
      * @param ImageService $imageService
-     * @param RestrictionService $restrictionService
+     * @param PermissionService $permissionService
      * @param Page $page
      * @param Page $page
      */
      */
-    public function __construct(Image $image, ImageService $imageService, RestrictionService $restrictionService, Page $page)
+    public function __construct(Image $image, ImageService $imageService, PermissionService $permissionService, Page $page)
     {
     {
         $this->image = $image;
         $this->image = $image;
         $this->imageService = $imageService;
         $this->imageService = $imageService;
-        $this->restictionService = $restrictionService;
+        $this->restictionService = $permissionService;
         $this->page = $page;
         $this->page = $page;
     }
     }
 
 

@@ -14,14 +14,17 @@ class PageRepo extends EntityRepo
 {
 {
 
 
     protected $pageRevision;
     protected $pageRevision;
+    protected $tagRepo;
 
 
     /**
     /**
      * PageRepo constructor.
      * PageRepo constructor.
      * @param PageRevision $pageRevision
      * @param PageRevision $pageRevision
+     * @param TagRepo $tagRepo
      */
      */
-    public function __construct(PageRevision $pageRevision)
+    public function __construct(PageRevision $pageRevision, TagRepo $tagRepo)
     {
     {
         $this->pageRevision = $pageRevision;
         $this->pageRevision = $pageRevision;
+        $this->tagRepo = $tagRepo;
         parent::__construct();
         parent::__construct();
     }
     }
 
 
@@ -32,7 +35,7 @@ class PageRepo extends EntityRepo
      */
      */
     private function pageQuery($allowDrafts = false)
     private function pageQuery($allowDrafts = false)
     {
     {
-        $query = $this->restrictionService->enforcePageRestrictions($this->page, 'view');
+        $query = $this->permissionService->enforcePageRestrictions($this->page, 'view');
         if (!$allowDrafts) {
         if (!$allowDrafts) {
             $query = $query->where('draft', '=', false);
             $query = $query->where('draft', '=', false);
         }
         }
@@ -76,7 +79,7 @@ class PageRepo extends EntityRepo
     {
     {
         $revision = $this->pageRevision->where('slug', '=', $pageSlug)
         $revision = $this->pageRevision->where('slug', '=', $pageSlug)
             ->whereHas('page', function ($query) {
             ->whereHas('page', function ($query) {
-                $this->restrictionService->enforcePageRestrictions($query);
+                $this->permissionService->enforcePageRestrictions($query);
             })
             })
             ->where('type', '=', 'version')
             ->where('type', '=', 'version')
             ->where('book_slug', '=', $bookSlug)->orderBy('created_at', 'desc')
             ->where('book_slug', '=', $bookSlug)->orderBy('created_at', 'desc')
@@ -142,6 +145,11 @@ class PageRepo extends EntityRepo
     {
     {
         $draftPage->fill($input);
         $draftPage->fill($input);
 
 
+        // Save page tags if present
+        if(isset($input['tags'])) {
+            $this->tagRepo->saveTagsToEntity($draftPage, $input['tags']);
+        }
+
         $draftPage->slug = $this->findSuitableSlug($draftPage->name, $draftPage->book->id);
         $draftPage->slug = $this->findSuitableSlug($draftPage->name, $draftPage->book->id);
         $draftPage->html = $this->formatHtml($input['html']);
         $draftPage->html = $this->formatHtml($input['html']);
         $draftPage->text = strip_tags($draftPage->html);
         $draftPage->text = strip_tags($draftPage->html);
@@ -168,6 +176,7 @@ class PageRepo extends EntityRepo
         if ($chapter) $page->chapter_id = $chapter->id;
         if ($chapter) $page->chapter_id = $chapter->id;
 
 
         $book->pages()->save($page);
         $book->pages()->save($page);
+        $this->permissionService->buildJointPermissionsForEntity($page);
         return $page;
         return $page;
     }
     }
 
 
@@ -241,8 +250,9 @@ class PageRepo extends EntityRepo
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     {
     {
         $terms = $this->prepareSearchTerms($term);
         $terms = $this->prepareSearchTerms($term);
-        $pages = $this->restrictionService->enforcePageRestrictions($this->page->fullTextSearchQuery(['name', 'text'], $terms, $whereTerms))
-            ->paginate($count)->appends($paginationAppends);
+        $pageQuery = $this->permissionService->enforcePageRestrictions($this->page->fullTextSearchQuery(['name', 'text'], $terms, $whereTerms));
+        $pageQuery = $this->addAdvancedSearchQueries($pageQuery, $term);
+        $pages = $pageQuery->paginate($count)->appends($paginationAppends);
 
 
         // Add highlights to page text.
         // Add highlights to page text.
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
@@ -307,6 +317,11 @@ class PageRepo extends EntityRepo
             $page->slug = $this->findSuitableSlug($input['name'], $book_id, $page->id);
             $page->slug = $this->findSuitableSlug($input['name'], $book_id, $page->id);
         }
         }
 
 
+        // Save page tags if present
+        if(isset($input['tags'])) {
+            $this->tagRepo->saveTagsToEntity($page, $input['tags']);
+        }
+
         // Update with new details
         // Update with new details
         $userId = auth()->user()->id;
         $userId = auth()->user()->id;
         $page->fill($input);
         $page->fill($input);
@@ -577,12 +592,14 @@ class PageRepo extends EntityRepo
      * Destroy a given page along with its dependencies.
      * Destroy a given page along with its dependencies.
      * @param $page
      * @param $page
      */
      */
-    public function destroy($page)
+    public function destroy(Page $page)
     {
     {
         Activity::removeEntity($page);
         Activity::removeEntity($page);
         $page->views()->delete();
         $page->views()->delete();
+        $page->tags()->delete();
         $page->revisions()->delete();
         $page->revisions()->delete();
-        $page->restrictions()->delete();
+        $page->permissions()->delete();
+        $this->permissionService->deleteJointPermissionsForEntity($page);
         $page->delete();
         $page->delete();
     }
     }
 
 

@@ -2,8 +2,9 @@
 
 
 
 
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Exceptions\PermissionsException;
-use BookStack\Permission;
+use BookStack\RolePermission;
 use BookStack\Role;
 use BookStack\Role;
+use BookStack\Services\PermissionService;
 use Setting;
 use Setting;
 
 
 class PermissionsRepo
 class PermissionsRepo
@@ -11,16 +12,21 @@ class PermissionsRepo
 
 
     protected $permission;
     protected $permission;
     protected $role;
     protected $role;
+    protected $permissionService;
+
+    protected $systemRoles = ['admin', 'public'];
 
 
     /**
     /**
      * PermissionsRepo constructor.
      * PermissionsRepo constructor.
-     * @param $permission
-     * @param $role
+     * @param RolePermission $permission
+     * @param Role $role
+     * @param PermissionService $permissionService
      */
      */
-    public function __construct(Permission $permission, Role $role)
+    public function __construct(RolePermission $permission, Role $role, PermissionService $permissionService)
     {
     {
         $this->permission = $permission;
         $this->permission = $permission;
         $this->role = $role;
         $this->role = $role;
+        $this->permissionService = $permissionService;
     }
     }
 
 
     /**
     /**
@@ -29,7 +35,7 @@ class PermissionsRepo
      */
      */
     public function getAllRoles()
     public function getAllRoles()
     {
     {
-        return $this->role->all();
+        return $this->role->where('hidden', '=', false)->get();
     }
     }
 
 
     /**
     /**
@@ -39,7 +45,7 @@ class PermissionsRepo
      */
      */
     public function getAllRolesExcept(Role $role)
     public function getAllRolesExcept(Role $role)
     {
     {
-        return $this->role->where('id', '!=', $role->id)->get();
+        return $this->role->where('id', '!=', $role->id)->where('hidden', '=', false)->get();
     }
     }
 
 
     /**
     /**
@@ -69,6 +75,7 @@ class PermissionsRepo
 
 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
         $this->assignRolePermissions($role, $permissions);
+        $this->permissionService->buildJointPermissionForRole($role);
         return $role;
         return $role;
     }
     }
 
 
@@ -77,10 +84,14 @@ class PermissionsRepo
      * Ensure Admin role always has all permissions.
      * Ensure Admin role always has all permissions.
      * @param $roleId
      * @param $roleId
      * @param $roleData
      * @param $roleData
+     * @throws PermissionsException
      */
      */
     public function updateRole($roleId, $roleData)
     public function updateRole($roleId, $roleData)
     {
     {
         $role = $this->role->findOrFail($roleId);
         $role = $this->role->findOrFail($roleId);
+
+        if ($role->hidden) throw new PermissionsException("Cannot update a hidden role");
+
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
         $this->assignRolePermissions($role, $permissions);
 
 
@@ -91,6 +102,7 @@ class PermissionsRepo
 
 
         $role->fill($roleData);
         $role->fill($roleData);
         $role->save();
         $role->save();
+        $this->permissionService->buildJointPermissionForRole($role);
     }
     }
 
 
     /**
     /**
@@ -122,8 +134,8 @@ class PermissionsRepo
         $role = $this->role->findOrFail($roleId);
         $role = $this->role->findOrFail($roleId);
 
 
         // Prevent deleting admin role or default registration role.
         // Prevent deleting admin role or default registration role.
-        if ($role->name === 'admin') {
-            throw new PermissionsException('The admin role cannot be deleted');
+        if ($role->system_name && in_array($role->system_name, $this->systemRoles)) {
+            throw new PermissionsException('This role is a system role and cannot be deleted');
         } else if ($role->id == setting('registration-role')) {
         } else if ($role->id == setting('registration-role')) {
             throw new PermissionsException('This role cannot be deleted while set as the default registration role.');
             throw new PermissionsException('This role cannot be deleted while set as the default registration role.');
         }
         }
@@ -136,6 +148,7 @@ class PermissionsRepo
             }
             }
         }
         }
 
 
+        $this->permissionService->deleteJointPermissionsForRole($role);
         $role->delete();
         $role->delete();
     }
     }
 
 

+<?php namespace BookStack\Repos;
+
+use BookStack\Tag;
+use BookStack\Entity;
+use BookStack\Services\PermissionService;
+
+/**
+ * Class TagRepo
+ * @package BookStack\Repos
+ */
+class TagRepo
+{
+
+    protected $tag;
+    protected $entity;
+    protected $permissionService;
+
+    /**
+     * TagRepo constructor.
+     * @param Tag $attr
+     * @param Entity $ent
+     * @param 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
+     */
+    public function getEntity($entityType, $entityId, $action = 'view')
+    {
+        $entityInstance = $this->entity->getEntityInstance($entityType);
+        $searchQuery = $entityInstance->where('id', '=', $entityId)->with('tags');
+        $searchQuery = $this->permissionService->enforceEntityRestrictions($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.
+     * @param $searchTerm
+     * @return array
+     */
+    public function getNameSuggestions($searchTerm)
+    {
+        if ($searchTerm === '') return [];
+        $query = $this->tag->where('name', 'LIKE', $searchTerm . '%')->groupBy('name')->orderBy('name', 'desc');
+        $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.
+     * @param $searchTerm
+     * @return array
+     */
+    public function getValueSuggestions($searchTerm)
+    {
+        if ($searchTerm === '') return [];
+        $query = $this->tag->where('value', 'LIKE', $searchTerm . '%')->groupBy('value')->orderBy('value', 'desc');
+        $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 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 static
+     */
+    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);
+    }
+
+}
\ No newline at end of file

@@ -52,6 +52,27 @@ class UserRepo
     }
     }
 
 
     /**
     /**
+     * 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 = 20, $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.
      * Creates a new user and attaches a role to them.
      * @param array $data
      * @param array $data
      * @return User
      * @return User
@@ -169,13 +190,22 @@ class UserRepo
     }
     }
 
 
     /**
     /**
+     * Get the roles in the system that are assignable to a user.
+     * @return mixed
+     */
+    public function getAssignableRoles()
+    {
+        return $this->role->visible();
+    }
+
+    /**
      * Get all the roles which can be given restricted access to
      * Get all the roles which can be given restricted access to
      * other entities in the system.
      * other entities in the system.
      * @return mixed
      * @return mixed
      */
      */
     public function getRestrictableRoles()
     public function getRestrictableRoles()
     {
     {
-        return $this->role->where('name', '!=', 'admin')->get();
+        return $this->role->where('hidden', '=', false)->where('system_name', '=', '')->get();
     }
     }
 
 
 }
 }
\ No newline at end of file

-<?php
+<?php namespace BookStack;
 
 
-namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model;
 
 
 class Role extends Model
 class Role extends Model
 {
 {
@@ -14,40 +11,54 @@ class Role extends Model
      */
      */
     public function users()
     public function users()
     {
     {
-        return $this->belongsToMany('BookStack\User');
+        return $this->belongsToMany(User::class);
+    }
+
+    /**
+     * Get all related JointPermissions.
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function jointPermissions()
+    {
+        return $this->hasMany(JointPermission::class);
     }
     }
 
 
     /**
     /**
-     * The permissions that belong to the role.
+     * The RolePermissions that belong to the role.
      */
      */
     public function permissions()
     public function permissions()
     {
     {
-        return $this->belongsToMany('BookStack\Permission');
+        return $this->belongsToMany(RolePermission::class, 'permission_role', 'role_id', 'permission_id');
     }
     }
 
 
     /**
     /**
      * Check if this role has a permission.
      * Check if this role has a permission.
-     * @param $permission
+     * @param $permissionName
+     * @return bool
      */
      */
-    public function hasPermission($permission)
+    public function hasPermission($permissionName)
     {
     {
-        return $this->permissions->pluck('name')->contains($permission);
+        $permissions = $this->getRelationValue('permissions');
+        foreach ($permissions as $permission) {
+            if ($permission->getRawAttribute('name') === $permissionName) return true;
+        }
+        return false;
     }
     }
 
 
     /**
     /**
      * Add a permission to this role.
      * Add a permission to this role.
-     * @param Permission $permission
+     * @param RolePermission $permission
      */
      */
-    public function attachPermission(Permission $permission)
+    public function attachPermission(RolePermission $permission)
     {
     {
         $this->permissions()->attach($permission->id);
         $this->permissions()->attach($permission->id);
     }
     }
 
 
     /**
     /**
      * Detach a single permission from this role.
      * Detach a single permission from this role.
-     * @param Permission $permission
+     * @param RolePermission $permission
      */
      */
-    public function detachPermission(Permission $permission)
+    public function detachPermission(RolePermission $permission)
     {
     {
         $this->permissions()->detach($permission->id);
         $this->permissions()->detach($permission->id);
     }
     }
@@ -61,4 +72,24 @@ class Role extends Model
     {
     {
         return static::where('name', '=', $roleName)->first();
         return static::where('name', '=', $roleName)->first();
     }
     }
+
+    /**
+     * Get the role object for the specified system role.
+     * @param $roleName
+     * @return mixed
+     */
+    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();
+    }
+
 }
 }

-<?php
+<?php namespace BookStack;
 
 
-namespace BookStack;
 
 
-use Illuminate\Database\Eloquent\Model;
-
-class Permission extends Model
+class RolePermission extends Model
 {
 {
     /**
     /**
      * The roles that belong to the permission.
      * The roles that belong to the permission.
      */
      */
     public function roles()
     public function roles()
     {
     {
-        return $this->belongsToMany('BookStack\Role');
+        return $this->belongsToMany(Role::class, 'permission_role','permission_id', 'role_id');
     }
     }
 
 
     /**
     /**
      * Get the permission object by name.
      * Get the permission object by name.
-     * @param $roleName
+     * @param $name
      * @return mixed
      * @return mixed
      */
      */
     public static function getByName($name)
     public static function getByName($name)

@@ -8,17 +8,17 @@ class ActivityService
 {
 {
     protected $activity;
     protected $activity;
     protected $user;
     protected $user;
-    protected $restrictionService;
+    protected $permissionService;
 
 
     /**
     /**
      * ActivityService constructor.
      * ActivityService constructor.
      * @param Activity $activity
      * @param Activity $activity
-     * @param RestrictionService $restrictionService
+     * @param PermissionService $permissionService
      */
      */
-    public function __construct(Activity $activity, RestrictionService $restrictionService)
+    public function __construct(Activity $activity, PermissionService $permissionService)
     {
     {
         $this->activity = $activity;
         $this->activity = $activity;
-        $this->restrictionService = $restrictionService;
+        $this->permissionService = $permissionService;
         $this->user = auth()->user();
         $this->user = auth()->user();
     }
     }
 
 
@@ -88,7 +88,7 @@ class ActivityService
      */
      */
     public function latest($count = 20, $page = 0)
     public function latest($count = 20, $page = 0)
     {
     {
-        $activityList = $this->restrictionService
+        $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
             ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
 
 
@@ -105,8 +105,16 @@ class ActivityService
      */
      */
     public function entityActivity($entity, $count = 20, $page = 0)
     public function entityActivity($entity, $count = 20, $page = 0)
     {
     {
-        $activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
-            ->skip($count * $page)->take($count)->get();
+        if ($entity->isA('book')) {
+            $query = $this->activity->where('book_id', '=', $entity->id);
+        } else {
+            $query = $this->activity->where('entity_type', '=', get_class($entity))
+                ->where('entity_id', '=', $entity->id);
+        }
+        
+        $activity = $this->permissionService
+            ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
 
 
         return $this->filterSimilar($activity);
         return $this->filterSimilar($activity);
     }
     }
@@ -121,7 +129,7 @@ class ActivityService
      */
      */
     public function userActivity($user, $count = 20, $page = 0)
     public function userActivity($user, $count = 20, $page = 0)
     {
     {
-        $activityList = $this->restrictionService
+        $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')->where('user_id', '=', $user->id)->skip($count * $page)->take($count)->get();
             ->orderBy('created_at', 'desc')->where('user_id', '=', $user->id)->skip($count * $page)->take($count)->get();
         return $this->filterSimilar($activityList);
         return $this->filterSimilar($activityList);

@@ -34,6 +34,17 @@ class Ldap
     }
     }
 
 
     /**
     /**
+     * Set the version number for the given ldap connection.
+     * @param $ldapConnection
+     * @param $version
+     * @return bool
+     */
+    public function setVersion($ldapConnection, $version)
+    {
+        return $this->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $version);
+    }
+
+    /**
      * Search LDAP tree using the provided filter.
      * Search LDAP tree using the provided filter.
      * @param resource   $ldapConnection
      * @param resource   $ldapConnection
      * @param string     $baseDn
      * @param string     $baseDn

@@ -122,7 +122,7 @@ class LdapService
 
 
         // Set any required options
         // Set any required options
         if ($this->config['version']) {
         if ($this->config['version']) {
-            $this->ldap->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $this->config['version']);
+            $this->ldap->setVersion($ldapConnection, $this->config['version']);
         }
         }
 
 
         $this->ldapConnection = $ldapConnection;
         $this->ldapConnection = $ldapConnection;

 <?php namespace BookStack\Services;
 <?php namespace BookStack\Services;
 
 
-use GuzzleHttp\Exception\ClientException;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Http\Controllers\Auth\AuthController;
 use BookStack\Repos\UserRepo;
 use BookStack\Repos\UserRepo;
 use BookStack\SocialAccount;
 use BookStack\SocialAccount;
-use BookStack\User;
 
 
 class SocialAuthService
 class SocialAuthService
 {
 {

@@ -8,18 +8,18 @@ class ViewService
 
 
     protected $view;
     protected $view;
     protected $user;
     protected $user;
-    protected $restrictionService;
+    protected $permissionService;
 
 
     /**
     /**
      * ViewService constructor.
      * ViewService constructor.
      * @param View $view
      * @param View $view
-     * @param RestrictionService $restrictionService
+     * @param PermissionService $permissionService
      */
      */
-    public function __construct(View $view, RestrictionService $restrictionService)
+    public function __construct(View $view, PermissionService $permissionService)
     {
     {
         $this->view = $view;
         $this->view = $view;
         $this->user = auth()->user();
         $this->user = auth()->user();
-        $this->restrictionService = $restrictionService;
+        $this->permissionService = $permissionService;
     }
     }
 
 
     /**
     /**
@@ -55,7 +55,7 @@ class ViewService
     public function getPopular($count = 10, $page = 0, $filterModel = false)
     public function getPopular($count = 10, $page = 0, $filterModel = false)
     {
     {
         $skipCount = $count * $page;
         $skipCount = $count * $page;
-        $query = $this->restrictionService->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type')
+        $query = $this->permissionService->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type')
             ->select('*', 'viewable_id', 'viewable_type', \DB::raw('SUM(views) as view_count'))
             ->select('*', 'viewable_id', 'viewable_type', \DB::raw('SUM(views) as view_count'))
             ->groupBy('viewable_id', 'viewable_type')
             ->groupBy('viewable_id', 'viewable_type')
             ->orderBy('view_count', 'desc');
             ->orderBy('view_count', 'desc');
@@ -76,7 +76,7 @@ class ViewService
     {
     {
         if ($this->user === null) return collect();
         if ($this->user === null) return collect();
 
 
-        $query = $this->restrictionService
+        $query = $this->permissionService
             ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
             ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
 
 
         if ($filterModel) $query = $query->where('viewable_type', '=', get_class($filterModel));
         if ($filterModel) $query = $query->where('viewable_type', '=', get_class($filterModel));

-<?php
-
-namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model;
+<?php namespace BookStack;
 
 
 class Setting extends Model
 class Setting extends Model
 {
 {

-<?php
+<?php namespace BookStack;
 
 
-namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model;
 
 
 class SocialAccount extends Model
 class SocialAccount extends Model
 {
 {
@@ -11,6 +8,6 @@ class SocialAccount extends Model
 
 
     public function user()
     public function user()
     {
     {
-        return $this->belongsTo('BookStack\User');
+        return $this->belongsTo(User::class);
     }
     }
 }
 }

+<?php namespace BookStack;
+
+/**
+ * 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');
+    }
+}
\ No newline at end of file

-<?php
-
-namespace BookStack;
+<?php namespace BookStack;
 
 
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Authenticatable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
@@ -52,7 +49,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
      */
     public function roles()
     public function roles()
     {
     {
-        return $this->belongsToMany('BookStack\Role');
+        return $this->belongsToMany(Role::class);
     }
     }
 
 
     /**
     /**
@@ -116,7 +113,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
      */
     public function socialAccounts()
     public function socialAccounts()
     {
     {
-        return $this->hasMany('BookStack\SocialAccount');
+        return $this->hasMany(SocialAccount::class);
     }
     }
 
 
     /**
     /**
@@ -151,7 +148,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
      */
     public function avatar()
     public function avatar()
     {
     {
-        return $this->belongsTo('BookStack\Image', 'image_id');
+        return $this->belongsTo(Image::class, 'image_id');
     }
     }
 
 
     /**
     /**

-<?php
-
-namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model;
+<?php namespace BookStack;
 
 
 class View extends Model
 class View extends Model
 {
 {

@@ -31,7 +31,7 @@ if (!function_exists('versioned_asset')) {
 
 
 /**
 /**
  * Check if the current user has a permission.
  * Check if the current user has a permission.
- * If an ownable element is passed in the permissions are checked against
+ * If an ownable element is passed in the jointPermissions are checked against
  * that particular item.
  * that particular item.
  * @param $permission
  * @param $permission
  * @param \BookStack\Ownable $ownable
  * @param \BookStack\Ownable $ownable
@@ -39,26 +39,13 @@ if (!function_exists('versioned_asset')) {
  */
  */
 function userCan($permission, \BookStack\Ownable $ownable = null)
 function userCan($permission, \BookStack\Ownable $ownable = null)
 {
 {
-    if (!auth()->check()) return false;
     if ($ownable === null) {
     if ($ownable === null) {
         return auth()->user() && auth()->user()->can($permission);
         return auth()->user() && auth()->user()->can($permission);
     }
     }
 
 
     // Check permission on ownable item
     // Check permission on ownable item
-    $permissionBaseName = strtolower($permission) . '-';
-    $hasPermission = false;
-    if (auth()->user()->can($permissionBaseName . 'all')) $hasPermission = true;
-    if (auth()->user()->can($permissionBaseName . 'own') && $ownable->createdBy && $ownable->createdBy->id === auth()->user()->id) $hasPermission = true;
-
-    if (!$ownable instanceof \BookStack\Entity) return $hasPermission;
-
-    // Check restrictions on the entity
-    $restrictionService = app('BookStack\Services\RestrictionService');
-    $explodedPermission = explode('-', $permission);
-    $action = end($explodedPermission);
-    $hasAccess = $restrictionService->checkIfEntityRestricted($ownable, $action);
-    $restrictionsSet = $restrictionService->checkIfRestrictionsSet($ownable, $action);
-    return ($hasAccess && $restrictionsSet) || (!$restrictionsSet && $hasPermission);
+    $permissionService = app('BookStack\Services\PermissionService');
+    return $permissionService->checkEntityUserAccess($ownable, $permission);
 }
 }
 
 
 /**
 /**
@@ -72,3 +59,35 @@ function setting($key, $default = false)
     $settingService = app('BookStack\Services\SettingService');
     $settingService = app('BookStack\Services\SettingService');
     return $settingService->get($key, $default);
     return $settingService->get($key, $default);
 }
 }
+
+/**
+ * Generate a url with multiple parameters for sorting purposes.
+ * Works out the logic to set the correct sorting direction
+ * Discards empty parameters and allows overriding.
+ * @param $path
+ * @param array $data
+ * @param array $overrideData
+ * @return string
+ */
+function sortUrl($path, $data, $overrideData = [])
+{
+    $queryStringSections = [];
+    $queryData = array_merge($data, $overrideData);
+    
+    // Change sorting direction is already sorted on current attribute
+    if (isset($overrideData['sort']) && $overrideData['sort'] === $data['sort']) {
+        $queryData['order'] = ($data['order'] === 'asc') ? 'desc' : 'asc';
+    } else {
+        $queryData['order'] = 'asc';
+    }
+    
+    foreach ($queryData as $name => $value) {
+        $trimmedVal = trim($value);
+        if ($trimmedVal === '') continue;
+        $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal);
+    }
+
+    if (count($queryStringSections) === 0) return $path;
+
+    return $path . '?' . implode('&', $queryStringSections);
+}
\ No newline at end of file

@@ -84,8 +84,8 @@ return [
             'driver'    => 'mysql',
             'driver'    => 'mysql',
             'host'      => 'localhost',
             'host'      => 'localhost',
             'database'  => 'bookstack-test',
             'database'  => 'bookstack-test',
-            'username'  => 'bookstack-test',
-            'password'  => 'bookstack-test',
+            'username'  => env('MYSQL_USER', 'bookstack-test'),
+            'password'  => env('MYSQL_PASSWORD', 'bookstack-test'),
             'charset'   => 'utf8',
             'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'prefix'    => '',

@@ -52,4 +52,11 @@ $factory->define(BookStack\Role::class, function ($faker) {
         'display_name' => $faker->sentence(3),
         'display_name' => $faker->sentence(3),
         'description' => $faker->sentence(10)
         'description' => $faker->sentence(10)
     ];
     ];
+});
+
+$factory->define(BookStack\Tag::class, function ($faker) {
+    return [
+        'name' => $faker->city,
+        'value' => $faker->sentence(3)
+    ];
 });
 });
\ No newline at end of file

@@ -21,10 +21,13 @@ class CreateUsersTable extends Migration
             $table->nullableTimestamps();
             $table->nullableTimestamps();
         });
         });
 
 
-        \BookStack\User::forceCreate([
+        // Create the initial admin user
+        DB::table('users')->insert([
             'name' => 'Admin',
             'name' => 'Admin',
             'email' => 'admin@admin.com',
             'email' => 'admin@admin.com',
-            'password' => bcrypt('password')
+            'password' => bcrypt('password'),
+            'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+            'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
         ]);
         ]);
     }
     }
 
 

@@ -68,35 +68,44 @@ class AddRolesAndPermissions extends Migration
 
 
 
 
         // Create default roles
         // Create default roles
-        $admin = new \BookStack\Role();
-        $admin->name = 'admin';
-        $admin->display_name = 'Admin';
-        $admin->description = 'Administrator of the whole application';
-        $admin->save();
-
-        $editor = new \BookStack\Role();
-        $editor->name = 'editor';
-        $editor->display_name = 'Editor';
-        $editor->description = 'User can edit Books, Chapters & Pages';
-        $editor->save();
-
-        $viewer = new \BookStack\Role();
-        $viewer->name = 'viewer';
-        $viewer->display_name = 'Viewer';
-        $viewer->description = 'User can view books & their content behind authentication';
-        $viewer->save();
+        $adminId = DB::table('roles')->insertGetId([
+            'name' => 'admin',
+            'display_name' => 'Admin',
+            'description' => 'Administrator of the whole application',
+            'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+            'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+        ]);
+        $editorId = DB::table('roles')->insertGetId([
+            'name' => 'editor',
+            'display_name' => 'Editor',
+            'description' => 'User can edit Books, Chapters & Pages',
+            'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+            'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+        ]);
+        $viewerId = DB::table('roles')->insertGetId([
+            'name' => 'viewer',
+            'display_name' => 'Viewer',
+            'description' => 'User can view books & their content behind authentication',
+            'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+            'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+        ]);
+
 
 
         // Create default CRUD permissions and allocate to admins and editors
         // Create default CRUD permissions and allocate to admins and editors
         $entities = ['Book', 'Page', 'Chapter', 'Image'];
         $entities = ['Book', 'Page', 'Chapter', 'Image'];
         $ops = ['Create', 'Update', 'Delete'];
         $ops = ['Create', 'Update', 'Delete'];
         foreach ($entities as $entity) {
         foreach ($entities as $entity) {
             foreach ($ops as $op) {
             foreach ($ops as $op) {
-                $newPermission = new \BookStack\Permission();
-                $newPermission->name = strtolower($entity) . '-' . strtolower($op);
-                $newPermission->display_name = $op . ' ' . $entity . 's';
-                $newPermission->save();
-                $admin->attachPermission($newPermission);
-                $editor->attachPermission($newPermission);
+                $newPermId = DB::table('permissions')->insertGetId([
+                    'name' => strtolower($entity) . '-' . strtolower($op),
+                    'display_name' => $op . ' ' . $entity . 's',
+                    'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+                    'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+                ]);
+                DB::table('permission_role')->insert([
+                    ['permission_id' => $newPermId, 'role_id' => $adminId],
+                    ['permission_id' => $newPermId, 'role_id' => $editorId]
+                ]);
             }
             }
         }
         }
 
 
@@ -105,19 +114,27 @@ class AddRolesAndPermissions extends Migration
         $ops = ['Create', 'Update', 'Delete'];
         $ops = ['Create', 'Update', 'Delete'];
         foreach ($entities as $entity) {
         foreach ($entities as $entity) {
             foreach ($ops as $op) {
             foreach ($ops as $op) {
-                $newPermission = new \BookStack\Permission();
-                $newPermission->name = strtolower($entity) . '-' . strtolower($op);
-                $newPermission->display_name = $op . ' ' . $entity;
-                $newPermission->save();
-                $admin->attachPermission($newPermission);
+                $newPermId = DB::table('permissions')->insertGetId([
+                    'name' => strtolower($entity) . '-' . strtolower($op),
+                    'display_name' => $op . ' ' . $entity,
+                    'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+                    'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+                ]);
+                DB::table('permission_role')->insert([
+                    'permission_id' => $newPermId,
+                    'role_id' => $adminId
+                ]);
             }
             }
         }
         }
 
 
         // Set all current users as admins
         // Set all current users as admins
         // (At this point only the initially create user should be an admin)
         // (At this point only the initially create user should be an admin)
-        $users = \BookStack\User::all();
+        $users = DB::table('users')->get();
         foreach ($users as $user) {
         foreach ($users as $user) {
-            $user->attachRole($admin);
+            DB::table('role_user')->insert([
+                'role_id' => $adminId,
+                'user_id' => $user->id
+            ]);
         }
         }
 
 
     }
     }

@@ -13,29 +13,31 @@ class UpdatePermissionsAndRoles extends Migration
     public function up()
     public function up()
     {
     {
         // Get roles with permissions we need to change
         // Get roles with permissions we need to change
-        $adminRole = \BookStack\Role::getRole('admin');
-        $editorRole = \BookStack\Role::getRole('editor');
+        $adminRoleId = DB::table('roles')->where('name', '=', 'admin')->first()->id;
+        $editorRole = DB::table('roles')->where('name', '=', 'editor')->first();
 
 
         // Delete old permissions
         // Delete old permissions
-        $permissions = \BookStack\Permission::all();
-        $permissions->each(function ($permission) {
-            $permission->delete();
-        });
+        $permissions = DB::table('permissions')->delete();
 
 
         // Create & attach new admin permissions
         // Create & attach new admin permissions
         $permissionsToCreate = [
         $permissionsToCreate = [
             'settings-manage' => 'Manage Settings',
             'settings-manage' => 'Manage Settings',
             'users-manage' => 'Manage Users',
             'users-manage' => 'Manage Users',
             'user-roles-manage' => 'Manage Roles & Permissions',
             'user-roles-manage' => 'Manage Roles & Permissions',
-            'restrictions-manage-all' => 'Manage All Entity Restrictions',
-            'restrictions-manage-own' => 'Manage Entity Restrictions On Own Content'
+            'restrictions-manage-all' => 'Manage All Entity Permissions',
+            'restrictions-manage-own' => 'Manage Entity Permissions On Own Content'
         ];
         ];
         foreach ($permissionsToCreate as $name => $displayName) {
         foreach ($permissionsToCreate as $name => $displayName) {
-            $newPermission = new \BookStack\Permission();
-            $newPermission->name = $name;
-            $newPermission->display_name = $displayName;
-            $newPermission->save();
-            $adminRole->attachPermission($newPermission);
+            $permissionId = DB::table('permissions')->insertGetId([
+                'name' => $name,
+                'display_name' => $displayName,
+                'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+                'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+            ]);
+            DB::table('permission_role')->insert([
+                'role_id' => $adminRoleId,
+                'permission_id' => $permissionId
+            ]);
         }
         }
 
 
         // Create & attach new entity permissions
         // Create & attach new entity permissions
@@ -43,12 +45,22 @@ class UpdatePermissionsAndRoles extends Migration
         $ops = ['Create All', 'Create Own', 'Update All', 'Update Own', 'Delete All', 'Delete Own'];
         $ops = ['Create All', 'Create Own', 'Update All', 'Update Own', 'Delete All', 'Delete Own'];
         foreach ($entities as $entity) {
         foreach ($entities as $entity) {
             foreach ($ops as $op) {
             foreach ($ops as $op) {
-                $newPermission = new \BookStack\Permission();
-                $newPermission->name = strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op));
-                $newPermission->display_name = $op . ' ' . $entity . 's';
-                $newPermission->save();
-                $adminRole->attachPermission($newPermission);
-                if ($editorRole !== null) $editorRole->attachPermission($newPermission);
+                $permissionId = DB::table('permissions')->insertGetId([
+                    'name' => strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op)),
+                    'display_name' => $op . ' ' . $entity . 's',
+                    'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+                    'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+                ]);
+                DB::table('permission_role')->insert([
+                    'role_id' => $adminRoleId,
+                    'permission_id' => $permissionId
+                ]);
+                if ($editorRole !== null) {
+                    DB::table('permission_role')->insert([
+                        'role_id' => $editorRole->id,
+                        'permission_id' => $permissionId
+                    ]);
+                }
             }
             }
         }
         }
 
 
@@ -62,24 +74,26 @@ class UpdatePermissionsAndRoles extends Migration
     public function down()
     public function down()
     {
     {
         // Get roles with permissions we need to change
         // Get roles with permissions we need to change
-        $adminRole = \BookStack\Role::getRole('admin');
+        $adminRoleId = DB::table('roles')->where('name', '=', 'admin')->first()->id;
 
 
         // Delete old permissions
         // Delete old permissions
-        $permissions = \BookStack\Permission::all();
-        $permissions->each(function ($permission) {
-            $permission->delete();
-        });
+        $permissions = DB::table('permissions')->delete();
 
 
         // Create default CRUD permissions and allocate to admins and editors
         // Create default CRUD permissions and allocate to admins and editors
         $entities = ['Book', 'Page', 'Chapter', 'Image'];
         $entities = ['Book', 'Page', 'Chapter', 'Image'];
         $ops = ['Create', 'Update', 'Delete'];
         $ops = ['Create', 'Update', 'Delete'];
         foreach ($entities as $entity) {
         foreach ($entities as $entity) {
             foreach ($ops as $op) {
             foreach ($ops as $op) {
-                $newPermission = new \BookStack\Permission();
-                $newPermission->name = strtolower($entity) . '-' . strtolower($op);
-                $newPermission->display_name = $op . ' ' . $entity . 's';
-                $newPermission->save();
-                $adminRole->attachPermission($newPermission);
+                $permissionId = DB::table('permissions')->insertGetId([
+                    'name' => strtolower($entity) . '-' . strtolower($op),
+                    'display_name' => $op . ' ' . $entity . 's',
+                    'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+                    'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+                ]);
+                DB::table('permission_role')->insert([
+                    'role_id' => $adminRoleId,
+                    'permission_id' => $permissionId
+                ]);
             }
             }
         }
         }
 
 
@@ -88,11 +102,16 @@ class UpdatePermissionsAndRoles extends Migration
         $ops = ['Create', 'Update', 'Delete'];
         $ops = ['Create', 'Update', 'Delete'];
         foreach ($entities as $entity) {
         foreach ($entities as $entity) {
             foreach ($ops as $op) {
             foreach ($ops as $op) {
-                $newPermission = new \BookStack\Permission();
-                $newPermission->name = strtolower($entity) . '-' . strtolower($op);
-                $newPermission->display_name = $op . ' ' . $entity;
-                $newPermission->save();
-                $adminRole->attachPermission($newPermission);
+                $permissionId = DB::table('permissions')->insertGetId([
+                    'name' => strtolower($entity) . '-' . strtolower($op),
+                    'display_name' => $op . ' ' . $entity,
+                    'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+                    'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+                ]);
+                DB::table('permission_role')->insert([
+                    'role_id' => $adminRoleId,
+                    'permission_id' => $permissionId
+                ]);
             }
             }
         }
         }
     }
     }

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddViewPermissionsToRoles extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $currentRoles = DB::table('roles')->get();
+
+        // Create new view permission
+        $entities = ['Book', 'Page', 'Chapter'];
+        $ops = ['View All', 'View Own'];
+        foreach ($entities as $entity) {
+            foreach ($ops as $op) {
+                $permId = DB::table('permissions')->insertGetId([
+                    'name' => strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op)),
+                    'display_name' => $op . ' ' . $entity . 's',
+                    'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+                    'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+                ]);
+                // Assign view permission to all current roles
+                foreach ($currentRoles as $role) {
+                    DB::table('permission_role')->insert([
+                        'role_id' => $role->id,
+                        'permission_id' => $permId
+                    ]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Delete the new view permission
+        $entities = ['Book', 'Page', 'Chapter'];
+        $ops = ['View All', 'View Own'];
+        foreach ($entities as $entity) {
+            foreach ($ops as $op) {
+                $permissionName = strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op));
+                $permission = DB::table('permissions')->where('name', '=', $permissionName)->first();
+                DB::table('permission_role')->where('permission_id', '=', $permission->id)->delete();
+                DB::table('permissions')->where('name', '=', $permissionName)->delete();
+            }
+        }
+    }
+}

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateJointPermissionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('joint_permissions', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('role_id');
+            $table->string('entity_type');
+            $table->integer('entity_id');
+            $table->string('action');
+            $table->boolean('has_permission')->default(false);
+            $table->boolean('has_permission_own')->default(false);
+            $table->integer('created_by');
+            // Create indexes
+            $table->index(['entity_id', 'entity_type']);
+            $table->index('has_permission');
+            $table->index('has_permission_own');
+            $table->index('role_id');
+            $table->index('action');
+            $table->index('created_by');
+        });
+
+        Schema::table('roles', function (Blueprint $table) {
+            $table->string('system_name');
+            $table->boolean('hidden')->default(false);
+            $table->index('hidden');
+            $table->index('system_name');
+        });
+
+        Schema::rename('permissions', 'role_permissions');
+        Schema::rename('restrictions', 'entity_permissions');
+
+        // Create the new public role
+        $publicRoleData = [
+            'name' => 'public',
+            'display_name' => 'Public',
+            'description' => 'The role given to public visitors if allowed',
+            'system_name' => 'public',
+            'hidden' => true,
+            'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+            'updated_at' => \Carbon\Carbon::now()->toDateTimeString()
+        ];
+
+        // Ensure unique name
+        while (DB::table('roles')->where('name', '=', $publicRoleData['display_name'])->count() > 0) {
+            $publicRoleData['display_name'] = $publicRoleData['display_name'] . str_random(2);
+        }
+        $publicRoleId = DB::table('roles')->insertGetId($publicRoleData);
+
+        // Add new view permissions to public role
+        $entities = ['Book', 'Page', 'Chapter'];
+        $ops = ['View All', 'View Own'];
+        foreach ($entities as $entity) {
+            foreach ($ops as $op) {
+                $name = strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op));
+                $permission = DB::table('role_permissions')->where('name', '=', $name)->first();
+                // Assign view permission to public
+                DB::table('permission_role')->insert([
+                    'permission_id' => $permission->id,
+                    'role_id' => $publicRoleId
+                ]);
+            }
+        }
+
+        // Update admin role with system name
+        DB::table('roles')->where('name', '=', 'admin')->update(['system_name' => 'admin']);
+
+        // Generate the new entity jointPermissions
+        $restrictionService = app(\BookStack\Services\PermissionService::class);
+        $restrictionService->buildJointPermissions();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('joint_permissions');
+
+        Schema::rename('role_permissions', 'permissions');
+        Schema::rename('entity_permissions', 'restrictions');
+
+        // Delete the public role
+        DB::table('roles')->where('system_name', '=', 'public')->delete();
+
+        Schema::table('roles', function (Blueprint $table) {
+            $table->dropColumn('system_name');
+            $table->dropColumn('hidden');
+        });
+    }
+}

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTagsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tags', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('entity_id');
+            $table->string('entity_type', 100);
+            $table->string('name');
+            $table->string('value');
+            $table->integer('order');
+            $table->timestamps();
+
+            $table->index('name');
+            $table->index('value');
+            $table->index('order');
+            $table->index(['entity_id', 'entity_type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('tags');
+    }
+}

@@ -20,12 +20,15 @@ class DummyContentSeeder extends Seeder
             ->each(function($book) use ($user) {
             ->each(function($book) use ($user) {
                 $chapters = factory(BookStack\Chapter::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id])
                 $chapters = factory(BookStack\Chapter::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id])
                     ->each(function($chapter) use ($user, $book){
                     ->each(function($chapter) use ($user, $book){
-                       $pages = factory(\BookStack\Page::class, 10)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]);
+                       $pages = factory(\BookStack\Page::class, 5)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]);
                         $chapter->pages()->saveMany($pages);
                         $chapter->pages()->saveMany($pages);
                     });
                     });
                 $pages = factory(\BookStack\Page::class, 3)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
                 $pages = factory(\BookStack\Page::class, 3)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
                 $book->chapters()->saveMany($chapters);
                 $book->chapters()->saveMany($chapters);
                 $book->pages()->saveMany($pages);
                 $book->pages()->saveMany($pages);
             });
             });
+
+        $restrictionService = app(\BookStack\Services\PermissionService::class);
+        $restrictionService->buildJointPermissions();
     }
     }
 }
 }

@@ -4,10 +4,11 @@
     "gulp": "^3.9.0"
     "gulp": "^3.9.0"
   },
   },
   "dependencies": {
   "dependencies": {
-    "angular": "^1.5.0-rc.0",
-    "angular-animate": "^1.5.0-rc.0",
-    "angular-resource": "^1.5.0-rc.0",
-    "angular-sanitize": "^1.5.0-rc.0",
+    "angular": "^1.5.5",
+    "angular-animate": "^1.5.5",
+    "angular-resource": "^1.5.5",
+    "angular-sanitize": "^1.5.5",
+    "angular-ui-sortable": "^0.14.0",
     "babel-runtime": "^5.8.29",
     "babel-runtime": "^5.8.29",
     "bootstrap-sass": "^3.0.0",
     "bootstrap-sass": "^3.0.0",
     "dropzone": "^4.0.1",
     "dropzone": "^4.0.1",

@@ -34,5 +34,6 @@
         <env name="GITHUB_APP_SECRET" value="aaaaaaaaaaaaaa"/>
         <env name="GITHUB_APP_SECRET" value="aaaaaaaaaaaaaa"/>
         <env name="GOOGLE_APP_ID" value="aaaaaaaaaaaaaa"/>
         <env name="GOOGLE_APP_ID" value="aaaaaaaaaaaaaa"/>
         <env name="GOOGLE_APP_SECRET" value="aaaaaaaaaaaaaa"/>
         <env name="GOOGLE_APP_SECRET" value="aaaaaaaaaaaaaa"/>
+        <env name="APP_URL" value="http://bookstack.dev"/>
     </php>
     </php>
 </phpunit>
 </phpunit>

 # BookStack
 # BookStack
 
 
+[![Build Status](https://travis-ci.org/ssddanbrown/BookStack.svg)](https://travis-ci.org/ssddanbrown/BookStack)
+
 A platform for storing and organising information and documentation. General information and documentation for BookStack can be found at https://www.bookstackapp.com/.
 A platform for storing and organising information and documentation. General information and documentation for BookStack can be found at https://www.bookstackapp.com/.
 
 
 * [Installation Instructions](https://www.bookstackapp.com/docs/admin/installation)
 * [Installation Instructions](https://www.bookstackapp.com/docs/admin/installation)

@@ -400,4 +400,116 @@ module.exports = function (ngApp, events) {
 
 
     }]);
     }]);
 
 
-};
\ No newline at end of file
+    ngApp.controller('PageTagController', ['$scope', '$http', '$attrs',
+        function ($scope, $http, $attrs) {
+
+            const pageId = Number($attrs.pageId);
+            $scope.tags = [];
+            
+            $scope.sortOptions = {
+                handle: '.handle',
+                items: '> tr',
+                containment: "parent",
+                axis: "y"
+            };
+
+            /**
+             * Push an empty tag to the end of the scope tags.
+             */
+            function addEmptyTag() {
+                $scope.tags.push({
+                    name: '',
+                    value: ''
+                });
+            }
+            $scope.addEmptyTag = addEmptyTag;
+
+            /**
+             * Get all tags for the current book and add into scope.
+             */
+            function getTags() {
+                $http.get('/ajax/tags/get/page/' + pageId).then((responseData) => {
+                    $scope.tags = responseData.data;
+                    addEmptyTag();
+                });
+            }
+            getTags();
+
+            /**
+             * Set the order property on all tags.
+             */
+            function setTagOrder() {
+                for (let i = 0; i < $scope.tags.length; i++) {
+                    $scope.tags[i].order = i;
+                }
+            }
+
+            /**
+             * When an tag changes check if another empty editable
+             * field needs to be added onto the end.
+             * @param tag
+             */
+            $scope.tagChange = function(tag) {
+                let cPos = $scope.tags.indexOf(tag);
+                if (cPos !== $scope.tags.length-1) return;
+
+                if (tag.name !== '' || tag.value !== '') {
+                    addEmptyTag();
+                }
+            };
+
+            /**
+             * When an tag field loses focus check the tag to see if its
+             * empty and therefore could be removed from the list.
+             * @param tag
+             */
+            $scope.tagBlur = function(tag) {
+                let isLast = $scope.tags.length - 1 === $scope.tags.indexOf(tag);
+                if (tag.name === '' && tag.value === '' && !isLast) {
+                    let cPos = $scope.tags.indexOf(tag);
+                    $scope.tags.splice(cPos, 1);
+                }
+            };
+
+            /**
+             * Save the tags to the current page.
+             */
+            $scope.saveTags = function() {
+                setTagOrder();
+                let postData = {tags: $scope.tags};
+                $http.post('/ajax/tags/update/page/' + pageId, postData).then((responseData) => {
+                    $scope.tags = responseData.data.tags;
+                    addEmptyTag();
+                    events.emit('success', responseData.data.message);
+                })
+            };
+
+            /**
+             * Remove a tag from the current list.
+             * @param tag
+             */
+            $scope.removeTag = function(tag) {
+                let cIndex = $scope.tags.indexOf(tag);
+                $scope.tags.splice(cIndex, 1);
+            };
+
+        }]);
+
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

@@ -301,6 +301,219 @@ module.exports = function (ngApp, events) {
 
 
             }
             }
         }
         }
-    }])
+    }]);
+    
+    ngApp.directive('toolbox', [function() {
+        return {
+            restrict: 'A',
+            link: function(scope, elem, attrs) {
+
+                // Get common elements
+                const $buttons = elem.find('[tab-button]');
+                const $content = elem.find('[tab-content]');
+                const $toggle = elem.find('[toolbox-toggle]');
+
+                // Handle toolbox toggle click
+                $toggle.click((e) => {
+                    elem.toggleClass('open');
+                });
+                
+                // Set an active tab/content by name
+                function setActive(tabName, openToolbox) {
+                    $buttons.removeClass('active');
+                    $content.hide();
+                    $buttons.filter(`[tab-button="${tabName}"]`).addClass('active');
+                    $content.filter(`[tab-content="${tabName}"]`).show();
+                    if (openToolbox) elem.addClass('open');
+                }
+
+                // Set the first tab content active on load
+                setActive($content.first().attr('tab-content'), false);
+
+                // Handle tab button click
+                $buttons.click(function(e) {
+                    let name = $(this).attr('tab-button');
+                    setActive(name, true);
+                });
+            }
+        }
+    }]);
+
+    ngApp.directive('autosuggestions', ['$http', function($http) {
+        return {
+            restrict: 'A',
+            link: function(scope, elem, attrs) {
+                
+                // Local storage for quick caching.
+                const localCache = {};
+
+                // Create suggestion element
+                const suggestionBox = document.createElement('ul');
+                suggestionBox.className = 'suggestion-box';
+                suggestionBox.style.position = 'absolute';
+                suggestionBox.style.display = 'none';
+                const $suggestionBox = $(suggestionBox);
+
+                // General state tracking
+                let isShowing = false;
+                let currentInput = false;
+                let active = 0;
+
+                // Listen to input events on autosuggest fields
+                elem.on('input', '[autosuggest]', function(event) {
+                    let $input = $(this);
+                    let val = $input.val();
+                    let url = $input.attr('autosuggest');
+                    // No suggestions until at least 3 chars
+                    if (val.length < 3) {
+                        if (isShowing) {
+                            $suggestionBox.hide();
+                            isShowing = false;
+                        }
+                        return;
+                    };
+
+                    let suggestionPromise = getSuggestions(val.slice(0, 3), url);
+                    suggestionPromise.then((suggestions) => {
+                       if (val.length > 2) {
+                           suggestions = suggestions.filter((item) => {
+                               return item.toLowerCase().indexOf(val.toLowerCase()) !== -1;
+                           }).slice(0, 4);
+                           displaySuggestions($input, suggestions);
+                       }
+                    });
+                });
+
+                // Hide autosuggestions when input loses focus.
+                // Slight delay to allow clicks.
+                elem.on('blur', '[autosuggest]', function(event) {
+                    setTimeout(() => {
+                        $suggestionBox.hide();
+                        isShowing = false;
+                    }, 200)
+                });
+
+                elem.on('keydown', '[autosuggest]', function (event) {
+                    if (!isShowing) return;
+
+                    let suggestionElems = suggestionBox.childNodes;
+                    let suggestCount = suggestionElems.length;
+
+                    // Down arrow
+                    if (event.keyCode === 40) {
+                        let newActive = (active === suggestCount-1) ? 0 : active + 1;
+                        changeActiveTo(newActive, suggestionElems);
+                    }
+                    // Up arrow
+                    else if (event.keyCode === 38) {
+                        let newActive = (active === 0) ? suggestCount-1 : active - 1;
+                        changeActiveTo(newActive, suggestionElems);
+                    }
+                    // Enter key
+                    else if (event.keyCode === 13) {
+                        let text = suggestionElems[active].textContent;
+                        currentInput[0].value = text;
+                        currentInput.focus();
+                        $suggestionBox.hide();
+                        isShowing = false;
+                        event.preventDefault();
+                        return false;
+                    }
+                });
+
+                // Change the active suggestion to the given index
+                function changeActiveTo(index, suggestionElems) {
+                    suggestionElems[active].className = '';
+                    active = index;
+                    suggestionElems[active].className = 'active';
+                }
+
+                // Display suggestions on a field
+                let prevSuggestions = [];
+                function displaySuggestions($input, suggestions) {
+
+                    // Hide if no suggestions
+                    if (suggestions.length === 0) {
+                        $suggestionBox.hide();
+                        isShowing = false;
+                        prevSuggestions = suggestions;
+                        return;
+                    }
+
+                    // Otherwise show and attach to input
+                    if (!isShowing) {
+                        $suggestionBox.show();
+                        isShowing = true;
+                    }
+                    if ($input !== currentInput) {
+                        $suggestionBox.detach();
+                        $input.after($suggestionBox);
+                        currentInput = $input;
+                    }
+
+                    // Return if no change
+                    if (prevSuggestions.join() === suggestions.join()) {
+                        prevSuggestions = suggestions;
+                        return;
+                    }
+
+                    // Build suggestions
+                    $suggestionBox[0].innerHTML = '';
+                    for (let i = 0; i < suggestions.length; i++) {
+                        var suggestion = document.createElement('li');
+                        suggestion.textContent = suggestions[i];
+                        suggestion.onclick = suggestionClick;
+                        if (i === 0) {
+                            suggestion.className = 'active'
+                            active = 0;
+                        };
+                        $suggestionBox[0].appendChild(suggestion);
+                    }
+
+                    prevSuggestions = suggestions;
+                }
+
+                // Suggestion click event
+                function suggestionClick(event) {
+                    let text = this.textContent;
+                    currentInput[0].value = text;
+                    currentInput.focus();
+                    $suggestionBox.hide();
+                    isShowing = false;
+                };
+
+                // Get suggestions & cache
+                function getSuggestions(input, url) {
+                    let searchUrl = url + '?search=' + encodeURIComponent(input);
+
+                    // Get from local cache if exists
+                    if (localCache[searchUrl]) {
+                        return new Promise((resolve, reject) => {
+                            resolve(localCache[input]);
+                        });
+                    }
+
+                    return $http.get(searchUrl).then((response) => {
+                        localCache[input] = response.data;
+                        return response.data;
+                    });
+                }
+
+            }
+        }
+    }]);
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-};
\ No newline at end of file

@@ -5,9 +5,9 @@ var angular = require('angular');
 var ngResource = require('angular-resource');
 var ngResource = require('angular-resource');
 var ngAnimate = require('angular-animate');
 var ngAnimate = require('angular-animate');
 var ngSanitize = require('angular-sanitize');
 var ngSanitize = require('angular-sanitize');
+require('angular-ui-sortable');
 
 
-var ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize']);
-
+var ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']);
 
 
 // Global Event System
 // Global Event System
 var Events = {
 var Events = {

@@ -65,6 +65,9 @@ $button-border-radius: 2px;
   &:focus, &:active {
   &:focus, &:active {
     outline: 0;
     outline: 0;
   }
   }
+  &:hover {
+    text-decoration: none;
+  }
   &.neg {
   &.neg {
     color: $negative;
     color: $negative;
   }
   }

@@ -154,6 +154,11 @@ input:checked + .toggle-switch {
 
 
 .form-group {
 .form-group {
   margin-bottom: $-s;
   margin-bottom: $-s;
+  textarea {
+    display: block;
+    width: 100%;
+    min-height: 64px;
+  }
 }
 }
 
 
 .form-group {
 .form-group {
@@ -239,6 +244,17 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] {
   }
   }
 }
 }
 
 
+input.outline {
+  border: 0;
+  border-bottom: 2px solid #DDD;
+  border-radius: 0;
+  &:focus, &:active {
+    border: 0;
+    border-bottom: 2px solid #AAA;
+    outline: 0;
+  }
+}
+
 #login-form label[for="remember"] {
 #login-form label[for="remember"] {
   margin: 0;
   margin: 0;
 }
 }

@@ -11,13 +11,16 @@ body.flexbox {
   #content {
   #content {
     flex: 1;
     flex: 1;
     display: flex;
     display: flex;
+    min-height: 0px;
   }
   }
 }
 }
 
 
 .flex-fill {
 .flex-fill {
   display: flex;
   display: flex;
   align-items: stretch;
   align-items: stretch;
+  min-height: 0px;
   .flex, &.flex {
   .flex, &.flex {
+    min-height: 0px;
     flex: 1;
     flex: 1;
   }
   }
 }
 }

@@ -266,6 +266,7 @@ ul.pagination {
   display: inline-block;
   display: inline-block;
   list-style: none;
   list-style: none;
   margin: $-m 0;
   margin: $-m 0;
+  padding-left: 1px;
   li {
   li {
     float: left;
     float: left;
   }
   }
@@ -300,6 +301,10 @@ ul.pagination {
   }
   }
 }
 }
 
 
+.compact ul.pagination {
+  margin: 0;
+}
+
 .entity-list {
 .entity-list {
   >div {
   >div {
     padding: $-m 0;
     padding: $-m 0;

@@ -49,7 +49,7 @@
     height:auto;
     height:auto;
   }
   }
   h1, h2, h3, h4, h5, h6 {
   h1, h2, h3, h4, h5, h6 {
-    clear: both;
+    clear: left;
   }
   }
   hr {
   hr {
     clear: both;
     clear: both;
@@ -72,7 +72,7 @@
 .pointer {
 .pointer {
   border: 1px solid #CCC;
   border: 1px solid #CCC;
   display: inline-block;
   display: inline-block;
-  padding: $-xs $-s;
+  padding: $-s $-s;
   border-radius: 4px;
   border-radius: 4px;
   box-shadow: 0 0 8px 1px rgba(212, 209, 209, 0.35);
   box-shadow: 0 0 8px 1px rgba(212, 209, 209, 0.35);
   position: absolute;
   position: absolute;
@@ -122,9 +122,181 @@
   }
   }
 }
 }
 
 
-h1, h2, h3, h4, h5, h6 {
-  &:hover a.link-hook {
-    opacity: 1;
-    transform: translate3d(0, 0, 0);
+// Attribute form
+.floating-toolbox {
+  background-color: #FFF;
+  border: 1px solid #DDD;
+  right: $-xl*2;
+  z-index: 99;
+  width: 48px;
+  overflow: hidden;
+  align-items: stretch;
+  flex-direction: row;
+  display: flex;
+  transition: width ease-in-out 180ms;
+  margin-top: -1px;
+  min-height: 0px;
+  &.open {
+    width: 480px;
+  }
+  [toolbox-toggle] i {
+    transition: transform ease-in-out 180ms;
+  }
+  [toolbox-toggle] {
+    transition: background-color ease-in-out 180ms;
+  }
+  &.open [toolbox-toggle] {
+    background-color: rgba(255, 0, 0, 0.29);
+  }
+  &.open [toolbox-toggle] i {
+    transform: rotate(180deg);
+  }
+  > div {
+    flex: 1;
+    position: relative;
+  }
+  .tabs {
+    display: block;
+    border-right: 1px solid #DDD;
+    width: 54px;
+    flex: 0;
+  }
+  .tabs i {
+    color: rgba(0, 0, 0, 0.5);
+    padding: 0;
+    margin: 0;
+  }
+  .tabs > span {
+    display: block;
+    cursor: pointer;
+    padding: $-s $-m;
+    font-size: 13.5px;
+    line-height: 1.6;
+    border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+  }
+  &.open .tabs > span.active {
+    color: #444;
+    background-color: rgba(0, 0, 0, 0.1);
+  }
+  div[tab-content] {
+    padding-bottom: 45px;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0px;
+    overflow-y: scroll;
+  }
+  div[tab-content] .padded {
+    flex: 1;
+    padding-top: 0;
+  }
+  h4 {
+    font-size: 24px;
+    margin: $-m 0 0 0;
+    padding: 0 $-l $-s $-l;
+  }
+  .tags input {
+    max-width: 100%;
+    width: 100%;
+    min-width: 50px;
+  }
+  .tags td {
+    padding-right: $-s;
+    padding-top: $-s;
+    position: relative;
+  }
+  button.pos {
+    position: absolute;
+    bottom: 0;
+    display: block;
+    width: 100%;
+    padding: $-s;
+    height: 45px;
+    border: 0;
+    margin: 0;
+    box-shadow: none;
+    border-radius: 0;
+    &:hover{
+      box-shadow: none;
+    }
+  }
+  .handle {
+    user-select: none;
+    cursor: move;
+    color: #999;
+  }
+  form {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow-y: scroll;
+  }
+}
+
+[tab-content] {
+  display: none;
+}
+
+.tag-display {
+  margin: $-xl $-xs;
+  border: 1px solid #DDD;
+  min-width: 180px;
+  max-width: 320px;
+  opacity: 0.7;
+  z-index: 5;
+  position: relative;
+  table {
+    width: 100%;
+    margin: 0;
+    padding: 0;
+  }
+  span {
+    color: #666;
+    margin-left: $-s;
+  }
+  .heading {
+    padding: $-xs $-s;
+    color: #444;
+  }
+  td {
+    border: 0;
+    border-bottom: 1px solid #DDD;
+    padding: $-xs $-s;
+    color: #444;
+  }
+  .tag-value {
+    color: #888;
+  }
+  td i {
+    color: #888;
+  }
+  tr:last-child td {
+    border-bottom: none;
+  }
+  .tag {
+    padding: $-s;
   }
   }
 }
 }
+
+.suggestion-box {
+  position: absolute;
+  background-color: #FFF;
+  border: 1px solid #BBB;
+  box-shadow: $bs-light;
+  list-style: none;
+  z-index: 100;
+  padding: 0;
+  margin: 0;
+  border-radius: 3px;
+  li {
+    display: block;
+    padding: $-xs $-s;
+    border-bottom: 1px solid #DDD;
+    &:last-child {
+      border-bottom: 0;
+    }
+    &.active {
+      background-color: #EEE;
+    }
+  }
+}
\ No newline at end of file

@@ -26,6 +26,13 @@ table {
   }
   }
 }
 }
 
 
+table.no-style {
+  td {
+    border: 0;
+    padding: 0;
+  }
+}
+
 table.list-table {
 table.list-table {
   margin: 0 -$-xs;
   margin: 0 -$-xs;
   td {
   td {

@@ -297,6 +297,12 @@ span.sep {
   display: block;
   display: block;
 }
 }
 
 
+.action-header {
+  h1 {
+    margin-top: $-m;
+  }
+}
+
 /**
 /**
   * Icons
   * Icons
   */
   */

@@ -21,6 +21,11 @@
 
 
 [ng\:cloak], [ng-cloak], .ng-cloak {
 [ng\:cloak], [ng-cloak], .ng-cloak {
   display: none !important;
   display: none !important;
+  user-select: none;
+}
+
+[ng-click] {
+  cursor: pointer;
 }
 }
 
 
 // Jquery Sortable Styles
 // Jquery Sortable Styles
@@ -201,4 +206,4 @@ $btt-size: 40px;
     background-color: $negative;
     background-color: $negative;
     color: #EEE;
     color: #EEE;
   }
   }
-}
\ No newline at end of file
+}

@@ -15,10 +15,16 @@
 
 
     <!-- Scripts -->
     <!-- Scripts -->
     <script src="/libs/jquery/jquery.min.js?version=2.1.4"></script>
     <script src="/libs/jquery/jquery.min.js?version=2.1.4"></script>
+    <script src="/libs/jquery/jquery-ui.min.js?version=1.11.4"></script>
 
 
     @yield('head')
     @yield('head')
 
 
     @include('partials/custom-styles')
     @include('partials/custom-styles')
+
+    <!-- Custom user content -->
+    @if(setting('app-custom-head', false))
+        {!! setting('app-custom-head') !!}
+    @endif
 </head>
 </head>
 <body class="@yield('body-class')" ng-app="bookStack">
 <body class="@yield('body-class')" ng-app="bookStack">
 
 

@@ -68,9 +68,9 @@
                             <hr>
                             <hr>
                         @endif
                         @endif
                         <p class="text-muted small">
                         <p class="text-muted small">
-                            Created {{$book->created_at->diffForHumans()}} @if($book->createdBy) by {{$book->createdBy->name}} @endif
+                            Created {{$book->created_at->diffForHumans()}} @if($book->createdBy) by <a href="/user/{{ $book->createdBy->id }}">{{$book->createdBy->name}}</a> @endif
                             <br>
                             <br>
-                            Last Updated {{$book->updated_at->diffForHumans()}} @if($book->updatedBy) by {{$book->updatedBy->name}} @endif
+                            Last Updated {{$book->updated_at->diffForHumans()}} @if($book->updatedBy) by <a href="/user/{{ $book->updatedBy->id }}">{{$book->updatedBy->name}}</a> @endif
                         </p>
                         </p>
                     </div>
                     </div>
                 </div>
                 </div>

@@ -49,17 +49,23 @@
                     <hr>
                     <hr>
                     <p class="text-muted">No pages are currently in this chapter.</p>
                     <p class="text-muted">No pages are currently in this chapter.</p>
                     <p>
                     <p>
-                        <a href="{{$chapter->getUrl() . '/create-page'}}" class="text-page"><i class="zmdi zmdi-file-text"></i>Create a new page</a>
-                        &nbsp;&nbsp;<em class="text-muted">-or-</em>&nbsp;&nbsp;&nbsp;
-                        <a href="{{$book->getUrl() . '/sort'}}" class="text-book"><i class="zmdi zmdi-book"></i>Sort the current book</a>
+                        @if(userCan('page-create', $chapter))
+                            <a href="{{$chapter->getUrl() . '/create-page'}}" class="text-page"><i class="zmdi zmdi-file-text"></i>Create a new page</a>
+                        @endif
+                        @if(userCan('page-create', $chapter) && userCan('book-update', $book))
+                            &nbsp;&nbsp;<em class="text-muted">-or-</em>&nbsp;&nbsp;&nbsp;
+                        @endif
+                        @if(userCan('book-update', $book))
+                            <a href="{{$book->getUrl() . '/sort'}}" class="text-book"><i class="zmdi zmdi-book"></i>Sort the current book</a>
+                        @endif
                     </p>
                     </p>
                     <hr>
                     <hr>
                 @endif
                 @endif
 
 
                 <p class="text-muted small">
                 <p class="text-muted small">
-                    Created {{$chapter->created_at->diffForHumans()}} @if($chapter->createdBy) by {{$chapter->createdBy->name}} @endif
+                    Created {{$chapter->created_at->diffForHumans()}} @if($chapter->createdBy) by <a href="/user/{{ $chapter->createdBy->id }}">{{ $chapter->createdBy->name}}</a> @endif
                     <br>
                     <br>
-                    Last Updated {{$chapter->updated_at->diffForHumans()}} @if($chapter->updatedBy) by {{$chapter->updatedBy->name}} @endif
+                    Last Updated {{$chapter->updated_at->diffForHumans()}} @if($chapter->updatedBy) by <a href="/user/{{ $chapter->updatedBy->id }}">{{  $chapter->updatedBy->name}}</a> @endif
                 </p>
                 </p>
             </div>
             </div>
             <div class="col-md-3 col-md-offset-1">
             <div class="col-md-3 col-md-offset-1">

-@extends('base')
-
-@section('head')
-    <script src="/libs/tinymce/tinymce.min.js?ver=4.3.7"></script>
-@stop
-
-@section('body-class', 'flexbox')
-
-@section('content')
-
-    <div class="flex-fill flex">
-        <form action="{{$book->getUrl() . '/page/' . $draft->id}}" method="POST" class="flex flex-fill">
-            @include('pages/form', ['model' => $draft])
-        </form>
-    </div>
-    @include('partials/image-manager', ['imageType' => 'gallery', 'uploaded_to' => $draft->id])
-@stop
\ No newline at end of file

@@ -9,10 +9,15 @@
 @section('content')
 @section('content')
 
 
     <div class="flex-fill flex">
     <div class="flex-fill flex">
-        <form action="{{$page->getUrl()}}" data-page-id="{{ $page->id }}" method="POST" class="flex flex-fill">
-            <input type="hidden" name="_method" value="PUT">
+        <form action="{{$page->getUrl()}}" autocomplete="off" data-page-id="{{ $page->id }}" method="POST" class="flex flex-fill">
+            @if(!isset($isDraft))
+                <input type="hidden" name="_method" value="PUT">
+            @endif
             @include('pages/form', ['model' => $page])
             @include('pages/form', ['model' => $page])
+            @include('pages/form-toolbox')
         </form>
         </form>
+
+
     </div>
     </div>
     @include('partials/image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id])
     @include('partials/image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id])
 
 

+
+<div toolbox class="floating-toolbox">
+
+    <div class="tabs primary-background-light">
+        <span toolbox-toggle><i class="zmdi zmdi-caret-left-circle"></i></span>
+        <span tab-button="tags" title="Page Tags" class="active"><i class="zmdi zmdi-tag"></i></span>
+    </div>
+
+    <div tab-content="tags" ng-controller="PageTagController" page-id="{{ $page->id or 0 }}">
+        <h4>Page Tags</h4>
+        <div class="padded tags">
+            <p class="muted small">Add some tags to better categorise your content. <br> You can assign a value to a tag for more in-depth organisation.</p>
+            <table class="no-style" autosuggestions style="width: 100%;">
+                <tbody ui-sortable="sortOptions" ng-model="tags" >
+                    <tr ng-repeat="tag in tags track by $index">
+                        <td width="20" ><i class="handle zmdi zmdi-menu"></i></td>
+                        <td><input autosuggest="/ajax/tags/suggest/names" class="outline" ng-attr-name="tags[@{{$index}}][name]" type="text" ng-model="tag.name" ng-change="tagChange(tag)" ng-blur="tagBlur(tag)" placeholder="Tag"></td>
+                        <td><input autosuggest="/ajax/tags/suggest/values" class="outline" ng-attr-name="tags[@{{$index}}][value]" type="text" ng-model="tag.value" ng-change="tagChange(tag)" ng-blur="tagBlur(tag)" placeholder="Tag Value (Optional)"></td>
+                        <td width="10" ng-show="tags.length != 1" class="text-center text-neg" style="padding: 0;" ng-click="removeTag(tag)"><i class="zmdi zmdi-close"></i></td>
+                    </tr>
+                </tbody>
+            </table>
+            <table class="no-style" style="width: 100%;">
+                <tbody>
+                <tr class="unsortable">
+                    <td  width="34"></td>
+                    <td ng-click="addEmptyTag()">
+                        <button type="button" class="text-button">Add another tag</button>
+                    </td>
+                    <td></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file

@@ -41,6 +41,7 @@
             @include('form/text', ['name' => 'name', 'placeholder' => 'Page Title'])
             @include('form/text', ['name' => 'name', 'placeholder' => 'Page Title'])
         </div>
         </div>
     </div>
     </div>
+
     <div class="edit-area flex-fill flex">
     <div class="edit-area flex-fill flex">
         @if(setting('app-editor') === 'wysiwyg')
         @if(setting('app-editor') === 'wysiwyg')
             <textarea id="html-editor" tinymce="editorOptions" mce-change="editorChange" mce-model="editContent"  name="html" rows="5"
             <textarea id="html-editor" tinymce="editorOptions" mce-change="editorChange" mce-model="editContent"  name="html" rows="5"

 <div ng-non-bindable>
 <div ng-non-bindable>
-    <h1 id="bkmrk-page-title">{{$page->name}}</h1>
+
+    <h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1>
+
+    @if(count($page->tags) > 0)
+        <div class="tag-display float right">
+            <div class="heading primary-background-light">Page Tags</div>
+            <table>
+                @foreach($page->tags as $tag)
+                    <tr class="tag">
+                        <td @if(!$tag->value) colspan="2" @endif><a href="/search/all?term=%5B{{ urlencode($tag->name) }}%5D">{{ $tag->name }}</a></td>
+                        @if($tag->value) <td class="tag-value"><a href="/search/all?term=%5B{{ urlencode($tag->name) }}%3D{{ urlencode($tag->value) }}%5D">{{$tag->value}}</a></td> @endif
+                    </tr>
+                @endforeach
+            </table>
+        </div>
+    @endif
+
+    <div style="clear:left;"></div>
 
 
     {!! $page->html !!}
     {!! $page->html !!}
 </div>
 </div>
\ No newline at end of file

@@ -62,9 +62,9 @@
                     <hr>
                     <hr>
 
 
                     <p class="text-muted small">
                     <p class="text-muted small">
-                        Created {{$page->created_at->diffForHumans()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif
+                        Created {{$page->created_at->diffForHumans()}} @if($page->createdBy) by <a href="/user/{{ $page->createdBy->id }}">{{$page->createdBy->name}}</a> @endif
                         <br>
                         <br>
-                        Last Updated {{$page->updated_at->diffForHumans()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif
+                        Last Updated {{$page->updated_at->diffForHumans()}} @if($page->updatedBy) by <a href="/user/{{ $page->updatedBy->id }}">{{$page->updatedBy->name}}</a> @endif
                     </p>
                     </p>
 
 
                 </div>
                 </div>

 @if(Setting::get('app-color'))
 @if(Setting::get('app-color'))
     <style>
     <style>
-        header, #back-to-top {
+        header, #back-to-top, .primary-background {
             background-color: {{ Setting::get('app-color') }};
             background-color: {{ Setting::get('app-color') }};
         }
         }
-        .faded-small {
+        .faded-small, .primary-background-light {
             background-color: {{ Setting::get('app-color-light') }};
             background-color: {{ Setting::get('app-color-light') }};
         }
         }
         .button-base, .button, input[type="button"], input[type="submit"] {
         .button-base, .button, input[type="button"], input[type="submit"] {
@@ -15,7 +15,7 @@
         .nav-tabs a.selected, .nav-tabs .tab-item.selected {
         .nav-tabs a.selected, .nav-tabs .tab-item.selected {
             border-bottom-color: {{ Setting::get('app-color') }};
             border-bottom-color: {{ Setting::get('app-color') }};
         }
         }
-        p.primary:hover, p .primary:hover, span.primary:hover, .text-primary:hover, a, a:hover, a:focus {
+        p.primary:hover, p .primary:hover, span.primary:hover, .text-primary:hover, a, a:hover, a:focus, .text-button, .text-button:hover, .text-button:focus {
             color: {{ Setting::get('app-color') }};
             color: {{ Setting::get('app-color') }};
         }
         }
     </style>
     </style>

@@ -25,7 +25,7 @@
                 </div>
                 </div>
                 <div class="form-group">
                 <div class="form-group">
                     <label>Enable higher security image uploads?</label>
                     <label>Enable higher security image uploads?</label>
-                    <p class="small">For performance reasons, all images are public by default, This option adds a random, hard-to-guess characters in front of image names. Ensure directory indexes are not enabled to prevent easy access.</p>
+                    <p class="small">For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.</p>
                     <div toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></div>
                     <div toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></div>
                 </div>
                 </div>
                 <div class="form-group">
                 <div class="form-group">
@@ -51,12 +51,16 @@
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
-
-
+        <div class="form-group">
+            <label for="setting-app-custom-head">Custom HTML head content</label>
+            <p class="small">Any content added here will be inserted into the bottom of the &lt;head&gt; section of every page. This is handy for overriding styles or adding analytics code.</p>
+            <textarea name="setting-app-custom-head" id="setting-app-custom-head">{{ setting('app-custom-head', '') }}</textarea>
+        </div>
 
 
         <hr class="margin-top">
         <hr class="margin-top">
 
 
         <h3>Registration Settings</h3>
         <h3>Registration Settings</h3>
+
         <div class="row">
         <div class="row">
             <div class="col-md-6">
             <div class="col-md-6">
                 <div class="form-group">
                 <div class="form-group">
@@ -66,8 +70,8 @@
                 <div class="form-group">
                 <div class="form-group">
                     <label for="setting-registration-role">Default user role after registration</label>
                     <label for="setting-registration-role">Default user role after registration</label>
                     <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
                     <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
-                        @foreach(\BookStack\Role::all() as $role)
-                            <option value="{{$role->id}}"
+                        @foreach(\BookStack\Role::visible() as $role)
+                            <option value="{{$role->id}}" data-role-name="{{ $role->name }}"
                                     @if(setting('registration-role', \BookStack\Role::first()->id) == $role->id) selected @endif
                                     @if(setting('registration-role', \BookStack\Role::first()->id) == $role->id) selected @endif
                                     >
                                     >
                                 {{ $role->display_name }}
                                 {{ $role->display_name }}

@@ -3,9 +3,15 @@
     <div class="container">
     <div class="container">
         <div class="row">
         <div class="row">
             <div class="col-md-12 setting-nav nav-tabs">
             <div class="col-md-12 setting-nav nav-tabs">
-                <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
-                <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
-                <a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a>
+                @if($currentUser->can('settings-manage'))
+                    <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
+                @endif
+                @if($currentUser->can('users-manage'))
+                    <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
+                @endif
+                @if($currentUser->can('user-roles-manage'))
+                    <a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a>
+                @endif
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>

 <input type="checkbox" name="permissions[{{ $permission }}]"
 <input type="checkbox" name="permissions[{{ $permission }}]"
-       @if(old('permissions.'.$permission, false)|| (!old('display_name', false) && (isset($role) && $role->hasPermission($permission)))) checked="checked" @endif
+       @if(old('permissions'.$permission, false)|| (!old('display_name', false) && (isset($role) && $role->hasPermission($permission)))) checked="checked" @endif
        value="true">
        value="true">
\ No newline at end of file

@@ -18,7 +18,7 @@
                 <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) Manage users</label>
                 <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) Manage users</label>
                 <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) Manage roles & role permissions</label>
                 <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) Manage roles & role permissions</label>
                 <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) Manage all Book, Chapter & Page permissions</label>
                 <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) Manage all Book, Chapter & Page permissions</label>
-                <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) Manage permissions on own Book, Chapter & Pages</label>
+                <label>@include('settings/roles/checkbox', ['permission' => 'permissions']) Manage permissions on own Book, Chapter & Pages</label>
                 <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) Manage app settings</label>
                 <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) Manage app settings</label>
             </div>
             </div>
 
 
@@ -31,10 +31,11 @@
                 </p>
                 </p>
                 <table class="table">
                 <table class="table">
                     <tr>
                     <tr>
-                        <th></th>
-                        <th>Create</th>
-                        <th>Edit</th>
-                        <th>Delete</th>
+                        <th width="20%"></th>
+                        <th width="20%">Create</th>
+                        <th width="20%">View</th>
+                        <th width="20%">Edit</th>
+                        <th width="20%">Delete</th>
                     </tr>
                     </tr>
                     <tr>
                     <tr>
                         <td>Books</td>
                         <td>Books</td>
@@ -42,6 +43,10 @@
                             <label>@include('settings/roles/checkbox', ['permission' => 'book-create-all']) All</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'book-create-all']) All</label>
                         </td>
                         </td>
                         <td>
                         <td>
+                            <label>@include('settings/roles/checkbox', ['permission' => 'book-view-own']) Own</label>
+                            <label>@include('settings/roles/checkbox', ['permission' => 'book-view-all']) All</label>
+                        </td>
+                        <td>
                             <label>@include('settings/roles/checkbox', ['permission' => 'book-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'book-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'book-update-all']) All</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'book-update-all']) All</label>
                         </td>
                         </td>
@@ -57,6 +62,10 @@
                             <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-all']) All</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-all']) All</label>
                         </td>
                         </td>
                         <td>
                         <td>
+                            <label>@include('settings/roles/checkbox', ['permission' => 'chapter-view-own']) Own</label>
+                            <label>@include('settings/roles/checkbox', ['permission' => 'chapter-view-all']) All</label>
+                        </td>
+                        <td>
                             <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-all']) All</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-all']) All</label>
                         </td>
                         </td>
@@ -72,6 +81,10 @@
                             <label>@include('settings/roles/checkbox', ['permission' => 'page-create-all']) All</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'page-create-all']) All</label>
                         </td>
                         </td>
                         <td>
                         <td>
+                            <label>@include('settings/roles/checkbox', ['permission' => 'page-view-own']) Own</label>
+                            <label>@include('settings/roles/checkbox', ['permission' => 'page-view-all']) All</label>
+                        </td>
+                        <td>
                             <label>@include('settings/roles/checkbox', ['permission' => 'page-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'page-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'page-update-all']) All</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'page-update-all']) All</label>
                         </td>
                         </td>
@@ -83,6 +96,7 @@
                     <tr>
                     <tr>
                         <td>Images</td>
                         <td>Images</td>
                         <td>@include('settings/roles/checkbox', ['permission' => 'image-create-all'])</td>
                         <td>@include('settings/roles/checkbox', ['permission' => 'image-create-all'])</td>
+                        <td style="line-height:1.2;"><small class="faded">Controlled by the asset they are uploaded to</small></td>
                         <td>
                         <td>
                             <label>@include('settings/roles/checkbox', ['permission' => 'image-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'image-update-own']) Own</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'image-update-all']) All</label>
                             <label>@include('settings/roles/checkbox', ['permission' => 'image-update-all']) All</label>

@@ -6,11 +6,15 @@
 
 
     <div class="container small">
     <div class="container small">
 
 
-        <h1>User Roles</h1>
-
-        <p>
-            <a href="/settings/roles/new" class="text-pos"><i class="zmdi zmdi-lock-open"></i>Add new role</a>
-        </p>
+        <div class="row action-header">
+            <div class="col-sm-8">
+                <h1>User Roles</h1>
+            </div>
+            <div class="col-sm-4">
+                <p></p>
+                <a href="/settings/roles/new" class="button float right pos"><i class="zmdi zmdi-lock-open"></i>Add new role</a>
+            </div>
+        </div>
 
 
         <table class="table">
         <table class="table">
             <tr>
             <tr>

@@ -3,33 +3,29 @@
 
 
 @section('content')
 @section('content')
 
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-6"></div>
-                <div class="col-sm-6 faded">
-                    <div class="action-buttons">
-                        <a href="/settings/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+    @include('settings/navbar', ['selected' => 'users'])
 
 
 
 
 
 
     <div class="container small">
     <div class="container small">
         <form action="/settings/users/{{$user->id}}" method="post">
         <form action="/settings/users/{{$user->id}}" method="post">
-        <div class="row">
+            <div class="row">
+                <div class="col-sm-8">
+                    <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
+                </div>
+                <div class="col-sm-4">
+                    <p></p>
+                    <a href="/settings/users/{{$user->id}}/delete" class="neg button float right">Delete User</a>
+                </div>
+            </div>
+            <div class="row">
             <div class="col-md-6" ng-non-bindable>
             <div class="col-md-6" ng-non-bindable>
-                <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
                 {!! csrf_field() !!}
                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="put">
                 <input type="hidden" name="_method" value="put">
                 @include('users.forms.' . $authMethod, ['model' => $user])
                 @include('users.forms.' . $authMethod, ['model' => $user])
 
 
             </div>
             </div>
             <div class="col-md-6">
             <div class="col-md-6">
-                <h1>&nbsp;</h1>
                 <div class="form-group" id="logo-control">
                 <div class="form-group" id="logo-control">
                     <label for="user-avatar">User Avatar</label>
                     <label for="user-avatar">User Avatar</label>
                     <p class="small">This image should be approx 256px square.</p>
                     <p class="small">This image should be approx 256px square.</p>

@@ -13,7 +13,7 @@
 @if(userCan('users-manage'))
 @if(userCan('users-manage'))
     <div class="form-group">
     <div class="form-group">
         <label for="role">User Role</label>
         <label for="role">User Role</label>
-        @include('form/role-checkboxes', ['name' => 'roles', 'roles' => \BookStack\Role::all()])
+        @include('form/role-checkboxes', ['name' => 'roles', 'roles' => $roles])
     </div>
     </div>
 @endif
 @endif
 
 

@@ -11,7 +11,7 @@
 @if(userCan('users-manage'))
 @if(userCan('users-manage'))
     <div class="form-group">
     <div class="form-group">
         <label for="role">User Role</label>
         <label for="role">User Role</label>
-        @include('form/role-checkboxes', ['name' => 'roles', 'roles' => \BookStack\Role::all()])
+        @include('form/role-checkboxes', ['name' => 'roles', 'roles' => $roles])
     </div>
     </div>
 @endif
 @endif
 
 

@@ -7,17 +7,42 @@
 
 
 
 
     <div class="container small" ng-non-bindable>
     <div class="container small" ng-non-bindable>
-        <h1>Users</h1>
-        @if(userCan('users-manage'))
-            <p>
-                <a href="/settings/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
-            </p>
-        @endif
+        <div class="row action-header">
+            <div class="col-sm-8">
+                <h1>Users</h1>
+            </div>
+            <div class="col-sm-4">
+                <p></p>
+                @if(userCan('users-manage'))
+                    <a href="/settings/users/create" class="pos button float right"><i class="zmdi zmdi-account-add"></i>Add new user</a>
+                @endif
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-sm-8">
+                <div class="compact">
+                    {!! $users->links() !!}
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <form method="get" class="float right" action="/settings/users">
+                    @foreach(collect($listDetails)->except('search') as $name => $val)
+                        <input type="hidden" name="{{$name}}" value="{{$val}}">
+                    @endforeach
+                    <input type="text" name="search" placeholder="Search Users" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
+                </form>
+            </div>
+        </div>
+        <div class="text-center">
+
+        </div>
+
         <table class="table">
         <table class="table">
             <tr>
             <tr>
                 <th></th>
                 <th></th>
-                <th>Name</th>
-                <th>Email</th>
+                <th><a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'name']) }}">Name</a></th>
+                <th><a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'email']) }}">Email</a></th>
                 <th>User Roles</th>
                 <th>User Roles</th>
             </tr>
             </tr>
             @foreach($users as $user)
             @foreach($users as $user)
@@ -42,11 +67,17 @@
                         @endif
                         @endif
                     </td>
                     </td>
                     <td>
                     <td>
-                       <small> {{ $user->roles->implode('display_name', ', ') }}</small>
+                        @foreach($user->roles as $index => $role)
+                            <small><a href="/settings/roles/{{$role->id}}">{{$role->display_name}}</a>@if($index !== count($user->roles) -1),@endif</small>
+                        @endforeach
                     </td>
                     </td>
                 </tr>
                 </tr>
             @endforeach
             @endforeach
         </table>
         </table>
+
+        <div>
+            {!! $users->links() !!}
+        </div>
     </div>
     </div>
 
 
 @stop
 @stop

@@ -181,7 +181,7 @@ class AuthTest extends TestCase
     public function test_user_deletion()
     public function test_user_deletion()
     {
     {
         $userDetails = factory(\BookStack\User::class)->make();
         $userDetails = factory(\BookStack\User::class)->make();
-        $user = $this->getNewUser($userDetails->toArray());
+        $user = $this->getEditor($userDetails->toArray());
 
 
         $this->asAdmin()
         $this->asAdmin()
             ->visit('/settings/users/' . $user->id)
             ->visit('/settings/users/' . $user->id)

@@ -22,7 +22,7 @@ class LdapTest extends \TestCase
     public function test_login()
     public function test_login()
     {
     {
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
-        $this->mockLdap->shouldReceive('setOption')->once();
+        $this->mockLdap->shouldReceive('setVersion')->once();
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
             ->andReturn(['count' => 1, 0 => [
@@ -49,7 +49,7 @@ class LdapTest extends \TestCase
     public function test_login_works_when_no_uid_provided_by_ldap_server()
     public function test_login_works_when_no_uid_provided_by_ldap_server()
     {
     {
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
-        $this->mockLdap->shouldReceive('setOption')->once();
+        $this->mockLdap->shouldReceive('setVersion')->once();
         $ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
         $ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
@@ -73,7 +73,7 @@ class LdapTest extends \TestCase
     public function test_initial_incorrect_details()
     public function test_initial_incorrect_details()
     {
     {
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
-        $this->mockLdap->shouldReceive('setOption')->once();
+        $this->mockLdap->shouldReceive('setVersion')->once();
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
             ->andReturn(['count' => 1, 0 => [

@@ -161,8 +161,8 @@ class EntityTest extends TestCase
     public function test_entities_viewable_after_creator_deletion()
     public function test_entities_viewable_after_creator_deletion()
     {
     {
         // Create required assets and revisions
         // Create required assets and revisions
-        $creator = $this->getNewUser();
-        $updater = $this->getNewUser();
+        $creator = $this->getEditor();
+        $updater = $this->getEditor();
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($creator);
         $this->actingAs($creator);
         app('BookStack\Repos\UserRepo')->destroy($creator);
         app('BookStack\Repos\UserRepo')->destroy($creator);
@@ -174,8 +174,8 @@ class EntityTest extends TestCase
     public function test_entities_viewable_after_updater_deletion()
     public function test_entities_viewable_after_updater_deletion()
     {
     {
         // Create required assets and revisions
         // Create required assets and revisions
-        $creator = $this->getNewUser();
-        $updater = $this->getNewUser();
+        $creator = $this->getEditor();
+        $updater = $this->getEditor();
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($updater);
         $this->actingAs($updater);
         app('BookStack\Repos\UserRepo')->destroy($updater);
         app('BookStack\Repos\UserRepo')->destroy($updater);
@@ -198,7 +198,7 @@ class EntityTest extends TestCase
 
 
     public function test_recently_created_pages_view()
     public function test_recently_created_pages_view()
     {
     {
-        $user = $this->getNewUser();
+        $user = $this->getEditor();
         $content = $this->createEntityChainBelongingToUser($user);
         $content = $this->createEntityChainBelongingToUser($user);
 
 
         $this->asAdmin()->visit('/pages/recently-created')
         $this->asAdmin()->visit('/pages/recently-created')
@@ -207,7 +207,7 @@ class EntityTest extends TestCase
 
 
     public function test_recently_updated_pages_view()
     public function test_recently_updated_pages_view()
     {
     {
-        $user = $this->getNewUser();
+        $user = $this->getEditor();
         $content = $this->createEntityChainBelongingToUser($user);
         $content = $this->createEntityChainBelongingToUser($user);
 
 
         $this->asAdmin()->visit('/pages/recently-updated')
         $this->asAdmin()->visit('/pages/recently-updated')
@@ -241,7 +241,7 @@ class EntityTest extends TestCase
 
 
     public function test_recently_created_pages_on_home()
     public function test_recently_created_pages_on_home()
     {
     {
-        $entityChain = $this->createEntityChainBelongingToUser($this->getNewUser());
+        $entityChain = $this->createEntityChainBelongingToUser($this->getEditor());
         $this->asAdmin()->visit('/')
         $this->asAdmin()->visit('/')
             ->seeInElement('#recently-created-pages', $entityChain['page']->name);
             ->seeInElement('#recently-created-pages', $entityChain['page']->name);
     }
     }

@@ -32,7 +32,7 @@ class PageDraftTest extends TestCase
             ->dontSeeInField('html', $addedContent);
             ->dontSeeInField('html', $addedContent);
 
 
         $newContent = $this->page->html . $addedContent;
         $newContent = $this->page->html . $addedContent;
-        $newUser = $this->getNewUser();
+        $newUser = $this->getEditor();
         $this->pageRepo->saveUpdateDraft($this->page, ['html' => $newContent]);
         $this->pageRepo->saveUpdateDraft($this->page, ['html' => $newContent]);
         $this->actingAs($newUser)->visit($this->page->getUrl() . '/edit')
         $this->actingAs($newUser)->visit($this->page->getUrl() . '/edit')
             ->dontSeeInField('html', $newContent);
             ->dontSeeInField('html', $newContent);
@@ -54,7 +54,7 @@ class PageDraftTest extends TestCase
             ->dontSeeInField('html', $addedContent);
             ->dontSeeInField('html', $addedContent);
 
 
         $newContent = $this->page->html . $addedContent;
         $newContent = $this->page->html . $addedContent;
-        $newUser = $this->getNewUser();
+        $newUser = $this->getEditor();
         $this->pageRepo->saveUpdateDraft($this->page, ['html' => $newContent]);
         $this->pageRepo->saveUpdateDraft($this->page, ['html' => $newContent]);
 
 
         $this->actingAs($newUser)
         $this->actingAs($newUser)
@@ -79,7 +79,7 @@ class PageDraftTest extends TestCase
     {
     {
         $book = \BookStack\Book::first();
         $book = \BookStack\Book::first();
         $chapter = $book->chapters->first();
         $chapter = $book->chapters->first();
-        $newUser = $this->getNewUser();
+        $newUser = $this->getEditor();
 
 
         $this->actingAs($newUser)->visit('/')
         $this->actingAs($newUser)->visit('/')
             ->visit($book->getUrl() . '/page/create')
             ->visit($book->getUrl() . '/page/create')

+<?php namespace Entity;
+
+use BookStack\Tag;
+use BookStack\Page;
+use BookStack\Services\PermissionService;
+
+class TagTests extends \TestCase
+{
+
+    protected $defaultTagCount = 20;
+
+    /**
+     * Get an instance of a page that has many tags.
+     * @param Tag[]|bool $tags
+     * @return mixed
+     */
+    protected function getPageWithTags($tags = false)
+    {
+        $page = Page::first();
+
+        if (!$tags) {
+            $tags = factory(Tag::class, $this->defaultTagCount)->make();
+        }
+
+        $page->tags()->saveMany($tags);
+        return $page;
+    }
+
+    public function test_get_page_tags()
+    {
+        $page = $this->getPageWithTags();
+
+        // Add some other tags to check they don't interfere
+        factory(Tag::class, $this->defaultTagCount)->create();
+
+        $this->asAdmin()->get("/ajax/tags/get/page/" . $page->id)
+            ->shouldReturnJson();
+
+        $json = json_decode($this->response->getContent());
+        $this->assertTrue(count($json) === $this->defaultTagCount, "Returned JSON item count is not as expected");
+    }
+
+    public function test_tag_name_suggestions()
+    {
+        // Create some tags with similar names to test with
+        $attrs = collect();
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'country']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'color']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'city']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'county']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'planet']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'plans']));
+        $page = $this->getPageWithTags($attrs);
+
+        $this->asAdmin()->get('/ajax/tags/suggest/names?search=dog')->seeJsonEquals([]);
+        $this->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country', 'county']);
+        $this->get('/ajax/tags/suggest/names?search=cou')->seeJsonEquals(['country', 'county']);
+        $this->get('/ajax/tags/suggest/names?search=pla')->seeJsonEquals(['planet', 'plans']);
+    }
+
+    public function test_tag_value_suggestions()
+    {
+        // Create some tags with similar values to test with
+        $attrs = collect();
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'country', 'value' => 'cats']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'color', 'value' => 'cattery']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'city', 'value' => 'castle']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'county', 'value' => 'dog']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'planet', 'value' => 'catapult']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'plans', 'value' => 'dodgy']));
+        $page = $this->getPageWithTags($attrs);
+
+        $this->asAdmin()->get('/ajax/tags/suggest/values?search=ora')->seeJsonEquals([]);
+        $this->get('/ajax/tags/suggest/values?search=cat')->seeJsonEquals(['cats', 'cattery', 'catapult']);
+        $this->get('/ajax/tags/suggest/values?search=do')->seeJsonEquals(['dog', 'dodgy']);
+        $this->get('/ajax/tags/suggest/values?search=cas')->seeJsonEquals(['castle']);
+    }
+
+    public function test_entity_permissions_effect_tag_suggestions()
+    {
+        $permissionService = $this->app->make(PermissionService::class);
+
+        // Create some tags with similar names to test with and save to a page
+        $attrs = collect();
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'country']));
+        $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'color']));
+        $page = $this->getPageWithTags($attrs);
+
+        $this->asAdmin()->get('/ajax/tags/suggest?search=co')->seeJsonEquals(['color', 'country']);
+        $this->asEditor()->get('/ajax/tags/suggest?search=co')->seeJsonEquals(['color', 'country']);
+
+        // Set restricted permission the page
+        $page->restricted = true;
+        $page->save();
+        $permissionService->buildJointPermissionsForEntity($page);
+
+        $this->asAdmin()->get('/ajax/tags/suggest?search=co')->seeJsonEquals(['color', 'country']);
+        $this->asEditor()->get('/ajax/tags/suggest?search=co')->seeJsonEquals([]);
+    }
+
+    public function test_entity_tag_updating()
+    {
+        $page = $this->getPageWithTags();
+
+        $testJsonData = [
+            ['name' => 'color', 'value' => 'red'],
+            ['name' => 'color', 'value' => ' blue '],
+            ['name' => 'city', 'value' => 'London '],
+            ['name' => 'country', 'value' => ' England'],
+        ];
+        $testResponseJsonData = [
+            ['name' => 'color', 'value' => 'red'],
+            ['name' => 'color', 'value' => 'blue'],
+            ['name' => 'city', 'value' => 'London'],
+            ['name' => 'country', 'value' => 'England'],
+        ];
+
+        // Do update request
+        $this->asAdmin()->json("POST", "/ajax/tags/update/page/" . $page->id, ['tags' => $testJsonData]);
+        $updateData = json_decode($this->response->getContent());
+        // Check data is correct
+        $testDataCorrect = true;
+        foreach ($updateData->tags as $data) {
+            $testItem = ['name' => $data->name, 'value' => $data->value];
+            if (!in_array($testItem, $testResponseJsonData)) $testDataCorrect = false;
+        }
+        $testMessage = "Expected data was not found in the response.\nExpected Data: %s\nRecieved Data: %s";
+        $this->assertTrue($testDataCorrect, sprintf($testMessage, json_encode($testResponseJsonData), json_encode($updateData)));
+        $this->assertTrue(isset($updateData->message), "No message returned in tag update response");
+
+        // Do get request
+        $this->asAdmin()->get("/ajax/tags/get/page/" . $page->id);
+        $getResponseData = json_decode($this->response->getContent());
+        // Check counts
+        $this->assertTrue(count($getResponseData) === count($testJsonData), "The received tag count is incorrect");
+        // Check data is correct
+        $testDataCorrect = true;
+        foreach ($getResponseData as $data) {
+            $testItem = ['name' => $data->name, 'value' => $data->value];
+            if (!in_array($testItem, $testResponseJsonData)) $testDataCorrect = false;
+        }
+        $testMessage = "Expected data was not found in the response.\nExpected Data: %s\nRecieved Data: %s";
+        $this->assertTrue($testDataCorrect, sprintf($testMessage, json_encode($testResponseJsonData), json_encode($getResponseData)));
+    }
+
+}

@@ -4,12 +4,14 @@ class RestrictionsTest extends TestCase
 {
 {
     protected $user;
     protected $user;
     protected $viewer;
     protected $viewer;
+    protected $restrictionService;
 
 
     public function setUp()
     public function setUp()
     {
     {
         parent::setUp();
         parent::setUp();
-        $this->user = $this->getNewUser();
+        $this->user = $this->getEditor();
         $this->viewer = $this->getViewer();
         $this->viewer = $this->getViewer();
+        $this->restrictionService = $this->app[\BookStack\Services\PermissionService::class];
     }
     }
 
 
     protected function getViewer()
     protected function getViewer()
@@ -21,28 +23,30 @@ class RestrictionsTest extends TestCase
     }
     }
 
 
     /**
     /**
-     * Manually set some restrictions on an entity.
+     * Manually set some permissions on an entity.
      * @param \BookStack\Entity $entity
      * @param \BookStack\Entity $entity
      * @param $actions
      * @param $actions
      */
      */
     protected function setEntityRestrictions(\BookStack\Entity $entity, $actions)
     protected function setEntityRestrictions(\BookStack\Entity $entity, $actions)
     {
     {
         $entity->restricted = true;
         $entity->restricted = true;
-        $entity->restrictions()->delete();
+        $entity->permissions()->delete();
         $role = $this->user->roles->first();
         $role = $this->user->roles->first();
         $viewerRole = $this->viewer->roles->first();
         $viewerRole = $this->viewer->roles->first();
         foreach ($actions as $action) {
         foreach ($actions as $action) {
-            $entity->restrictions()->create([
+            $entity->permissions()->create([
                 'role_id' => $role->id,
                 'role_id' => $role->id,
                 'action' => strtolower($action)
                 'action' => strtolower($action)
             ]);
             ]);
-            $entity->restrictions()->create([
+            $entity->permissions()->create([
                 'role_id' => $viewerRole->id,
                 'role_id' => $viewerRole->id,
                 'action' => strtolower($action)
                 'action' => strtolower($action)
             ]);
             ]);
         }
         }
         $entity->save();
         $entity->save();
-        $entity->load('restrictions');
+        $entity->load('permissions');
+        $this->restrictionService->buildJointPermissionsForEntity($entity);
+        $entity->load('jointPermissions');
     }
     }
 
 
     public function test_book_view_restriction()
     public function test_book_view_restriction()
@@ -344,7 +348,7 @@ class RestrictionsTest extends TestCase
             ->check('restrictions[2][view]')
             ->check('restrictions[2][view]')
             ->press('Save Permissions')
             ->press('Save Permissions')
             ->seeInDatabase('books', ['id' => $book->id, 'restricted' => true])
             ->seeInDatabase('books', ['id' => $book->id, 'restricted' => true])
-            ->seeInDatabase('restrictions', [
+            ->seeInDatabase('entity_permissions', [
                 'restrictable_id' => $book->id,
                 'restrictable_id' => $book->id,
                 'restrictable_type' => 'BookStack\Book',
                 'restrictable_type' => 'BookStack\Book',
                 'role_id' => '2',
                 'role_id' => '2',
@@ -361,7 +365,7 @@ class RestrictionsTest extends TestCase
             ->check('restrictions[2][update]')
             ->check('restrictions[2][update]')
             ->press('Save Permissions')
             ->press('Save Permissions')
             ->seeInDatabase('chapters', ['id' => $chapter->id, 'restricted' => true])
             ->seeInDatabase('chapters', ['id' => $chapter->id, 'restricted' => true])
-            ->seeInDatabase('restrictions', [
+            ->seeInDatabase('entity_permissions', [
                 'restrictable_id' => $chapter->id,
                 'restrictable_id' => $chapter->id,
                 'restrictable_type' => 'BookStack\Chapter',
                 'restrictable_type' => 'BookStack\Chapter',
                 'role_id' => '2',
                 'role_id' => '2',
@@ -378,7 +382,7 @@ class RestrictionsTest extends TestCase
             ->check('restrictions[2][delete]')
             ->check('restrictions[2][delete]')
             ->press('Save Permissions')
             ->press('Save Permissions')
             ->seeInDatabase('pages', ['id' => $page->id, 'restricted' => true])
             ->seeInDatabase('pages', ['id' => $page->id, 'restricted' => true])
-            ->seeInDatabase('restrictions', [
+            ->seeInDatabase('entity_permissions', [
                 'restrictable_id' => $page->id,
                 'restrictable_id' => $page->id,
                 'restrictable_type' => 'BookStack\Page',
                 'restrictable_type' => 'BookStack\Page',
                 'role_id' => '2',
                 'role_id' => '2',

@@ -7,7 +7,15 @@ class RolesTest extends TestCase
     public function setUp()
     public function setUp()
     {
     {
         parent::setUp();
         parent::setUp();
-        $this->user = $this->getNewBlankUser();
+        $this->user = $this->getViewer();
+    }
+
+    protected function getViewer()
+    {
+        $role = \BookStack\Role::getRole('viewer');
+        $viewer = $this->getNewBlankUser();
+        $viewer->attachRole($role);;
+        return $viewer;
     }
     }
 
 
     /**
     /**
@@ -141,7 +149,7 @@ class RolesTest extends TestCase
 
 
     public function test_restrictions_manage_own_permission()
     public function test_restrictions_manage_own_permission()
     {
     {
-        $otherUsersPage = \BookStack\Page::take(1)->get()->first();
+        $otherUsersPage = \BookStack\Page::first();
         $content = $this->createEntityChainBelongingToUser($this->user);
         $content = $this->createEntityChainBelongingToUser($this->user);
         // Check can't restrict other's content
         // Check can't restrict other's content
         $this->actingAs($this->user)->visit($otherUsersPage->getUrl())
         $this->actingAs($this->user)->visit($otherUsersPage->getUrl())
@@ -536,4 +544,27 @@ class RolesTest extends TestCase
             ->dontSeeInElement('.book-content', $otherPage->name);
             ->dontSeeInElement('.book-content', $otherPage->name);
     }
     }
 
 
+    public function test_public_role_not_visible_in_user_edit_screen()
+    {
+        $user = \BookStack\User::first();
+        $this->asAdmin()->visit('/settings/users/' . $user->id)
+            ->seeElement('#roles-admin')
+            ->dontSeeElement('#roles-public');
+    }
+
+    public function test_public_role_not_visible_in_role_listing()
+    {
+        $this->asAdmin()->visit('/settings/roles')
+            ->see('Admin')
+            ->dontSee('Public');
+    }
+
+    public function test_public_role_not_visible_in_default_role_setting()
+    {
+        $this->asAdmin()->visit('/settings')
+            ->seeElement('[data-role-name="admin"]')
+            ->dontSeeElement('[data-role-name="public"]');
+
+    }
+
 }
 }

@@ -14,7 +14,10 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
      * @var string
      * @var string
      */
      */
     protected $baseUrl = 'http://localhost';
     protected $baseUrl = 'http://localhost';
+
+    // Local user instances
     private $admin;
     private $admin;
+    private $editor;
 
 
     /**
     /**
      * Creates the application.
      * Creates the application.
@@ -30,6 +33,10 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
         return $app;
         return $app;
     }
     }
 
 
+    /**
+     * Set the current user context to be an admin.
+     * @return $this
+     */
     public function asAdmin()
     public function asAdmin()
     {
     {
         if($this->admin === null) {
         if($this->admin === null) {
@@ -40,6 +47,18 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
     }
     }
 
 
     /**
     /**
+     * Set the current editor context to be an editor.
+     * @return $this
+     */
+    public function asEditor()
+    {
+        if($this->editor === null) {
+            $this->editor = $this->getEditor();
+        }
+        return $this->actingAs($this->editor);
+    }
+
+    /**
      * Quickly sets an array of settings.
      * Quickly sets an array of settings.
      * @param $settingsArray
      * @param $settingsArray
      */
      */
@@ -65,6 +84,8 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
         $page = factory(BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
         $page = factory(BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
         $book->chapters()->saveMany([$chapter]);
         $book->chapters()->saveMany([$chapter]);
         $chapter->pages()->saveMany([$page]);
         $chapter->pages()->saveMany([$page]);
+        $restrictionService = $this->app[\BookStack\Services\PermissionService::class];
+        $restrictionService->buildJointPermissionsForEntity($book);
         return [
         return [
             'book' => $book,
             'book' => $book,
             'chapter' => $chapter,
             'chapter' => $chapter,
@@ -77,7 +98,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
      * @param array $attributes
      * @param array $attributes
      * @return mixed
      * @return mixed
      */
      */
-    protected function getNewUser($attributes = [])
+    protected function getEditor($attributes = [])
     {
     {
         $user = factory(\BookStack\User::class)->create($attributes);
         $user = factory(\BookStack\User::class)->create($attributes);
         $role = \BookStack\Role::getRole('editor');
         $role = \BookStack\Role::getRole('editor');

@@ -33,7 +33,7 @@ class UserProfileTest extends TestCase
 
 
     public function test_profile_page_shows_created_content_counts()
     public function test_profile_page_shows_created_content_counts()
     {
     {
-        $newUser = $this->getNewUser();
+        $newUser = $this->getEditor();
 
 
         $this->asAdmin()->visit('/user/' . $newUser->id)
         $this->asAdmin()->visit('/user/' . $newUser->id)
             ->see($newUser->name)
             ->see($newUser->name)
@@ -52,7 +52,7 @@ class UserProfileTest extends TestCase
 
 
     public function test_profile_page_shows_recent_activity()
     public function test_profile_page_shows_recent_activity()
     {
     {
-        $newUser = $this->getNewUser();
+        $newUser = $this->getEditor();
         $this->actingAs($newUser);
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         Activity::add($entities['book'], 'book_update', $entities['book']->id);
         Activity::add($entities['book'], 'book_update', $entities['book']->id);
@@ -66,7 +66,7 @@ class UserProfileTest extends TestCase
 
 
     public function test_clicking_user_name_in_activity_leads_to_profile_page()
     public function test_clicking_user_name_in_activity_leads_to_profile_page()
     {
     {
-        $newUser = $this->getNewUser();
+        $newUser = $this->getEditor();
         $this->actingAs($newUser);
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         Activity::add($entities['book'], 'book_update', $entities['book']->id);
         Activity::add($entities['book'], 'book_update', $entities['book']->id);