Closes #69. Implemented and tested memcached.

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index a6fdae049bb4e880aca0d7cc042078c6ccd0a90e..d577a85b134dcd060eebf72b2be744bc8914766e 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,25 +1,37 @@
 <?php
 
 <?php
 

-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;

 
 

+use Activity;

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

+use Illuminate\Support\Facades\Auth;

 use Illuminate\Support\Str;
 use Illuminate\Support\Str;

-use Oxbow\Http\Requests;
-use Oxbow\Repos\BookRepo;
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
+use Views;

 
 class BookController extends Controller
 {
 
     protected $bookRepo;
 
 class BookController extends Controller
 {
 
     protected $bookRepo;

+    protected $pageRepo;
+    protected $chapterRepo;

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

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

      */
      */

-    public function __construct(BookRepo $bookRepo)
+    public function __construct(BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo)

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

+        $this->pageRepo = $pageRepo;
+        $this->chapterRepo = $chapterRepo;
+        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -29,8 +41,11 @@ class BookController extends Controller
      */
     public function index()
     {
      */
     public function index()
     {

-        $books = $this->bookRepo->getAll();
-        return view('books/index', ['books' => $books]);
+        $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]);

     }
 
     /**
     }
 
     /**


@@ -40,29 +55,31 @@ class BookController extends Controller
      */
     public function create()
     {
      */
     public function create()
     {

+        $this->checkPermission('book-create');
+        $this->setPageTitle('Create New Book');

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

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

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

             'description' => 'string|max:1000'
         ]);
         $book = $this->bookRepo->newFromInput($request->all());
             '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->slug = $this->bookRepo->findSuitableSlug($book->name);
+        $book->created_by = Auth::user()->id;
+        $book->updated_by = Auth::user()->id;

         $book->save();
         $book->save();

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

     }
 
     /**
     }
 
     /**


@@ -74,7 +91,10 @@ class BookController extends Controller
     public function show($slug)
     {
         $book = $this->bookRepo->getBySlug($slug);
     public function show($slug)
     {
         $book = $this->bookRepo->getBySlug($slug);

-        return view('books/show', ['book' => $book]);
+        $bookChildren = $this->bookRepo->getChildren($book);
+        Views::add($book);
+        $this->setPageTitle($book->getShortName());
+        return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);

     }
 
     /**
     }
 
     /**


@@ -85,42 +105,135 @@ class BookController extends Controller
      */
     public function edit($slug)
     {
      */
     public function edit($slug)
     {

+        $this->checkPermission('book-update');

         $book = $this->bookRepo->getBySlug($slug);
         $book = $this->bookRepo->getBySlug($slug);

-        return view('books/edit', ['book' => $book]);
+        $this->setPageTitle('Edit Book ' . $book->getShortName());
+        return view('books/edit', ['book' => $book, 'current' => $book]);

     }
 
     /**
      * Update the specified book in storage.
      *
      * @param  Request $request
     }
 
     /**
      * Update the specified book in storage.
      *
      * @param  Request $request

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

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

+        $this->checkPermission('book-update');

         $book = $this->bookRepo->getBySlug($slug);
         $this->validate($request, [
         $book = $this->bookRepo->getBySlug($slug);
         $this->validate($request, [

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

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

-        $slug = Str::slug($book->name);
-        while($this->bookRepo->countBySlug($slug) > 0 && $book->slug != $slug) {
-            $slug += '1';
-        }
-        $book->slug = $slug;
+        $book->fill($request->all());
+        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
+        $book->updated_by = Auth::user()->id;

         $book->save();
         $book->save();

-        return redirect('/books');
+        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)
+    {
+        $this->checkPermission('book-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $this->setPageTitle('Delete Book ' . $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)
+    {
+        $this->checkPermission('book-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $bookChildren = $this->bookRepo->getChildren($book);
+        $books = $this->bookRepo->getAll(false);
+        $this->setPageTitle('Sort Book ' . $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->bookRepo->getBySlug($bookSlug);
+        $bookChildren = $this->bookRepo->getChildren($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)
+    {
+        $this->checkPermission('book-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+
+        // Return if no map sent
+        if (!$request->has('sort-tree')) {
+            return redirect($book->getUrl());
+        }
+
+        $sortedBooks = [];
+        // 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;
+            }
+            $model->save();
+            if (!in_array($bookId, $sortedBooks)) {
+                $sortedBooks[] = $bookId;
+            }
+        }
+
+        // Add activity for books
+        foreach ($sortedBooks as $bookId) {
+            $updatedBook = $this->bookRepo->getById($bookId);
+            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);
+        $this->checkPermission('book-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        Activity::addMessage('book_delete', 0, $book->name);
+        Activity::removeEntity($book);
+        $this->bookRepo->destroyBySlug($bookSlug);

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