From 7e60297f540d9a331feb01dbd9b885c39434f62c Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 2 Jun 2008 21:56:06 +0000 Subject: [PATCH] MDL-14679 converted some sql_'s --- admin/user/user_bulk_confirm.php | 2 +- admin/user/user_bulk_delete.php | 2 +- course/lib.php | 2 +- lib/searchlib.php | 4 ++-- lib/tablelib.php | 3 ++- user/filters/courserole.php | 4 ++-- user/filters/lib.php | 4 ++-- user/filters/profilefield.php | 4 ++-- user/filters/text.php | 3 ++- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/admin/user/user_bulk_confirm.php b/admin/user/user_bulk_confirm.php index 1bf5af41af..163623effd 100755 --- a/admin/user/user_bulk_confirm.php +++ b/admin/user/user_bulk_confirm.php @@ -40,7 +40,7 @@ if ($confirm and confirm_sesskey()) { } else { $in = implode(',', $SESSION->bulk_users); - $userlist = $DB->get_records_select_menu('user', "id IN ($in)", null, 'fullname', 'id,'.sql_fullname().' AS fullname'); + $userlist = $DB->get_records_select_menu('user', "id IN ($in)", null, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname'); $usernames = implode(', ', $userlist); $optionsyes = array(); $optionsyes['confirm'] = 1; diff --git a/admin/user/user_bulk_delete.php b/admin/user/user_bulk_delete.php index 6880cbc7bd..42fd9858ef 100755 --- a/admin/user/user_bulk_delete.php +++ b/admin/user/user_bulk_delete.php @@ -39,7 +39,7 @@ if ($confirm and confirm_sesskey()) { } else { $in = implode(',', $SESSION->bulk_users); - $userlist = $DB->get_records_select_menu('user', "id IN ($in)", null, 'fullname', 'id,'.sql_fullname().' AS fullname'); + $userlist = $DB->get_records_select_menu('user', "id IN ($in)", null, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname'); $usernames = implode(', ', $userlist); $optionsyes = array(); $optionsyes['confirm'] = 1; diff --git a/course/lib.php b/course/lib.php index f89dd71421..951cc0dc54 100644 --- a/course/lib.php +++ b/course/lib.php @@ -730,7 +730,7 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname, } if ($ld && !empty($log->info)) { // ugly hack to make sure fullname is shown correctly - if (($ld->mtable == 'user') and ($ld->field == sql_concat('firstname', "' '" , 'lastname'))) { + if (($ld->mtable == 'user') and ($ld->field == $DB->sql_concat('firstname', "' '" , 'lastname'))) { $log->info = fullname($DB->get_record($ld->mtable, array('id'=>$log->info)), true); } else { $log->info = $DB->get_field($ld->mtable, $ld->field, array('id'=>$log->info)); diff --git a/lib/searchlib.php b/lib/searchlib.php index 4fee4b4824..2f50c17f4a 100644 --- a/lib/searchlib.php +++ b/lib/searchlib.php @@ -444,9 +444,9 @@ function search_generate_text_SQL($parsetree, $datafield, $metafield, $mainidfie function search_generate_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield, $userfirstnamefield, $userlastnamefield, $timefield, $instancefield) { - global $CFG; + global $CFG, $DB; - $LIKE = sql_ilike(); + $LIKE = $DB->sql_ilike(); $NOTLIKE = 'NOT ' . $LIKE; if ($CFG->dbfamily == "postgres") { $REGEXP = "~*"; diff --git a/lib/tablelib.php b/lib/tablelib.php index 9c7477483d..b0dbcaabc6 100644 --- a/lib/tablelib.php +++ b/lib/tablelib.php @@ -488,11 +488,12 @@ class flexible_table { * @return type? */ function get_sql_where() { + global $DB; if(!isset($this->columns['fullname'])) { return ''; } - $LIKE = sql_ilike(); + $LIKE = $DB->sql_ilike(); if(!empty($this->sess->i_first) && !empty($this->sess->i_last)) { return 'firstname '.$LIKE.' \''.$this->sess->i_first.'%\' AND lastname '.$LIKE.' \''.$this->sess->i_last.'%\''; } diff --git a/user/filters/courserole.php b/user/filters/courserole.php index 523a15f990..d7d90a01bf 100644 --- a/user/filters/courserole.php +++ b/user/filters/courserole.php @@ -81,7 +81,7 @@ class user_filter_courserole extends user_filter_type { * @return array sql string and $params */ function get_sql_filter($data) { - global $CFG; + global $CFG, $DB; static $counter = 0; $name = 'ex_courserole'.$counter++; @@ -104,7 +104,7 @@ class user_filter_courserole extends user_filter_type { $where .= " AND c.category=$categoryid"; } if ($value) { - $where .= " AND c.shortname ".sql_ilike()." :$name"; + $where .= " AND c.shortname ".$DB->sql_ilike()." :$name"; $params[$name] = $value; } return array("id IN (SELECT userid diff --git a/user/filters/lib.php b/user/filters/lib.php index 160647e7f7..d062b738d7 100644 --- a/user/filters/lib.php +++ b/user/filters/lib.php @@ -94,11 +94,11 @@ class user_filtering { * @return object filter */ function get_field($fieldname, $advanced) { - global $USER; + global $USER, $DB; switch ($fieldname) { case 'username': return new user_filter_text('username', get_string('username'), $advanced, 'username'); - case 'realname': return new user_filter_text('realname', get_string('fullnameuser'), $advanced, sql_fullname()); + case 'realname': return new user_filter_text('realname', get_string('fullnameuser'), $advanced, $DB->sql_fullname()); case 'lastname': return new user_filter_text('lastname', get_string('lastname'), $advanced, 'lastname'); case 'firstname': return new user_filter_text('firstname', get_string('firstname'), $advanced, 'firstname'); case 'email': return new user_filter_text('email', get_string('email'), $advanced, 'email'); diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php index 925cca3295..34135e0288 100644 --- a/user/filters/profilefield.php +++ b/user/filters/profilefield.php @@ -101,7 +101,7 @@ class user_filter_profilefield extends user_filter_type { * @return array sql string and $params */ function get_sql_filter($data) { - global $CFG; + global $CFG, $DB; static $counter = 0; $name = 'ex_profilefield'.$counter++; @@ -121,7 +121,7 @@ class user_filter_profilefield extends user_filter_type { $where = ""; $op = " IN "; - $ilike = sql_ilike(); + $ilike = $DB->sql_ilike(); if ($operator < 5 and $value === '') { return ''; diff --git a/user/filters/text.php b/user/filters/text.php index a5ffbab596..185d81346e 100644 --- a/user/filters/text.php +++ b/user/filters/text.php @@ -75,6 +75,7 @@ class user_filter_text extends user_filter_type { * @return array sql string and $params */ function get_sql_filter($data) { + global $DB; static $counter = 0; $name = 'ex_text'.$counter++; @@ -88,7 +89,7 @@ class user_filter_text extends user_filter_type { return ''; } - $ilike = sql_ilike(); + $ilike = $DB->sql_ilike(); switch($operator) { case 0: // contains -- 2.39.5