Fixed a whole bunch of warnings and minor bugs, which all shared a common cause:

The preferences screens weren't handling filter changes correctly.

diff --git a/calendar/lib.php b/calendar/lib.php
index 9a6ce1ae1a1221d198e8af392b640c2805a37f74..0edc01ad7727d6796fc6607f6e817b5c05afe5db 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -567,6 +567,9 @@ function calendar_filter_controls($type) {
         case 'upcoming':
             $getvars = '';
         break;
+        case 'prefs':
+            $getvars = '&from=prefs&pref='.$_GET['edit'];
+        break;
         case 'event':
             global $day, $mon, $yr;
             $getvars = '&from=event&id='.$_GET['id'];

diff --git a/calendar/preferences.php b/calendar/preferences.php
index 5cc3d5f16e4afe111d679deec6ea37db5addb9ed..16b525d35db5d43decb2a1048bdb68a0e0829675 100644 (file)
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -258,7 +258,7 @@
     list($prevmon, $prevyr) = calendar_sub_month($mon, $yr);
     list($nextmon, $nextyr) = calendar_add_month($mon, $yr);
 
-    echo calendar_filter_controls($_GET['view']);
+    echo calendar_filter_controls('prefs');
     echo '<p>';
     echo calendar_top_controls('display', array('m' => $prevmon, 'y' => $prevyr));
     echo calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);

diff --git a/calendar/set.php b/calendar/set.php
index bf4af681528858b645d627434b0d81db9feadae9..709b40aa00d61fba422447418e86010c2df63e30 100644 (file)
--- a/calendar/set.php
+++ b/calendar/set.php
@@ -89,8 +89,11 @@
        }
 
        switch($_GET['from']) {
+           case 'prefs':
+           redirect($CFG->wwwroot.'/calendar/preferences.php?edit='.$_GET['pref']);
+           break;
                case 'month':
-       redirect($CFG->wwwroot.'/calendar/view.php?view=month&cal_d='.$_GET['cal_d'].'&cal_m='.$_GET['cal_m'].'&cal_y='.$_GET['cal_y']);
+           redirect($CFG->wwwroot.'/calendar/view.php?view=month&cal_d='.$_GET['cal_d'].'&cal_m='.$_GET['cal_m'].'&cal_y='.$_GET['cal_y']);
                break;
                case 'upcoming':
                redirect($CFG->wwwroot.'/calendar/view.php?view=upcoming&cal_d='.$_GET['cal_d'].'&cal_m='.$_GET['cal_m'].'&cal_y='.$_GET['cal_y']);