French translation update

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index eb9bf7ababd14f8a23b818a2426b6a4e4718c2e4..2c3946239cac3981e4abffab0fe5ae14b4ce2de9 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,57 +1,64 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 use Activity;
 
 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\Facades\Auth;
-use Illuminate\Support\Str;
-use BookStack\Http\Requests;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;
+use Illuminate\Http\Response;
+use Views;

 
 class BookController extends Controller
 {
 
 
 class BookController extends Controller
 {
 

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

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

-     * @param BookRepo    $bookRepo
-     * @param PageRepo    $pageRepo
-     * @param ChapterRepo $chapterRepo
+     * @param EntityRepo $entityRepo
+     * @param UserRepo $userRepo
+     * @param ExportService $exportService

      */
      */

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

     {
     {

-        $this->bookRepo = $bookRepo;
-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;
+        $this->entityRepo = $entityRepo;
+        $this->userRepo = $userRepo;
+        $this->exportService = $exportService;

         parent::__construct();
     }
 
     /**
      * Display a listing of the book.
         parent::__construct();
     }
 
     /**
      * Display a listing of the book.

-     *

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

-        $books = $this->bookRepo->getAllPaginated(10);
-        return view('books/index', ['books' => $books]);
+        $books = $this->entityRepo->getAllPaginated('book', 18);
+        $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', config('app.views.books', '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');
+        $this->checkPermission('book-create-all');
+        $this->setPageTitle(trans('entities.books_create'));

         return view('books/create');
     }
 
         return view('books/create');
     }
 


@@ -63,66 +70,66 @@ class BookController extends Controller
      */
     public function store(Request $request)
     {
      */
     public function store(Request $request)
     {

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

         $this->validate($request, [
         $this->validate($request, [

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

             'description' => 'string|max:1000'
         ]);
             'description' => 'string|max:1000'
         ]);

-        $book = $this->bookRepo->newFromInput($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name);
-        $book->created_by = Auth::user()->id;
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->entityRepo->createFromInput('book', $request->all());

         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
 
     /**
      * 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, 'current' => $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)
     {

-        $this->checkPermission('book-update');
-        $book = $this->bookRepo->getBySlug($slug);
+        $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.
         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * Update the specified book in storage.

-     *

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

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

         $this->validate($request, [
         $this->validate($request, [

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

             'description' => 'string|max:1000'
         ]);
             'description' => 'string|max:1000'
         ]);

-        $book->fill($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
-        $book->updated_by = Auth::user()->id;
-        $book->save();
-        Activity::add($book, 'book_update', $book->id);
-        return redirect($book->getUrl());
+         $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
+         Activity::add($book, 'book_update', $book->id);
+         return redirect($book->getUrl());

     }
 
     /**
     }
 
     /**


@@ -132,8 +139,9 @@ class BookController extends Controller
      */
     public function showDelete($bookSlug)
     {
      */
     public function showDelete($bookSlug)
     {

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


@@ -144,77 +152,186 @@ class BookController extends Controller
      */
     public function sort($bookSlug)
     {
      */
     public function sort($bookSlug)
     {

-        $this->checkPermission('book-update');
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $books = $this->bookRepo->getAll();
-        return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books]);
+        $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)
     {
     public function getSortItem($bookSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        return view('books/sort-box', ['book' => $book]);
+        $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.
     }
 
     /**
      * 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)
     {
      * @param  string $bookSlug
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function saveSort($bookSlug, Request $request)
     {

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

 
         // Return if no map sent
 
         // Return if no map sent

-        if (!$request->has('sort-tree')) {
+        if (!$request->filled('sort-tree')) {

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

-        $sortedBooks = [];

         // Sort pages and chapters
         // Sort pages and chapters

-        $sortMap = json_decode($request->get('sort-tree'));
-        $defaultBookId = $book->id;
-        foreach ($sortMap as $index => $bookChild) {
-            $id = $bookChild->id;
-            $isPage = $bookChild->type == 'page';
-            $bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId;
-            $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
-            $isPage ? $this->pageRepo->setBookId($bookId, $model) : $this->chapterRepo->setBookId($bookId, $model);
-            $model->priority = $index;
-            if ($isPage) {
-                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
+        $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->entityRepo->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->entityRepo->book->newQuery()->whereIn('id', $bookIdsInvolved)->get();
+        // 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->entityRepo->changeBook($mapItem->type, $mapItem->book, $model);

             }
             }

-            $model->save();
-            if (!in_array($bookId, $sortedBooks)) {
-                $sortedBooks[] = $bookId;
+            if ($chapterChanged) {
+                $model->chapter_id = intval($mapItem->parentChapter);
+                $model->save();

             }
             }

-        }
+            if ($priorityChanged) {
+                $model->priority = intval($mapItem->sort);
+                $model->save();
+            }
+        });

 
 

-        // Add activity for books
-        foreach ($sortedBooks as $bookId) {
-            $updatedBook = $this->bookRepo->getById($bookId);
-            Activity::add($updatedBook, 'book_sort', $updatedBook->id);
-        }
+        // Rebuild permissions and add activity for involved books.
+        $booksInvolved->each(function (Book $book) {
+            $this->entityRepo->buildJointPermissionsForBook($book);
+            Activity::add($book, 'book_sort', $book->id);
+        });

 
         return redirect($book->getUrl());
     }
 
     /**
      * Remove the specified book from storage.
 
         return redirect($book->getUrl());
     }
 
     /**
      * Remove the specified book from storage.

-     *

      * @param $bookSlug
      * @return Response
      */
     public function destroy($bookSlug)
     {
      * @param $bookSlug
      * @return Response
      */
     public function destroy($bookSlug)
     {

-        $this->checkPermission('book-delete');
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $this->checkOwnablePermission('book-delete', $book);

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

-        Activity::removeEntity($book);
-        $this->bookRepo->destroyBySlug($bookSlug);
+        $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'
+        ]);
+    }

 }
 }