Updated packages and added better upload failure logging

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index c17a082a591a6f394c97360a5719fa5480142574..59c205d0a9241770e6fd84c8d09e0f5f196cfb3b 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,131 +1,216 @@
-<?php
-
-namespace Oxbow\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+use Activity;
+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 Illuminate\Http\Request;
 use Illuminate\Http\Request;

-
-use Illuminate\Support\Str;
-use Oxbow\Http\Requests;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Repos\PageRepo;
+use Illuminate\Validation\ValidationException;
+use Throwable;
+use Views;

 
 class BookController extends Controller
 {
 
     protected $bookRepo;
 
 class BookController extends Controller
 {
 
     protected $bookRepo;

-    protected $pageRepo;
+    protected $entityContextManager;

 
 

-    /**
-     * BookController constructor.
-     * @param BookRepo $bookRepo
-     * @param PageRepo $pageRepo
-     */
-    public function __construct(BookRepo $bookRepo, PageRepo $pageRepo)
+    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo)

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

-        $this->pageRepo = $pageRepo;
+        $this->entityContextManager = $entityContextManager;

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

-     *
-     * @return Response

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

-        $books = $this->bookRepo->getAll();
-        return view('books/index', ['books' => $books]);
+        $view = setting()->getForCurrentUser('books_view_type');
+        $sort = setting()->getForCurrentUser('books_sort', 'name');
+        $order = setting()->getForCurrentUser('books_sort_order', 'asc');
+
+        $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->setPageTitle(trans('entities.books'));
+        return view('books.index', [
+            'books' => $books,
+            'recents' => $recents,
+            'popular' => $popular,
+            'new' => $new,
+            'view' => $view,
+            'sort' => $sort,
+            'order' => $order,
+        ]);

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

-     *
-     * @return Response

      */
      */

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

     {
     {

-        return view('books/create');
+        $this->checkPermission('book-create-all');
+
+        $bookshelf = null;
+        if ($shelfSlug !== null) {
+            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
+        }
+
+        $this->setPageTitle(trans('entities.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
-     * @return Response
+     * @throws ImageUploadException
+     * @throws ValidationException

      */
      */

-    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->validate($request, [
             'name' => 'required|string|max:255',

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

         ]);
         ]);

-        $book = $this->bookRepo->newFromInput($request->all());
-        $slug = Str::slug($book->name);
-        while($this->bookRepo->countBySlug($slug) > 0) {
-            $slug .= '1';
+
+        $bookshelf = null;
+        if ($shelfSlug !== null) {
+            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);

         }
         }

-        $book->slug = $slug;
-        $book->save();
-        return redirect('/books');
+
+        $book = $this->bookRepo->create($request->all());
+        $this->bookRepo->updateCoverImage($book, $request->file('image', null));
+
+        if ($bookshelf) {
+            $bookshelf->appendBook($book);
+            Activity::addForEntity($bookshelf, ActivityType::BOOKSHELF_UPDATE);
+        }
+
+        return redirect($book->getUrl());

     }
 
     /**
      * Display the specified book.
     }
 
     /**
      * Display the specified book.

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

      */
      */

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

     {
         $book = $this->bookRepo->getBySlug($slug);
     {
         $book = $this->bookRepo->getBySlug($slug);

-        return view('books/show', ['book' => $book]);
+        $bookChildren = (new BookContents($book))->getTree(true);
+        $bookParentShelves = $book->shelves()->visible()->get();
+
+        Views::add($book);
+        if ($request->has('shelf')) {
+            $this->entityContextManager->setShelfContext(intval($request->get('shelf')));
+        }
+
+        $this->setPageTitle($book->getShortName());
+        return view('books.show', [
+            'book' => $book,
+            'current' => $book,
+            'bookChildren' => $bookChildren,
+            'bookParentShelves' => $bookParentShelves,
+            'activity' => Activity::entityActivity($book, 20, 1)
+        ]);

     }
 
     /**
      * Show the form for editing the specified book.
     }
 
     /**
      * Show the form for editing the specified book.

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

      */
      */

-    public function edit($slug)
+    public function edit(string $slug)

     {
         $book = $this->bookRepo->getBySlug($slug);
     {
         $book = $this->bookRepo->getBySlug($slug);

-        return view('books/edit', ['book' => $book]);
+        $this->checkOwnablePermission('book-update', $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 $slug
-     * @return Response
+     * @throws ImageUploadException
+     * @throws ValidationException
+     * @throws Throwable

      */
      */

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

     {
         $book = $this->bookRepo->getBySlug($slug);
     {
         $book = $this->bookRepo->getBySlug($slug);

+        $this->checkOwnablePermission('book-update', $book);

         $this->validate($request, [
             'name' => 'required|string|max:255',
         $this->validate($request, [
             'name' => 'required|string|max:255',

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

         ]);
         ]);

-        $book->fill($request->all());
-        $slug = Str::slug($book->name);
-        while($this->bookRepo->countBySlug($slug) > 0 && $book->slug != $slug) {
-            $slug += '1';
-        }
-        $book->slug = $slug;
-        $book->save();
+
+        $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());
     }
 
     /**

-     * Remove the specified book from storage.
-     *
-     * @param  int  $id
-     * @return Response
+     * Shows the page to confirm deletion.
+     */
+    public function showDelete(string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('book-delete', $book);
+        $this->setPageTitle(trans('entities.books_delete_named', ['bookName' => $book->getShortName()]));
+        return view('books.delete', ['book' => $book, 'current' => $book]);
+    }
+
+    /**
+     * Remove the specified book from the system.
+     * @throws Throwable

      */
      */

-    public function destroy($id)
+    public function destroy(string $bookSlug)

     {
     {

-        $this->bookRepo->destroyById($id);
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('book-delete', $book);
+
+        $this->bookRepo->destroy($book);
+

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

+
+    /**
+     * Show the permissions view.
+     */
+    public function showPermissions(string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $book);
+
+        return view('books.permissions', [
+            'book' => $book,
+        ]);
+    }
+
+    /**
+     * Set the restrictions for this book.
+     * @throws Throwable
+     */
+    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $book);
+
+        $permissionsUpdater->updateFromPermissionsForm($book, $request);
+
+        $this->showSuccessNotification(trans('entities.books_permissions_updated'));
+        return redirect($book->getUrl());
+    }

 }
 }