Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 9c1154281be3f47b01ed10ab8efbd73c5db2daee..4313a4e2082a246bcf908db46a9f0814c8fcdec2 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -39,9 +39,9 @@ class BookController extends Controller
         $books = $this->entityRepo->getAllPaginated('book', 16);
         $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
         $popular = $this->entityRepo->getPopular('book', 3, 0);
-        $books_display = $this->currentUser->books_display;
+        $display = $this->currentUser->display;
         $this->setPageTitle('Books');
-        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display]);
+        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]); //added displaly to access user display
     }
 
     /**
@@ -68,11 +68,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
-        $image = $request->file('image');
-        $path = $this->getBookCoverURL($image);
         $book = $this->entityRepo->createFromInput('book', $request->all());
-        $book->image = $path; 
-        $book->save();
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
@@ -119,27 +115,9 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
-         $image = $request->file('image');
-         $path = $this->getBookCoverURL($image);
-         $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
-         $book->image = $path; 
-         $book->save();
-         Activity::add($book, 'book_update', $book->id);
-         return redirect($book->getUrl());
-    }
-
-    /**
-     * Generate URL for book cover image
-     * @param  $image
-     * @return $path
-     */
-    public function getBookCoverURL($image)
-    {
-         $input = time().'-'.$image->getClientOriginalName();
-         $destinationPath = public_path('uploads/book/');
-         $image->move($destinationPath, $input);
-         $path = baseUrl('/uploads/book/').'/'.$input;
-         return $path;
+        $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
+        Activity::add($book, 'book_update', $book->id);
+        return redirect($book->getUrl());
     }
 
     /**