Merge branch 'master' into release

@@ -14,14 +14,28 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 QUEUE_DRIVER=sync
 
 
+# Storage
+STORAGE_TYPE=local
+# Amazon S3 Config
+STORAGE_S3_KEY=false
+STORAGE_S3_SECRET=false
+STORAGE_S3_REGION=false
+STORAGE_S3_BUCKET=false
+# Storage URL
+# Used to prefix image urls for when using custom domains/cdns
+STORAGE_URL=false
+
 # Social Authentication information. Defaults as off.
 # Social Authentication information. Defaults as off.
 GITHUB_APP_ID=false
 GITHUB_APP_ID=false
 GITHUB_APP_SECRET=false
 GITHUB_APP_SECRET=false
 GOOGLE_APP_ID=false
 GOOGLE_APP_ID=false
 GOOGLE_APP_SECRET=false
 GOOGLE_APP_SECRET=false
-# URL for social login redirects, NO TRAILING SLASH
+# URL used for social login redirects, NO TRAILING SLASH
 APP_URL=http://bookstack.dev
 APP_URL=http://bookstack.dev
 
 
+# External services
+USE_GRAVATAR=true
+
 # Mail settings
 # Mail settings
 MAIL_DRIVER=smtp
 MAIL_DRIVER=smtp
 MAIL_HOST=localhost
 MAIL_HOST=localhost

@@ -7,23 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 abstract class Entity extends Model
 abstract class Entity extends Model
 {
 {
 
 
-    /**
-     * Relation for the user that created this entity.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function createdBy()
-    {
-        return $this->belongsTo('BookStack\User', 'created_by');
-    }
-
-    /**
-     * Relation for the user that updated this entity.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function updatedBy()
-    {
-        return $this->belongsTo('BookStack\User', 'updated_by');
-    }
+    use Ownable;
 
 
     /**
     /**
      * Compares this entity to another given entity.
      * Compares this entity to another given entity.
@@ -97,19 +81,30 @@ abstract class Entity extends Model
      */
      */
     public static function isA($type)
     public static function isA($type)
     {
     {
-        return static::getName() === strtolower($type);
+        return static::getClassName() === strtolower($type);
     }
     }
 
 
     /**
     /**
      * Gets the class name.
      * Gets the class name.
      * @return string
      * @return string
      */
      */
-    public static function getName()
+    public static function getClassName()
     {
     {
         return strtolower(array_slice(explode('\\', static::class), -1, 1)[0]);
         return strtolower(array_slice(explode('\\', static::class), -1, 1)[0]);
     }
     }
 
 
     /**
     /**
+     *Gets a limited-length version of the entities name.
+     * @param int $length
+     * @return string
+     */
+    public function getShortName($length = 25)
+    {
+        if(strlen($this->name) <= $length) return $this->name;
+        return substr($this->name, 0, $length-3) . '...';
+    }
+
+    /**
      * Perform a full-text search on this entity.
      * Perform a full-text search on this entity.
      * @param string[] $fieldsToSearch
      * @param string[] $fieldsToSearch
      * @param string[] $terms
      * @param string[] $terms
@@ -123,20 +118,20 @@ abstract class Entity extends Model
             $termString .= $term . '* ';
             $termString .= $term . '* ';
         }
         }
         $fields = implode(',', $fieldsToSearch);
         $fields = implode(',', $fieldsToSearch);
-        $search = static::whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
+        $termStringEscaped = \DB::connection()->getPdo()->quote($termString);
+        $search = static::addSelect(\DB::raw('*, MATCH(name) AGAINST('.$termStringEscaped.' IN BOOLEAN MODE) AS title_relevance'));
+        $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
+
+        // 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]);
         }
         }
 
 
-        if (!static::isA('book')) {
-            $search = $search->with('book');
-        }
-
-        if (static::isA('page')) {
-            $search = $search->with('chapter');
-        }
+        // Load in relations
+        if (!static::isA('book')) $search = $search->with('book');
+        if (static::isA('page'))  $search = $search->with('chapter');
 
 
-        return $search->get();
+        return $search->orderBy('title_relevance', 'desc')->get();
     }
     }
 
 
     /**
     /**

@@ -42,8 +42,10 @@ class BookController extends Controller
     public function index()
     public function index()
     {
     {
         $books = $this->bookRepo->getAllPaginated(10);
         $books = $this->bookRepo->getAllPaginated(10);
-        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(10, 0) : false;
-        return view('books/index', ['books' => $books, 'recents' => $recents]);
+        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(4, 0) : false;
+        $popular = $this->bookRepo->getPopular(4, 0);
+        $this->setPageTitle('Books');
+        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
     }
     }
 
 
     /**
     /**
@@ -54,6 +56,7 @@ class BookController extends Controller
     public function create()
     public function create()
     {
     {
         $this->checkPermission('book-create');
         $this->checkPermission('book-create');
+        $this->setPageTitle('Create New Book');
         return view('books/create');
         return view('books/create');
     }
     }
 
 
@@ -88,8 +91,9 @@ class BookController extends Controller
     public function show($slug)
     public function show($slug)
     {
     {
         $book = $this->bookRepo->getBySlug($slug);
         $book = $this->bookRepo->getBySlug($slug);
-        Views::add($book);
         $bookChildren = $this->bookRepo->getChildren($book);
         $bookChildren = $this->bookRepo->getChildren($book);
+        Views::add($book);
+        $this->setPageTitle($book->getShortName());
         return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
         return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
     }
     }
 
 
@@ -103,6 +107,7 @@ class BookController extends Controller
     {
     {
         $this->checkPermission('book-update');
         $this->checkPermission('book-update');
         $book = $this->bookRepo->getBySlug($slug);
         $book = $this->bookRepo->getBySlug($slug);
+        $this->setPageTitle('Edit Book ' . $book->getShortName());
         return view('books/edit', ['book' => $book, 'current' => $book]);
         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
     }
 
 
@@ -138,6 +143,7 @@ class BookController extends Controller
     {
     {
         $this->checkPermission('book-delete');
         $this->checkPermission('book-delete');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->setPageTitle('Delete Book ' . $book->getShortName());
         return view('books/delete', ['book' => $book, 'current' => $book]);
         return view('books/delete', ['book' => $book, 'current' => $book]);
     }
     }
 
 
@@ -152,9 +158,16 @@ class BookController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $bookChildren = $this->bookRepo->getChildren($book);
         $bookChildren = $this->bookRepo->getChildren($book);
         $books = $this->bookRepo->getAll();
         $books = $this->bookRepo->getAll();
+        $this->setPageTitle('Sort Book ' . $book->getShortName());
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
     }
     }
 
 
+    /**
+     * Shows the sort box for a single book.
+     * Used via AJAX when loading in extra books to a sort.
+     * @param $bookSlug
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
     public function getSortItem($bookSlug)
     public function getSortItem($bookSlug)
     {
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);

@@ -40,6 +40,7 @@ class ChapterController extends Controller
     {
     {
         $this->checkPermission('chapter-create');
         $this->checkPermission('chapter-create');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->setPageTitle('Create New Chapter');
         return view('chapters/create', ['book' => $book, 'current' => $book]);
         return view('chapters/create', ['book' => $book, 'current' => $book]);
     }
     }
 
 
@@ -79,6 +80,7 @@ class ChapterController extends Controller
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $sidebarTree = $this->bookRepo->getChildren($book);
         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($chapter);
         Views::add($chapter);
+        $this->setPageTitle($chapter->getShortName());
         return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter, 'sidebarTree' => $sidebarTree]);
         return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter, 'sidebarTree' => $sidebarTree]);
     }
     }
 
 
@@ -93,6 +95,7 @@ class ChapterController extends Controller
         $this->checkPermission('chapter-update');
         $this->checkPermission('chapter-update');
         $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->setPageTitle('Edit Chapter' . $chapter->getShortName());
         return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
         return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
     }
 
 
@@ -127,6 +130,7 @@ class ChapterController extends Controller
         $this->checkPermission('chapter-delete');
         $this->checkPermission('chapter-delete');
         $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->setPageTitle('Delete Chapter' . $chapter->getShortName());
         return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
         return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
     }
 
 

@@ -43,6 +43,15 @@ abstract class Controller extends BaseController
     }
     }
 
 
     /**
     /**
+     * Adds the page title into the view.
+     * @param $title
+     */
+    public function setPageTitle($title)
+    {
+        view()->share('pageTitle', $title);
+    }
+
+    /**
      * Checks for a permission.
      * Checks for a permission.
      *
      *
      * @param $permissionName
      * @param $permissionName

@@ -2,6 +2,7 @@
 
 
 namespace BookStack\Http\Controllers;
 namespace BookStack\Http\Controllers;
 
 
+use BookStack\Repos\ImageRepo;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Auth;
@@ -14,125 +15,78 @@ class ImageController extends Controller
 {
 {
     protected $image;
     protected $image;
     protected $file;
     protected $file;
+    protected $imageRepo;
 
 
     /**
     /**
      * ImageController constructor.
      * ImageController constructor.
      * @param Image     $image
      * @param Image     $image
      * @param File      $file
      * @param File      $file
+     * @param ImageRepo $imageRepo
      */
      */
-    public function __construct(Image $image, File $file)
+    public function __construct(Image $image, File $file, ImageRepo $imageRepo)
     {
     {
         $this->image = $image;
         $this->image = $image;
         $this->file = $file;
         $this->file = $file;
+        $this->imageRepo = $imageRepo;
         parent::__construct();
         parent::__construct();
     }
     }
 
 
 
 
     /**
     /**
-     * Get all images, Paginated
+     * Get all images for a specific type, Paginated
      * @param int $page
      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      * @return \Illuminate\Http\JsonResponse
      */
      */
-    public function getAll($page = 0)
+    public function getAllByType($type, $page = 0)
     {
     {
-        $pageSize = 30;
-        $images = $this->image->orderBy('created_at', 'desc')
-            ->skip($page * $pageSize)->take($pageSize)->get();
-        foreach ($images as $image) {
-            $this->loadSizes($image);
-        }
-        $hasMore = $this->image->orderBy('created_at', 'desc')
-                ->skip(($page + 1) * $pageSize)->take($pageSize)->count() > 0;
-        return response()->json([
-            'images' => $images,
-            'hasMore' => $hasMore
-        ]);
+        $imgData = $this->imageRepo->getPaginatedByType($type, $page);
+        return response()->json($imgData);
     }
     }
 
 
     /**
     /**
-     * Loads the standard thumbnail sizes for an image.
-     * @param Image $image
-     */
-    private function loadSizes(Image $image)
-    {
-        $image->thumbnail = $this->getThumbnail($image, 150, 150);
-        $image->display = $this->getThumbnail($image, 840, 0, true);
-    }
-
-    /**
-     * Get the thumbnail for an image.
-     * If $keepRatio is true only the width will be used.
-     * @param      $image
-     * @param int  $width
-     * @param int  $height
-     * @param bool $keepRatio
-     * @return string
+     * Get all images for a user.
+     * @param int $page
+     * @return \Illuminate\Http\JsonResponse
      */
      */
-    public function getThumbnail($image, $width = 220, $height = 220, $keepRatio = false)
+    public function getAllForUserType($page = 0)
     {
     {
-        $explodedPath = explode('/', $image->url);
-        $dirPrefix = $keepRatio ? 'scaled-' : 'thumbs-';
-        array_splice($explodedPath, 4, 0, [$dirPrefix . $width . '-' . $height]);
-        $thumbPath = implode('/', $explodedPath);
-        $thumbFilePath = public_path() . $thumbPath;
-
-        // Return the thumbnail url path if already exists
-        if (file_exists($thumbFilePath)) {
-            return $thumbPath;
-        }
-
-        // Otherwise create the thumbnail
-        $thumb = ImageTool::make(public_path() . $image->url);
-        if($keepRatio) {
-            $thumb->resize($width, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            });
-        } else {
-            $thumb->fit($width, $height);
-        }
-
-        // Create thumbnail folder if it does not exist
-        if (!file_exists(dirname($thumbFilePath))) {
-            mkdir(dirname($thumbFilePath), 0775, true);
+        $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id);
+        return response()->json($imgData);
     }
     }
 
 
-        //Save Thumbnail
-        $thumb->save($thumbFilePath);
-        return $thumbPath;
-    }
 
 
     /**
     /**
      * Handles image uploads for use on pages.
      * Handles image uploads for use on pages.
+     * @param string  $type
      * @param Request $request
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @return \Illuminate\Http\JsonResponse
      */
      */
-    public function upload(Request $request)
+    public function uploadByType($type, Request $request)
     {
     {
         $this->checkPermission('image-create');
         $this->checkPermission('image-create');
         $this->validate($request, [
         $this->validate($request, [
             'file' => 'image|mimes:jpeg,gif,png'
             'file' => 'image|mimes:jpeg,gif,png'
         ]);
         ]);
-        $imageUpload = $request->file('file');
 
 
-        $name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
-        $storageName = substr(sha1(time()), 0, 10) . '-' . $name;
-        $imagePath = '/uploads/images/' . Date('Y-m-M') . '/';
-        $storagePath = public_path() . $imagePath;
-        $fullPath = $storagePath . $storageName;
-        while (file_exists($fullPath)) {
-            $storageName = substr(sha1(rand()), 0, 3) . $storageName;
-            $fullPath = $storagePath . $storageName;
+        $imageUpload = $request->file('file');
+        $image = $this->imageRepo->saveNew($imageUpload, $type);
+        return response()->json($image);
     }
     }
-        $imageUpload->move($storagePath, $storageName);
-        // Create and save image object
-        $this->image->name = $name;
-        $this->image->url = $imagePath . $storageName;
-        $this->image->created_by = auth()->user()->id;
-        $this->image->updated_by = auth()->user()->id;
-        $this->image->save();
-        $this->loadSizes($this->image);
-        return response()->json($this->image);
+
+    /**
+     * Generate a sized thumbnail for an image.
+     * @param $id
+     * @param $width
+     * @param $height
+     * @param $crop
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getThumbnail($id, $width, $height, $crop)
+    {
+        $this->checkPermission('image-create');
+        $image = $this->imageRepo->getById($id);
+        $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false');
+        return response()->json(['url' => $thumbnailUrl]);
     }
     }
 
 
     /**
     /**
@@ -147,13 +101,12 @@ class ImageController extends Controller
         $this->validate($request, [
         $this->validate($request, [
             'name' => 'required|min:2|string'
             'name' => 'required|min:2|string'
         ]);
         ]);
-        $image = $this->image->findOrFail($imageId);
-        $image->fill($request->all());
-        $image->save();
-        $this->loadSizes($image);
-        return response()->json($this->image);
+        $image = $this->imageRepo->getById($imageId);
+        $image = $this->imageRepo->updateImageDetails($image, $request->all());
+        return response()->json($image);
     }
     }
 
 
+
     /**
     /**
      * Deletes an image and all thumbnail/image files
      * Deletes an image and all thumbnail/image files
      * @param PageRepo $pageRepo
      * @param PageRepo $pageRepo
@@ -164,41 +117,18 @@ class ImageController extends Controller
     public function destroy(PageRepo $pageRepo, Request $request, $id)
     public function destroy(PageRepo $pageRepo, Request $request, $id)
     {
     {
         $this->checkPermission('image-delete');
         $this->checkPermission('image-delete');
-        $image = $this->image->findOrFail($id);
+        $image = $this->imageRepo->getById($id);
 
 
         // Check if this image is used on any pages
         // Check if this image is used on any pages
-        $pageSearch = $pageRepo->searchForImage($image->url);
         $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
         $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
-        if ($pageSearch !== false && !$isForced) {
+        if (!$isForced) {
+            $pageSearch = $pageRepo->searchForImage($image->url);
+            if ($pageSearch !== false) {
                 return response()->json($pageSearch, 400);
                 return response()->json($pageSearch, 400);
             }
             }
-
-        // Delete files
-        $folder = public_path() . dirname($image->url);
-        $fileName = basename($image->url);
-
-        // Delete thumbnails
-        foreach (glob($folder . '/*') as $file) {
-            if (is_dir($file)) {
-                $thumbName = $file . '/' . $fileName;
-                if (file_exists($file)) {
-                    unlink($thumbName);
-                }
-                // Remove thumb folder if empty
-                if (count(glob($file . '/*')) === 0) {
-                    rmdir($file);
-                }
-            }
         }
         }
 
 
-        // Delete file and database entry
-        unlink($folder . '/' . $fileName);
-        $image->delete();
-
-        // Delete parent folder if empty
-        if (count(glob($folder . '/*')) === 0) {
-            rmdir($folder);
-        }
+        $this->imageRepo->destroyImage($image);
         return response()->json('Image Deleted');
         return response()->json('Image Deleted');
     }
     }
 
 

@@ -46,6 +46,7 @@ class PageController extends Controller
         $this->checkPermission('page-create');
         $this->checkPermission('page-create');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
         $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
+        $this->setPageTitle('Create New Page');
         return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
         return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
     }
     }
 
 
@@ -89,6 +90,7 @@ class PageController extends Controller
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $sidebarTree = $this->bookRepo->getChildren($book);
         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($page);
         Views::add($page);
+        $this->setPageTitle($page->getShortName());
         return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page, 'sidebarTree' => $sidebarTree]);
         return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page, 'sidebarTree' => $sidebarTree]);
     }
     }
 
 
@@ -104,6 +106,7 @@ class PageController extends Controller
         $this->checkPermission('page-update');
         $this->checkPermission('page-update');
         $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->setPageTitle('Editing Page ' . $page->getShortName());
         return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]);
         return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]);
     }
     }
 
 
@@ -148,6 +151,7 @@ class PageController extends Controller
         $this->checkPermission('page-delete');
         $this->checkPermission('page-delete');
         $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->setPageTitle('Delete Page ' . $page->getShortName());
         return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
         return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
     }
     }
 
 
@@ -179,6 +183,7 @@ 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->setPageTitle('Revisions For ' . $page->getShortName());
         return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]);
         return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]);
     }
     }
 
 
@@ -195,6 +200,7 @@ class PageController extends Controller
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $revision = $this->pageRepo->getRevisionById($revisionId);
         $revision = $this->pageRepo->getRevisionById($revisionId);
         $page->fill($revision->toArray());
         $page->fill($revision->toArray());
+        $this->setPageTitle('Page Revision For ' . $page->getShortName());
         return view('pages/revision', ['page' => $page, 'book' => $book]);
         return view('pages/revision', ['page' => $page, 'book' => $book]);
     }
     }
 
 

@@ -45,6 +45,7 @@ class SearchController extends Controller
         $pages = $this->pageRepo->getBySearch($searchTerm);
         $pages = $this->pageRepo->getBySearch($searchTerm);
         $books = $this->bookRepo->getBySearch($searchTerm);
         $books = $this->bookRepo->getBySearch($searchTerm);
         $chapters = $this->chapterRepo->getBySearch($searchTerm);
         $chapters = $this->chapterRepo->getBySearch($searchTerm);
+        $this->setPageTitle('Search For ' . $searchTerm);
         return view('search/all', ['pages' => $pages, 'books' => $books, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
         return view('search/all', ['pages' => $pages, 'books' => $books, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
     }
     }
 
 

@@ -18,6 +18,7 @@ class SettingController extends Controller
     public function index()
     public function index()
     {
     {
         $this->checkPermission('settings-update');
         $this->checkPermission('settings-update');
+        $this->setPageTitle('Settings');
         return view('settings/index');
         return view('settings/index');
     }
     }
 
 

@@ -4,7 +4,7 @@ namespace BookStack\Http\Controllers;
 
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
-use Illuminate\Support\Facades\Hash;
+use Illuminate\Http\Response;
 use BookStack\Http\Requests;
 use BookStack\Http\Requests;
 use BookStack\Repos\UserRepo;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\SocialAuthService;
 use BookStack\Services\SocialAuthService;
@@ -18,7 +18,8 @@ class UserController extends Controller
 
 
     /**
     /**
      * UserController constructor.
      * UserController constructor.
-     * @param $user
+     * @param User     $user
+     * @param UserRepo $userRepo
      */
      */
     public function __construct(User $user, UserRepo $userRepo)
     public function __construct(User $user, UserRepo $userRepo)
     {
     {
@@ -29,18 +30,17 @@ class UserController extends Controller
 
 
     /**
     /**
      * Display a listing of the users.
      * Display a listing of the users.
-     *
      * @return Response
      * @return Response
      */
      */
     public function index()
     public function index()
     {
     {
         $users = $this->user->all();
         $users = $this->user->all();
+        $this->setPageTitle('Users');
         return view('users/index', ['users' => $users]);
         return view('users/index', ['users' => $users]);
     }
     }
 
 
     /**
     /**
      * Show the form for creating a new user.
      * Show the form for creating a new user.
-     *
      * @return Response
      * @return Response
      */
      */
     public function create()
     public function create()
@@ -51,7 +51,6 @@ class UserController extends Controller
 
 
     /**
     /**
      * Store a newly created user in storage.
      * Store a newly created user in storage.
-     *
      * @param  Request $request
      * @param  Request $request
      * @return Response
      * @return Response
      */
      */
@@ -60,7 +59,7 @@ class UserController extends Controller
         $this->checkPermission('user-create');
         $this->checkPermission('user-create');
         $this->validate($request, [
         $this->validate($request, [
             'name'             => 'required',
             'name'             => 'required',
-            'email'            => 'required|email',
+            'email'            => 'required|email|unique:users,email',
             'password'         => 'required|min:5',
             'password'         => 'required|min:5',
             'password-confirm' => 'required|same:password',
             'password-confirm' => 'required|same:password',
             'role'             => 'required|exists:roles,id'
             'role'             => 'required|exists:roles,id'
@@ -71,13 +70,20 @@ class UserController extends Controller
         $user->save();
         $user->save();
 
 
         $user->attachRoleId($request->get('role'));
         $user->attachRoleId($request->get('role'));
+
+        // Get avatar from gravatar and save
+        if (!env('DISABLE_EXTERNAL_SERVICES', false)) {
+            $avatar = \Images::saveUserGravatar($user);
+            $user->avatar()->associate($avatar);
+            $user->save();
+        }
+
         return redirect('/users');
         return redirect('/users');
     }
     }
 
 
 
 
     /**
     /**
      * Show the form for editing the specified user.
      * Show the form for editing the specified user.
-     *
      * @param  int              $id
      * @param  int              $id
      * @param SocialAuthService $socialAuthService
      * @param SocialAuthService $socialAuthService
      * @return Response
      * @return Response
@@ -90,12 +96,12 @@ class UserController extends Controller
 
 
         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
+        $this->setPageTitle('User Profile');
         return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers]);
         return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers]);
     }
     }
 
 
     /**
     /**
      * Update the specified user in storage.
      * Update the specified user in storage.
-     *
      * @param  Request $request
      * @param  Request $request
      * @param  int     $id
      * @param  int     $id
      * @return Response
      * @return Response
@@ -139,12 +145,12 @@ class UserController extends Controller
             return $this->currentUser->id == $id;
             return $this->currentUser->id == $id;
         });
         });
         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);
+        $this->setPageTitle('Delete User ' . $user->name);
         return view('users/delete', ['user' => $user]);
         return view('users/delete', ['user' => $user]);
     }
     }
 
 
     /**
     /**
      * Remove the specified user from storage.
      * Remove the specified user from storage.
-     *
      * @param  int $id
      * @param  int $id
      * @return Response
      * @return Response
      */
      */
@@ -153,14 +159,14 @@ class UserController extends Controller
         $this->checkPermissionOr('user-delete', function () use ($id) {
         $this->checkPermissionOr('user-delete', function () use ($id) {
             return $this->currentUser->id == $id;
             return $this->currentUser->id == $id;
         });
         });
+
         $user = $this->userRepo->getById($id);
         $user = $this->userRepo->getById($id);
-        // Delete social accounts
-        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());
         }
         }
-        $user->socialAccounts()->delete();
-        $user->delete();
+        $this->userRepo->destroy($user);
+
         return redirect('/users');
         return redirect('/users');
     }
     }
 }
 }

@@ -45,8 +45,6 @@ Route::group(['middleware' => 'auth'], function () {
 
 
     });
     });
 
 
-    // Uploads
-    Route::post('/upload/image', 'ImageController@upload');
 
 
     // Users
     // Users
     Route::get('/users', 'UserController@index');
     Route::get('/users', 'UserController@index');
@@ -58,10 +56,18 @@ Route::group(['middleware' => 'auth'], function () {
     Route::delete('/users/{id}', 'UserController@destroy');
     Route::delete('/users/{id}', 'UserController@destroy');
 
 
     // Image routes
     // Image routes
-    Route::get('/images/all', 'ImageController@getAll');
-    Route::put('/images/update/{imageId}', 'ImageController@update');
-    Route::delete('/images/{imageId}', 'ImageController@destroy');
-    Route::get('/images/all/{page}', 'ImageController@getAll');
+    Route::group(['prefix' => 'images'], function() {
+        // Get for user images
+        Route::get('/user/all', 'ImageController@getAllForUserType');
+        Route::get('/user/all/{page}', 'ImageController@getAllForUserType');
+        // Standard get, update and deletion for all types
+        Route::get('/thumb/{id}/{width}/{height}/{crop}', 'ImageController@getThumbnail');
+        Route::put('/update/{imageId}', 'ImageController@update');
+        Route::post('/{type}/upload', 'ImageController@uploadByType');
+        Route::get('/{type}/all', 'ImageController@getAllByType');
+        Route::get('/{type}/all/{page}', 'ImageController@getAllByType');
+        Route::delete('/{imageId}', 'ImageController@destroy');
+    });
 
 
     // Links
     // Links
     Route::get('/link/{id}', 'PageController@redirectFromLink');
     Route::get('/link/{id}', 'PageController@redirectFromLink');

@@ -3,22 +3,24 @@
 namespace BookStack;
 namespace BookStack;
 
 
 
 
-class Image extends Entity
+use Illuminate\Database\Eloquent\Model;
+use Images;
+
+class Image extends Model
 {
 {
+    use Ownable;
 
 
     protected $fillable = ['name'];
     protected $fillable = ['name'];
 
 
-    public function getFilePath()
-    {
-        return storage_path() . $this->url;
-    }
-
     /**
     /**
-     * Get the url for this item.
+     * Get a thumbnail for this image.
+     * @param  int       $width
+     * @param  int       $height
+     * @param bool|false $keepRatio
      * @return string
      * @return string
      */
      */
-    public function getUrl()
+    public function getThumb($width, $height, $keepRatio = false)
     {
     {
-        return public_path() . $this->url;
+        return Images::getThumbnail($this, $width, $height, $keepRatio);
     }
     }
 }
 }

+<?php namespace BookStack;
+
+
+trait Ownable
+{
+    /**
+     * Relation for the user that created this entity.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function createdBy()
+    {
+        return $this->belongsTo('BookStack\User', 'created_by');
+    }
+
+    /**
+     * Relation for the user that updated this entity.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function updatedBy()
+    {
+        return $this->belongsTo('BookStack\User', 'updated_by');
+    }
+}
\ No newline at end of file

@@ -32,7 +32,6 @@ class Page extends Entity
         return $this->chapter()->count() > 0;
         return $this->chapter()->count() > 0;
     }
     }
 
 
-
     public function revisions()
     public function revisions()
     {
     {
         return $this->hasMany('BookStack\PageRevision')->orderBy('created_at', 'desc');
         return $this->hasMany('BookStack\PageRevision')->orderBy('created_at', 'desc');
@@ -40,7 +39,6 @@ class Page extends Entity
 
 
     public function getUrl()
     public function getUrl()
     {
     {
-        // TODO - Extract this and share with chapters
         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
         return '/books/' . $bookSlug . '/page/' . $this->slug;
         return '/books/' . $bookSlug . '/page/' . $this->slug;
     }
     }

@@ -2,6 +2,7 @@
 
 
 namespace BookStack\Providers;
 namespace BookStack\Providers;
 
 
+use BookStack\Services\ImageService;
 use BookStack\Services\ViewService;
 use BookStack\Services\ViewService;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\ServiceProvider;
 use BookStack\Services\ActivityService;
 use BookStack\Services\ActivityService;
@@ -40,5 +41,12 @@ class CustomFacadeProvider extends ServiceProvider
                 $this->app->make('Illuminate\Contracts\Cache\Repository')
                 $this->app->make('Illuminate\Contracts\Cache\Repository')
             );
             );
         });
         });
+        $this->app->bind('images', function() {
+            return new ImageService(
+                $this->app->make('Intervention\Image\ImageManager'),
+                $this->app->make('Illuminate\Contracts\Filesystem\Factory'),
+                $this->app->make('Illuminate\Contracts\Cache\Repository')
+            );
+        });
     }
     }
 }
 }

@@ -78,6 +78,17 @@ class BookRepo
     }
     }
 
 
     /**
     /**
+     * Gets the most viewed books.
+     * @param int $count
+     * @param int $page
+     * @return mixed
+     */
+    public function getPopular($count = 10, $page = 0)
+    {
+        return Views::getPopular($count, $page, $this->book);
+    }
+
+    /**
      * Get a book by slug
      * Get a book by slug
      * @param $slug
      * @param $slug
      * @return mixed
      * @return mixed

+<?php namespace BookStack\Repos;
+
+
+use BookStack\Image;
+use BookStack\Services\ImageService;
+use Setting;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class ImageRepo
+{
+
+    protected $image;
+    protected $imageService;
+
+    /**
+     * ImageRepo constructor.
+     * @param Image        $image
+     * @param ImageService $imageService
+     */
+    public function __construct(Image $image, ImageService $imageService)
+    {
+        $this->image = $image;
+        $this->imageService = $imageService;
+    }
+
+
+    /**
+     * Get an image with the given id.
+     * @param $id
+     * @return mixed
+     */
+    public function getById($id)
+    {
+        return $this->image->findOrFail($id);
+    }
+
+
+    /**
+     * Gets a load images paginated, filtered by image type.
+     * @param string $type
+     * @param int    $page
+     * @param int    $pageSize
+     * @param bool|int   $userFilter
+     * @return array
+     */
+    public function getPaginatedByType($type, $page = 0, $pageSize = 24, $userFilter = false)
+    {
+        $images = $this->image->where('type', '=', strtolower($type));
+
+        if ($userFilter !== false) {
+            $images = $images->where('created_by', '=', $userFilter);
+        }
+
+        $images = $images->orderBy('created_at', 'desc')->skip($pageSize * $page)->take($pageSize + 1)->get();
+        $hasMore = count($images) > $pageSize;
+
+        $returnImages = $images->take(24);
+        $returnImages->each(function ($image) {
+            $this->loadThumbs($image);
+        });
+
+        return [
+            'images'  => $returnImages,
+            'hasMore' => $hasMore
+        ];
+    }
+
+    /**
+     * Save a new image into storage and return the new image.
+     * @param UploadedFile $uploadFile
+     * @param  string      $type
+     * @return Image
+     */
+    public function saveNew(UploadedFile $uploadFile, $type)
+    {
+        $image = $this->imageService->saveNewFromUpload($uploadFile, $type);
+        $this->loadThumbs($image);
+        return $image;
+    }
+
+    /**
+     * Update the details of an image via an array of properties.
+     * @param Image $image
+     * @param array $updateDetails
+     * @return Image
+     */
+    public function updateImageDetails(Image $image, $updateDetails)
+    {
+        $image->fill($updateDetails);
+        $image->save();
+        $this->loadThumbs($image);
+        return $image;
+    }
+
+
+    /**
+     * Destroys an Image object along with its files and thumbnails.
+     * @param Image $image
+     * @return bool
+     */
+    public function destroyImage(Image $image)
+    {
+        $this->imageService->destroyImage($image);
+        return true;
+    }
+
+
+    /**
+     * Load thumbnails onto an image object.
+     * @param Image $image
+     */
+    private function loadThumbs(Image $image)
+    {
+        $image->thumbs = [
+            'gallery' => $this->getThumbnail($image, 150, 150),
+            'display' => $this->getThumbnail($image, 840, 0, true)
+        ];
+    }
+
+    /**
+     * Get the thumbnail for an image.
+     * If $keepRatio is true only the width will be used.
+     * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
+     *
+     * @param Image $image
+     * @param int   $width
+     * @param int   $height
+     * @param bool  $keepRatio
+     * @return string
+     */
+    public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
+    {
+        return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
+    }
+
+
+}
\ No newline at end of file

@@ -269,7 +269,7 @@ class PageRepo
      * @param Page $page
      * @param Page $page
      * @return $this
      * @return $this
      */
      */
-    private function saveRevision(Page $page)
+    public function saveRevision(Page $page)
     {
     {
         $revision = $this->pageRevision->fill($page->toArray());
         $revision = $this->pageRevision->fill($page->toArray());
         $revision->page_id = $page->id;
         $revision->page_id = $page->id;

@@ -46,14 +46,19 @@ class UserRepo
     public function registerNew(array $data)
     public function registerNew(array $data)
     {
     {
         $user = $this->create($data);
         $user = $this->create($data);
-        $roleId = \Setting::get('registration-role');
-
-        if ($roleId === false) {
-            $roleId = $this->role->getDefault()->id;
+        $this->attachDefaultRole($user);
+        return $user;
     }
     }
 
 
+    /**
+     * Give a user the default role. Used when creating a new user.
+     * @param $user
+     */
+    public function attachDefaultRole($user)
+    {
+        $roleId = \Setting::get('registration-role');
+        if ($roleId === false) $roleId = $this->role->getDefault()->id;
         $user->attachRoleId($roleId);
         $user->attachRoleId($roleId);
-        return $user;
     }
     }
 
 
     /**
     /**
@@ -88,4 +93,14 @@ class UserRepo
             'password' => bcrypt($data['password'])
             'password' => bcrypt($data['password'])
         ]);
         ]);
     }
     }
+
+    /**
+     * Remove the given user from storage, Delete all related content.
+     * @param User $user
+     */
+    public function destroy(User $user)
+    {
+        $user->socialAccounts()->delete();
+        $user->delete();
+    }
 }
 }
\ No newline at end of file

+<?php namespace BookStack\Services\Facades;
+
+
+use Illuminate\Support\Facades\Facade;
+
+class Images extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor() { return 'images'; }
+}
\ No newline at end of file

+<?php namespace BookStack\Services;
+
+use BookStack\Image;
+use BookStack\User;
+use Intervention\Image\ImageManager;
+use Illuminate\Contracts\Filesystem\Factory as FileSystem;
+use Illuminate\Contracts\Filesystem\Filesystem as FileSystemInstance;
+use Illuminate\Contracts\Cache\Repository as Cache;
+use Setting;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class ImageService
+{
+
+    protected $imageTool;
+    protected $fileSystem;
+    protected $cache;
+
+    /**
+     * @var FileSystemInstance
+     */
+    protected $storageInstance;
+    protected $storageUrl;
+
+    /**
+     * ImageService constructor.
+     * @param $imageTool
+     * @param $fileSystem
+     * @param $cache
+     */
+    public function __construct(ImageManager $imageTool, FileSystem $fileSystem, Cache $cache)
+    {
+        $this->imageTool = $imageTool;
+        $this->fileSystem = $fileSystem;
+        $this->cache = $cache;
+    }
+
+    /**
+     * Saves a new image from an upload.
+     * @param UploadedFile $uploadedFile
+     * @param  string      $type
+     * @return mixed
+     */
+    public function saveNewFromUpload(UploadedFile $uploadedFile, $type)
+    {
+        $imageName = $uploadedFile->getClientOriginalName();
+        $imageData = file_get_contents($uploadedFile->getRealPath());
+        return $this->saveNew($imageName, $imageData, $type);
+    }
+
+
+    /**
+     * Gets an image from url and saves it to the database.
+     * @param             $url
+     * @param string      $type
+     * @param bool|string $imageName
+     * @return mixed
+     * @throws \Exception
+     */
+    private function saveNewFromUrl($url, $type, $imageName = false)
+    {
+        $imageName = $imageName ? $imageName : basename($url);
+        $imageData = file_get_contents($url);
+        if($imageData === false) throw new \Exception('Cannot get image from ' . $url);
+        return $this->saveNew($imageName, $imageData, $type);
+    }
+
+    /**
+     * Saves a new image
+     * @param string $imageName
+     * @param string $imageData
+     * @param string $type
+     * @return Image
+     */
+    private function saveNew($imageName, $imageData, $type)
+    {
+        $storage = $this->getStorage();
+        $secureUploads = Setting::get('app-secure-images');
+        $imageName = str_replace(' ', '-', $imageName);
+
+        if ($secureUploads) $imageName = str_random(16) . '-' . $imageName;
+
+        $imagePath = '/uploads/images/' . $type . '/' . Date('Y-m-M') . '/';
+        while ($storage->exists($imagePath . $imageName)) {
+            $imageName = str_random(3) . $imageName;
+        }
+        $fullPath = $imagePath . $imageName;
+
+        $storage->put($fullPath, $imageData);
+
+        $userId = auth()->user()->id;
+        $image = Image::forceCreate([
+            'name'       => $imageName,
+            'path'       => $fullPath,
+            'url'        => $this->getPublicUrl($fullPath),
+            'type'       => $type,
+            'created_by' => $userId,
+            'updated_by' => $userId
+        ]);
+
+        return $image;
+    }
+
+    /**
+     * Get the thumbnail for an image.
+     * If $keepRatio is true only the width will be used.
+     * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
+     *
+     * @param Image $image
+     * @param int   $width
+     * @param int   $height
+     * @param bool  $keepRatio
+     * @return string
+     */
+    public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
+    {
+        $thumbDirName = '/' . ($keepRatio ? 'scaled-' : 'thumbs-') . $width . '-' . $height . '/';
+        $thumbFilePath = dirname($image->path) . $thumbDirName . basename($image->path);
+
+        if ($this->cache->has('images-' . $image->id . '-' . $thumbFilePath) && $this->cache->get('images-' . $thumbFilePath)) {
+            return $this->getPublicUrl($thumbFilePath);
+        }
+
+        $storage = $this->getStorage();
+
+        if ($storage->exists($thumbFilePath)) {
+            return $this->getPublicUrl($thumbFilePath);
+        }
+
+        // Otherwise create the thumbnail
+        $thumb = $this->imageTool->make($storage->get($image->path));
+        if ($keepRatio) {
+            $thumb->resize($width, null, function ($constraint) {
+                $constraint->aspectRatio();
+                $constraint->upsize();
+            });
+        } else {
+            $thumb->fit($width, $height);
+        }
+
+        $thumbData = (string)$thumb->encode();
+        $storage->put($thumbFilePath, $thumbData);
+        $this->cache->put('images-' . $image->id . '-' . $thumbFilePath, $thumbFilePath, 60 * 72);
+
+        return $this->getPublicUrl($thumbFilePath);
+    }
+
+    /**
+     * Destroys an Image object along with its files and thumbnails.
+     * @param Image $image
+     * @return bool
+     */
+    public function destroyImage(Image $image)
+    {
+        $storage = $this->getStorage();
+
+        $imageFolder = dirname($image->path);
+        $imageFileName = basename($image->path);
+        $allImages = collect($storage->allFiles($imageFolder));
+
+        $imagesToDelete = $allImages->filter(function ($imagePath) use ($imageFileName) {
+            $expectedIndex = strlen($imagePath) - strlen($imageFileName);
+            return strpos($imagePath, $imageFileName) === $expectedIndex;
+        });
+
+        $storage->delete($imagesToDelete->all());
+
+        // Cleanup of empty folders
+        foreach ($storage->directories($imageFolder) as $directory) {
+            if ($this->isFolderEmpty($directory)) $storage->deleteDirectory($directory);
+        }
+        if ($this->isFolderEmpty($imageFolder)) $storage->deleteDirectory($imageFolder);
+
+        $image->delete();
+        return true;
+    }
+
+    /**
+     * Save a gravatar image and set a the profile image for a user.
+     * @param User $user
+     * @param int  $size
+     * @return mixed
+     */
+    public function saveUserGravatar(User $user, $size = 500)
+    {
+        $emailHash = md5(strtolower(trim($user->email)));
+        $url = 'http://www.gravatar.com/avatar/' . $emailHash . '?s=' . $size . '&d=identicon';
+        $imageName = str_replace(' ', '-', $user->name . '-gravatar.png');
+        $image = $this->saveNewFromUrl($url, 'user', $imageName);
+        $image->created_by = $user->id;
+        $image->save();
+        return $image;
+    }
+
+    /**
+     * Get the storage that will be used for storing images.
+     * @return FileSystemInstance
+     */
+    private function getStorage()
+    {
+        if ($this->storageInstance !== null) return $this->storageInstance;
+
+        $storageType = env('STORAGE_TYPE');
+        $this->storageInstance = $this->fileSystem->disk($storageType);
+
+        return $this->storageInstance;
+    }
+
+    /**
+     * Check whether or not a folder is empty.
+     * @param $path
+     * @return int
+     */
+    private function isFolderEmpty($path)
+    {
+        $files = $this->getStorage()->files($path);
+        $folders = $this->getStorage()->directories($path);
+        return count($files) === 0 && count($folders) === 0;
+    }
+
+    /**
+     * Gets a public facing url for an image by checking relevant environment variables.
+     * @param $filePath
+     * @return string
+     */
+    private function getPublicUrl($filePath)
+    {
+        if ($this->storageUrl === null) {
+            $storageUrl = env('STORAGE_URL');
+
+            // Get the standard public s3 url if s3 is set as storage type
+            if ($storageUrl == false && env('STORAGE_TYPE') === 's3') {
+                $storageDetails = config('filesystems.disks.s3');
+                $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
+            }
+
+            $this->storageUrl = $storageUrl;
+        }
+
+        return ($this->storageUrl == false ? '' : rtrim($this->storageUrl, '/')) . $filePath;
+    }
+
+
+}
\ No newline at end of file

@@ -44,6 +44,29 @@ class ViewService
         return 1;
         return 1;
     }
     }
 
 
+
+    /**
+     * Get the entities with the most views.
+     * @param int        $count
+     * @param int        $page
+     * @param bool|false $filterModel
+     */
+    public function getPopular($count = 10, $page = 0, $filterModel = false)
+    {
+        $skipCount = $count * $page;
+        $query = $this->view->select('id', 'viewable_id', 'viewable_type', \DB::raw('SUM(views) as view_count'))
+            ->groupBy('viewable_id', 'viewable_type')
+            ->orderBy('view_count', 'desc');
+
+        if($filterModel) $query->where('viewable_type', '=', get_class($filterModel));
+
+        $views = $query->with('viewable')->skip($skipCount)->take($count)->get();
+        $viewedEntities = $views->map(function ($item) {
+            return $item->viewable()->getResults();
+        });
+        return $viewedEntities;
+    }
+
     /**
     /**
      * Get all recently viewed entities for the current user.
      * Get all recently viewed entities for the current user.
      * @param int         $count
      * @param int         $count

@@ -24,7 +24,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      *
      *
      * @var array
      * @var array
      */
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = ['name', 'email', 'password', 'image_id'];
 
 
     /**
     /**
      * The attributes excluded from the model's JSON form.
      * The attributes excluded from the model's JSON form.
@@ -145,8 +145,17 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
      */
     public function getAvatar($size = 50)
     public function getAvatar($size = 50)
     {
     {
-        $emailHash = md5(strtolower(trim($this->email)));
-        return '//www.gravatar.com/avatar/' . $emailHash . '?s=' . $size . '&d=identicon';
+        if ($this->image_id === 0 || $this->image_id === '0' || $this->image_id === null) return '/user_avatar.png';
+        return $this->avatar->getThumb($size, $size, false);
+    }
+
+    /**
+     * Get the avatar for the user.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function avatar()
+    {
+        return $this->belongsTo('BookStack\Image', 'image_id');
     }
     }
 
 
     /**
     /**

+<?php
+
+if (! function_exists('versioned_asset')) {
+    /**
+     * Get the path to a versioned file.
+     *
+     * @param  string  $file
+     * @return string
+     *
+     * @throws \InvalidArgumentException
+     */
+    function versioned_asset($file)
+    {
+        static $manifest = null;
+
+        if (is_null($manifest)) {
+            $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
+        }
+
+        if (isset($manifest[$file])) {
+            return '/' . $manifest[$file];
+        }
+
+        if (file_exists(public_path($file))) {
+            return '/' . $file;
+        }
+
+        throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
+    }
+}
\ No newline at end of file

@@ -8,15 +8,16 @@
         "php": ">=5.5.9",
         "php": ">=5.5.9",
         "laravel/framework": "5.1.*",
         "laravel/framework": "5.1.*",
         "intervention/image": "^2.3",
         "intervention/image": "^2.3",
-        "laravel/socialite": "^2.0"
+        "laravel/socialite": "^2.0",
+        "barryvdh/laravel-ide-helper": "^2.1",
+        "barryvdh/laravel-debugbar": "^2.0",
+        "league/flysystem-aws-s3-v3": "^1.0"
     },
     },
     "require-dev": {
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~4.0",
         "phpunit/phpunit": "~4.0",
-        "phpspec/phpspec": "~2.1",
-        "barryvdh/laravel-ide-helper": "^2.1",
-        "barryvdh/laravel-debugbar": "^2.0"
+        "phpspec/phpspec": "~2.1"
     },
     },
     "autoload": {
     "autoload": {
         "classmap": [
         "classmap": [
@@ -24,7 +25,10 @@
         ],
         ],
         "psr-4": {
         "psr-4": {
             "BookStack\\": "app/"
             "BookStack\\": "app/"
-        }
+        },
+        "files": [
+            "app/helpers.php"
+        ]
     },
     },
     "autoload-dev": {
     "autoload-dev": {
         "classmap": [
         "classmap": [

@@ -217,6 +217,7 @@ return [
         'Activity' => BookStack\Services\Facades\Activity::class,
         'Activity' => BookStack\Services\Facades\Activity::class,
         'Setting'  => BookStack\Services\Facades\Setting::class,
         'Setting'  => BookStack\Services\Facades\Setting::class,
         'Views'    => BookStack\Services\Facades\Views::class,
         'Views'    => BookStack\Services\Facades\Views::class,
+        'Images'   => \BookStack\Services\Facades\Images::class,
 
 
     ],
     ],
 
 

@@ -45,7 +45,7 @@ return [
 
 
         'local' => [
         'local' => [
             'driver' => 'local',
             'driver' => 'local',
-            'root'   => storage_path('app'),
+            'root'   => public_path(),
         ],
         ],
 
 
         'ftp' => [
         'ftp' => [
@@ -64,10 +64,10 @@ return [
 
 
         's3' => [
         's3' => [
             'driver' => 's3',
             'driver' => 's3',
-            'key'    => 'your-key',
-            'secret' => 'your-secret',
-            'region' => 'your-region',
-            'bucket' => 'your-bucket',
+            'key'    => env('STORAGE_S3_KEY', 'your-key'),
+            'secret' => env('STORAGE_S3_SECRET', 'your-secret'),
+            'region' => env('STORAGE_S3_REGION', 'your-region'),
+            'bucket' => env('STORAGE_S3_BUCKET', 'your-bucket'),
         ],
         ],
 
 
         'rackspace' => [
         'rackspace' => [

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FulltextWeighting extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::statement('ALTER TABLE pages ADD FULLTEXT name_search(name)');
+        DB::statement('ALTER TABLE books ADD FULLTEXT name_search(name)');
+        DB::statement('ALTER TABLE chapters ADD FULLTEXT name_search(name)');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('pages', function(Blueprint $table) {
+            $table->dropIndex('name_search');
+        });
+        Schema::table('books', function(Blueprint $table) {
+            $table->dropIndex('name_search');
+        });
+        Schema::table('chapters', function(Blueprint $table) {
+            $table->dropIndex('name_search');
+        });
+    }
+}

+<?php
+
+use BookStack\Image;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddImageUploadTypes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('images', function (Blueprint $table) {
+            $table->string('path', 400);
+            $table->string('type')->index();
+        });
+
+        Image::all()->each(function($image) {
+            $image->path = $image->url;
+            $image->type = 'gallery';
+            $image->save();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('images', function (Blueprint $table) {
+            $table->dropColumn('type');
+            $table->dropColumn('path');
+        });
+
+    }
+}

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUserAvatars extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->integer('image_id')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('image_id');
+        });
+    }
+}

@@ -23,7 +23,9 @@ class DummyContentSeeder extends Seeder
                        $pages = factory(\BookStack\Page::class, 10)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]);
                        $pages = factory(\BookStack\Page::class, 10)->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]);
                 $book->chapters()->saveMany($chapters);
                 $book->chapters()->saveMany($chapters);
+                $book->pages()->saveMany($pages);
             });
             });
     }
     }
 }
 }

 var elixir = require('laravel-elixir');
 var elixir = require('laravel-elixir');
 
 
+// Custom extensions
+var gulp = require('gulp');
+var Task = elixir.Task;
+var fs = require('fs');
+
+elixir.extend('queryVersion', function(inputFiles) {
+     new Task('queryVersion', function() {
+         var manifestObject = {};
+         var uidString = Date.now().toString(16).slice(4);
+         for (var i = 0; i < inputFiles.length; i++) {
+             var file = inputFiles[i];
+             manifestObject[file] = file + '?version=' + uidString;
+         }
+         var fileContents = JSON.stringify(manifestObject, null, 1);
+         fs.writeFileSync('public/build/manifest.json', fileContents);
+     }).watch(['./public/css/*.css', './public/js/*.js']);
+});
+
 elixir(function(mix) {
 elixir(function(mix) {
     mix.sass('styles.scss')
     mix.sass('styles.scss')
         .sass('print-styles.scss')
         .sass('print-styles.scss')
         .browserify(['jquery-extensions.js', 'global.js'], 'public/js/common.js')
         .browserify(['jquery-extensions.js', 'global.js'], 'public/js/common.js')
-        .version(['css/styles.css', 'css/print-styles.css', 'js/common.js']);
+        .queryVersion(['css/styles.css', 'css/print-styles.css', 'js/common.js']);
 });
 });

 {
 {
   "private": true,
   "private": true,
   "devDependencies": {
   "devDependencies": {
-    "gulp": "^3.8.8",
+    "gulp": "^3.9.0",
     "insert-css": "^0.2.0"
     "insert-css": "^0.2.0"
   },
   },
   "dependencies": {
   "dependencies": {

@@ -26,5 +26,6 @@
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="mysql_testing"/>
         <env name="DB_CONNECTION" value="mysql_testing"/>
         <env name="MAIL_PRETEND" value="true"/>
         <env name="MAIL_PRETEND" value="true"/>
+        <env name="DISABLE_EXTERNAL_SERVICES" value="true"/>
     </php>
     </php>
 </phpunit>
 </phpunit>

@@ -5,7 +5,7 @@ A platform to create documentation/wiki content. General information about BookS
 
 
 ## Requirements
 ## Requirements
 
 
-BookStack has the similar requirements to Laravel. On top of those are some front-end build tools which are only required when developing.
+BookStack has similar requirements to Laravel. On top of those are some front-end build tools which are only required when developing.
 
 
 * PHP >= 5.5.9
 * PHP >= 5.5.9
 * OpenSSL PHP Extension
 * OpenSSL PHP Extension
@@ -25,7 +25,7 @@ Ensure the requirements are met before installing.
 
 
 This project currently uses the `release` branch of this repository as a stable channel for providing updates.
 This project currently uses the `release` branch of this repository as a stable channel for providing updates.
 
 
-The installation is currently somewhat complicated. Some PHP/Laravel experience will benefit. 
+The installation is currently somewhat complicated and will be made simpler in future releases. Some PHP/Laravel experience will currently benefit.
 
 
 1. Clone the release branch of this repository into a folder.
 1. Clone the release branch of this repository into a folder.
 
 
@@ -37,7 +37,7 @@ git clone https://github.com/ssddanbrown/BookStack.git --branch release --single
 3. Copy the `.env.example` file to `.env` and fill with your own database and mail details.
 3. Copy the `.env.example` file to `.env` and fill with your own database and mail details.
 4. Ensure the `storage` & `bootstrap/cache` folders are writable by the web server.
 4. Ensure the `storage` & `bootstrap/cache` folders are writable by the web server.
 5. In the application root, Run `php artisan key:generate` to generate a unique application key.
 5. In the application root, Run `php artisan key:generate` to generate a unique application key.
-6. If not using apache or `.htaccess` files are disable you will have to create some  URL rewrite rules as shown below.
+6. If not using apache or if `.htaccess` files are disabled you will have to create some URL rewrite rules as shown below.
 7. Run `php migrate` to update the database.
 7. Run `php migrate` to update the database.
 8. Done! You can now login using the default admin details `admin@admin.com` with a password of `password`. It is recommended to change these details directly after first logging in.
 8. Done! You can now login using the default admin details `admin@admin.com` with a password of `password`. It is recommended to change these details directly after first logging in.
 
 
@@ -76,3 +76,17 @@ Once done you can run `phpunit` in the application root directory to run all tes
 ## License
 ## License
 
 
 BookStack is provided under the MIT License.
 BookStack is provided under the MIT License.
+
+## Attribution
+
+These are the great projects used to help build BookStack:
+
+* [Laravel](http://laravel.com/)
+* [VueJS](http://vuejs.org/)
+* [jQuery](https://jquery.com/)
+* [TinyMCE](https://www.tinymce.com/)
+* [highlight.js](https://highlightjs.org/)
+* [jQuery Sortable](https://johnny.github.io/jquery-sortable/)
+* [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font/icons.html)
+* [Dropzone.js](http://www.dropzonejs.com/)
+* [ZeroClipboard](http://zeroclipboard.org/)

@@ -7,7 +7,7 @@
                         <div v-for="image in images">
                         <div v-for="image in images">
                             <img class="anim fadeIn"
                             <img class="anim fadeIn"
                                  :class="{selected: (image==selectedImage)}"
                                  :class="{selected: (image==selectedImage)}"
-                                 :src="image.thumbnail" :alt="image.title" :title="image.name"
+                                 :src="image.thumbs.gallery" :alt="image.title" :title="image.name"
                                  @click="imageClick(image)"
                                  @click="imageClick(image)"
                                  :style="{animationDelay: ($index > 26) ? '160ms' : ($index * 25) + 'ms'}">
                                  :style="{animationDelay: ($index > 26) ? '160ms' : ($index * 25) + 'ms'}">
                         </div>
                         </div>
@@ -76,6 +76,13 @@
             }
             }
         },
         },
 
 
+        props: {
+            imageType: {
+                type: String,
+                required: true
+            }
+        },
+
         created: function () {
         created: function () {
             window.ImageManager = this;
             window.ImageManager = this;
         },
         },
@@ -88,7 +95,7 @@
         methods: {
         methods: {
             fetchData: function () {
             fetchData: function () {
                 var _this = this;
                 var _this = this;
-                this.$http.get('/images/all/' + _this.page, function (data) {
+                this.$http.get('/images/' + _this.imageType + '/all/' + _this.page, function (data) {
                     _this.images = _this.images.concat(data.images);
                     _this.images = _this.images.concat(data.images);
                     _this.hasMore = data.hasMore;
                     _this.hasMore = data.hasMore;
                     _this.page++;
                     _this.page++;
@@ -98,7 +105,7 @@
             setupDropZone: function () {
             setupDropZone: function () {
                 var _this = this;
                 var _this = this;
                 var dropZone = new Dropzone(_this.$els.dropZone, {
                 var dropZone = new Dropzone(_this.$els.dropZone, {
-                    url: '/upload/image',
+                    url: '/images/' + _this.imageType + '/upload',
                     init: function () {
                     init: function () {
                         var dz = this;
                         var dz = this;
                         this.on("sending", function (file, xhr, data) {
                         this.on("sending", function (file, xhr, data) {
@@ -110,8 +117,8 @@
                                 dz.removeFile(file);
                                 dz.removeFile(file);
                             });
                             });
                         });
                         });
-                        this.on('error', function(file, errorMessage, xhr) {
-                            if(errorMessage.file) {
+                        this.on('error', function (file, errorMessage, xhr) {
+                            if (errorMessage.file) {
                                 $(file.previewElement).find('[data-dz-errormessage]').text(errorMessage.file[0]);
                                 $(file.previewElement).find('[data-dz-errormessage]').text(errorMessage.file[0]);
                             }
                             }
                             console.log(errorMessage);
                             console.log(errorMessage);
@@ -120,6 +127,10 @@
                 });
                 });
             },
             },
 
 
+            returnCallback: function (image) {
+                this.callback(image);
+            },
+
             imageClick: function (image) {
             imageClick: function (image) {
                 var dblClickTime = 380;
                 var dblClickTime = 380;
                 var cTime = (new Date()).getTime();
                 var cTime = (new Date()).getTime();
@@ -127,7 +138,7 @@
                 if (this.cClickTime !== 0 && timeDiff < dblClickTime && this.selectedImage === image) {
                 if (this.cClickTime !== 0 && timeDiff < dblClickTime && this.selectedImage === image) {
                     // DoubleClick
                     // DoubleClick
                     if (this.callback) {
                     if (this.callback) {
-                        this.callback(image);
+                        this.returnCallback(image);
                     }
                     }
                     this.hide();
                     this.hide();
                 } else {
                 } else {
@@ -139,7 +150,7 @@
 
 
             selectButtonClick: function () {
             selectButtonClick: function () {
                 if (this.callback) {
                 if (this.callback) {
-                    this.callback(this.selectedImage);
+                    this.returnCallback(this.selectedImage);
                 }
                 }
                 this.hide();
                 this.hide();
             },
             },

@@ -7,31 +7,89 @@
         </div>
         </div>
         <button class="button" type="button" @click="showImageManager">Select Image</button>
         <button class="button" type="button" @click="showImageManager">Select Image</button>
         <br>
         <br>
-        <button class="text-button" @click="reset" type="button">Reset</button> <span class="sep">|</span> <button class="text-button neg" v-on:click="remove" type="button">Remove</button>
-        <input type="hidden" :name="name" :id="name" v-model="image">
+        <button class="text-button" @click="reset" type="button">Reset</button> <span v-show="showRemove" class="sep">|</span> <button v-show="showRemove" class="text-button neg" @click="remove" type="button">Remove</button>
+        <input type="hidden" :name="name" :id="name" v-model="value">
     </div>
     </div>
 </template>
 </template>
 
 
 <script>
 <script>
     module.exports = {
     module.exports = {
-        props: ['currentImage', 'name', 'imageClass', 'defaultImage'],
+        props: {
+            currentImage: {
+                required: true,
+                type: String
+            },
+            currentId: {
+                required: false,
+                default: 'false',
+                type: String
+            },
+            name: {
+                required: true,
+                type: String
+            },
+            defaultImage: {
+                required: true,
+                type: String
+            },
+            imageClass: {
+                required: true,
+                type: String
+            },
+            resizeWidth: {
+                type: String
+            },
+            resizeHeight: {
+                type: String
+            },
+            resizeCrop: {
+                type: Boolean
+            },
+            showRemove: {
+                type: Boolean,
+                default: 'true'
+            }
+        },
         data: function() {
         data: function() {
             return {
             return {
-                image: this.currentImage
+                image: this.currentImage,
+                value: false
             }
             }
         },
         },
+        compiled: function() {
+            this.value = this.currentId === 'false' ? this.currentImage : this.currentId;
+        },
         methods: {
         methods: {
+            setCurrentValue: function(imageModel, imageUrl) {
+                this.image = imageUrl;
+                this.value = this.currentId === 'false' ?  imageUrl : imageModel.id;
+            },
             showImageManager: function(e) {
             showImageManager: function(e) {
                 var _this = this;
                 var _this = this;
                 ImageManager.show(function(image) {
                 ImageManager.show(function(image) {
-                    _this.image = image.url;
+                    _this.updateImageFromModel(image);
                 });
                 });
             },
             },
             reset: function() {
             reset: function() {
-                this.image = '';
+                this.setCurrentValue({id: 0}, this.defaultImage);
             },
             },
             remove: function() {
             remove: function() {
                 this.image = 'none';
                 this.image = 'none';
+            },
+            updateImageFromModel: function(model) {
+                var _this = this;
+                var isResized = _this.resizeWidth && _this.resizeHeight;
+
+                if (!isResized) {
+                    _this.setCurrentValue(model, model.url);
+                    return;
+                }
+
+                var cropped = _this.resizeCrop ? 'true' : 'false';
+                var requestString = '/images/thumb/' + model.id + '/' + _this.resizeWidth + '/' + _this.resizeHeight + '/' + cropped;
+                _this.$http.get(requestString, function(data) {
+                    _this.setCurrentValue(model, data.url);
+                });
             }
             }
         }
         }
     };
     };

@@ -100,7 +100,7 @@ module.exports = {
             onclick: function() {
             onclick: function() {
                 ImageManager.show(function(image) {
                 ImageManager.show(function(image) {
                     var html = '<a href="'+image.url+'" target="_blank">';
                     var html = '<a href="'+image.url+'" target="_blank">';
-                    html += '<img src="'+image.display+'" alt="'+image.name+'">';
+                    html += '<img src="'+image.thumbs.display+'" alt="'+image.name+'">';
                     html += '</a>';
                     html += '</a>';
                     editor.execCommand('mceInsertContent', false, html);
                     editor.execCommand('mceInsertContent', false, html);
                 });
                 });

@@ -118,6 +118,9 @@
       text-decoration: none;
       text-decoration: none;
     }
     }
   }
   }
+  li a i {
+    padding-right: $-xs + 2px;
+  }
   li, a {
   li, a {
     display: block;
     display: block;
   }
   }
@@ -150,11 +153,11 @@
   }
   }
   .list-item-page {
   .list-item-page {
     border-bottom: none;
     border-bottom: none;
+    border-left: 5px solid $color-page;
+    margin: 10px 10px;
   }
   }
   .page {
   .page {
     color: $color-page !important;
     color: $color-page !important;
-    border-left: 5px solid $color-page;
-    margin: 10px 10px;
     border-bottom: none;
     border-bottom: none;
     &.selected {
     &.selected {
       background-color: rgba($color-page, 0.1);
       background-color: rgba($color-page, 0.1);

@@ -32,10 +32,16 @@ body.dragging, body.dragging * {
 .avatar {
 .avatar {
   border-radius: 100%;
   border-radius: 100%;
   background-color: #EEE;
   background-color: #EEE;
+  width: 30px;
+  height: 30px;
   &.med {
   &.med {
     width: 40px;
     width: 40px;
     height: 40px;
     height: 40px;
   }
   }
+  &.large {
+    width: 80px;
+    height: 80px;
+  }
 }
 }
 
 
 // System wide notifications
 // System wide notifications

 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
-    <title>BookStack</title>
+    <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ Setting::get('app-name', 'BookStack') }}</title>
 
 
     <!-- Meta -->
     <!-- Meta -->
     <meta name="viewport" content="width=device-width">
     <meta name="viewport" content="width=device-width">
@@ -9,8 +9,8 @@
     <meta charset="utf-8">
     <meta charset="utf-8">
 
 
     <!-- Styles and Fonts -->
     <!-- Styles and Fonts -->
-    <link rel="stylesheet" href="{{ elixir('css/styles.css') }}">
-    <link rel="stylesheet" media="print" href="{{ elixir('css/print-styles.css') }}">
+    <link rel="stylesheet" href="{{ versioned_asset('css/styles.css') }}">
+    <link rel="stylesheet" media="print" href="{{ versioned_asset('css/print-styles.css') }}">
     <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/libs/material-design-iconic-font/css/material-design-iconic-font.min.css">
     <link rel="stylesheet" href="/libs/material-design-iconic-font/css/material-design-iconic-font.min.css">
 
 
@@ -79,6 +79,6 @@
     </section>
     </section>
 
 
 @yield('bottom')
 @yield('bottom')
-<script src="{{ elixir('js/common.js') }}"></script>
+<script src="{{ versioned_asset('js/common.js') }}"></script>
 </body>
 </body>
 </html>
 </html>

@@ -34,12 +34,23 @@
                 @endif
                 @endif
             </div>
             </div>
             <div class="col-sm-4 col-sm-offset-1">
             <div class="col-sm-4 col-sm-offset-1">
-                <div class="margin-top large">&nbsp;</div>
+                <div id="recents">
                     @if($recents)
                     @if($recents)
+                        <div class="margin-top large">&nbsp;</div>
                         <h3>Recently Viewed</h3>
                         <h3>Recently Viewed</h3>
                         @include('partials/entity-list', ['entities' => $recents])
                         @include('partials/entity-list', ['entities' => $recents])
                     @endif
                     @endif
                 </div>
                 </div>
+                <div class="margin-top large">&nbsp;</div>
+                <div id="popular">
+                    <h3>Popular Books</h3>
+                    @if(count($popular) > 0)
+                        @include('partials/entity-list', ['entities' => $popular])
+                    @else
+                        <p class="text-muted">The most popular books will appear here.</p>
+                    @endif
+                </div>
+            </div>
         </div>
         </div>
     </div>
     </div>
 
 

@@ -58,7 +58,7 @@
                         <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 {{$book->createdBy->name}} @endif
                             <br>
                             <br>
-                            Last Updated {{$book->updated_at->diffForHumans()}} @if($book->createdBy) by {{$book->updatedBy->name}} @endif
+                            Last Updated {{$book->updated_at->diffForHumans()}} @if($book->updatedBy) by {{$book->updatedBy->name}} @endif
                         </p>
                         </p>
                     </div>
                     </div>
                 </div>
                 </div>

@@ -2,7 +2,7 @@
     <h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3>
     <h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3>
     <ul class="sortable-page-list sort-list">
     <ul class="sortable-page-list sort-list">
         @foreach($bookChildren as $bookChild)
         @foreach($bookChildren as $bookChild)
-            <li data-id="{{$bookChild->id}}" data-type="{{ $bookChild->getName() }}" class="text-{{ $bookChild->getName() }}">
+            <li data-id="{{$bookChild->id}}" data-type="{{ $bookChild->getClassName() }}" class="text-{{ $bookChild->getClassName() }}">
                 <i class="zmdi {{ $bookChild->isA('chapter') ? 'zmdi-collection-bookmark':'zmdi-file-text'}}"></i>{{ $bookChild->name }}
                 <i class="zmdi {{ $bookChild->isA('chapter') ? 'zmdi-collection-bookmark':'zmdi-file-text'}}"></i>{{ $bookChild->name }}
                 @if($bookChild->isA('chapter'))
                 @if($bookChild->isA('chapter'))
                     <ul>
                     <ul>

@@ -56,7 +56,7 @@
                 <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 {{$chapter->createdBy->name}} @endif
                     <br>
                     <br>
-                    Last Updated {{$chapter->updated_at->diffForHumans()}} @if($chapter->createdBy) by {{$chapter->updatedBy->name}} @endif
+                    Last Updated {{$chapter->updated_at->diffForHumans()}} @if($chapter->updatedBy) by {{$chapter->updatedBy->name}} @endif
                 </p>
                 </p>
             </div>
             </div>
             <div class="col-md-3 col-md-offset-1">
             <div class="col-md-3 col-md-offset-1">

@@ -16,5 +16,5 @@
             @endif
             @endif
         </form>
         </form>
     </div>
     </div>
-    <image-manager></image-manager>
+    <image-manager image-type="gallery"></image-manager>
 @stop
 @stop
\ No newline at end of file

@@ -14,6 +14,6 @@
             @include('pages/form', ['model' => $page])
             @include('pages/form', ['model' => $page])
         </form>
         </form>
     </div>
     </div>
-    <image-manager></image-manager>
+    <image-manager image-type="gallery"></image-manager>
 
 
 @stop
 @stop
\ No newline at end of file

@@ -32,8 +32,12 @@
                 @foreach($page->revisions as $revision)
                 @foreach($page->revisions as $revision)
                     <tr>
                     <tr>
                         <td>{{$revision->name}}</td>
                         <td>{{$revision->name}}</td>
-                        <td style="line-height: 0;"><img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{$revision->createdBy->name}}"></td>
-                        <td> {{$revision->createdBy->name}}</td>
+                        <td style="line-height: 0;">
+                            @if($revision->createdBy)
+                                <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{$revision->createdBy->name}}">
+                            @endif
+                        </td>
+                        <td> @if($revision->createdBy) {{$revision->createdBy->name}} @else Deleted User @endif</td>
                         <td><small>{{$revision->created_at->format('jS F, Y H:i:s')}} ({{$revision->created_at->diffForHumans()}})</small></td>
                         <td><small>{{$revision->created_at->format('jS F, Y H:i:s')}} ({{$revision->created_at->diffForHumans()}})</small></td>
                         <td>
                         <td>
                             <a href="{{$revision->getUrl()}}" target="_blank">Preview</a>
                             <a href="{{$revision->getUrl()}}" target="_blank">Preview</a>

@@ -7,12 +7,12 @@
             <div class="row">
             <div class="row">
                 <div class="col-sm-6 faded">
                 <div class="col-sm-6 faded">
                     <div class="breadcrumbs">
                     <div class="breadcrumbs">
-                        <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->name }}</a>
+                        <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
                         @if($page->hasChapter())
                         @if($page->hasChapter())
                             <span class="sep">&raquo;</span>
                             <span class="sep">&raquo;</span>
                             <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
                             <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
                                 <i class="zmdi zmdi-collection-bookmark"></i>
                                 <i class="zmdi zmdi-collection-bookmark"></i>
-                                {{$page->chapter->name}}
+                                {{$page->chapter->getShortName()}}
                             </a>
                             </a>
                         @endif
                         @endif
                     </div>
                     </div>
@@ -53,7 +53,7 @@
                     <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 {{$page->createdBy->name}} @endif
                         <br>
                         <br>
-                        Last Updated {{$page->updated_at->diffForHumans()}} @if($page->createdBy) by {{$page->updatedBy->name}} @endif
+                        Last Updated {{$page->updated_at->diffForHumans()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif
                     </p>
                     </p>
 
 
                 </div>
                 </div>

@@ -6,8 +6,8 @@
 
 
 
 
         @foreach($sidebarTree as $bookChild)
         @foreach($sidebarTree as $bookChild)
-            <li class="list-item-{{ $bookChild->getName() }} {{ $bookChild->getName() }}">
-                <a href="{{$bookChild->getUrl()}}" class="{{ $bookChild->getName() }} {{ $current->matches($bookChild)? 'selected' : '' }}">
+            <li class="list-item-{{ $bookChild->getClassName() }} {{ $bookChild->getClassName() }}">
+                <a href="{{$bookChild->getUrl()}}" class="{{ $bookChild->getClassName() }} {{ $current->matches($bookChild)? 'selected' : '' }}">
                     @if($bookChild->isA('chapter'))<i class="zmdi zmdi-collection-bookmark"></i>@else <i class="zmdi zmdi-file-text"></i>@endif{{ $bookChild->name }}
                     @if($bookChild->isA('chapter'))<i class="zmdi zmdi-collection-bookmark"></i>@else <i class="zmdi zmdi-file-text"></i>@endif{{ $bookChild->name }}
                 </a>
                 </a>
 
 

@@ -10,6 +10,8 @@
 <div class="right">
 <div class="right">
     @if($activity->user)
     @if($activity->user)
         {{$activity->user->name}}
         {{$activity->user->name}}
+    @else
+        A deleted user
     @endif
     @endif
 
 
     {{ $activity->getText() }}
     {{ $activity->getText() }}

 
 
 @if(count($entities) > 0)
 @if(count($entities) > 0)
-    @foreach($entities as $entity)
+    @foreach($entities as $index => $entity)
         @if($entity->isA('page'))
         @if($entity->isA('page'))
             @include('pages/list-item', ['page' => $entity])
             @include('pages/list-item', ['page' => $entity])
         @elseif($entity->isA('book'))
         @elseif($entity->isA('book'))
@@ -8,7 +8,11 @@
         @elseif($entity->isA('chapter'))
         @elseif($entity->isA('chapter'))
             @include('chapters/list-item', ['chapter' => $entity, 'hidePages' => true])
             @include('chapters/list-item', ['chapter' => $entity, 'hidePages' => true])
         @endif
         @endif
+
+        @if($index !== count($entities) - 1)
             <hr>
             <hr>
+        @endif
+
     @endforeach
     @endforeach
 @else
 @else
     <p class="text-muted">
     <p class="text-muted">

@@ -23,12 +23,17 @@
                     <label>Allow public viewing?</label>
                     <label>Allow public viewing?</label>
                     <toggle-switch name="setting-app-public" value="{{ Setting::get('app-public') }}"></toggle-switch>
                     <toggle-switch name="setting-app-public" value="{{ Setting::get('app-public') }}"></toggle-switch>
                 </div>
                 </div>
+                <div class="form-group">
+                    <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>
+                    <toggle-switch name="setting-app-secure-images" value="{{ Setting::get('app-secure-images') }}"></toggle-switch>
+                </div>
             </div>
             </div>
             <div class="col-md-6">
             <div class="col-md-6">
                 <div class="form-group" id="logo-control">
                 <div class="form-group" id="logo-control">
                     <label for="setting-app-logo">Application Logo</label>
                     <label for="setting-app-logo">Application Logo</label>
-                    <p class="small">This image should be 43px in height. </p>
-                    <image-picker current-image="{{ Setting::get('app-logo', '') }}" default-image="/logo.png" name="setting-app-logo" image-class="logo-image"></image-picker>
+                    <p class="small">This image should be 43px in height. <br>Large images will be scaled down.</p>
+                    <image-picker resize-height="43" resize-width="200" current-image="{{ Setting::get('app-logo', '') }}" default-image="/logo.png" name="setting-app-logo" image-class="logo-image"></image-picker>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
@@ -57,7 +62,7 @@
                     </select>
                     </select>
                 </div>
                 </div>
                 <div class="form-group">
                 <div class="form-group">
-                    <label for="setting-registration-confirmation">Require Email Confirmation?</label>
+                    <label for="setting-registration-confirmation">Require email confirmation?</label>
                     <p class="small">If domain restriction is used then email confirmation will be required and the below value will be ignored.</p>
                     <p class="small">If domain restriction is used then email confirmation will be required and the below value will be ignored.</p>
                     <toggle-switch name="setting-registration-confirmation" value="{{ Setting::get('registration-confirmation') }}"></toggle-switch>
                     <toggle-switch name="setting-registration-confirmation" value="{{ Setting::get('registration-confirmation') }}"></toggle-switch>
                 </div>
                 </div>
@@ -81,6 +86,6 @@
 
 
 </div>
 </div>
 
 
-<image-manager></image-manager>
+<image-manager image-type="system"></image-manager>
 
 
 @stop
 @stop

@@ -19,26 +19,25 @@
 
 
 
 
     <div class="container small">
     <div class="container small">
-
+        <form action="/users/{{$user->id}}" method="post">
         <div class="row">
         <div class="row">
             <div class="col-md-6">
             <div class="col-md-6">
                 <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
                 <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
-                <form action="/users/{{$user->id}}" method="post">
                 {!! csrf_field() !!}
                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="put">
                 <input type="hidden" name="_method" value="put">
                 @include('users/form', ['model' => $user])
                 @include('users/form', ['model' => $user])
-                </form>
+
             </div>
             </div>
             <div class="col-md-6">
             <div class="col-md-6">
                 <h1>&nbsp;</h1>
                 <h1>&nbsp;</h1>
-                <div class="shaded padded margin-top">
-                    <p>
-                        <img class="avatar" src="{{ $user->getAvatar(80) }}" alt="{{ $user->name }}">
-                    </p>
-                    <p class="text-muted">You can change your profile picture at <a href="http://en.gravatar.com/">Gravatar</a>.</p>
+                <div class="form-group" id="logo-control">
+                    <label for="user-avatar">User Avatar</label>
+                    <p class="small">This image should be approx 256px square.</p>
+                    <image-picker resize-height="512" resize-width="512" current-image="{{ $user->getAvatar(80) }}" current-id="{{ $user->image_id }}" default-image="/user_avatar.png" name="image_id" show-remove="false" image-class="avatar large"></image-picker>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
+        </form>
 
 
         <hr class="margin-top large">
         <hr class="margin-top large">
 
 
@@ -80,5 +79,5 @@
     </div>
     </div>
 
 
     <p class="margin-top large"><br></p>
     <p class="margin-top large"><br></p>
-
+    <image-manager image-type="user"></image-manager>
 @stop
 @stop

@@ -37,3 +37,4 @@
     <a href="/users" class="button muted">Cancel</a>
     <a href="/users" class="button muted">Cancel</a>
     <button class="button pos" type="submit">Save</button>
     <button class="button pos" type="submit">Save</button>
 </div>
 </div>
+

+<?php
+
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class ActivityTrackingTest extends TestCase
+{
+
+    public function testRecentlyViewedBooks()
+    {
+        $books = \BookStack\Book::all()->take(10);
+
+        $this->asAdmin()->visit('/books')
+            ->dontSeeInElement('#recents', $books[0]->name)
+            ->dontSeeInElement('#recents', $books[1]->name)
+            ->visit($books[0]->getUrl())
+            ->visit($books[1]->getUrl())
+            ->visit('/books')
+            ->seeInElement('#recents', $books[0]->name)
+            ->seeInElement('#recents', $books[1]->name);
+    }
+
+    public function testPopularBooks()
+    {
+        $books = \BookStack\Book::all()->take(10);
+
+        $this->asAdmin()->visit('/books')
+            ->dontSeeInElement('#popular', $books[0]->name)
+            ->dontSeeInElement('#popular', $books[1]->name)
+            ->visit($books[0]->getUrl())
+            ->visit($books[1]->getUrl())
+            ->visit($books[0]->getUrl())
+            ->visit('/books')
+            ->seeInNthElement('#popular .book', 0, $books[0]->name)
+            ->seeInNthElement('#popular .book', 1, $books[1]->name);
+    }
+}

@@ -171,4 +171,43 @@ class EntityTest extends TestCase
     }
     }
 
 
 
 
+    public function testEntitiesViewableAfterCreatorDeletion()
+    {
+        // Create required assets and revisions
+        $creator = $this->getNewUser();
+        $updater = $this->getNewUser();
+        $entities = $this->createEntityChainBelongingToUser($creator, $updater);
+        $this->actingAs($creator);
+        app('BookStack\Repos\UserRepo')->destroy($creator);
+        app('BookStack\Repos\PageRepo')->saveRevision($entities['page']);
+
+        $this->checkEntitiesViewable($entities);
+    }
+
+    public function testEntitiesViewableAfterUpdaterDeletion()
+    {
+        // Create required assets and revisions
+        $creator = $this->getNewUser();
+        $updater = $this->getNewUser();
+        $entities = $this->createEntityChainBelongingToUser($creator, $updater);
+        $this->actingAs($updater);
+        app('BookStack\Repos\UserRepo')->destroy($updater);
+        app('BookStack\Repos\PageRepo')->saveRevision($entities['page']);
+
+        $this->checkEntitiesViewable($entities);
+    }
+
+    private function checkEntitiesViewable($entities)
+    {
+        // Check pages and books are visible.
+        $this->asAdmin();
+        $this->visit($entities['book']->getUrl())->seeStatusCode(200)
+            ->visit($entities['chapter']->getUrl())->seeStatusCode(200)
+            ->visit($entities['page']->getUrl())->seeStatusCode(200);
+        // Check revision listing shows no errors.
+        $this->visit($entities['page']->getUrl())
+            ->click('Revisions')->seeStatusCode(200);
+    }
+
+
 }
 }

@@ -48,4 +48,65 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
             $settings->put($key, $value);
             $settings->put($key, $value);
         }
         }
     }
     }
+
+    /**
+     * Create a group of entities that belong to a specific user.
+     * @param $creatorUser
+     * @param $updaterUser
+     * @return array
+     */
+    protected function createEntityChainBelongingToUser($creatorUser, $updaterUser = false)
+    {
+        if ($updaterUser === false) $updaterUser = $creatorUser;
+        $book = factory(BookStack\Book::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
+        $chapter = factory(BookStack\Chapter::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
+        $page = factory(BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
+        $book->chapters()->saveMany([$chapter]);
+        $chapter->pages()->saveMany([$page]);
+        return [
+            'book' => $book,
+            'chapter' => $chapter,
+            'page' => $page
+        ];
+    }
+
+    /**
+     * Quick way to create a new user
+     * @param array $attributes
+     * @return mixed
+     */
+    protected function getNewUser($attributes = [])
+    {
+        $user = factory(\BookStack\User::class)->create($attributes);
+        $userRepo = app('BookStack\Repos\UserRepo');
+        $userRepo->attachDefaultRole($user);
+        return $user;
+    }
+
+    /**
+     * Assert that a given string is seen inside an element.
+     *
+     * @param  bool|string|null $element
+     * @param  integer          $position
+     * @param  string           $text
+     * @param  bool             $negate
+     * @return $this
+     */
+    protected function seeInNthElement($element, $position, $text, $negate = false)
+    {
+        $method = $negate ? 'assertNotRegExp' : 'assertRegExp';
+
+        $rawPattern = preg_quote($text, '/');
+
+        $escapedPattern = preg_quote(e($text), '/');
+
+        $content = $this->crawler->filter($element)->eq($position)->html();
+
+        $pattern = $rawPattern == $escapedPattern
+            ? $rawPattern : "({$rawPattern}|{$escapedPattern})";
+
+        $this->$method("/$pattern/i", $content);
+
+        return $this;
+    }
 }
 }