Merge branch 'custom_role_system'

[bookstack] / app / Entity.php

diff --git a/app/Entity.php b/app/Entity.php
index 97500917419cd82bd730b0f9859bfc309bb99be6..6bf29ca0fbb17b5650a653385edfd01211037441 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -91,8 +91,8 @@ abstract class Entity extends Ownable
      */
     public function getShortName($length = 25)
     {
      */
     public function getShortName($length = 25)
     {

-        if(strlen($this->name) <= $length) return $this->name;
-        return substr($this->name, 0, $length-3) . '...';
+        if (strlen($this->name) <= $length) return $this->name;
+        return substr($this->name, 0, $length - 3) . '...';

     }
 
     /**
     }
 
     /**


@@ -104,22 +104,40 @@ abstract class Entity extends Ownable
      */
     public static function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
     {
      */
     public static function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
     {

-        $termString = '';
-        foreach ($terms as $term) {
-            $termString .= htmlentities($term) . '* ';
+        $exactTerms = [];
+        foreach ($terms as $key => $term) {
+            $term = htmlentities($term, ENT_QUOTES);
+            $term =  preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
+            if (preg_match('/\s/', $term)) {
+                $exactTerms[] = '%' . $term . '%';
+                $term = '"' . $term . '"';
+            } else {
+                $term = '' . $term . '*';
+            }
+            if ($term !== '*') $terms[$key] = $term;

         }
         }

+        $termString = implode(' ', $terms);

         $fields = implode(',', $fieldsToSearch);
         $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 = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);

         $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
 
         $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
 

+        // Ensure at least one exact term matches if in search
+        if (count($exactTerms) > 0) {
+            $search = $search->where(function($query) use ($exactTerms, $fieldsToSearch) {
+                foreach ($exactTerms as $exactTerm) {
+                    foreach ($fieldsToSearch as $field) {
+                        $query->orWhere($field, 'like', $exactTerm);
+                    }
+                }
+            });
+        }
+

         // Add additional where terms
         foreach ($wheres as $whereTerm) {
             $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
         }
         // Add additional where terms
         foreach ($wheres as $whereTerm) {
             $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
         }

-

         // Load in relations
         // Load in relations

-        if (static::isA('page'))  {
+        if (static::isA('page')) {

             $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
         } else if (static::isA('chapter')) {
             $search = $search->with('book');
             $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
         } else if (static::isA('chapter')) {
             $search = $search->with('book');