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

diff --git a/mod/chat/gui_header_js/insert.php b/mod/chat/gui_header_js/insert.php
index 384e410fd3af1f44ee7ea27801196b3164686926..62f0dc8147e96aee0c380de1075a9862f1420445 100644 (file)
--- 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
index eca88aea121f04c6e9bde9c003d9a52742dcc659..2b5a2fc4c0ddbdd0c72864e173766dbcee1563f3 100755 (executable)
--- 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
index fc21c0a9e5084f7f880528f96bca45fc8f6b15b9..640ff4b6d78f5db47780fc34b8165ad435ddd62b 100755 (executable)
--- 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
index 6e42ba869a224439e7603fca4f6ba34ac028f78c..fad954c5ff84e5a9afa72b5514193326bda6c896 100644 (file)
--- 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
index 8978492bbe2bbc921afc11073fe999457bcb4728..dee41637397944e72d3b184ecc2830b018c003bd 100644 (file)
--- 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
index 0854b9ec1d2bea54734098eaa20739408f2575a1..b88059b5ce2548df966cfd3edc3af47a8d0a057e 100644 (file)
--- 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
index 114d59984ea68d9c1de33377e117ff7be0ee9eb3..a93d9bd57becf5ad80a6d5fe1179f8aee733a3ea 100644 (file)
--- 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
index a853ecb39f2b0a89848b5a0aaf950567d21ceb08..50cc54044ae2009229d8085c2937b27b670153a3 100644 (file)
--- 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
index 39a602a7cf3417983280b6b3906f8d078661b4a4..681fcfbabcb8453fe93bd37f156d4a531704cb41 100644 (file)
--- 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
index 57bc10d031cf073e0998226c9345045ac5d4affc..314fd3e9d30c4b0afc8d6b64cc0e9c63c7a65004 100644 (file)
--- 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
index 54d22819592654e1e3c0524f845553b307b781fc..6957eb2babe9a085190b1d1be3aabc0acd5d1849 100644 (file)
--- 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
index a7a27eabbb9f623f586d7b662ea470fe5ab9983a..6462000950f0e0263bc6c73d747ced991b7dab22 100644 (file)
--- 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
index 71ec67c2ef0425ec77264b1de63e7c2076fc5435..84103ea508a06bdd19f09e748f202d9e7a4589cb 100644 (file)
--- a/mod/lams/view.php
+++ b/mod/lams/view.php
@@ -21,7 +21,7 @@ if (! $lams = get_record("lams", "id", $cm->instance)) {
     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
index 71bfe5345e7b24c462c4314bb3cc201f9566b4af..be1559a04b1e75f19ee5774725e208729c7da000 100644 (file)
--- 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
index 05899720668a72e1156cb1b1c5f2459443bd7373..a211f78a680277f52c9ac6cb1c4688e6e44bb5af 100644 (file)
--- 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
index 56d9b3724e0df44363991e412467d2c7505e1b04..ac4132b06f1c3762620f3a2122c1f042e9e62a55 100644 (file)
--- 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
index 1ec2803210e199b183965446e5a2249f36c0cc73..d005fb5555c0c5aac4c4c9a244338a1ca56ee109 100644 (file)
--- 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
index fcb7f7daf2687965600dbbe980ff5f7baff12009..33f01a307479fcf965c24d6552d6f0f0b8555d7c 100644 (file)
--- 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
index be32352dc7e28098bf8ec242f9520441cfcdf6d5..ac60642e6d99cb2126cded0cc877409a7a989b96 100644 (file)
--- 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
index 35d5283850cf99d135f59fd7952a07f8db6a57b1..df8ad8c3197797b13312e976cd7eeabc997adb7a 100644 (file)
--- 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);