From 5f5cd33c1d72fa5206fb0222f85af3627e4def66 Mon Sep 17 00:00:00 2001 From: skodak Date: Wed, 4 Jun 2008 00:04:03 +0000 Subject: [PATCH] MDL-15114 resource mod converted --- mod/resource/backuplib.php | 18 ++++---- mod/resource/db/upgrade.php | 1 - mod/resource/filter.php | 21 ++++----- mod/resource/lib.php | 78 +++++++++++++++----------------- mod/resource/type/ims/deploy.php | 8 ++-- mod/resource/view.php | 6 +-- 6 files changed, 61 insertions(+), 71 deletions(-) diff --git a/mod/resource/backuplib.php b/mod/resource/backuplib.php index d7866e677b..73ad6b4360 100644 --- a/mod/resource/backuplib.php +++ b/mod/resource/backuplib.php @@ -18,12 +18,12 @@ //This function executes all the backup procedure about this mod function resource_backup_mods($bf,$preferences) { - global $CFG; + global $CFG, $DB; $status = true; ////Iterate over resource table - $resources = get_records ("resource","course",$preferences->backup_course,"id"); + $resources = $DB->get_records ("resource", array("course"=>$preferences->backup_course),"id"); if ($resources) { foreach ($resources as $resource) { if (backup_mod_selected($preferences,'resource',$resource->id)) { @@ -35,11 +35,10 @@ } function resource_backup_one_mod($bf,$preferences,$resource) { - - global $CFG; + global $CFG, $DB; if (is_numeric($resource)) { - $resource = get_record('resource','id',$resource); + $resource = $DB->get_record('resource', array('id'=>$resource)); } $status = true; @@ -124,12 +123,11 @@ //Returns an array of resources id function resource_ids ($course) { + global $CFG, $DB; - global $CFG; - - return get_records_sql ("SELECT a.id, a.course - FROM {$CFG->prefix}resource a - WHERE a.course = '$course'"); + return $DB->get_records_sql("SELECT a.id, a.course + FROM {resource} a + WHERE a.course = ?", array($course)); } function resource_backup_files($bf,$preferences,$resource) { diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php index b5e09b8440..93c376fecd 100644 --- a/mod/resource/db/upgrade.php +++ b/mod/resource/db/upgrade.php @@ -18,7 +18,6 @@ // using the functions defined in lib/ddllib.php function xmldb_resource_upgrade($oldversion=0) { - global $CFG, $THEME, $DB; $result = true; diff --git a/mod/resource/filter.php b/mod/resource/filter.php index 6a76378d96..e722b259dd 100644 --- a/mod/resource/filter.php +++ b/mod/resource/filter.php @@ -4,8 +4,7 @@ //Williams, Stronk7, Martin D function resource_filter($courseid, $text) { - - global $CFG; + global $CFG, $DB; // Trivial-cache - keyed on $cachedcourseid static $nothingtodo; @@ -38,17 +37,15 @@ * link to the top resource first. */ $resource_sql = "SELECT r.id, r.name - FROM {$CFG->prefix}resource r, - {$CFG->prefix}course_modules cm, - {$CFG->prefix}modules m - WHERE m.name = 'resource' AND - cm.module = m.id AND - cm.visible = 1 AND - r.id = cm.instance AND - cm.course = {$courseid} - ORDER BY CHAR_LENGTH(r.name) DESC, cm.section ASC;"; + FROM {resource} r, {course_modules} cm, {modules} m + WHERE m.name = 'resource' AND + cm.module = m.id AND + cm.visible = 1 AND + r.id = cm.instance AND + cm.course = ? + ORDER BY CHAR_LENGTH(r.name) DESC, cm.section ASC"; - if (!$resources = get_records_sql($resource_sql) ){ + if (!$resources = $DB->get_records_sql($resource_sql, array($courseid)) ){ $nothingtodo = true; return $text; } diff --git a/mod/resource/lib.php b/mod/resource/lib.php index e25846f8f7..29a535869d 100644 --- a/mod/resource/lib.php +++ b/mod/resource/lib.php @@ -33,8 +33,8 @@ class resource_base { * @param cmid integer, the current course module id - not set for new resources */ function resource_base($cmid=0) { + global $CFG, $COURSE, $DB; - global $CFG, $COURSE; $this->navlinks = array(); if ($cmid) { @@ -42,11 +42,11 @@ class resource_base { print_error("Course Module ID was incorrect"); } - if (! $this->course = get_record("course", "id", $this->cm->course)) { + if (! $this->course = $DB->get_record("course", array("id"=>$this->cm->course))) { print_error("Course is misconfigured"); } - if (! $this->resource = get_record("resource", "id", $this->cm->instance)) { + if (! $this->resource = $DB->get_record("resource", array("id"=>$this->cm->instance))) { print_error("Resource ID was incorrect"); } @@ -80,9 +80,7 @@ class resource_base { */ function display_course_blocks_start() { - global $CFG; - global $USER; - global $THEME; + global $CFG, $USER, $THEME; require_once($CFG->libdir.'/blocklib.php'); require_once($CFG->libdir.'/pagelib.php'); @@ -151,9 +149,7 @@ class resource_base { * Finish displaying the resource with the course blocks */ function display_course_blocks_end() { - - global $CFG; - global $THEME; + global $CFG, $THEME; $PAGE = $this->PAGE; $pageblocks = blocks_setup($PAGE); @@ -299,8 +295,10 @@ function resource_delete_instance($id) { function resource_user_outline($course, $user, $mod, $resource) { - if ($logs = get_records_select("log", "userid='$user->id' AND module='resource' - AND action='view' AND info='$resource->id'", "time ASC")) { + global $DB; + + if ($logs = $DB->get_records("log", array('userid'=>$user->id, 'module'=>'resource', + 'action'=>'view', 'info'=>$resource->id), "time ASC")) { $numviews = count($logs); $lastlog = array_pop($logs); @@ -316,10 +314,10 @@ function resource_user_outline($course, $user, $mod, $resource) { function resource_user_complete($course, $user, $mod, $resource) { - global $CFG; + global $CFG, $DB; - if ($logs = get_records_select("log", "userid='$user->id' AND module='resource' - AND action='view' AND info='$resource->id'", "time ASC")) { + if ($logs = $DB->get_records("log", array('userid'=>$user->id, 'module'=>'resource', + 'action'=>'view', 'info'=>$resource->id), "time ASC")) { $numviews = count($logs); $lastlog = array_pop($logs); @@ -347,12 +345,11 @@ function resource_get_coursemodule_info($coursemodule) { /// /// See get_array_of_activities() in course/lib.php /// - - global $CFG; + global $CFG, $DB; $info = NULL; - if ($resource = get_record("resource", "id", $coursemodule->instance, '', '', '', '', 'id, popup, reference, type, name')) { + if ($resource = $DB->get_record("resource", array("id"=>$coursemodule->instance), 'id, popup, reference, type, name')) { $info = new object(); $info->name = $resource->name; if (!empty($resource->popup)) { @@ -568,7 +565,7 @@ function resource_get_post_actions() { } function resource_renamefiles($course, $wdir, $oldname, $name) { - global $CFG; + global $CFG, $DB; $status = '

'.get_string('affectedresources', 'resource').':