Fix for bug 1503:

Things are now easier for visitors and guests. We should do some regression
testing though: if you are a visitor or a guest and then you login (either
after browsing the site or immediately by typing a Moodle URL in the location
bar, without having a Moodle session at all), do user events always get shown
correctly? Does anything abnormal happen to the courses filter?

diff --git a/calendar/lib.php b/calendar/lib.php
index 1288ff0b473c5b44ac9c9ba8f1297d22742dc0b2..349ad27cd5e8941f57ab7eb2a1a75c326f0d1983 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -451,7 +451,6 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
     if(is_bool($users) && is_bool($groups) && is_bool($courses)) {
         return false;
     }
-
     if(is_array($users) && !empty($users)) {
         // Events from a number of users
         if(!empty($whereclause)) $whereclause .= ' OR';
@@ -467,6 +466,13 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
         if(!empty($whereclause)) $whereclause .= ' OR';
         $whereclause .= ' userid != 0 AND courseid = 0 AND groupid = 0';
     }
+    else if($users === false) {
+        // No user at all
+        if(!empty($whereclause)) {
+            $whereclause .= ' OR';
+        }
+        $whereclause .= ' 0';
+    }
     if(is_array($groups) && !empty($groups)) {
         // Events from a number of groups
         if(!empty($whereclause)) $whereclause .= ' OR';
@@ -482,10 +488,21 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
         if(!empty($whereclause)) $whereclause .= ' OR ';
         $whereclause .= ' groupid != 0';
     }
-    if(is_array($courses) && !empty($courses)) {
-        // A number of courses
-        if(!empty($whereclause)) $whereclause .= ' OR';
-        $whereclause .= ' groupid = 0 AND courseid IN ('.implode(',', $courses).')';
+    if(is_array($courses)) {
+        // A number of courses (maybe none at all!)
+        if(!empty($courses)) {
+            if(!empty($whereclause)) {
+                $whereclause .= ' OR';
+            }
+            $whereclause .= ' groupid = 0 AND courseid IN ('.implode(',', $courses).')';
+        }
+        else {
+            // This means NO courses, not that we don't care!
+            if(!empty($whereclause)) {
+                $whereclause .= ' OR';
+            }
+            $whereclause .= ' 0';
+        }
     }
     else if(is_numeric($courses)) {
         // One course
@@ -517,6 +534,7 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
         // Just basic time filtering
         $whereclause = $timeclause;
     }
+
     return $whereclause;
 }
 
@@ -639,7 +657,7 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL) {
         $content .= '<td style="width: 8px;"></td><td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_showcourse', 'calendar').'">'.get_string('courseevents', 'calendar').'</a></td>'."\n";
     }
 
-    if(!isguest($USER->id)) {
+    if(!empty($USER) && !isguest($USER->id)) {
         $content .= "</tr>\n<tr>";
 
         if($groupevents) {
@@ -1032,6 +1050,10 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
 function calendar_edit_event_allowed($event) {
     global $USER;
 
+    if(empty($USER) || isguest($USER->id)) {
+        return false;
+    }
+
     if (isadmin($USER->id)) return true; // Admins are allowed anything
 
     if ($event->courseid > 1) {
@@ -1128,7 +1150,7 @@ function calendar_preferences_button() {
     global $CFG, $USER;
 
     // Guests have no preferences
-    if (empty($USER->id) or isguest()) {
+    if (empty($USER->id) || isguest()) {
         return '';
     }
 

diff --git a/calendar/set.php b/calendar/set.php
index 066fa0ce16b73e9c85f9d075ad35f1eb51e4696f..78d40f5bd86be25213486af3430c55bfc0110a7c 100644 (file)
--- a/calendar/set.php
+++ b/calendar/set.php
@@ -41,8 +41,6 @@
     require_once('../config.php');
     require_once('lib.php');
 
-    require_login();
-
     require_variable($_GET['from']);
     require_variable($_GET['var']);
     optional_variable($_GET['value']);

diff --git a/calendar/view.php b/calendar/view.php
index d91050e8911bd7a806ef2c534b6209c844cfda50..eb6042c5867eff9b409cae546f98be8952eacb40 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -42,9 +42,6 @@
 
     require_once('../config.php');
     require_once('../course/lib.php');
-
-    require_login();
-
     require_once('lib.php');
 
     optional_variable($_GET['view'], 'upcoming');
@@ -108,7 +105,7 @@
         }
     }
 
-    if(isguest($USER->id)) {
+    if(empty($USER) || isguest($USER->id)) {
         $defaultcourses = calendar_get_default_courses();
         calendar_set_filters($courses, $groups, $users, $defaultcourses, $defaultcourses);
     }
@@ -200,7 +197,7 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) {
     $events = calendar_get_upcoming($courses, $groups, $users, 1, 100, $starttime);
 
     // New event button
-    if (isguest()) {
+    if (empty($USER) || isguest()) {
         $text = get_string('dayview', 'calendar').': '.calendar_course_filter_selector($getvars);
 
     } else {
@@ -311,7 +308,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
     calendar_events_by_day($events, $display->tstart, $eventsbyday, $durationbyday, $typesbyday);
 
     // New event button
-    if(isguest()) {
+    if(empty($USER) || isguest()) {
         $text = get_string('detailedmonthview', 'calendar').': '.calendar_course_filter_selector($getvars);
     }
     else {
@@ -474,7 +471,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
 
     echo "</tr>\n";
 
-    if(!isguest($USER->id)) {
+    if(!empty($USER) && !isguest($USER->id)) {
         echo '<tr>';
         // Group events
         if($SESSION->cal_show_groups) {
@@ -506,7 +503,7 @@ function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $
     $events = calendar_get_upcoming($courses, $groups, $users, $futuredays, $maxevents);
 
     // New event button
-    if(isguest()) {
+    if(empty($USER) || isguest()) {
         $text = get_string('upcomingevents', 'calendar').': '.calendar_course_filter_selector('from=upcoming');
 
     } else {
@@ -592,7 +589,7 @@ function calendar_print_event($event) {
 function calendar_course_filter_selector($getvars = '') {
     global $USER, $SESSION;
 
-    if (isguest($USER->id)) {
+    if (empty($USER) || isguest($USER->id)) {
         return '';
     }