fix image delete confirm text

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 1a787203034153f650a5d267113e0a2cc068670b..3d695ba85dbdae692f35d24e429e4fc553effbd5 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,22 +1,15 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

-use BookStack\Auth\UserRepo;
-use BookStack\Entities\Book;
-use BookStack\Entities\Bookshelf;
-use BookStack\Entities\EntityContextManager;
+use BookStack\Actions\ActivityType;
+use BookStack\Entities\Tools\BookContents;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Tools\PermissionsUpdater;
+use BookStack\Entities\Tools\ShelfContext;

 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Exceptions\NotFoundException;
-use BookStack\Exceptions\NotifyException;
-use BookStack\Uploads\ImageRepo;
-use Illuminate\Contracts\View\Factory;
-use Illuminate\Http\RedirectResponse;

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

-use Illuminate\Http\Response;
-use Illuminate\Routing\Redirector;

 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\ValidationException;

-use Illuminate\View\View;

 use Throwable;
 use Views;
 
 use Throwable;
 use Views;
 


@@ -24,44 +17,27 @@ class BookController extends Controller
 {
 
     protected $bookRepo;
 {
 
     protected $bookRepo;

-    protected $userRepo;

     protected $entityContextManager;
     protected $entityContextManager;

-    protected $imageRepo;

 
 

-    /**
-     * BookController constructor.
-     * @param BookRepo $bookRepo
-     * @param UserRepo $userRepo
-     * @param EntityContextManager $entityContextManager
-     * @param ImageRepo $imageRepo
-     */
-    public function __construct(
-        BookRepo $bookRepo,
-        UserRepo $userRepo,
-        EntityContextManager $entityContextManager,
-        ImageRepo $imageRepo
-    ) {
+    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo)
+    {

         $this->bookRepo = $bookRepo;
         $this->bookRepo = $bookRepo;

-        $this->userRepo = $userRepo;

         $this->entityContextManager = $entityContextManager;
         $this->entityContextManager = $entityContextManager;

-        $this->imageRepo = $imageRepo;
-        parent::__construct();

     }
 
     /**
      * Display a listing of the book.
     }
 
     /**
      * Display a listing of the book.

-     * @return Response

      */
     public function index()
     {
      */
     public function index()
     {

-        $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');
+        $view = setting()->getForCurrentUser('books_view_type', config('app.views.books'));
+        $sort = setting()->getForCurrentUser('books_sort', 'name');
+        $order = setting()->getForCurrentUser('books_sort_order', 'asc');

 
 

-        $books = $this->bookRepo->getAllPaginated('book', 18, $sort, $order);
-        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed('book', 4, 0) : false;
-        $popular = $this->bookRepo->getPopular('book', 4, 0);
-        $new = $this->bookRepo->getRecentlyCreated('book', 4, 0);
+        $books = $this->bookRepo->getAllPaginated(18, $sort, $order);
+        $recents = $this->isSignedIn() ? $this->bookRepo->getRecentlyViewed(4) : false;
+        $popular = $this->bookRepo->getPopular(4);
+        $new = $this->bookRepo->getRecentlyCreated(4);

 
         $this->entityContextManager->clearShelfContext();
 
 
         $this->entityContextManager->clearShelfContext();
 


@@ -79,19 +55,17 @@ class BookController extends Controller
 
     /**
      * Show the form for creating a new book.
 
     /**
      * Show the form for creating a new book.

-     * @param string $shelfSlug
-     * @return Response
-     * @throws NotFoundException

      */
     public function create(string $shelfSlug = null)
     {
      */
     public function create(string $shelfSlug = null)
     {

+        $this->checkPermission('book-create-all');
+

         $bookshelf = null;
         if ($shelfSlug !== null) {
         $bookshelf = null;
         if ($shelfSlug !== null) {

-            $bookshelf = $this->bookRepo->getEntityBySlug('bookshelf', $shelfSlug);
+            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();

             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 
             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 

-        $this->checkPermission('book-create-all');

         $this->setPageTitle(trans('entities.books_create'));
         return view('books.create', [
             'bookshelf' => $bookshelf
         $this->setPageTitle(trans('entities.books_create'));
         return view('books.create', [
             'bookshelf' => $bookshelf


@@ -100,14 +74,8 @@ class BookController extends Controller
 
     /**
      * Store a newly created book in storage.
 
     /**
      * Store a newly created book in storage.

-     *
-     * @param Request $request
-     * @param string $shelfSlug
-     * @return Response
-     * @throws NotFoundException

      * @throws ImageUploadException
      * @throws ValidationException
      * @throws ImageUploadException
      * @throws ValidationException

-     * @throws Throwable

      */
     public function store(Request $request, string $shelfSlug = null)
     {
      */
     public function store(Request $request, string $shelfSlug = null)
     {


@@ -115,24 +83,21 @@ class BookController extends Controller
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',

-            'image' => $this->imageRepo->getImageValidationRules(),
+            'image' => 'nullable|' . $this->getImageValidationRules(),

         ]);
 
         $bookshelf = null;
         if ($shelfSlug !== null) {
         ]);
 
         $bookshelf = null;
         if ($shelfSlug !== null) {

-            /** @var Bookshelf $bookshelf */
-            $bookshelf = $this->bookRepo->getEntityBySlug('bookshelf', $shelfSlug);
+            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();

             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 
             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 

-        /** @var Book $book */
-        $book = $this->bookRepo->createFromInput('book', $request->all());
-        $this->bookUpdateActions($book, $request);
-        Activity::add($book, 'book_create', $book->id);
+        $book = $this->bookRepo->create($request->all());
+        $this->bookRepo->updateCoverImage($book, $request->file('image', null));

 
         if ($bookshelf) {
             $bookshelf->appendBook($book);
 
         if ($bookshelf) {
             $bookshelf->appendBook($book);

-            Activity::add($bookshelf, 'bookshelf_update');
+            Activity::addForEntity($bookshelf, ActivityType::BOOKSHELF_UPDATE);

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


@@ -140,17 +105,12 @@ class BookController extends Controller
 
     /**
      * Display the specified book.
 
     /**
      * Display the specified book.

-     * @param Request $request
-     * @param string $slug
-     * @return Response
-     * @throws NotFoundException

      */
     public function show(Request $request, string $slug)
     {
         $book = $this->bookRepo->getBySlug($slug);
      */
     public function show(Request $request, string $slug)
     {
         $book = $this->bookRepo->getBySlug($slug);

-        $this->checkOwnablePermission('book-view', $book);
-
-        $bookChildren = $this->bookRepo->getBookChildren($book);
+        $bookChildren = (new BookContents($book))->getTree(true);
+        $bookParentShelves = $book->shelves()->visible()->get();

 
         Views::add($book);
         if ($request->has('shelf')) {
 
         Views::add($book);
         if ($request->has('shelf')) {


@@ -162,15 +122,13 @@ class BookController extends Controller
             'book' => $book,
             'current' => $book,
             'bookChildren' => $bookChildren,
             'book' => $book,
             'current' => $book,
             'bookChildren' => $bookChildren,

+            'bookParentShelves' => $bookParentShelves,

             'activity' => Activity::entityActivity($book, 20, 1)
         ]);
     }
 
     /**
      * Show the form for editing the specified book.
             'activity' => Activity::entityActivity($book, 20, 1)
         ]);
     }
 
     /**
      * Show the form for editing the specified book.

-     * @param string $slug
-     * @return Response
-     * @throws NotFoundException

      */
     public function edit(string $slug)
     {
      */
     public function edit(string $slug)
     {


@@ -182,11 +140,7 @@ class BookController extends Controller
 
     /**
      * Update the specified book in storage.
 
     /**
      * Update the specified book in storage.

-     * @param Request $request
-     * @param string $slug
-     * @return Response

      * @throws ImageUploadException
      * @throws ImageUploadException

-     * @throws NotFoundException

      * @throws ValidationException
      * @throws Throwable
      */
      * @throws ValidationException
      * @throws Throwable
      */


@@ -197,22 +151,18 @@ class BookController extends Controller
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',

-            'image' => $this->imageRepo->getImageValidationRules(),
+            'image' => 'nullable|' . $this->getImageValidationRules(),

         ]);
 
         ]);
 

-         $book = $this->bookRepo->updateFromInput('book', $book, $request->all());
-         $this->bookUpdateActions($book, $request);
-
-         Activity::add($book, 'book_update', $book->id);
+        $book = $this->bookRepo->update($book, $request->all());
+        $resetCover = $request->has('image_reset');
+        $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);

 
 

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

     }
 
     /**
     }
 
     /**

-     * Shows the page to confirm deletion
-     * @param string $bookSlug
-     * @return View
-     * @throws NotFoundException
+     * Shows the page to confirm deletion.

      */
     public function showDelete(string $bookSlug)
     {
      */
     public function showDelete(string $bookSlug)
     {


@@ -223,186 +173,44 @@ class BookController extends Controller
     }
 
     /**
     }
 
     /**

-     * Shows the view which allows pages to be re-ordered and sorted.
-     * @param string $bookSlug
-     * @return View
-     * @throws NotFoundException
-     */
-    public function sort(string $bookSlug)
-    {
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
-
-        $bookChildren = $this->bookRepo->getBookChildren($book, true);
-
-        $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
-        return view('books.sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
-    }
-
-    /**
-     * Shows the sort box for a single book.
-     * Used via AJAX when loading in extra books to a sort.
-     * @param string $bookSlug
-     * @return Factory|View
-     * @throws NotFoundException
-     */
-    public function getSortItem(string $bookSlug)
-    {
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $bookChildren = $this->bookRepo->getBookChildren($book);
-        return view('books.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
-    }
-
-    /**
-     * Saves an array of sort mapping to pages and chapters.
-     * @param Request $request
-     * @param string $bookSlug
-     * @return RedirectResponse|Redirector
-     * @throws NotFoundException
-     */
-    public function saveSort(Request $request, string $bookSlug)
-    {
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
-
-        // Return if no map sent
-        if (!$request->filled('sort-tree')) {
-            return redirect($book->getUrl());
-        }
-
-        // Sort pages and chapters
-        $sortMap = collect(json_decode($request->get('sort-tree')));
-        $bookIdsInvolved = collect([$book->id]);
-
-        // Load models into map
-        $sortMap->each(function ($mapItem) use ($bookIdsInvolved) {
-            $mapItem->type = ($mapItem->type === 'page' ? 'page' : 'chapter');
-            $mapItem->model = $this->bookRepo->getById($mapItem->type, $mapItem->id);
-            // Store source and target books
-            $bookIdsInvolved->push(intval($mapItem->model->book_id));
-            $bookIdsInvolved->push(intval($mapItem->book));
-        });
-
-        // Get the books involved in the sort
-        $bookIdsInvolved = $bookIdsInvolved->unique()->toArray();
-        $booksInvolved = $this->bookRepo->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;
-
-            $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->bookRepo->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->bookRepo->buildJointPermissionsForBook($book);
-            Activity::add($book, 'book_sort', $book->id);
-        });
-
-        return redirect($book->getUrl());
-    }
-
-    /**
-     * Remove the specified book from storage.
-     * @param string $bookSlug
-     * @return Response
-     * @throws NotFoundException
+     * Remove the specified book from the system.

      * @throws Throwable
      * @throws Throwable

-     * @throws NotifyException

      */
     public function destroy(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
      */
     public function destroy(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);

-        Activity::addMessage('book_delete', $book->name);

 
 

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

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

-     * Show the Restrictions view.
-     * @param string $bookSlug
-     * @return Factory|View
-     * @throws NotFoundException
+     * Show the permissions view.

      */
     public function showPermissions(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
      */
     public function showPermissions(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);

-        $roles = $this->userRepo->getRestrictableRoles();
+

         return view('books.permissions', [
             'book' => $book,
         return view('books.permissions', [
             'book' => $book,

-            'roles' => $roles

         ]);
     }
 
     /**
      * Set the restrictions for this book.
         ]);
     }
 
     /**
      * Set the restrictions for this book.

-     * @param Request $request
-     * @param string $bookSlug
-     * @return RedirectResponse|Redirector
-     * @throws NotFoundException

      * @throws Throwable
      */
      * @throws Throwable
      */

-    public function permissions(Request $request, string $bookSlug)
+    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug)

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

-        $this->bookRepo->updateEntityPermissionsFromRequest($request, $book);
-        $this->showSuccessNotification(trans('entities.books_permissions_updated'));
-        return redirect($book->getUrl());
-    }

 
 

-    /**
-     * Common actions to run on book update.
-     * Handles updating the cover image.
-     * @param Book $book
-     * @param Request $request
-     * @throws 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();
-        }
+        $permissionsUpdater->updateFromPermissionsForm($book, $request);

 
 

-        if ($request->has('image_reset')) {
-            $this->imageRepo->destroyImage($book->cover);
-            $book->image_id = 0;
-            $book->save();
-        }
+        $this->showSuccessNotification(trans('entities.books_permissions_updated'));
+        return redirect($book->getUrl());

     }
 }
     }
 }