MDL-7821 wrong use of cm in data mod and added proper require_login()

diff --git a/mod/data/comment.php b/mod/data/comment.php
index eafcf2e2e50609845f386de7e018d7b45b318a19..8b359ad0a59915983fdba8caabd720d0df23ae79 100755 (executable)
--- a/mod/data/comment.php
+++ b/mod/data/comment.php
@@ -24,10 +24,12 @@
     if (! $course = get_record('course', 'id', $data->course)) {
         error('Course is misconfigured');
     }
+    if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
+        error('Course Module ID was incorrect');
+    }
 
-    require_login($course->id);
+    require_login($course->id, false, $cm);
     
-    $cm = data_get_cm($data);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     
     if ($commentid) {
@@ -111,7 +113,7 @@
         
         default:    //print all listing, and add comment form
             print_header();
-            data_print_comments($data, $record, $search, $template, $sort, $page, $rid, $order, $group);
+            data_print_comments($data, $record, $page);
             print_footer();
         break;
         

diff --git a/mod/data/edit.php b/mod/data/edit.php
index a863de4aafd47561b5d33023d2fc1e2df99c926e..83895d07ea1acae70389ec720415657b572133fc 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -56,7 +56,7 @@
         }
     }
     
-    require_course_login($course, false, $cm);
+    require_login($course->id, false, $cm);
     
     if (!isloggedin() or isguest()) {
         redirect('view.php?d='.$data->id);

diff --git a/mod/data/field.php b/mod/data/field.php
index dda2bf2abc9efac753d0d2e6b6463bf72730e726..bbfedcd2f58a2254d06cfcdba2b51b1aa72d7476 100755 (executable)
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -41,7 +41,7 @@
     
     
     if ($id) {
-        if (! $cm = get_record('course_modules', 'id', $id)) {
+        if (! $cm = get_coursemodule_from_id('data', $id)) {
             error('Course Module ID was incorrect');
         }
         if (! $course = get_record('course', 'id', $cm->course)) {
@@ -63,7 +63,7 @@
         }
     }
 
-    require_course_login($course, true, $cm);
+    require_login($course->id, true, $cm);
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/data:managetemplates', $context);

diff --git a/mod/data/lib.php b/mod/data/lib.php
index f19da82ed70dc1894c50060359d093b7d0f1481f..8a0d2a0ea46f03bc66acd132eb0932e5aa24d3a9 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -546,7 +546,7 @@ function data_numentries($data){
 function data_add_record($data, $groupid=0){
     global $USER;
 
-    $cm = data_get_cm($data);
+    $cm = get_coursemodule_from_instance('data', $data->id);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     $record->userid = $USER->id;
@@ -811,7 +811,7 @@ function data_get_coursemodule_info($coursemodule) {
 function data_print_template($template, $records, $data, $search='',$page=0, $return=false) {
     global $CFG;
 
-    $cm = data_get_cm($data);
+    $cm = get_coursemodule_from_instance('data', $data->id);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     static $fields = NULL;
@@ -963,7 +963,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
 function data_print_ratings($data, $record) {
     global $USER;
 
-    $cm = data_get_cm($data);
+    $cm = get_coursemodule_from_instance('data', $data->id);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     $ratingsmenuused = false;
@@ -1136,7 +1136,7 @@ function data_print_comment($data, $comment, $page=0) {
 
     global $USER, $CFG;
 
-    $cm = data_get_cm($data);
+    $cm = get_coursemodule_from_instance('data', $data->id);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     $stredit = get_string('edit');
@@ -1225,17 +1225,6 @@ function data_convert_arrays_to_strings(&$fieldinput) {
     }
 }
 
-// returns the $cm given $data
-function data_get_cm($data) {
-    global $CFG, $course;
-    $datamod = get_record('modules', 'name', 'data');
-    $SQL = "select * from {$CFG->prefix}course_modules
-            where course = $course->id and
-            module = $datamod->id and
-            instance = $data->id";
-    return get_record_sql($SQL);
-}
-
 
 /**
  * Converts a database (module instance) to use the Roles System

diff --git a/mod/data/preset.php b/mod/data/preset.php
index 1ebc1651ffc82e6699c40712fa11bafb28bb28a1..eec50c0eb12f9257f7556ea9c8e4ff963c20b6af 100644 (file)
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -19,8 +19,8 @@ $shortname  = optional_param('shortname', '', PARAM_FILE); // directory the pres
 $file       = optional_param('file', '', PARAM_FILE); // uploaded file
 
 if ($id) {
-    if (! $cm = get_record('course_modules', 'id', $id)) {
-        error('Course Module ID Incorrect');
+    if (! $cm = get_coursemodule_from_id('data', $id)) {
+        error('Course Module ID was incorrect');
     }
     if (! $course = get_record('course', 'id', $cm->course)) {
         error('Course is misconfigured');
@@ -46,7 +46,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) {
     error('Could not find context');
 }
 
-require_login($course->id);
+require_login($course->id, false, $cm);
 
 require_capability('mod/data:managetemplates', $context);
 

diff --git a/mod/data/tabs.php b/mod/data/tabs.php
index ea1ace0824f8e80f8437ead0106df596adc5b45d..38b67f2f4b3223a46556c376211dc8ce139c9d16 100755 (executable)
--- a/mod/data/tabs.php
+++ b/mod/data/tabs.php
@@ -29,7 +29,6 @@
         error('You cannot call this script in that way');
     }
     
-    $cm = data_get_cm($data);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     $inactive = NULL;

diff --git a/mod/data/templates.php b/mod/data/templates.php
index bc4cfe3d27e81329ee2ff1a8c040f6566704174d..11e24e4583ff1ef34fff964674b3baef10db2c28 100755 (executable)
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -33,7 +33,7 @@
     $mode  = optional_param('mode', 'singletemplate', PARAM_ALPHA);
 
     if ($id) {
-        if (! $cm = get_record('course_modules', 'id', $id)) {
+        if (! $cm = get_coursemodule_from_id('data', $id)) {
             error('Course Module ID was incorrect');
         }
         if (! $course = get_record('course', 'id', $cm->course)) {
@@ -55,7 +55,8 @@
         }
     }
 
-    require_course_login($course, true, $cm);
+    require_login($course->id, false, $cm);
+
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/data:managetemplates', $context);