MDL-10353, adding couse variable to nav bar in calendar preferences

ragusa87 · Oct 15, 2007 · 9ba7679 · 9ba7679
1 parent 9458576
commit 9ba7679
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/calendar/export.php b/calendar/export.php
@@ -9,7 +9,9 @@
 $day  = optional_param('cal_d', 0, PARAM_INT);
 $mon  = optional_param('cal_m', 0, PARAM_INT);
 $yr   = optional_param('cal_y', 0, PARAM_INT);
-$courseid = optional_param('course', 0, PARAM_INT);
+if ($courseid = optional_param('course', 0, PARAM_INT)) {
+    $course = get_record('course', 'id', $courseid); 
+}
 
 require_login();
 
@@ -24,6 +26,11 @@
 $navlinks = array();
 $now = usergetdate(time());
 
+if ($course->id != SITEID) {
+    $navlinks[] = array('name' => $course->shortname,
+                        'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
+                        'type' => 'misc');
+}
 $navlinks[] = array('name' => get_string('calendar', 'calendar'),
                     'link' =>calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&amp;course='.$course.'&amp;',
                                                     $now['mday'], $now['mon'], $now['year']),

diff --git a/calendar/lib.php b/calendar/lib.php
@@ -514,7 +514,11 @@ function calendar_print_event($event) {
 
     echo '</td></tr>';
     echo '<tr><td class="side">&nbsp;</td>';
-    echo '<td class="description '.$event->cssclass.'">';
+    if (isset($event->cssclass)) {
+        echo '<td class="description '.$event->cssclass.'">';
+    } else {
+        echo '<td class="description">'; 
+    }
     echo format_text($event->description, FORMAT_HTML);
     if (calendar_edit_event_allowed($event)) {
         echo '<div class="commands">';

diff --git a/calendar/view.php b/calendar/view.php
@@ -165,7 +165,7 @@
 
     //Link to calendar export page
     echo '<div class="bottom">';
-    print_single_button('export.php', false, get_string('exportcalendar', 'calendar'));
+    print_single_button('export.php', array('course'=>$courseid), get_string('exportcalendar', 'calendar'));
 
     if (!empty($USER->id)) {
         $authtoken = sha1($USER->username . $USER->password);