MDL-15114 resource mod converted

diff --git a/mod/resource/backuplib.php b/mod/resource/backuplib.php
index d7866e677b82df86d94a608c8cf7e8826a689493..73ad6b43603c69939d0f60a9643000c5412565fb 100644 (file)
--- 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 b5e09b8440062598f3e2b146fa70dae367739932..93c376fecd57e7bbe91c5fa563d6f9c9b5af177d 100644 (file)
--- 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 6a76378d96123c748897e43dd4684db7cacd657e..e722b259ddc4fc888db40ea039c7ada2a4a876f9 100644 (file)
--- 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 e25846f8f7fb20a7b1db7177492186d1568e5e5c..29a535869d994ddbb18fab1c1c3c85a31e1d374f 100644 (file)
--- 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 = '<p align=\"center\"><strong>'.get_string('affectedresources', 'resource').':</strong><ul>';
     $updates = false;
@@ -577,30 +574,29 @@ function resource_renamefiles($course, $wdir, $oldname, $name) {
     $new = trim($wdir.'/'.$name, '/');
 
     $sql = "SELECT r.id, r.reference, r.name, cm.id AS cmid
-             FROM {$CFG->prefix}resource r,
-                  {$CFG->prefix}course_modules cm,
-                  {$CFG->prefix}modules m
-             WHERE r.course    = '{$course->id}'
-               AND m.name      = 'resource'
-               AND cm.module   = m.id
-               AND cm.instance = r.id
-               AND (r.type = 'file' OR r.type = 'directory')
-               AND (r.reference LIKE '{$old}/%' OR r.reference = '{$old}')";
-    if ($resources = get_records_sql($sql)) {
+              FROM {resource} r, {course_modules} cm, {modules} m
+             WHERE r.course    = :courseid
+                   AND m.name      = 'resource'
+                   AND cm.module   = m.id
+                   AND cm.instance = r.id
+                   AND (r.type = 'file' OR r.type = 'directory')
+                   AND (r.reference LIKE :old1 OR r.reference = :old2)";
+    $params = array('courseid'=>$course->id, 'old1'=>"{$old}/%", 'old2'=>$old);
+    if ($resources = $DB->get_records_sql($sql, $params)) {
         foreach ($resources as $resource) {
             $r = new object();
             $r->id = $resource->id;
             $r->reference = '';
             if ($resource->reference == $old) {
-                $r->reference = addslashes($new);
+                $r->reference = $new;
             } else {
-                $r->reference = addslashes(preg_replace('|^'.preg_quote($old, '|').'/|', $new.'/', $resource->reference));
+                $r->reference = preg_replace('|^'.preg_quote($old, '|').'/|', $new.'/', $resource->reference);
             }
             if ($r->reference !== '') {
                 $updates = true;
                 $status .= "<li><a href=\"$CFG->wwwroot/mod/resource/view.php?id=$resource->cmid\" target=\"_blank\">$resource->name</a>: $resource->reference ==> $r->reference</li>";
                 if (!empty($CFG->resource_autofilerename)) {
-                    if (!update_record('resource', $r)) {
+                    if (!$DB->update_record('resource', $r)) {
                         print_error("Error updating resource with ID $r->id.");
                     }
                 }
@@ -618,7 +614,7 @@ function resource_renamefiles($course, $wdir, $oldname, $name) {
 }
 
 function resource_delete_warning($course, $files) {
-    global $CFG;
+    global $CFG, $DB;
 
     $found = array();
 
@@ -626,15 +622,15 @@ function resource_delete_warning($course, $files) {
         $files[$key] = trim($file, '/');
     }
     $sql = "SELECT r.id, r.reference, r.name, cm.id AS cmid
-             FROM {$CFG->prefix}resource r,
-                  {$CFG->prefix}course_modules cm,
-                  {$CFG->prefix}modules m
-             WHERE r.course    = '{$course->id}'
-               AND m.name      = 'resource'
-               AND cm.module   = m.id
-               AND cm.instance = r.id
-               AND (r.type = 'file' OR r.type = 'directory')";
-    if ($resources = get_records_sql($sql)) {
+              FROM {resource} r,
+                   {course_modules} cm,
+                   {modules} m
+             WHERE r.course    = ?
+                   AND m.name      = 'resource'
+                   AND cm.module   = m.id
+                   AND cm.instance = r.id
+                   AND (r.type = 'file' OR r.type = 'directory')";
+    if ($resources = $DB->get_records_sql($sql, array($course->id))) {
         foreach ($resources as $resource) {
             if ($resource->reference == '') {
                 continue; // top shared directory does not prevent anything

diff --git a/mod/resource/type/ims/deploy.php b/mod/resource/type/ims/deploy.php
index 9e5426df132ff77b448e91885d997c337524d356..0eb1fd20f5bf53e1200ce87c7e178deb4629fb1a 100644 (file)
--- a/mod/resource/type/ims/deploy.php
+++ b/mod/resource/type/ims/deploy.php
@@ -45,9 +45,9 @@
     $inpopup    = optional_param ('inpopup', 0, PARAM_BOOL);
 
 /// Fetch some records from DB
-    $course   = get_record ('course', 'id', $courseid);
+    $course   = $DB->get_record ('course', array('id'=>$courseid));
     $cm       = get_coursemodule_from_id('resource', $cmid);
-    $resource = get_record ('resource', 'id', $cm->instance);
+    $resource = $DB->get_record ('resource', array('id'=>$cm->instance));
 
 /// Get some needed strings
     $strdeploy = get_string('deploy','resource');
@@ -73,9 +73,9 @@
 
 /// Security Constraints (sesskey and isteacheredit)
     if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
+        print_error('confirmsesskeybad', 'error');
     } else if (!has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $courseid))) {
-        error(get_string('onlyeditingteachers', 'error'));
+        print_error('onlyeditingteachers', 'error');
     }
 
 ///

diff --git a/mod/resource/view.php b/mod/resource/view.php
index 9a344baf71a0a139322763e0a148b92e896e2e7e..455a395641124b94333501e496d08ba4cd9cc938 100644 (file)
--- a/mod/resource/view.php
+++ b/mod/resource/view.php
@@ -7,7 +7,7 @@
     $r  = optional_param('r', 0, PARAM_INT);  // Resource
 
     if ($r) {  // Two ways to specify the resource
-        if (! $resource = get_record('resource', 'id', $r)) {
+        if (! $resource = $DB->get_record('resource', array('id'=>$r))) {
             print_error('Resource ID was incorrect');
         }
 
@@ -20,14 +20,14 @@
             print_error('Course Module ID was incorrect');
         }
 
-        if (! $resource = get_record('resource', 'id', $cm->instance)) {
+        if (! $resource = $DB->get_record('resource', array('id'=>$cm->instance))) {
             print_error('Resource ID was incorrect');
         }
     } else {
         print_error('No valid parameters!!');
     }
 
-    if (! $course = get_record('course', 'id', $cm->course)) {
+    if (! $course = $DB->get_record('course', array('id'=>$cm->course))) {
         print_error('Incorrect course id');
     }