fix(form): search engine and accented chars

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Nov 23, 2018 · 0583a5f · 0583a5f
1 parent accae14
commit 0583a5f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/inc/common.class.php b/inc/common.class.php
@@ -133,4 +133,25 @@ public static function getMax(CommonDBTM $item, $condition, $fieldName) {
       }
       return (int) $line[$fieldName];
    }
+
+   /**
+    * Prepare keywords for a fulltext search in boolean mode
+    * takes into account strings in double quotes
+    *
+    * @param string $keywords
+    * @return string
+    */
+   public static function prepareBooleanKeywords($keywords) {
+      // @see https://stackoverflow.com/questions/2202435/php-explode-the-string-but-treat-words-in-quotes-as-a-single-word
+      preg_match_all('/"(?:\\\\.|[^\\\\"])*"|\S+/', $keywords, $matches);
+      $matches = $matches[0];
+      foreach ($matches as &$keyword) {
+         if (strpos($keyword, '"') === 0) {
+            // keyword does not begins with a double quote (assume it does not ends with this char)
+            $keyword .= '*';
+         }
+      }
+
+      return implode(' ', $matches);
+   }
 }
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -686,7 +686,6 @@ public function showFormList($rootCategory = 0, $keywords = '', $helpdeskHome =
       }
 
       // Find forms accessible by the current user
-      $keywords = preg_replace("/[^A-Za-z0-9 ]/", '', $keywords);
       if (!empty($keywords)) {
          // Determine the optimal search mode
          $searchMode = "BOOLEAN MODE";
@@ -696,13 +695,15 @@ public function showFormList($rootCategory = 0, $keywords = '', $helpdeskHome =
             $row = $DB->fetch_assoc($result);
             if ($row['Rows'] > 20) {
                $searchMode = "NATURAL LANGUAGE MODE";
+            } else {
+               $keywords = PluginFormcreatorCommon::prepareBooleanKeywords($keywords);
             }
          }
          $keywords = $DB->escape($keywords);
          $highWeightedMatch = " MATCH($table_form.`name`, $table_form.`description`)
-               AGAINST('$keywords*' IN $searchMode)";
+               AGAINST('$keywords' IN $searchMode)";
          $lowWeightedMatch = " MATCH($table_question.`name`, $table_question.`description`)
-               AGAINST('$keywords*' IN $searchMode)";
+               AGAINST('$keywords' IN $searchMode)";
          $where_form .= " AND ($highWeightedMatch OR $lowWeightedMatch)";
       }
       $query_forms = "SELECT