Fixes for CodeStyle vol.2

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index bddfe3f6db005ceb8aa5857d4e44dcb399d57f17..7c099377cb6eebddc1338d0e59616ddc468c2722 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,31 +1,29 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 use Activity;
 
 use Activity;

-use BookStack\Entities\Managers\BookContents;
-use BookStack\Entities\Bookshelf;
-use BookStack\Entities\Managers\EntityContext;
+use BookStack\Actions\ActivityType;
+use BookStack\Actions\View;
+use BookStack\Entities\Models\Bookshelf;

 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookRepo;

+use BookStack\Entities\Tools\BookContents;
+use BookStack\Entities\Tools\PermissionsUpdater;
+use BookStack\Entities\Tools\ShelfContext;

 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Exceptions\NotifyException;

 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;

-use Views;

 
 class BookController extends Controller
 {
 
 class BookController extends Controller
 {

-

     protected $bookRepo;
     protected $entityContextManager;
 
     protected $bookRepo;
     protected $entityContextManager;
 

-    /**
-     * BookController constructor.
-     */
-    public function __construct(EntityContext $entityContextManager, BookRepo $bookRepo)
+    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo)

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

-        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -33,7 +31,7 @@ class BookController extends Controller
      */
     public function index()
     {
      */
     public function index()
     {

-        $view = setting()->getForCurrentUser('books_view_type', config('app.views.books'));
+        $view = setting()->getForCurrentUser('books_view_type');

         $sort = setting()->getForCurrentUser('books_sort', 'name');
         $order = setting()->getForCurrentUser('books_sort_order', 'asc');
 
         $sort = setting()->getForCurrentUser('books_sort', 'name');
         $order = setting()->getForCurrentUser('books_sort_order', 'asc');
 


@@ -45,14 +43,15 @@ class BookController extends Controller
         $this->entityContextManager->clearShelfContext();
 
         $this->setPageTitle(trans('entities.books'));
         $this->entityContextManager->clearShelfContext();
 
         $this->setPageTitle(trans('entities.books'));

+

         return view('books.index', [
         return view('books.index', [

-            'books' => $books,
+            'books'   => $books,

             'recents' => $recents,
             'popular' => $popular,
             'recents' => $recents,
             'popular' => $popular,

-            'new' => $new,
-            'view' => $view,
-            'sort' => $sort,
-            'order' => $order,
+            'new'     => $new,
+            'view'    => $view,
+            'sort'    => $sort,
+            'order'   => $order,

         ]);
     }
 
         ]);
     }
 


@@ -70,13 +69,15 @@ class BookController extends Controller
         }
 
         $this->setPageTitle(trans('entities.books_create'));
         }
 
         $this->setPageTitle(trans('entities.books_create'));

+

         return view('books.create', [
         return view('books.create', [

-            'bookshelf' => $bookshelf
+            'bookshelf' => $bookshelf,

         ]);
     }
 
     /**
      * Store a newly created book in storage.
         ]);
     }
 
     /**
      * Store a newly created book in storage.

+     *

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


@@ -84,9 +85,9 @@ class BookController extends Controller
     {
         $this->checkPermission('book-create-all');
         $this->validate($request, [
     {
         $this->checkPermission('book-create-all');
         $this->validate($request, [

-            'name' => 'required|string|max:255',
+            'name'        => 'required|string|max:255',

             'description' => 'string|max:1000',
             'description' => 'string|max:1000',

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

         ]);
 
         $bookshelf = null;
         ]);
 
         $bookshelf = null;


@@ -97,11 +98,10 @@ class BookController extends Controller
 
         $book = $this->bookRepo->create($request->all());
         $this->bookRepo->updateCoverImage($book, $request->file('image', null));
 
         $book = $this->bookRepo->create($request->all());
         $this->bookRepo->updateCoverImage($book, $request->file('image', null));

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

 
         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());


@@ -114,18 +114,21 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($slug);
         $bookChildren = (new BookContents($book))->getTree(true);
     {
         $book = $this->bookRepo->getBySlug($slug);
         $bookChildren = (new BookContents($book))->getTree(true);

+        $bookParentShelves = $book->shelves()->visible()->get();

 
 

-        Views::add($book);
+        View::incrementFor($book);

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

+

         return view('books.show', [
         return view('books.show', [

-            'book' => $book,
-            'current' => $book,
-            'bookChildren' => $bookChildren,
-            'activity' => Activity::entityActivity($book, 20, 1)
+            'book'              => $book,
+            'current'           => $book,
+            'bookChildren'      => $bookChildren,
+            'bookParentShelves' => $bookParentShelves,
+            'activity'          => Activity::entityActivity($book, 20, 1),

         ]);
     }
 
         ]);
     }
 


@@ -137,11 +140,13 @@ class BookController extends Controller
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
         $book = $this->bookRepo->getBySlug($slug);
         $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.
         return view('books.edit', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * Update the specified book in storage.

+     *

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


@@ -151,17 +156,15 @@ class BookController extends Controller
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [

-            'name' => 'required|string|max:255',
+            'name'        => 'required|string|max:255',

             'description' => 'string|max:1000',
             'description' => 'string|max:1000',

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

         ]);
 
         $book = $this->bookRepo->update($book, $request->all());
         $resetCover = $request->has('image_reset');
         $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
 
         ]);
 
         $book = $this->bookRepo->update($book, $request->all());
         $resetCover = $request->has('image_reset');
         $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
 

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

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


@@ -173,20 +176,20 @@ class BookController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName' => $book->getShortName()]));
         $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.
         return view('books.delete', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * 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);

         $this->bookRepo->destroy($book);
 
         return redirect('/books');
         $this->bookRepo->destroy($book);
 
         return redirect('/books');


@@ -207,18 +210,18 @@ class BookController extends Controller
 
     /**
      * Set the restrictions for this book.
 
     /**
      * Set the restrictions for this book.

+     *

      * @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);
 

-        $restricted = $request->get('restricted') === 'true';
-        $permissions = $request->filled('restrictions') ? collect($request->get('restrictions')) : null;
-        $this->bookRepo->updatePermissions($book, $restricted, $permissions);
+        $permissionsUpdater->updateFromPermissionsForm($book, $request);

 
         $this->showSuccessNotification(trans('entities.books_permissions_updated'));
 
         $this->showSuccessNotification(trans('entities.books_permissions_updated'));

+

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