MDL-10890 all require_login() in modules reviewed and fixed use of $cm

janschrage · Aug 17, 2007 · bb5b722 · bb5b722
1 parent a104deb
commit bb5b722
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 21 deletions.
diff --git a/mod/chat/gui_header_js/insert.php b/mod/chat/gui_header_js/insert.php
@@ -18,7 +18,11 @@
         error('Could not find the course this belongs to!');
     }
 
-    require_login($course->id);
+    if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) {
+        error('Course Module ID was incorrect');
+    }
+
+    require_login($course->id, false, $cm);
 
     if (isguest()) {
         error('Guest does not have access to chat rooms');

diff --git a/mod/data/import.php b/mod/data/import.php
@@ -57,6 +57,8 @@
         }
     }
 
+    require_login($course, false, $cm);
+
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/data:uploadentries', $context);
 

diff --git a/mod/data/templates.php b/mod/data/templates.php
@@ -26,8 +26,6 @@
     require_once('lib.php');
     require_once($CFG->libdir.'/blocklib.php');
 
-    require_login();
-
     $id    = optional_param('id', 0, PARAM_INT);  // course module id
     $d     = optional_param('d', 0, PARAM_INT);   // database id
     $mode  = optional_param('mode', 'singletemplate', PARAM_ALPHA);

diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
@@ -39,7 +39,7 @@
         }
     }
 
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/glossary:managecategories', $context);

diff --git a/mod/glossary/export.php b/mod/glossary/export.php
@@ -21,7 +21,7 @@
         error("Course module is incorrect");
     }
 
-    require_login($course->id, false);  
+    require_login($course->id, false, $cm);  
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/glossary:export', $context);

diff --git a/mod/glossary/exportfile.php b/mod/glossary/exportfile.php
@@ -23,7 +23,7 @@
         error("Course module is incorrect");
     }
 
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/glossary:export', $context);

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
@@ -27,7 +27,7 @@
         error("Course module is incorrect");
     }
 
-    require_login($course->id, false);  
+    require_login($course->id, false, $cm);  
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/glossary:import', $context);

diff --git a/mod/hotpot/attempt.php b/mod/hotpot/attempt.php
@@ -22,7 +22,7 @@
     }
 
     // make sure this user is enrolled in this course
-    require_login($course->id);
+    require_login($course, true, $cm);
 
     $next_url = "$CFG->wwwroot/course/view.php?id=$course->id";
     $time = time();

diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
@@ -38,7 +38,7 @@
     // set homeurl of couse (for error messages)
     $course_homeurl = "$CFG->wwwroot/course/view.php?id=$course->id";
 
-    require_login($course->id);
+    require_login($course, true, $cm);
 
     // get report mode
     if (has_capability('mod/hotpot:viewreport',$modulecontext)) {

diff --git a/mod/hotpot/review.php b/mod/hotpot/review.php
@@ -31,9 +31,10 @@
     if (! $attempt = get_record("hotpot_attempts", "id", $attempt)) {
         error("Attempt ID was incorrect");
     }
+
+    require_login($course, true, $cm);
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-    require_login($course->id);
     if (!has_capability('mod/hotpot:viewreport',$context)) {
         if (!$hotpot->review) {
             error(get_string("noreview", "quiz"));

diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php
@@ -34,7 +34,7 @@
             }
 
         }
-        require_login($course->id);
+        require_login($course, true, $cm);
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     }
     // set nextpage (for error messages)

diff --git a/mod/journal/report.php b/mod/journal/report.php
@@ -13,7 +13,7 @@
         error("Course module is misconfigured");
     }
 
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
 
     if (!isteacher($course->id)) {
         error("Only teachers can look at this page");

diff --git a/mod/lams/view.php b/mod/lams/view.php
@@ -21,7 +21,7 @@
     error("Course module is incorrect");
 }
 
-require_login($course->id);
+require_login($course, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
 add_to_log($course->id, "lams", "view", "view.php?id=$cm->id", "$lams->id");

diff --git a/mod/lesson/import.php b/mod/lesson/import.php
@@ -28,7 +28,7 @@
     }
 
 
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/lesson:edit', $context);
 

diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
@@ -37,7 +37,7 @@
         error("Course module is incorrect");
     }
 
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/lesson:edit', $context);
 

diff --git a/mod/lesson/report.php b/mod/lesson/report.php
@@ -28,7 +28,7 @@
     }
 
 // make sure people are where they should be
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/lesson:manage', $context);
 

diff --git a/mod/quiz/comment.php b/mod/quiz/comment.php
@@ -28,9 +28,9 @@
         error('Attempt has not closed yet');
     }
 
-    require_login($course->id);
-
     $cm = get_coursemodule_from_instance('quiz', $quiz->id);
+    require_login($course, true, $cm);
+
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     require_capability('mod/quiz:grade', $context);

diff --git a/mod/quiz/report.php b/mod/quiz/report.php
@@ -35,7 +35,7 @@
         }
     }
 
-    require_login($course->id, false);
+    require_login($course, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/quiz:viewreports', $context);
 

diff --git a/mod/survey/download.php b/mod/survey/download.php
@@ -16,7 +16,7 @@
         error("Course is misconfigured");
     }
 
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
     require_capability('mod/survey:download', get_context_instance(CONTEXT_MODULE, $cm->id)) ;
 
     if (! $survey = get_record("survey", "id", $cm->instance)) {

diff --git a/mod/survey/report.php b/mod/survey/report.php
@@ -23,7 +23,7 @@
         error("Course is misconfigured");
     }
 
-    require_login($course->id, false);
+    require_login($course->id, false, $cm);
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,8 @@ @@
             }
         }
+        require_login($course, false, $cm);
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
         require_capability('mod/data:uploadentries', $context);
@@ Expand Down @@