L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-24079 messaging now using new sql_like

Browse Source
This commit is contained in:
Petr Skoda
2010-09-04 13:05:51 +00:00
parent 20a79b4316
commit dd54dc31b6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/lib.php
+4 -7
View File
@@ -1091,7 +1091,6 @@ function message_search_users($courseid, $searchtext, $sort='', $exceptions='')
global $CFG, $USER, $DB;
$fullname = $DB->sql_fullname();
$LIKE = $DB->sql_ilike();
if (!empty($exceptions)) {
$except = ' AND u.id NOT IN ('. $exceptions .') ';
@@ -1113,7 +1112,7 @@ function message_search_users($courseid, $searchtext, $sort='', $exceptions='')
LEFT JOIN {message_contacts} mc
ON mc.contactid = u.id AND mc.userid = ?
WHERE u.deleted = '0' AND u.confirmed = '1'
AND ($fullname $LIKE ?)
AND (".$DB->sql_like($fullname, '?', false).")
$except
$order", $params);
} else {
@@ -1130,7 +1129,7 @@ function message_search_users($courseid, $searchtext, $sort='', $exceptions='')
ON mc.contactid = u.id AND mc.userid = ?
WHERE u.deleted = '0' AND u.confirmed = '1'
AND ra.contextid $contextlists
AND ($fullname $LIKE ?)
AND (".$DB->sql_like($fullname, '?', false).")
$except
$order", $params);
@@ -1156,8 +1155,6 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
$NOTREGEXP = $DB->sql_regex(false);
}
$LIKE = $DB->sql_ilike();
$searchcond = array();
$params = array();
$i = 0;
@@ -1201,13 +1198,13 @@ 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";
$searchcond[] = "m.fullmessage NOT LIKE :ss$i"; //TODO: MDL-24080
$params['ss'.$i] = "%$searchterm%";
}
}
if (empty($searchcond)) {
$searchcond = " m.fullmessage $LIKE :ss1";
$searchcond = " ".$DB->sql_like('m.fullmessage', ':ss1', false);
$params['ss1'] = "%";
} else {
$searchcond = implode(" AND ", $searchcond);