replace GPL diff lib with MIT lib

[bookstack] / app / Entity.php

diff --git a/app/Entity.php b/app/Entity.php
index 7347ddcd689457e5eb1726df1d02a545f56a6ab2..1342c29971e8a1ec21d56c461a07c6dc2bc652d4 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -60,7 +60,7 @@ class Entity extends Ownable
      */
     public function tags()
     {
-        return $this->morphMany(Tag::class, 'entity');
+        return $this->morphMany(Tag::class, 'entity')->orderBy('order', 'asc');
     }
 
     /**
@@ -157,48 +157,54 @@ class Entity extends Ownable
      * @param string[] array $wheres
      * @return mixed
      */
-    public static function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
+    public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
     {
         $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 (count($terms) === 0) {
+            $search = $this;
+            $orderBy = 'updated_at';
+        } else {
+            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;
             }
-            if ($term !== '*') $terms[$key] = $term;
-        }
-        $termString = implode(' ', $terms);
-        $fields = implode(',', $fieldsToSearch);
-        $search = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$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);
+            $termString = implode(' ', $terms);
+            $fields = implode(',', $fieldsToSearch);
+            $search = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$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);
+                        }
                     }
-                }
-            });
-        }
+                });
+            }
+            $orderBy = 'title_relevance';
+        };
 
         // Add additional where terms
         foreach ($wheres as $whereTerm) {
             $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
         }
         // Load in relations
-        if (static::isA('page')) {
+        if ($this->isA('page')) {
             $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
-        } else if (static::isA('chapter')) {
+        } else if ($this->isA('chapter')) {
             $search = $search->with('book');
         }
 
-        return $search->orderBy('title_relevance', 'desc');
+        return $search->orderBy($orderBy, 'desc');
     }
     
 }