Refactored the code to first check for the permissions before sorting the book.

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index a6fdae049bb4e880aca0d7cc042078c6ccd0a90e..d70f9d0dfb92bc3b6691a0e6506c5fad23db3f72 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,126 +1,352 @@
-<?php
-
-namespace Oxbow\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+use Activity;
+use BookStack\Book;
+use BookStack\Repos\EntityRepo;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\ExportService;

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

-
-use Illuminate\Support\Str;
-use Oxbow\Http\Requests;
-use Oxbow\Repos\BookRepo;
+use Illuminate\Http\Response;
+use Views;

 
 class BookController extends Controller
 {
 
 
 class BookController extends Controller
 {
 

-    protected $bookRepo;
+    protected $entityRepo;
+    protected $userRepo;
+    protected $exportService;

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

-     * @param BookRepo $bookRepo
+     * @param EntityRepo $entityRepo
+     * @param UserRepo $userRepo
+     * @param ExportService $exportService

      */
      */

-    public function __construct(BookRepo $bookRepo)
+    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)

     {
     {

-        $this->bookRepo = $bookRepo;
+        $this->entityRepo = $entityRepo;
+        $this->userRepo = $userRepo;
+        $this->exportService = $exportService;
+        parent::__construct();

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

-     *

      * @return Response
      */
     public function index()
     {
      * @return Response
      */
     public function index()
     {

-        $books = $this->bookRepo->getAll();
-        return view('books/index', ['books' => $books]);
+        $books = $this->entityRepo->getAllPaginated('book', 20);
+        $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
+        $popular = $this->entityRepo->getPopular('book', 4, 0);
+        $new = $this->entityRepo->getRecentlyCreated('book', 4, 0);
+        $booksViewType = setting()->getUser($this->currentUser, 'books_view_type', 'list');
+        $this->setPageTitle(trans('entities.books'));
+        return view('books/index', [
+            'books' => $books,
+            'recents' => $recents,
+            'popular' => $popular,
+            'new' => $new,
+            'booksViewType' => $booksViewType
+        ]);

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

-     *

      * @return Response
      */
     public function create()
     {
      * @return Response
      */
     public function create()
     {

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

         return view('books/create');
     }
 
     /**
      * Store a newly created book in storage.
      *
         return view('books/create');
     }
 
     /**
      * Store a newly created book in storage.
      *

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

      * @return Response
      */
     public function store(Request $request)
     {
      * @return Response
      */
     public function store(Request $request)
     {

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

         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $book = $this->bookRepo->newFromInput($request->all());
-        $slug = Str::slug($book->name);
-        while($this->bookRepo->countBySlug($slug) > 0) {
-            $slug += '1';
-        }
-        $book->slug = $slug;
-        $book->save();
-        return redirect('/books');
+        $book = $this->entityRepo->createFromInput('book', $request->all());
+        Activity::add($book, 'book_create', $book->id);
+        return redirect($book->getUrl());

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

-     *

      * @param $slug
      * @return Response
      */
     public function show($slug)
     {
      * @param $slug
      * @return Response
      */
     public function show($slug)
     {

-        $book = $this->bookRepo->getBySlug($slug);
-        return view('books/show', ['book' => $book]);
+        $book = $this->entityRepo->getBySlug('book', $slug);
+        $this->checkOwnablePermission('book-view', $book);
+        $bookChildren = $this->entityRepo->getBookChildren($book);
+        Views::add($book);
+        $this->setPageTitle($book->getShortName());
+        return view('books/show', [
+            'book' => $book,
+            'current' => $book,
+            'bookChildren' => $bookChildren,
+            'activity' => Activity::entityActivity($book, 20, 0)
+        ]);

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

-     *

      * @param $slug
      * @return Response
      */
     public function edit($slug)
     {
      * @param $slug
      * @return Response
      */
     public function edit($slug)
     {

-        $book = $this->bookRepo->getBySlug($slug);
-        return view('books/edit', ['book' => $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]);

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

-     *

      * @param  Request $request
      * @param  Request $request

-     * @param $slug
+     * @param          $slug

      * @return Response
      */
     public function update(Request $request, $slug)
     {
      * @return Response
      */
     public function update(Request $request, $slug)
     {

-        $book = $this->bookRepo->getBySlug($slug);
+        $book = $this->entityRepo->getBySlug('book', $slug);
+        $this->checkOwnablePermission('book-update', $book);

         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $slug = Str::slug($book->name);
-        while($this->bookRepo->countBySlug($slug) > 0 && $book->slug != $slug) {
-            $slug += '1';
+         $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
+         Activity::add($book, 'book_update', $book->id);
+         return redirect($book->getUrl());
+    }
+
+    /**
+     * Shows the page to confirm deletion
+     * @param $bookSlug
+     * @return \Illuminate\View\View
+     */
+    public function showDelete($bookSlug)
+    {
+        $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]);
+    }
+
+    /**
+     * Shows the view which allows pages to be re-ordered and sorted.
+     * @param string $bookSlug
+     * @return \Illuminate\View\View
+     */
+    public function sort($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $this->checkOwnablePermission('book-update', $book);
+        $bookChildren = $this->entityRepo->getBookChildren($book, true);
+        $books = $this->entityRepo->getAll('book', false, 'update');
+        $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
+        return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
+    }
+
+    /**
+     * Shows the sort box for a single book.
+     * Used via AJAX when loading in extra books to a sort.
+     * @param $bookSlug
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function getSortItem($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $bookChildren = $this->entityRepo->getBookChildren($book);
+        return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
+    }
+
+    /**
+     * Saves an array of sort mapping to pages and chapters.
+     * @param  string $bookSlug
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function saveSort($bookSlug, Request $request)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $this->checkOwnablePermission('book-update', $book);
+
+        // Return if no map sent
+        if (!$request->filled('sort-tree')) {
+            return redirect($book->getUrl());

         }
         }

-        $book->slug = $slug;
-        $book->save();
-        return redirect('/books');
+
+        // Sort pages and chapters
+        $sortedBooks = [];
+        $updatedModels = collect();
+        $sortMap = json_decode($request->get('sort-tree'));
+        $defaultBookId = $book->id;
+
+        // Check permissions for all target and source books
+        $permissionsList = [$book->id];
+        foreach ($sortMap as $bookChild) {
+            // Check permission for target book
+            if (!in_array($bookChild->book, $permissionsList)) {
+                $targetBook = $this->entityRepo->getById('book', $bookChild->book);
+                if (!empty($targetBook)) {
+                    $bookId = $targetBook->id;
+                    $this->checkOwnablePermission('book-update', $targetBook);
+                    // cache the permission for future use.
+                    $permissionsList[] = $bookId;
+                }
+            }
+
+            // Check permissions for the source book
+            $id = intval($bookChild->id);
+            $isPage = $bookChild->type == 'page';
+            $model = $this->entityRepo->getById($isPage?'page':'chapter', $id);
+            $sourceBook = $model->book;
+            if (!in_array($sourceBook->id, $permissionsList)) {
+                $this->checkOwnablePermission('book-update', $sourceBook);
+
+                // cache the permission for future use.
+                $permissionsList[] = $sourceBook->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 = $defaultBookId;
+            $targetBook = $this->entityRepo->getById('book', $bookChild->book);
+
+            $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)) {
+                $this->entityRepo->changeBook($isPage?'page':'chapter', $bookId, $model);
+                $model->priority = $priority;
+                if ($isPage) $model->chapter_id = $chapterId;
+                $model->save();
+                $updatedModels->push($model);
+            }
+
+            // Store involved books to be sorted later
+            if (!in_array($bookId, $sortedBooks)) {
+                $sortedBooks[] = $bookId;
+            }
+        }
+
+        // Add activity for books
+        foreach ($sortedBooks as $bookId) {
+            /** @var Book $updatedBook */
+            $updatedBook = $this->entityRepo->getById('book', $bookId);
+            $this->entityRepo->buildJointPermissionsForBook($updatedBook);
+            Activity::add($updatedBook, 'book_sort', $updatedBook->id);
+        }
+
+        return redirect($book->getUrl());

     }
 
     /**
      * Remove the specified book from storage.
     }
 
     /**
      * Remove the specified book from storage.

-     *
-     * @param  int  $id
+     * @param $bookSlug

      * @return Response
      */
      * @return Response
      */

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

     {
     {

-        $this->bookRepo->destroyById($id);
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $this->checkOwnablePermission('book-delete', $book);
+        Activity::addMessage('book_delete', 0, $book->name);
+        $this->entityRepo->destroyBook($book);

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

+
+    /**
+     * Show the Restrictions view.
+     * @param $bookSlug
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function showRestrict($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $book);
+        $roles = $this->userRepo->getRestrictableRoles();
+        return view('books/restrictions', [
+            'book' => $book,
+            'roles' => $roles
+        ]);
+    }
+
+    /**
+     * Set the restrictions for this book.
+     * @param $bookSlug
+     * @param $bookSlug
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function restrict($bookSlug, Request $request)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $book);
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $book);
+        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 response()->make($pdfContent, 200, [
+            'Content-Type'        => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="' . $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 response()->make($htmlContent, 200, [
+            'Content-Type'        => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="' . $bookSlug . '.html'
+        ]);
+    }
+
+    /**
+     * Export a book as a plain text file.
+     * @param $bookSlug
+     * @return mixed
+     */
+    public function exportPlainText($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $htmlContent = $this->exportService->bookToPlainText($book);
+        return response()->make($htmlContent, 200, [
+            'Content-Type'        => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="' . $bookSlug . '.txt'
+        ]);
+    }

 }
 }