Merge branch 'master' into release

Author: ssddanbrown

app/Entity.php

@@ -115,12 +115,12 @@ public static function fullTextSearch($fieldsToSearch, $terms, $wheres = [])
     {
         $termString = '';
         foreach ($terms as $term) {
-            $termString .= $term . '* ';
+            $termString .= htmlentities($term) . '* ';
         }
         $fields = implode(',', $fieldsToSearch);
         $termStringEscaped = \DB::connection()->getPdo()->quote($termString);
         $search = static::addSelect(\DB::raw('*, MATCH(name) AGAINST('.$termStringEscaped.' IN BOOLEAN MODE) AS title_relevance'));
-        $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
+        $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termStringEscaped]);
 
         // Add additional where terms
         foreach ($wheres as $whereTerm) {

app/Http/Controllers/PageController.php

@@ -61,9 +61,7 @@ public function store(Request $request, $bookSlug)
     {
         $this->checkPermission('page-create');
         $this->validate($request, [
-            'name'   => 'required|string|max:255',
-            'html'   => 'required|string',
-            'parent' => 'integer|exists:pages,id'
+            'name'   => 'required|string|max:255'
         ]);
 
         $input = $request->all();
@@ -121,6 +119,9 @@ public function edit($bookSlug, $pageSlug)
     public function update(Request $request, $bookSlug, $pageSlug)
     {
         $this->checkPermission('page-update');
+        $this->validate($request, [
+            'name'   => 'required|string|max:255'
+        ]);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $this->pageRepo->updatePage($page, $book->id, $request->all());

app/Repos/BookRepo.php

@@ -95,7 +95,9 @@ public function getPopular($count = 10, $page = 0)
      */
     public function getBySlug($slug)
     {
-        return $this->book->where('slug', '=', $slug)->first();
+        $book = $this->book->where('slug', '=', $slug)->first();
+        if ($book === null) abort(404);
+        return $book;
     }
 
     /**
@@ -220,9 +222,9 @@ public function getChildren(Book $book)
      */
     public function getBySearch($term)
     {
-        $terms = explode(' ', preg_quote(trim($term)));
+        $terms = explode(' ', $term);
         $books = $this->book->fullTextSearch(['name', 'description'], $terms);
-        $words = join('|', $terms);
+        $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($books as $book) {
             //highlight
             $result = preg_replace('#' . $words . '#iu', "<span class=\"highlight\">\$0</span>", $book->getExcerpt(100));

app/Repos/ChapterRepo.php

@@ -56,7 +56,9 @@ public function getAll()
      */
     public function getBySlug($slug, $bookId)
     {
-        return $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
+        $chapter = $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
+        if ($chapter === null) abort(404);
+        return $chapter;
     }
 
     /**
@@ -127,9 +129,9 @@ public function findSuitableSlug($name, $bookId, $currentId = false)
      */
     public function getBySearch($term, $whereTerms = [])
     {
-        $terms = explode(' ', preg_quote(trim($term)));
+        $terms = explode(' ', $term);
         $chapters = $this->chapter->fullTextSearch(['name', 'description'], $terms, $whereTerms);
-        $words = join('|', $terms);
+        $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($chapters as $chapter) {
             //highlight
             $result = preg_replace('#' . $words . '#iu', "<span class=\"highlight\">\$0</span>", $chapter->getExcerpt(100));

app/Repos/PageRepo.php

@@ -64,7 +64,9 @@ public function getAll()
      */
     public function getBySlug($slug, $bookId)
     {
-        return $this->page->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
+        $page = $this->page->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
+        if ($page === null) abort(404);
+        return $page;
     }
 
     /**
@@ -120,6 +122,7 @@ public function saveNew(array $input, Book $book, $chapterId = null)
      */
     protected function formatHtml($htmlText)
     {
+        if($htmlText == '') return $htmlText;
         libxml_use_internal_errors(true);
         $doc = new \DOMDocument();
         $doc->loadHTML($htmlText);
@@ -174,11 +177,11 @@ protected function formatHtml($htmlText)
      */
     public function getBySearch($term, $whereTerms = [])
     {
-        $terms = explode(' ', preg_quote(trim($term)));
+        $terms = explode(' ', $term);
         $pages = $this->page->fullTextSearch(['name', 'text'], $terms, $whereTerms);
 
         // Add highlights to page text.
-        $words = join('|', $terms);
+        $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         //lookahead/behind assertions ensures cut between words
         $s = '\s\x00-/:-@\[-`{-~'; //character set for start/end of words
 

gulpfile.js

@@ -21,6 +21,6 @@ elixir.extend('queryVersion', function(inputFiles) {
 elixir(function(mix) {
     mix.sass('styles.scss')
         .sass('print-styles.scss')
-        .browserify(['jquery-extensions.js', 'global.js'], 'public/js/common.js')
+        .browserify('global.js', 'public/js/common.js')
         .queryVersion(['css/styles.css', 'css/print-styles.css', 'js/common.js']);
 });

package.json

@@ -1,19 +1,17 @@
 {
   "private": true,
   "devDependencies": {
-    "gulp": "^3.9.0",
-    "insert-css": "^0.2.0"
+    "gulp": "^3.9.0"
   },
   "dependencies": {
+    "angular": "^1.5.0-rc.0",
+    "angular-animate": "^1.5.0-rc.0",
+    "angular-resource": "^1.5.0-rc.0",
+    "angular-sanitize": "^1.5.0-rc.0",
     "babel-runtime": "^5.8.29",
     "bootstrap-sass": "^3.0.0",
     "dropzone": "^4.0.1",
     "laravel-elixir": "^3.4.0",
-    "vue": "^1.0.4",
-    "vue-hot-reload-api": "^1.2.1",
-    "vue-resource": "^0.1.16",
-    "vueify": "^5.0.1",
-    "vueify-insert-css": "^1.0.0",
     "zeroclipboard": "^2.2.0"
   }
 }