X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FLinkFilter.php;h=17594e8f4ea5250d368b675932c62e65ce1b08a9;hb=522b278b03280ed809025ebbeb3eac284b68bf81;hp=e2ef94ea78ff5476cca3d058ff72538060358539;hpb=bedd176a5406003631da42366736fd5ebae29135;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/LinkFilter.php b/application/LinkFilter.php
index e2ef94ea..17594e8f 100644
--- a/application/LinkFilter.php
+++ b/application/LinkFilter.php
@@ -138,6 +138,7 @@ class LinkFilter
      */
     private function filterFulltext($searchterms, $privateonly = false)
     {
+        $filtered = array();
         $search = mb_convert_case(html_entity_decode($searchterms), MB_CASE_LOWER, 'UTF-8');
         $exactRegex = '/"([^"]+)"/';
         // Retrieve exact search terms.
@@ -169,35 +170,32 @@ class LinkFilter
                 continue;
             }
 
-            // Iterate over searchable link fields.
+            // Concatenate link fields to search across fields.
+            // Adds a '\' separator for exact search terms.
+            $content = '';
             foreach ($keys as $key) {
-                // Be optimistic
-                $found = true;
-                
-                $haystack = mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8');
-
-                // First, we look for exact term search
-                for ($i = 0; $i < count($exactSearch) && $found; $i++) {
-                    $found = strpos($haystack, $exactSearch[$i]) !== false;
-                }
+                $content .= mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8') . '\\';
+            }
 
-                // Iterate over keywords, if keyword is not found,
-                // no need to check for the others. We want all or nothing.
-                for ($i = 0; $i < count($andSearch) && $found; $i++) {
-                    $found = strpos($haystack, $andSearch[$i]) !== false;
-                }
+            // Be optimistic
+            $found = true;
 
-                // Exclude terms.
-                for ($i = 0; $i < count($excludeSearch) && $found; $i++) {
-                    $found = strpos($haystack, $excludeSearch[$i]) === false;
-                }
-                
-                // One of the fields of the link matches, no need to check the other.
-                if ($found) {
-                    break;
-                }
+            // First, we look for exact term search
+            for ($i = 0; $i < count($exactSearch) && $found; $i++) {
+                $found = strpos($content, $exactSearch[$i]) !== false;
+            }
+
+            // Iterate over keywords, if keyword is not found,
+            // no need to check for the others. We want all or nothing.
+            for ($i = 0; $i < count($andSearch) && $found; $i++) {
+                $found = strpos($content, $andSearch[$i]) !== false;
             }
-            
+
+            // Exclude terms.
+            for ($i = 0; $i < count($excludeSearch) && $found; $i++) {
+                $found = strpos($content, $excludeSearch[$i]) === false;
+            }
+
             if ($found) {
                 $filtered[$link['linkdate']] = $link;
             }