Fixed local_secure_restricted preventing attachment uploads

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 3d695ba85dbdae692f35d24e429e4fc553effbd5..a041267bbdf87df17e4711a903200db2001ccb81 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,28 +1,36 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use Activity;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\ActivityQueries;

 use BookStack\Actions\ActivityType;
 use BookStack\Actions\ActivityType;

-use BookStack\Entities\Tools\BookContents;
+use BookStack\Actions\View;

 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Bookshelf;

+use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Tools\BookContents;
+use BookStack\Entities\Tools\Cloner;
+use BookStack\Entities\Tools\HierarchyTransformer;

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

-use BookStack\Entities\Repos\BookRepo;

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

+use BookStack\Exceptions\NotFoundException;
+use BookStack\Facades\Activity;
+use BookStack\References\ReferenceFetcher;

 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 $bookRepo;
+    protected ShelfContext $shelfContext;
+    protected ReferenceFetcher $referenceFetcher;

 
 

-    protected $bookRepo;
-    protected $entityContextManager;
-
-    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo)
+    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo, ReferenceFetcher $referenceFetcher)

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

-        $this->entityContextManager = $entityContextManager;
+        $this->shelfContext = $entityContextManager;
+        $this->referenceFetcher = $referenceFetcher;

     }
 
     /**
     }
 
     /**


@@ -30,7 +38,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');
 


@@ -39,17 +47,18 @@ class BookController extends Controller
         $popular = $this->bookRepo->getPopular(4);
         $new = $this->bookRepo->getRecentlyCreated(4);
 
         $popular = $this->bookRepo->getPopular(4);
         $new = $this->bookRepo->getRecentlyCreated(4);
 

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

 
         $this->setPageTitle(trans('entities.books'));
 
         $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,

         ]);
     }
 
         ]);
     }
 


@@ -67,23 +76,26 @@ 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
      */
     public function store(Request $request, string $shelfSlug = null)
     {
         $this->checkPermission('book-create-all');
      * @throws ImageUploadException
      * @throws ValidationException
      */
     public function store(Request $request, string $shelfSlug = null)
     {
         $this->checkPermission('book-create-all');

-        $this->validate($request, [
-            'name' => 'required|string|max:255',
-            'description' => 'string|max:1000',
-            'image' => 'nullable|' . $this->getImageValidationRules(),
+        $validated = $this->validate($request, [
+            'name'        => ['required', 'string', 'max:255'],
+            'description' => ['string', 'max:1000'],
+            'image'       => array_merge(['nullable'], $this->getImageValidationRules()),
+            'tags'        => ['array'],

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


@@ -92,12 +104,11 @@ class BookController extends Controller
             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 
             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 

-        $book = $this->bookRepo->create($request->all());
-        $this->bookRepo->updateCoverImage($book, $request->file('image', null));
+        $book = $this->bookRepo->create($validated);

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

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

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


@@ -106,24 +117,26 @@ class BookController extends Controller
     /**
      * Display the specified book.
      */
     /**
      * Display the specified book.
      */

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

     {
         $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();
+        $bookParentShelves = $book->shelves()->scopes('visible')->get();

 
 

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

         if ($request->has('shelf')) {
         if ($request->has('shelf')) {

-            $this->entityContextManager->setShelfContext(intval($request->get('shelf')));
+            $this->shelfContext->setShelfContext(intval($request->get('shelf')));

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

+

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

-            'book' => $book,
-            'current' => $book,
-            'bookChildren' => $bookChildren,
+            'book'              => $book,
+            'current'           => $book,
+            'bookChildren'      => $bookChildren,

             'bookParentShelves' => $bookParentShelves,
             'bookParentShelves' => $bookParentShelves,

-            'activity' => Activity::entityActivity($book, 20, 1)
+            'activity'          => $activities->entityActivity($book, 20, 1),
+            'referenceCount'    => $this->referenceFetcher->getPageReferenceCountToEntity($book),

         ]);
     }
 
         ]);
     }
 


@@ -135,11 +148,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


@@ -148,15 +163,21 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);

-        $this->validate($request, [
-            'name' => 'required|string|max:255',
-            'description' => 'string|max:1000',
-            'image' => 'nullable|' . $this->getImageValidationRules(),
+
+        $validated = $this->validate($request, [
+            'name'        => ['required', 'string', 'max:255'],
+            'description' => ['string', 'max:1000'],
+            'image'       => array_merge(['nullable'], $this->getImageValidationRules()),
+            'tags'        => ['array'],

         ]);
 
         ]);
 

-        $book = $this->bookRepo->update($book, $request->all());
-        $resetCover = $request->has('image_reset');
-        $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
+        if ($request->has('image_reset')) {
+            $validated['image'] = null;
+        } elseif (array_key_exists('image', $validated) && is_null($validated['image'])) {
+            unset($validated['image']);
+        }
+
+        $book = $this->bookRepo->update($book, $validated);

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


@@ -169,11 +190,13 @@ 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
      */
     public function destroy(string $bookSlug)
      * @throws Throwable
      */
     public function destroy(string $bookSlug)


@@ -201,6 +224,7 @@ class BookController extends Controller
 
     /**
      * Set the restrictions for this book.
 
     /**
      * Set the restrictions for this book.

+     *

      * @throws Throwable
      */
     public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug)
      * @throws Throwable
      */
     public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug)


@@ -211,6 +235,58 @@ class BookController extends Controller
         $permissionsUpdater->updateFromPermissionsForm($book, $request);
 
         $this->showSuccessNotification(trans('entities.books_permissions_updated'));
         $permissionsUpdater->updateFromPermissionsForm($book, $request);
 
         $this->showSuccessNotification(trans('entities.books_permissions_updated'));

+

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

+
+    /**
+     * Show the view to copy a book.
+     *
+     * @throws NotFoundException
+     */
+    public function showCopy(string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('book-view', $book);
+
+        session()->flashInput(['name' => $book->name]);
+
+        return view('books.copy', [
+            'book' => $book,
+        ]);
+    }
+
+    /**
+     * Create a copy of a book within the requested target destination.
+     *
+     * @throws NotFoundException
+     */
+    public function copy(Request $request, Cloner $cloner, string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('book-view', $book);
+        $this->checkPermission('book-create-all');
+
+        $newName = $request->get('name') ?: $book->name;
+        $bookCopy = $cloner->cloneBook($book, $newName);
+        $this->showSuccessNotification(trans('entities.books_copy_success'));
+
+        return redirect($bookCopy->getUrl());
+    }
+
+    /**
+     * Convert the chapter to a book.
+     */
+    public function convertToShelf(HierarchyTransformer $transformer, string $bookSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->checkOwnablePermission('book-update', $book);
+        $this->checkOwnablePermission('book-delete', $book);
+        $this->checkPermission('bookshelf-create-all');
+        $this->checkPermission('book-create-all');
+
+        $shelf = $transformer->transformBookToShelf($book);
+
+        return redirect($shelf->getUrl());
+    }

 }
 }