Prevent +/- operators (REGEXP) on glossary searches for MSSQL and Oracle. MDL-7312

Merged from MOODLE_17_STABLE

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index fd9fc0d14f1ce696f2c331999459c33e0f1ce114..ae90f92078836d68a41fdb5f2607915310f26707 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -987,6 +987,12 @@ function glossary_search($course, $searchterms, $extended = 0, $glossary = NULL)
             $definitionsearch.= " OR ";
         }
 
+    /// Under Oracle and MSSQL, trim the + and - operators and perform
+    /// simpler LIKE search
+        if ($CFG->dbtype == 'oci8po' || $CFG->dbtype == 'mssql' || $CFG->dbtype == 'mssql_n' || $CFG->dbtype == 'odbc_mssql') {
+            $searchterm = trim($searchterm, '+-');
+        }
+
         if (substr($searchterm,0,1) == "+") {
             $searchterm = substr($searchterm,1);
             $conceptsearch.= " e.concept $REGEXP '(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)' ";

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index c78ed29dc81c0b5d06ca87d3cd701b51c9efc4fe..767c20bca24fc40b6d7f3aa2f1b573cce7d438ef 100644 (file)
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -160,6 +160,13 @@
                 if ($definitionsearch) {
                     $definitionsearch .= " AND ";
                 }
+
+            /// Under Oracle and MSSQL, trim the + and - operators and perform
+            /// simpler LIKE search
+                if ($CFG->dbtype == 'oci8po' || $CFG->dbtype == 'mssql' || $CFG->dbtype == 'mssql_n' || $CFG->dbtype == 'odbc_mssql') {
+                    $searchterm = trim($searchterm, '+-');
+                }
+
                 if (substr($searchterm,0,1) == "+") {
                     $searchterm = substr($searchterm,1);
                     $conceptsearch .= " ge.concept $REGEXP '(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)' ";