Making sure MyISAM is set for the tables that need it for new installtions that are...

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 5b2b510c9ce279ba80728c8584b0ffbf97a6907a..5b97fbdafd18b628f97f6deb43a09b09b7436abb 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,13 +1,9 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 use Activity;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;
 
 use Activity;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;

-

 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Auth;

-use Illuminate\Support\Str;

 use BookStack\Http\Requests;
 use BookStack\Repos\BookRepo;
 use BookStack\Repos\ChapterRepo;
 use BookStack\Http\Requests;
 use BookStack\Repos\BookRepo;
 use BookStack\Repos\ChapterRepo;


@@ -40,7 +36,6 @@ class BookController extends Controller
 
     /**
      * Display a listing of the book.
 
     /**
      * Display a listing of the book.

-     *

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


@@ -54,7 +49,6 @@ class BookController extends Controller
 
     /**
      * 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()


@@ -77,24 +71,20 @@ 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->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->bookRepo->createFromInput($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)
     {
         $book = $this->bookRepo->getBySlug($slug);
      * @param $slug
      * @return Response
      */
     public function show($slug)
     {
         $book = $this->bookRepo->getBySlug($slug);

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

         $bookChildren = $this->bookRepo->getChildren($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());
         $bookChildren = $this->bookRepo->getChildren($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());


@@ -103,7 +93,6 @@ class BookController extends Controller
 
     /**
      * Show the form for editing the specified book.
 
     /**
      * Show the form for editing the specified book.

-     *

      * @param $slug
      * @return Response
      */
      * @param $slug
      * @return Response
      */


@@ -117,7 +106,6 @@ class BookController extends Controller
 
     /**
      * Update the specified book in storage.
 
     /**
      * Update the specified book in storage.

-     *

      * @param  Request $request
      * @param          $slug
      * @return Response
      * @param  Request $request
      * @param          $slug
      * @return Response


@@ -130,10 +118,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             'name' => 'required|string|max:255',
             '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();
+        $book = $this->bookRepo->updateFromInput($book, $request->all());

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


@@ -160,7 +145,7 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-update', $book);

-        $bookChildren = $this->bookRepo->getChildren($book);
+        $bookChildren = $this->bookRepo->getChildren($book, true);

         $books = $this->bookRepo->getAll(false);
         $this->setPageTitle('Sort Book ' . $book->getShortName());
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
         $books = $this->bookRepo->getAll(false);
         $this->setPageTitle('Sort Book ' . $book->getShortName());
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);


@@ -218,6 +203,7 @@ class BookController extends Controller
         // Add activity for books
         foreach ($sortedBooks as $bookId) {
             $updatedBook = $this->bookRepo->getById($bookId);
         // Add activity for books
         foreach ($sortedBooks as $bookId) {
             $updatedBook = $this->bookRepo->getById($bookId);

+            $this->bookRepo->updateBookPermissions($updatedBook);

             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 


@@ -235,7 +221,7 @@ class BookController extends Controller
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::removeEntity($book);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::removeEntity($book);

-        $this->bookRepo->destroyBySlug($bookSlug);
+        $this->bookRepo->destroy($book);

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


@@ -266,8 +252,8 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);

-        $this->bookRepo->updateRestrictionsFromRequest($request, $book);
-        session()->flash('success', 'Page Restrictions Updated');
+        $this->bookRepo->updateEntityPermissionsFromRequest($request, $book);
+        session()->flash('success', 'Book Restrictions Updated');

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