MDL-24080 converting remaining NOT LIKEs

ds125v · Sep 4, 2010 · 4758639 · 4758639
1 parent 2225fb4
commit 4758639
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 22 deletions.
diff --git a/course/lib.php b/course/lib.php
@@ -184,7 +184,7 @@ function build_mnet_logs_array($hostid, $course, $user=0, $date=0, $order="l.tim
     if ($modaction) {
         $firstletter = substr($modaction, 0, 1);
         if ($firstletter == '-') {
-            $where .= " AND l.action NOT LIKE :modaction"; //TODO: MDL-24080
+            $where .= " AND ".$DB->sql_like('l.action', ':modaction', false, true, true);
             $params['modaction'] = '%'.substr($modaction, 1).'%';
         } else {
             $where .= " AND ".$DB->sql_like('l.action', ':modaction', false);
@@ -266,7 +266,7 @@ function build_logs_array($course, $user=0, $date=0, $order="l.time ASC", $limit
     if ($modaction) {
         $firstletter = substr($modaction, 0, 1);
         if ($firstletter == '-') {
-            $joins[] = "l.action NOT LIKE :modaction"; //TODO: MDL-24080
+            $joins[] = $DB->sql_like('l.action', ':modaction', false, true, true);
             $params['modaction'] = '%'.substr($modaction, 1).'%';
         } else {
             $joins[] = $DB->sql_like('l.action', ':modaction', false);

diff --git a/lib/datalib.php b/lib/datalib.php
@@ -752,11 +752,7 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record
             $params['ss'.$i] = "(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)";
 
         } else {
-            if ($NOT) {
-                $searchcond[] = "$concat NOT LIKE :ss$i"; //TODO: MDL-24080
-            } else {
-                $searchcond[] = $DB->sql_like($concat,":ss$i", false);
-            }
+            $searchcond[] = $DB->sql_like($concat,":ss$i", false, true, $NOT);
             $params['ss'.$i] = "%$searchterm%";
         }
     }

diff --git a/message/lib.php b/message/lib.php
@@ -1171,7 +1171,7 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
     foreach ($searchterms as $searchterm) {
         $i++;
 
-        $NOT = ''; /// Initially we aren't going to perform NOT LIKE searches, only MSSQL and Oracle
+        $NOT = false; /// Initially we aren't going to perform NOT LIKE searches, only MSSQL and Oracle
 
         if ($dropshortwords && strlen($searchterm) < 2) {
             continue;
@@ -1180,7 +1180,7 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
     /// simpler LIKE search
         if (!$DB->sql_regex_supported()) {
             if (substr($searchterm, 0, 1) == '-') {
-                $NOT = ' NOT ';
+                $NOT = true;
             }
             $searchterm = trim($searchterm, '+-');
         }
@@ -1198,7 +1198,7 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
             $params['ss'.$i] = "(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)";
 
         } else {
-            $searchcond[] = "m.fullmessage NOT LIKE :ss$i"; //TODO: MDL-24080
+            $searchcond[] = $DB->sql_like("m.fullmessage", ":ss$i", false, true, $NOT);
             $params['ss'.$i] = "%$searchterm%";
         }
     }

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
@@ -1238,11 +1238,7 @@ function glossary_search($course, $searchterms, $extended = 0, $glossary = NULL)
             $params['ss'.$i] = "(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)";
 
         } else {
-            if ($NOT) {
-                $searchcond[] = "$concat NOT LIKE :ss$i"; //TODO: MDL-24080
-            } else {
-                $searchcond[] = $DB->sql_like($concat, ":ss$i", false);
-            }
+            $searchcond[] = $DB->sql_like($concat, ":ss$i", false, true, $NOT);
             $params['ss'.$i] = "%$searchterm%";
         }
     }

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
@@ -192,11 +192,7 @@
                     if ($textlib->strlen($searchterm) < 2) {
                         continue;
                     }
-                    if ($NOT) {
-                        $searchcond[] = "$concat NOT LIKE :ss$i"; //TODO: MDL-24080
-                    } else {
-                        $searchcond[] = $DB->sql_like($concat, ":ss$i", false);
-                    }
+                    $searchcond[] = $DB->sql_like($concat, ":ss$i", false, true, $NOT);
                     $params['ss'.$i] = "%$searchterm%";
                 }
             }

diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
@@ -131,7 +131,7 @@ function get_sql_filter($data) {
                 $params[$name] = "%$value%";
                 break;
             case 1: // does not contain
-                $where = "data NOT LIKE :$name"; //TODO: MDL-24080
+                $where = $DB->sql_like('data', ":$name", false, false, true);
                 $params[$name] = "%$value%";
                 break;
             case 2: // equal to

diff --git a/user/filters/text.php b/user/filters/text.php
@@ -94,7 +94,7 @@ function get_sql_filter($data) {
                 $params[$name] = "%$value%";
                 break;
             case 1: // does not contain
-                $res = "$field NOT LIKE :$name"; //TODO: MDL-24080
+                $res = $DB->sql_like($field, ":$name", false, false, true);
                 $params[$name] = "%$value%";
                 break;
             case 2: // equal to