Typo fix

[bookstack] / app / Http / Controllers / BookController.php

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 0b4749a48fa73958b7c653ee0972cdc195a1a7c7..a990eed9a950e4ffb45365bae858a35b279e1d43 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,13 +1,13 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

-use BookStack\Repos\EntityRepo;
-use BookStack\Repos\UserRepo;
+use BookStack\Auth\UserRepo;
+use BookStack\Entities\Book;
+use BookStack\Entities\EntityContextManager;
+use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\ExportService;
+use BookStack\Uploads\ImageRepo;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-use BookStack\Http\Requests;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;

 use Illuminate\Http\Response;
 use Views;
 
 use Illuminate\Http\Response;
 use Views;
 


@@ -15,26 +15,31 @@ class BookController extends Controller
 {
 
     protected $entityRepo;
 {
 
     protected $entityRepo;

-    protected $bookRepo;
-    protected $pageRepo;
-    protected $chapterRepo;

     protected $userRepo;
     protected $userRepo;

+    protected $exportService;
+    protected $entityContextManager;
+    protected $imageRepo;

 
     /**
      * BookController constructor.
 
     /**
      * BookController constructor.

-     * @param BookRepo $bookRepo
-     * @param PageRepo $pageRepo
-     * @param ChapterRepo $chapterRepo
+     * @param EntityRepo $entityRepo

      * @param UserRepo $userRepo
      * @param UserRepo $userRepo

+     * @param ExportService $exportService
+     * @param EntityContextManager $entityContextManager
+     * @param ImageRepo $imageRepo

      */
      */

-    public function __construct(EntityRepo $entityRepo, BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
-    {
+    public function __construct(
+        EntityRepo $entityRepo,
+        UserRepo $userRepo,
+        ExportService $exportService,
+        EntityContextManager $entityContextManager,
+        ImageRepo $imageRepo
+    ) {

         $this->entityRepo = $entityRepo;
         $this->entityRepo = $entityRepo;

-        // TODO - Remove below
-        $this->bookRepo = $bookRepo;
-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;

         $this->userRepo = $userRepo;
         $this->userRepo = $userRepo;

+        $this->exportService = $exportService;
+        $this->entityContextManager = $entityContextManager;
+        $this->imageRepo = $imageRepo;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -44,55 +49,118 @@ class BookController extends Controller
      */
     public function index()
     {
      */
     public function index()
     {

-        $books = $this->entityRepo->getAllPaginated('book', 10);
+        $view = setting()->getUser($this->currentUser, 'books_view_type', config('app.views.books'));
+        $sort = setting()->getUser($this->currentUser, 'books_sort', 'name');
+        $order = setting()->getUser($this->currentUser, 'books_sort_order', 'asc');
+        $sortOptions = [
+            'name' => trans('common.sort_name'),
+            'created_at' => trans('common.sort_created_at'),
+            'updated_at' => trans('common.sort_updated_at'),
+        ];
+
+        $books = $this->entityRepo->getAllPaginated('book', 18, $sort, $order);

         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
         $popular = $this->entityRepo->getPopular('book', 4, 0);
         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
         $popular = $this->entityRepo->getPopular('book', 4, 0);

-        $this->setPageTitle('Books');
-        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
+        $new = $this->entityRepo->getRecentlyCreated('book', 4, 0);
+
+        $this->entityContextManager->clearShelfContext();
+
+        $this->setPageTitle(trans('entities.books'));
+        return view('books.index', [
+            'books' => $books,
+            'recents' => $recents,
+            'popular' => $popular,
+            'new' => $new,
+            'view' => $view,
+            'sort' => $sort,
+            'order' => $order,
+            'sortOptions' => $sortOptions,
+        ]);

     }
 
     /**
      * Show the form for creating a new book.
     }
 
     /**
      * Show the form for creating a new book.

+     * @param string $shelfSlug

      * @return Response
      * @return Response

+     * @throws \BookStack\Exceptions\NotFoundException

      */
      */

-    public function create()
+    public function create(string $shelfSlug = null)

     {
     {

+        $bookshelf = null;
+        if ($shelfSlug !== null) {
+            $bookshelf = $this->entityRepo->getBySlug('bookshelf', $shelfSlug);
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
+        }
+

         $this->checkPermission('book-create-all');
         $this->setPageTitle(trans('entities.books_create'));
         $this->checkPermission('book-create-all');
         $this->setPageTitle(trans('entities.books_create'));

-        return view('books/create');
+        return view('books.create', [
+            'bookshelf' => $bookshelf
+        ]);

     }
 
     /**
      * Store a newly created book in storage.
      *
     }
 
     /**
      * Store a newly created book in storage.
      *

-     * @param  Request $request
+     * @param Request $request
+     * @param string $shelfSlug

      * @return Response
      * @return Response

+     * @throws \BookStack\Exceptions\NotFoundException
+     * @throws \BookStack\Exceptions\ImageUploadException

      */
      */

-    public function store(Request $request)
+    public function store(Request $request, string $shelfSlug = null)

     {
         $this->checkPermission('book-create-all');
         $this->validate($request, [
             'name' => 'required|string|max:255',
     {
         $this->checkPermission('book-create-all');
         $this->validate($request, [
             'name' => 'required|string|max:255',

-            'description' => 'string|max:1000'
+            'description' => 'string|max:1000',
+            'image' => $this->imageRepo->getImageValidationRules(),

         ]);
         ]);

-        $book = $this->bookRepo->createFromInput($request->all());
+
+        $bookshelf = null;
+        if ($shelfSlug !== null) {
+            $bookshelf = $this->entityRepo->getBySlug('bookshelf', $shelfSlug);
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
+        }
+
+        $book = $this->entityRepo->createFromInput('book', $request->all());
+        $this->bookUpdateActions($book, $request);

         Activity::add($book, 'book_create', $book->id);
         Activity::add($book, 'book_create', $book->id);

+
+        if ($bookshelf) {
+            $this->entityRepo->appendBookToShelf($bookshelf, $book);
+            Activity::add($bookshelf, 'bookshelf_update');
+        }
+

         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.
      * @param $slug
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.
      * @param $slug

+     * @param Request $request

      * @return Response
      * @return Response

+     * @throws \BookStack\Exceptions\NotFoundException

      */
      */

-    public function show($slug)
+    public function show($slug, Request $request)

     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-view', $book);
     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-view', $book);

-        $bookChildren = $this->bookRepo->getChildren($book);
+
+        $bookChildren = $this->entityRepo->getBookChildren($book);
+

         Views::add($book);
         Views::add($book);

+        if ($request->has('shelf')) {
+            $this->entityContextManager->setShelfContext(intval($request->get('shelf')));
+        }
+

         $this->setPageTitle($book->getShortName());
         $this->setPageTitle($book->getShortName());

-        return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
+        return view('books.show', [
+            'book' => $book,
+            'current' => $book,
+            'bookChildren' => $bookChildren,
+            'activity' => Activity::entityActivity($book, 20, 1)
+        ]);

     }
 
     /**
     }
 
     /**


@@ -104,27 +172,34 @@ class BookController extends Controller
     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-update', $book);
     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-update', $book);

-        $this->setPageTitle(trans('entities.books_edit_named',['bookName'=>$book->getShortName()]));
-        return view('books/edit', ['book' => $book, 'current' => $book]);
+        $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
+        return view('books.edit', ['book' => $book, 'current' => $book]);

     }
 
     /**
      * Update the specified book in storage.
     }
 
     /**
      * Update the specified book in storage.

-     * @param  Request $request
+     * @param Request $request

      * @param          $slug
      * @return Response
      * @param          $slug
      * @return Response

+     * @throws \BookStack\Exceptions\ImageUploadException
+     * @throws \BookStack\Exceptions\NotFoundException

      */
      */

-    public function update(Request $request, $slug)
+    public function update(Request $request, string $slug)

     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
             'name' => 'required|string|max:255',
     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
             'name' => 'required|string|max:255',

-            'description' => 'string|max:1000'
+            'description' => 'string|max:1000',
+            'image' => $this->imageRepo->getImageValidationRules(),

         ]);
         ]);

-        $book = $this->bookRepo->updateFromInput($book, $request->all());
-        Activity::add($book, 'book_update', $book->id);
-        return redirect($book->getUrl());
+
+         $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
+         $this->bookUpdateActions($book, $request);
+
+         Activity::add($book, 'book_update', $book->id);
+
+         return redirect($book->getUrl());

     }
 
     /**
     }
 
     /**


@@ -137,22 +212,24 @@ class BookController extends Controller
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));

-        return view('books/delete', ['book' => $book, 'current' => $book]);
+        return view('books.delete', ['book' => $book, 'current' => $book]);

     }
 
     /**
      * Shows the view which allows pages to be re-ordered and sorted.
      * @param string $bookSlug
      * @return \Illuminate\View\View
     }
 
     /**
      * Shows the view which allows pages to be re-ordered and sorted.
      * @param string $bookSlug
      * @return \Illuminate\View\View

+     * @throws \BookStack\Exceptions\NotFoundException

      */
     public function sort($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-update', $book);
      */
     public function sort($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-update', $book);

-        $bookChildren = $this->bookRepo->getChildren($book, true);
-        $books = $this->entityRepo->getAll('book', false);
+
+        $bookChildren = $this->entityRepo->getBookChildren($book, true);
+

         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));

-        return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
+        return view('books.sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);

     }
 
     /**
     }
 
     /**


@@ -164,8 +241,8 @@ class BookController extends Controller
     public function getSortItem($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
     public function getSortItem($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);

-        $bookChildren = $this->bookRepo->getChildren($book);
-        return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
+        $bookChildren = $this->entityRepo->getBookChildren($book);
+        return view('books.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);

     }
 
     /**
     }
 
     /**


@@ -180,48 +257,61 @@ class BookController extends Controller
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent

-        if (!$request->has('sort-tree')) {
+        if (!$request->filled('sort-tree')) {

             return redirect($book->getUrl());
         }
 
         // Sort pages and chapters
             return redirect($book->getUrl());
         }
 
         // Sort pages and chapters

-        $sortedBooks = [];
-        $updatedModels = collect();
-        $sortMap = json_decode($request->get('sort-tree'));
-        $defaultBookId = $book->id;
-
-        // Loop through contents of provided map and update entities accordingly
-        foreach ($sortMap as $bookChild) {
-            $priority = $bookChild->sort;
-            $id = intval($bookChild->id);
-            $isPage = $bookChild->type == 'page';
-            $bookId = $this->entityRepo->exists('book', $bookChild->book) ? intval($bookChild->book) : $defaultBookId;
-            $chapterId = ($isPage && $bookChild->parentChapter === false) ? 0 : intval($bookChild->parentChapter);
-            $model = $this->entityRepo->getById($isPage?'page':'chapter', $id);
-
-            // Update models only if there's a change in parent chain or ordering.
-            if ($model->priority !== $priority || $model->book_id !== $bookId || ($isPage && $model->chapter_id !== $chapterId)) {
-                $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
-                $model->priority = $priority;
-                if ($isPage) $model->chapter_id = $chapterId;
-                $model->save();
-                $updatedModels->push($model);
-            }
+        $sortMap = collect(json_decode($request->get('sort-tree')));
+        $bookIdsInvolved = collect([$book->id]);

 
 

-            // Store involved books to be sorted later
-            if (!in_array($bookId, $sortedBooks)) {
-                $sortedBooks[] = $bookId;
-            }
-        }
+        // Load models into map
+        $sortMap->each(function ($mapItem) use ($bookIdsInvolved) {
+            $mapItem->type = ($mapItem->type === 'page' ? 'page' : 'chapter');
+            $mapItem->model = $this->entityRepo->getById($mapItem->type, $mapItem->id);
+            // Store source and target books
+            $bookIdsInvolved->push(intval($mapItem->model->book_id));
+            $bookIdsInvolved->push(intval($mapItem->book));
+        });

 
 

-        // Add activity for books
-        foreach ($sortedBooks as $bookId) {
-            $updatedBook = $this->entityRepo->getById('book', $bookId);
-            Activity::add($updatedBook, 'book_sort', $updatedBook->id);
+        // Get the books involved in the sort
+        $bookIdsInvolved = $bookIdsInvolved->unique()->toArray();
+        $booksInvolved = $this->entityRepo->getManyById('book', $bookIdsInvolved, false, true);
+        // Throw permission error if invalid ids or inaccessible books given.
+        if (count($bookIdsInvolved) !== count($booksInvolved)) {
+            $this->showPermissionError();

         }
         }

+        // Check permissions of involved books
+        $booksInvolved->each(function (Book $book) {
+             $this->checkOwnablePermission('book-update', $book);
+        });
+
+        // Perform the sort
+        $sortMap->each(function ($mapItem) {
+            $model = $mapItem->model;

 
 

-        // Update permissions on changed models
-        $this->bookRepo->buildJointPermissions($updatedModels);
+            $priorityChanged = intval($model->priority) !== intval($mapItem->sort);
+            $bookChanged = intval($model->book_id) !== intval($mapItem->book);
+            $chapterChanged = ($mapItem->type === 'page') && intval($model->chapter_id) !== $mapItem->parentChapter;
+
+            if ($bookChanged) {
+                $this->entityRepo->changeBook($mapItem->type, $mapItem->book, $model);
+            }
+            if ($chapterChanged) {
+                $model->chapter_id = intval($mapItem->parentChapter);
+                $model->save();
+            }
+            if ($priorityChanged) {
+                $model->priority = intval($mapItem->sort);
+                $model->save();
+            }
+        });
+
+        // Rebuild permissions and add activity for involved books.
+        $booksInvolved->each(function (Book $book) {
+            $this->entityRepo->buildJointPermissionsForBook($book);
+            Activity::add($book, 'book_sort', $book->id);
+        });

 
         return redirect($book->getUrl());
     }
 
         return redirect($book->getUrl());
     }


@@ -236,8 +326,12 @@ class BookController extends Controller
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);

-        Activity::removeEntity($book);
-        $this->bookRepo->destroy($book);
+
+        if ($book->cover) {
+            $this->imageRepo->destroyImage($book->cover);
+        }
+        $this->entityRepo->destroyBook($book);
+

         return redirect('/books');
     }
 
         return redirect('/books');
     }
 


@@ -246,12 +340,12 @@ class BookController extends Controller
      * @param $bookSlug
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
      * @param $bookSlug
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */

-    public function showRestrict($bookSlug)
+    public function showPermissions($bookSlug)

     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
         $roles = $this->userRepo->getRestrictableRoles();
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
         $roles = $this->userRepo->getRestrictableRoles();

-        return view('books/restrictions', [
+        return view('books.permissions', [

             'book' => $book,
             'roles' => $roles
         ]);
             'book' => $book,
             'roles' => $roles
         ]);


@@ -260,16 +354,78 @@ class BookController extends Controller
     /**
      * Set the restrictions for this book.
      * @param $bookSlug
     /**
      * Set the restrictions for this book.
      * @param $bookSlug

-     * @param $bookSlug

      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

+     * @throws \BookStack\Exceptions\NotFoundException
+     * @throws \Throwable

      */
      */

-    public function restrict($bookSlug, Request $request)
+    public function permissions($bookSlug, Request $request)

     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);

-        $this->bookRepo->updateEntityPermissionsFromRequest($request, $book);
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $book);

         session()->flash('success', trans('entities.books_permissions_updated'));
         return redirect($book->getUrl());
     }
         session()->flash('success', trans('entities.books_permissions_updated'));
         return redirect($book->getUrl());
     }

+
+    /**
+     * Export a book as a PDF file.
+     * @param string $bookSlug
+     * @return mixed
+     */
+    public function exportPdf($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $pdfContent = $this->exportService->bookToPdf($book);
+        return $this->downloadResponse($pdfContent, $bookSlug . '.pdf');
+    }
+
+    /**
+     * Export a book as a contained HTML file.
+     * @param string $bookSlug
+     * @return mixed
+     */
+    public function exportHtml($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $htmlContent = $this->exportService->bookToContainedHtml($book);
+        return $this->downloadResponse($htmlContent, $bookSlug . '.html');
+    }
+
+    /**
+     * Export a book as a plain text file.
+     * @param $bookSlug
+     * @return mixed
+     */
+    public function exportPlainText($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $textContent = $this->exportService->bookToPlainText($book);
+        return $this->downloadResponse($textContent, $bookSlug . '.txt');
+    }
+
+    /**
+     * Common actions to run on book update.
+     * Handles updating the cover image.
+     * @param Book $book
+     * @param Request $request
+     * @throws \BookStack\Exceptions\ImageUploadException
+     */
+    protected function bookUpdateActions(Book $book, Request $request)
+    {
+        // Update the cover image if in request
+        if ($request->has('image')) {
+            $this->imageRepo->destroyImage($book->cover);
+            $newImage = $request->file('image');
+            $image = $this->imageRepo->saveNew($newImage, 'cover_book', $book->id, 512, 512, true);
+            $book->image_id = $image->id;
+            $book->save();
+        }
+
+        if ($request->has('image_reset')) {
+            $this->imageRepo->destroyImage($book->cover);
+            $book->image_id = 0;
+            $book->save();
+        }
+    }

 }
 }