From: stronk7 Date: Mon, 23 Oct 2006 23:00:18 +0000 (+0000) Subject: Moving deprecated uses of sql_paging_limit() to the new $limitfrom, X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=422770d8cba7227b6c9ce1ad46b2a8b85f43e9c0;p=moodle.git Moving deprecated uses of sql_paging_limit() to the new $limitfrom, $limitnum parameters in all the get_recordXXX() functions. MDL-7167 Merged from MOODLE_17_STABLE --- diff --git a/blocks/glossary_random/block_glossary_random.php b/blocks/glossary_random/block_glossary_random.php index 8aed12eb66..893d692b77 100644 --- a/blocks/glossary_random/block_glossary_random.php +++ b/blocks/glossary_random/block_glossary_random.php @@ -41,11 +41,14 @@ class block_glossary_random extends block_base { $this->instance_config_commit(); } + $limitfrom = 0; + $limitnum = 1; + switch ($this->config->type) { case BGR_RANDOMLY: $i = rand(1,$numberofentries); - $LIMIT = sql_paging_limit($i-1, 1); + $limitfrom = $i-1; $SORT = 'ASC'; break; @@ -58,13 +61,13 @@ class block_glossary_random extends block_base { if ($i > $numberofentries) { // Loop back to beginning $i = 1; } - $LIMIT = sql_paging_limit($i-1, 1); + $limitfrom = $i-1; $SORT = 'ASC'; break; default: // BGR_LASTMODIFIED $i = $numberofentries; - $LIMIT = 'LIMIT 1'; // The last one + $limitfrom = 0; $SORT = 'DESC'; break; } @@ -73,7 +76,7 @@ class block_glossary_random extends block_base { ' FROM '.$CFG->prefix.'glossary_entries'. ' WHERE glossaryid = '.$this->config->glossary. ' AND approved = 1 '. - 'ORDER BY timemodified '.$SORT.' '.$LIMIT)) { + 'ORDER BY timemodified '.$SORT, $limitfrom, $limitnum)) { $entry = reset($entry); diff --git a/blog/lib.php b/blog/lib.php index 7f979fb3f9..e142478634 100755 --- a/blog/lib.php +++ b/blog/lib.php @@ -532,16 +532,18 @@ } + $limitfrom = 0; + $limitnum = 0; + if ($fetchstart !== '' && $limit) { - $limit = sql_paging_limit($fetchstart, $fetchlimit); - } else { - $limit = ''; + $limitfrom = $fetchstart; + $limitnum = $fetchlimit; } $orderby = ' ORDER BY '. $sort .' '; //echo 'Debug: BlogFilter fetch_entries() sql="'. $SQL . $orderby . $limit .'"
'. $this->categoryid; //debug - $records = get_records_sql($SQL . $orderby . $limit); + $records = get_records_sql($SQL . $orderby, $limitfrom, $limitnum); // print_object($records); //debug diff --git a/course/report/participation/index.php b/course/report/participation/index.php index 9ba32c7f4e..ce559b9d81 100644 --- a/course/report/participation/index.php +++ b/course/report/participation/index.php @@ -276,11 +276,7 @@ $table->initialbars($totalcount > $perpage); $table->pagesize($perpage, $matchcount); - if($table->get_page_start() !== '' && $table->get_page_size() !== '') { - $sql .= ' '.sql_paging_limit($table->get_page_start(), $table->get_page_size()); - } - - if (!$users = get_records_sql($sql)) { + if (!$users = get_records_sql($sql, $table->get_page_start(), $table->get_page_size())) { $users = array(); // tablelib will handle saying 'Nothing to display' for us. } diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 71ec8a7053..43ff067539 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -146,14 +146,8 @@ function authorize_print_orders($courseid, $userid) $totalcount = count_records_sql('SELECT COUNT(*) ' . $from . $where); $table->initialbars($totalcount > $perpage); $table->pagesize($perpage, $totalcount); - if ($table->get_page_start() !== '' && $table->get_page_size() !== '') { - $limit = ' ' . sql_paging_limit($table->get_page_start(), $table->get_page_size()); - } - else { - $limit = ''; - } - if ($records = get_records_sql($select . $from . $where . $sort . $limit)) { + if ($records = get_records_sql($select . $from . $where . $sort, $table->get_page_start(), $table->get_page_size())) { foreach ($records as $record) { $actionstatus = authorize_get_status_action($record); $color = authorize_get_status_color($actionstatus->status); diff --git a/lib/datalib.php b/lib/datalib.php index 8fbefbac2a..9d286ebea4 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -260,11 +260,6 @@ function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperp global $CFG; - if ($recordsperpage) { - $limit = sql_paging_limit($page, $recordsperpage); - } else { - $limit = ''; - } $LIKE = sql_ilike(); $fullname = sql_fullname(); @@ -290,7 +285,7 @@ function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperp /// warning: will return UNCONFIRMED USERS return get_records_sql("SELECT id, username, email, firstname, lastname, city, country, lastaccess, confirmed FROM {$CFG->prefix}user - WHERE $select $sort $limit "); + WHERE $select $sort", $page, $recordsperpage); } @@ -704,8 +699,6 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record global $CFG; - $limit = sql_paging_limit($page, $recordsperpage); - //to allow case-insensitive search for postgesql if ($CFG->dbtype == 'postgres7') { $LIKE = 'ILIKE'; @@ -749,7 +742,7 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record $totalcount = count_records_sql('SELECT COUNT(*) FROM '. $selectsql); - $courses = get_records_sql('SELECT * FROM '. $selectsql .' ORDER BY '. $sort .' '. $limit); + $courses = get_records_sql('SELECT * FROM '. $selectsql .' ORDER BY '. $sort, $page, $recordsperpage); if ($courses) { /// Remove unavailable courses from the list foreach ($courses as $key => $course) { diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 2a301a8016..850e644911 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -843,10 +843,8 @@ class assignment_base { $sort = 'ORDER BY '.$sort.' '; } - $limit = sql_paging_limit($offset+1, 1); - $nextid = 0; - if (($auser = get_record_sql($select.$sql.$sort.$limit, false, true)) !== false) { + if (($auser = get_records_sql($select.$sql.$sort, $offset+1, 1)) !== false) { $nextid = $auser->id; } @@ -1100,13 +1098,6 @@ class assignment_base { $table->pagesize($perpage, count($users)); - if($table->get_page_start() !== '' && $table->get_page_size() !== '') { - $limit = ' '.sql_paging_limit($table->get_page_start(), $table->get_page_size()); - } - else { - $limit = ''; - } - ///offset used to calculate index of student in that particular query, needed for the pop up to know who's next $offset = $page * $perpage; @@ -1114,7 +1105,7 @@ class assignment_base { $strgrade = get_string('grade'); $grademenu = make_grades_menu($this->assignment->grade); - if (($ausers = get_records_sql($select.$sql.$sort.$limit)) !== false) { + if (($ausers = get_records_sql($select.$sql.$sort, $table->get_page_start(), $table->get_page_size())) !== false) { foreach ($ausers as $auser) { $picture = print_user_picture($auser->id, $course->id, $auser->picture, false, true);