MDL-15787 Using hidden feedbacks on front page

diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index 849dde239eb3182c847a2274ad11e67b6ac96b91..bbc5fe57b987070f142c6593fdfd148148c1f867 100644 (file)
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -51,7 +51,21 @@
     }
     $capabilities = feedback_load_capabilities($cm->id);
 
-    require_login($course->id, true, $cm);
+    if($course->id == SITEID) {
+        require_login($course->id, true);
+    }else{
+        require_login($course->id, true, $cm);
+    }
+
+    //check whether the given courseid exists
+    if($courseid AND $courseid != SITEID) {
+        if($course2 = $DB->get_record('course', array('id'=>$courseid))){
+            require_course_login($course2); //this overwrites the object $course :-(
+            $course = $DB->get_record("course", array("id"=>$cm->course)); // the workaround
+        }else {
+            error("courseid is not correct");
+        }
+    }
 
     if( !( ((intval($feedback->publish_stats) == 1) AND $capabilities->viewanalysepage) || $capabilities->viewreports)) {
         error(get_string('error'));

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 0b1505cea8cf9ea0fb341a36422977ba34a52d5f..6a0abc82606797c1e33307b4f9202309d27843ad 100644 (file)
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -90,7 +90,11 @@
     }
         
     if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
-        require_login($course->id, true, $cm);
+        if($course->id == SITEID) {
+            require_login($course->id, true);
+        }else {
+            require_login($course->id, true, $cm);
+        }
     } else {
         if($course->id == SITEID) {
             require_course_login($course, true);
@@ -98,15 +102,6 @@
             require_course_login($course, true, $cm);
         }
     }
-    // if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
-        // require_login($course->id, true, $cm);
-        // if(isguestuser()) {
-            // error(get_string('guestsno'), $CFG->wwwroot);
-            // exit;
-        // }
-    // } else {
-        // require_course_login($course, true, $cm);
-    // }
     
     //check whether the given courseid exists
     if($courseid AND $courseid != SITEID) {

diff --git a/mod/feedback/version.php b/mod/feedback/version.php
index 935256ffd0f7013399fecd615c76feb7262f8f86..99f2f59e1eb570830b9cd6fbc0b69cc7255994fe 100644 (file)
--- a/mod/feedback/version.php
+++ b/mod/feedback/version.php
@@ -10,7 +10,7 @@
 */
 
    
-    $module->version = 2008072401; // The current module version (Date: YYYYMMDDXX)
+    $module->version = 2008073001; // The current module version (Date: YYYYMMDDXX)
     $module->requires = 2008072401;  // Requires this Moodle version
     $feedback_version_intern = 1; //this version is used for restore older backups
     $module->cron = 0; // Period for cron to check this module (secs)

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index d0fef324adbc8d15533756dfcc027da10793217a..e7930336e6b7501196fcf382a60ff7b6dd1427cd 100644 (file)
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -51,7 +51,11 @@
     }
     
     if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
-        require_login($course->id, true, $cm);
+        if($course->id == SITEID) {
+            require_login($course->id, true);
+        }else {
+            require_login($course->id, true, $cm);
+        }
     } else {
         if($course->id == SITEID) {
             require_course_login($course, true);