Preliminary fix for bug 1451 (needs some more work).

Also a couple of notices removed.

diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index 1e4540261c5eb754e6cad68186329082dcd22f5e..4be9cf69fcec18af511a026a82564c842bd1c29f 100644 (file)
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -21,7 +21,7 @@ class CourseBlock_calendar_upcoming extends MoodleBlock {
 
         $this->content = New object;
         $this->content->text = '';
-        $this->content->footer = '<br /><a href="'.$CFG->wwwroot.'/calendar/view.php?view=upcoming">'.get_string('gotocalendar', 'calendar').'</a>...';
+        $this->content->footer = '<br /><a href="'.$CFG->wwwroot.'/calendar/view.php?view=upcoming&amp;course='.$this->course->id.'">'.get_string('gotocalendar', 'calendar').'</a>...';
         $this->content->footer .= '<br /><a href="'.$CFG->wwwroot.'/calendar/event.php?action=new">'.get_string('newevent', 'calendar').'</a>...';
 
         if($this->course === NULL) {

diff --git a/calendar/lib.php b/calendar/lib.php
index f176cb9b24560832e6ed05ee6391624f0d19f31a..d6a3218234462468c4fd35c6106c72b03e1dacf2 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -530,7 +530,7 @@ function calendar_top_controls($type, $data) {
             $prevlink = calendar_get_link_tag('<<', 'view.php?id='.$data['id'].'&', 0, $prevmonth, $prevyear);
             $content .= '<table class="generaltable" style="width: 100%;"><tr>';
             $content .= '<td style="text-align: left; width: 12%;">'.$prevlink."</td>\n";
-            $content .= '<td style="text-align: center;"><a href="'.calendar_get_link_href(CALENDAR_URL.'view.php?view=month&amp;', 1, $data['m'], $data['y']).'">'.strftime(get_string('strftimemonthyear'), $time)."</a></td>\n";
+            $content .= '<td style="text-align: center;"><a href="'.calendar_get_link_href(CALENDAR_URL.'view.php?view=month&amp;course='.$data['id'].'&amp;', 1, $data['m'], $data['y']).'">'.strftime(get_string('strftimemonthyear'), $time)."</a></td>\n";
             $content .= '<td style="text-align: right; width: 12%;">'.$nextlink."</td>\n";
             $content .= '</tr></table>';
         break;

diff --git a/calendar/view.php b/calendar/view.php
index 9f6dfc3f1b91c9a444fbe6ae16665fb6b47a596e..71340197249a3c2078db6d06fe783e6db0d11cba 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -47,6 +47,7 @@
     require_login();
 
     optional_variable($_GET['view'], 'upcoming');
+    optional_variable($_GET['course'], 0);
     optional_variable($_GET['cal_d']);
     optional_variable($_GET['cal_m']);
     optional_variable($_GET['cal_y']);
@@ -90,6 +91,13 @@
         break;
     }
 
+    // If a course has been supplied in the URL, change the filters to show that one
+    if(!empty($_GET['course'])) {
+        if(is_numeric($_GET['course']) && $_GET['course'] > 0 && record_exists('course', 'id', $_GET['course'])) {
+            $SESSION->cal_courses_shown = $_GET['course'];
+        }
+    }
+
     if(isguest($USER->id)) {
         $defaultcourses = calendar_get_default_courses();
         calendar_set_filters($courses, $groups, $users, $defaultcourses, $defaultcourses);
@@ -211,7 +219,7 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) {
         foreach ($events as $event) {
             if ($event->timestart >= $starttime && $event->timestart <= $endtime) {  // Print it now
                 unset($event->time);
-                calendar_print_event($event);  
+                calendar_print_event($event);
 
             } else {                                                                 // Save this for later
                 $underway[] = $event;
@@ -222,7 +230,7 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) {
         if (!empty($underway)) {
             echo '<p style="text-align: center;"><strong>'.get_string('spanningevents', 'calendar').':</strong></p>';
             foreach ($underway as $event) {
-                calendar_print_event($event);  
+                calendar_print_event($event);
             }
         }
     }
@@ -494,8 +502,10 @@ function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $
         $text = '<div style="float: left;">'.get_string('upcomingevents', 'calendar').': '.calendar_course_filter_selector('from=upcoming').'</div><div style="float: right;">';
         $text.= '<form style="display: inline;" action="'.CALENDAR_URL.'event.php" method="get">';
         $text.= '<input type="hidden" name="action" value="new" />';
+        /*
         $text.= '<input type="hidden" name="cal_m" value="'.$m.'" />';
         $text.= '<input type="hidden" name="cal_y" value="'.$y.'" />';
+        */
         $text.= '<input type="submit" value="'.get_string('newevent', 'calendar').'" />';
         $text.= '</form></div>';
     }
@@ -558,11 +568,11 @@ function calendar_print_event($event) {
             $editlink   = "$CFG->wwwroot/mod/$event->modulename/view.php?id=$event->cmid";
             $deletelink = "$CFG->wwwroot/course/mod.php?delete=$event->cmid";
         }
-        echo ' <a href="'.$editlink.'"><img 
-                  src="'.$CFG->pixpath.'/t/edit.gif" alt="'.get_string('tt_editevent', 'calendar').'" 
+        echo ' <a href="'.$editlink.'"><img
+                  src="'.$CFG->pixpath.'/t/edit.gif" alt="'.get_string('tt_editevent', 'calendar').'"
                   title="'.get_string('tt_editevent', 'calendar').'" /></a>';
-        echo ' <a href="'.$deletelink.'"><img 
-                  src="'.$CFG->pixpath.'/t/delete.gif" alt="'.get_string('tt_deleteevent', 'calendar').'" 
+        echo ' <a href="'.$deletelink.'"><img
+                  src="'.$CFG->pixpath.'/t/delete.gif" alt="'.get_string('tt_deleteevent', 'calendar').'"
                   title="'.get_string('tt_deleteevent', 'calendar').'" /></a>';
         echo '</div>';
     }
@@ -598,7 +608,7 @@ function calendar_course_filter_selector($getvars = '') {
         $selected = '';
     }
 
-    $form = popup_form(CALENDAR_URL.'set.php?var=setcourse&amp;'.$getvars.'&amp;id=', 
+    $form = popup_form(CALENDAR_URL.'set.php?var=setcourse&amp;'.$getvars.'&amp;id=',
                        $courseoptions, 'cal_course_flt', $selected, '', '', '', true);
 
     return str_replace('<form', '<form style="display: inline;"', $form);