Update german translation

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 5b97fbdafd18b628f97f6deb43a09b09b7436abb..ea39a771ec048529bab8995f2967306613132108 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,36 +1,32 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

+use BookStack\Book;
+use BookStack\Repos\EntityRepo;

 use BookStack\Repos\UserRepo;
 use BookStack\Repos\UserRepo;

+use BookStack\Services\ExportService;

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

-use Illuminate\Support\Facades\Auth;
-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
 {
 
 use Views;
 
 class BookController extends Controller
 {
 

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

     protected $userRepo;
     protected $userRepo;

+    protected $exportService;

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

-     * @param BookRepo $bookRepo
-     * @param PageRepo $pageRepo
-     * @param ChapterRepo $chapterRepo
+     * @param EntityRepo $entityRepo

      * @param UserRepo $userRepo
      * @param UserRepo $userRepo

+     * @param ExportService $exportService

      */
      */

-    public function __construct(BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
+    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->userRepo = $userRepo;

+        $this->exportService = $exportService;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -40,11 +36,19 @@ class BookController extends Controller
      */
     public function index()
     {
      */
     public function index()
     {

-        $books = $this->bookRepo->getAllPaginated(10);
-        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(4, 0) : false;
-        $popular = $this->bookRepo->getPopular(4, 0);
-        $this->setPageTitle('Books');
-        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
+        $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
+        ]);

     }
 
     /**
     }
 
     /**


@@ -54,7 +58,7 @@ class BookController extends Controller
     public function create()
     {
         $this->checkPermission('book-create-all');
     public function create()
     {
         $this->checkPermission('book-create-all');

-        $this->setPageTitle('Create New Book');
+        $this->setPageTitle(trans('entities.books_create'));

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


@@ -71,7 +75,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $book = $this->bookRepo->createFromInput($request->all());
+        $book = $this->entityRepo->createFromInput('book', $request->all());

         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }


@@ -83,12 +87,17 @@ class BookController extends Controller
      */
     public function show($slug)
     {
      */
     public function show($slug)
     {

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

         $this->checkOwnablePermission('book-view', $book);
         $this->checkOwnablePermission('book-view', $book);

-        $bookChildren = $this->bookRepo->getChildren($book);
+        $bookChildren = $this->entityRepo->getBookChildren($book);

         Views::add($book);
         $this->setPageTitle($book->getShortName());
         Views::add($book);
         $this->setPageTitle($book->getShortName());

-        return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
+        return view('books/show', [
+            'book' => $book,
+            'current' => $book,
+            'bookChildren' => $bookChildren,
+            'activity' => Activity::entityActivity($book, 20, 0)
+        ]);

     }
 
     /**
     }
 
     /**


@@ -98,9 +107,9 @@ class BookController extends Controller
      */
     public function edit($slug)
     {
      */
     public function edit($slug)
     {

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

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

-        $this->setPageTitle('Edit Book ' . $book->getShortName());
+        $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));

         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 
         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 


@@ -112,15 +121,15 @@ class BookController extends Controller
      */
     public function update(Request $request, $slug)
     {
      */
     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->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $book = $this->bookRepo->updateFromInput($book, $request->all());
-        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());

     }
 
     /**
     }
 
     /**


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

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

         $this->checkOwnablePermission('book-delete', $book);
         $this->checkOwnablePermission('book-delete', $book);

-        $this->setPageTitle('Delete Book ' . $book->getShortName());
+        $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]);
     }
 


@@ -143,11 +152,11 @@ class BookController extends Controller
      */
     public function sort($bookSlug)
     {
      */
     public function sort($bookSlug)
     {

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

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

-        $bookChildren = $this->bookRepo->getChildren($book, true);
-        $books = $this->bookRepo->getAll(false);
-        $this->setPageTitle('Sort Book ' . $book->getShortName());
+        $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]);
     }
 
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
     }
 


@@ -159,8 +168,8 @@ class BookController extends Controller
      */
     public function getSortItem($bookSlug)
     {
      */
     public function getSortItem($bookSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $bookChildren = $this->bookRepo->getChildren($book);
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $bookChildren = $this->entityRepo->getBookChildren($book);

         return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
     }
 
         return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
     }
 


@@ -172,40 +181,65 @@ class BookController extends Controller
      */
     public function saveSort($bookSlug, Request $request)
     {
      */
     public function saveSort($bookSlug, Request $request)
     {

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

         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent
         $this->checkOwnablePermission('book-update', $book);
 
         // 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->changeBook($bookId, $model) : $this->chapterRepo->changeBook($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);
-            $this->bookRepo->updateBookPermissions($updatedBook);
-            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());
     }
 
         return redirect($book->getUrl());
     }


@@ -217,11 +251,10 @@ class BookController extends Controller
      */
     public function destroy($bookSlug)
     {
      */
     public function destroy($bookSlug)
     {

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

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

-        Activity::removeEntity($book);
-        $this->bookRepo->destroy($book);
+        $this->entityRepo->destroyBook($book);

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


@@ -232,7 +265,7 @@ class BookController extends Controller
      */
     public function showRestrict($bookSlug)
     {
      */
     public function showRestrict($bookSlug)
     {

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

         $this->checkOwnablePermission('restrictions-manage', $book);
         $roles = $this->userRepo->getRestrictableRoles();
         return view('books/restrictions', [
         $this->checkOwnablePermission('restrictions-manage', $book);
         $roles = $this->userRepo->getRestrictableRoles();
         return view('books/restrictions', [


@@ -250,10 +283,46 @@ class BookController extends Controller
      */
     public function restrict($bookSlug, Request $request)
     {
      */
     public function restrict($bookSlug, Request $request)
     {

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

         $this->checkOwnablePermission('restrictions-manage', $book);
         $this->checkOwnablePermission('restrictions-manage', $book);

-        $this->bookRepo->updateEntityPermissionsFromRequest($request, $book);
-        session()->flash('success', 'Book Restrictions Updated');
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $book);
+        session()->flash('success', trans('entities.books_permissions_updated'));

         return redirect($book->getUrl());
     }
         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 $this->downloadResponse($pdfContent, $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 $this->downloadResponse($htmlContent, $bookSlug . '.html');
+    }
+
+    /**
+     * Export a book as a plain text file.
+     * @param $bookSlug
+     * @return mixed
+     */
+    public function exportPlainText($bookSlug)
+    {
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $textContent = $this->exportService->bookToPlainText($book);
+        return $this->downloadResponse($textContent, $bookSlug . '.txt');
+    }

 }
 }