'.$events[$i]->icon.' ';
- if (!empty($events[$i]->icon)) {
+ if (!empty($events[$i]->referer)) {
// That's an activity event, so let's provide the hyperlink
$content .= $events[$i]->referer;
} else {
@@ -901,6 +890,9 @@ function calendar_session_vars() {
if(!isset($SESSION->cal_show_user)) {
$SESSION->cal_show_user = $USER->id;
}
+ if(empty($SESSION->cal_courses_shown)) {
+ $SESSION->cal_courses_shown = calendar_get_default_courses(true);
+ }
}
function calendar_overlib_html() {
@@ -913,143 +905,43 @@ function calendar_overlib_html() {
return $html;
}
-// OBSOLETE, now that we have the blocks system in place.
-// Keeping it for a few revisions, just in case.
-/*
-function calendar_print_side_blocks($forcecourse = NULL) {
- // WARNING: Keep in mind that using $forcecourse will override the $SESSION
- // filters, and thus not respect the user's filter settings. Use it sparingly.
-
- global $USER, $CFG, $SESSION, $course;
- optional_variable($_GET['cal_m']);
- optional_variable($_GET['cal_y']);
-
- calendar_session_vars();
-
- if(is_int($forcecourse)) {
- // Overrides the course to use
- $courseshown = $forcecourse;
- $defaultcourses = array($courseshown => 1);
- }
- else if($forcecourse === false) {
- // Overrides: use no course at all
- $courseshown = false;
- $defaultcourses = NULL;
- }
- else {
- // Normal behavior: use displayed course, or front page if no course
- $courseshown = ($course === NULL) ? 1 : $course->id;
- $defaultcourses = array($courseshown => 1);
- }
-
- // I 'm not really sure if this belongs here...
- calendar_set_referring_course($courseshown);
-
- if($courseshown !== false && is_int($SESSION->cal_show_course) && $SESSION->cal_show_course != $courseshown) {
- // There is a filter in action that shows events from a course other than the current
- // Obviously we have to cut it out
- $SESSION->cal_show_course = true;
- }
- else if($courseshown !== false && is_array($SESSION->cal_show_course) && !in_array($courseshown, $SESSION->cal_show_course)) {
- // Same as above, only there are many courses being shown. Unfortunately, not this one.
- $SESSION->cal_show_course = true;
- }
-
- // Be VERY careful with the format for default courses arguments!
- // Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions.
-
- calendar_set_filters($courses, $group, $user, $defaultcourses, $defaultcourses);
-
- if(get_user_preferences('calendar_showmonth', true)) {
- if($courseshown == 1) {
- // For the front page
- echo calendar_overlib_html();
- print_side_block_start(get_string('calendar', 'calendar'));
- echo calendar_top_controls('frontpage', array('m' => $_GET['cal_m'], 'y' => $_GET['cal_y']));
- echo calendar_get_mini($courses, $group, $user, $_GET['cal_m'], $_GET['cal_y']);
- // No filters for now
- print_side_block_end();
- }
- else {
- // For any other course
- echo calendar_overlib_html();
- print_side_block_start(get_string('calendar', 'calendar'));
- echo calendar_top_controls('course', array('id' => $courseshown, 'm' => $_GET['cal_m'], 'y' => $_GET['cal_y']));
- echo calendar_get_mini($courses, $group, $user, $_GET['cal_m'], $_GET['cal_y']);
- echo calendar_filter_controls('course');
- print_side_block_end();
- }
- }
- if(get_user_preferences('calendar_showupcoming', true)) {
- $block = calendar_get_sideblock_upcoming($courses, $group, $user, get_user_preferences('calendar_lookahead', CALENDAR_UPCOMING_DAYS), get_user_preferences('calendar_maxevents', CALENDAR_UPCOMING_MAXEVENTS));
- if(!empty($block)) {
- print_side_block_start(get_string('upcomingevents', 'calendar'));
- echo $block;
- print_side_block_end();
- }
- }
-}
-*/
-
function calendar_set_referring_course($courseid) {
global $SESSION;
$SESSION->cal_course_referer = intval($courseid);
}
-function calendar_set_filters(&$courses, &$group, &$user, $defaultcourses = NULL, $groupcourses = NULL) {
+function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NULL, $groupeventsfrom = NULL, $ignorefilters = false) {
global $SESSION, $USER;
- // WARNING: When calling this function, be VERY careful with the format for default courses arguments!
- // Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions.
-
- // Insidious bug-wannabe: setting $SESSION->cal_show_course to $course->id would cause
+ // Insidious bug-wannabe: setting $SESSION->cal_courses_shown to $course->id would cause
// the code to function incorrectly UNLESS we convert it to an integer. One case where
// PHP's loose type system works against us.
- if(is_string($SESSION->cal_show_course)) {
- $SESSION->cal_show_course = intval($SESSION->cal_show_course);
+ if(is_string($SESSION->cal_courses_shown)) {
+ $SESSION->cal_courses_shown = intval($SESSION->cal_courses_shown);
}
- $showcourse = (
- (is_int($SESSION->cal_show_course) && $SESSION->cal_show_course) ||
- (is_array($SESSION->cal_show_course) && count($SESSION->cal_show_course)) ||
- ($SESSION->cal_show_course === true)
- );
-
- if($defaultcourses === NULL) {
- $defaultcourses = array();
+ if($courseeventsfrom === NULL) {
+ $courseeventsfrom = $SESSION->cal_courses_shown;
}
- if($groupcourses === NULL) {
- $groupcourses = array();
+ if($groupeventsfrom === NULL) {
+ $groupeventsfrom = $SESSION->cal_courses_shown;
}
- if(is_array($defaultcourses) && array_key_exists(1, $defaultcourses)) {
- // This should never happen, so let's be sure just in case
- $defaultcourses = array_diff_assoc($defaultcourses, array(1 => 1));
- }
-
- if($showcourse && $SESSION->cal_show_global) {
- if(is_int($SESSION->cal_show_course)) {
- $courses = array(1, $SESSION->cal_show_course);
+ if(($SESSION->cal_show_course && $SESSION->cal_show_global) || $ignorefilters) {
+ if(is_int($courseeventsfrom)) {
+ $courses = array(1, $courseeventsfrom);
}
- else if(is_array($SESSION->cal_show_course)) {
- $courses = array(1) + $SESSION->cal_show_course;
-
- }
- else {
- $courses = array_keys($defaultcourses);
+ else if(is_array($courseeventsfrom)) {
+ $courses = array_keys($courseeventsfrom);
$courses[] = 1;
}
}
- else if($showcourse) {
- if(is_int($SESSION->cal_show_course)) {
- $courses = array($SESSION->cal_show_course);
+ else if($SESSION->cal_show_course) {
+ if(is_int($courseeventsfrom)) {
+ $courses = array($courseeventsfrom);
}
- else if(is_array($SESSION->cal_show_course)) {
- $courses = $SESSION->cal_show_course;
- }
- else {
- $courses = array_keys($defaultcourses);
- if(empty($courses)) $courses = false;
+ else if(is_array($courseeventsfrom)) {
+ $courses = array_keys($courseeventsfrom);
}
}
else if($SESSION->cal_show_global) {
@@ -1059,7 +951,7 @@ function calendar_set_filters(&$courses, &$group, &$user, $defaultcourses = NULL
$courses = false;
}
- if($SESSION->cal_show_user) {
+ if($SESSION->cal_show_user || $ignorefilters) {
// This ignores the "which user to see" setting
// The functionality to do that does exist, but this was
// the most painless way to solve bug 1323. And anyway,
@@ -1070,57 +962,35 @@ function calendar_set_filters(&$courses, &$group, &$user, $defaultcourses = NULL
else {
$user = false;
}
- if($SESSION->cal_show_groups) {
- if(is_int($groupcourses)) {
- // One course, whatever group the user is in that course
- if(isteacher($groupcourses, $USER->id)) {
- $grouprecords = get_groups($groupcourses);
- if($grouprecords === false) {
- $group = false;
- }
- else {
- $group = array_keys($grouprecords);
- }
- }
- else if(mygroupid($groupcourses)) {
- $group = mygroupid($groupcourses);
- }
- else {
- $group = false;
- }
+ if($SESSION->cal_show_groups || $ignorefilters) {
+ if(is_int($groupeventsfrom)) {
+ $groupcourses = array($groupeventsfrom);
}
- else if(is_array($groupcourses)) {
- // Many courses, we want all of them
- $grouparray = array();
+ else if(is_array($groupeventsfrom)) {
+ $groupcourses = array_keys($groupeventsfrom);
+ }
+ $grouparray = array();
- // For each course...
- foreach($groupcourses as $courseid => $dummy) {
- // If the user is an editing teacher in there,
- if(isteacheredit($courseid, $USER->id)) {
- // Show events from all groups
- if(($grouprecords = get_groups($courseid)) !== false) {
- $grouparray = array_merge($grouparray, array_keys($grouprecords));
- }
- }
- // Otherwise show events from the group he is a member of
- else if(isset($USER->groupmember[$courseid])) {
- $grouparray[] = $USER->groupmember[$courseid];
+ // We already have the courses to examine in $courses
+ // For each course...
+ foreach($groupcourses as $courseid) {
+ // If the user is an editing teacher in there,
+ if(isteacheredit($courseid, $USER->id)) {
+ // Show events from all groups
+ if(($grouprecords = get_groups($courseid)) !== false) {
+ $grouparray = array_merge($grouparray, array_keys($grouprecords));
}
}
- if(empty($grouparray)) {
- $group = false;
- }
- else {
- $group = $grouparray;
+ // Otherwise show events from the group he is a member of
+ else if(isset($USER->groupmember[$courseid])) {
+ $grouparray[] = $USER->groupmember[$courseid];
}
}
- else if(is_bool($groupcourses)) {
- // Override
- $group = $groupcourses;
+ if(empty($grouparray)) {
+ $group = false;
}
else {
- // Sanity
- $group = false;
+ $group = $grouparray;
}
}
else {
diff --git a/calendar/set.php b/calendar/set.php
index 5cf05ea80a2..842ce758521 100644
--- a/calendar/set.php
+++ b/calendar/set.php
@@ -55,25 +55,21 @@
case 'setcourse':
$id = intval($_GET['id']);
if($id == 0) {
- $SESSION->cal_show_course = false;
+ $SESSION->cal_courses_shown = array();
}
else if($id == 1) {
- $SESSION->cal_show_course = true;
+ $SESSION->cal_courses_shown = calendar_get_default_courses(true);
}
- else if(isstudent($id, $USER->id) || isteacher($id, $USER->id)) {
- $SESSION->cal_show_course = $id;
+ else {
+ // We don't check for membership anymore: if(isstudent($id, $USER->id) || isteacher($id, $USER->id)) {
+ $SESSION->cal_courses_shown = $id;
}
break;
case 'showgroups':
$SESSION->cal_show_groups = !$SESSION->cal_show_groups;
break;
case 'showcourses':
- if(empty($SESSION->cal_show_course)) {
- $SESSION->cal_show_course = calendar_get_default_courses();
- }
- else {
- $SESSION->cal_show_course = false;
- }
+ $SESSION->cal_show_course = !$SESSION->cal_show_course;
break;
case 'showglobal':
$SESSION->cal_show_global = !$SESSION->cal_show_global;
diff --git a/calendar/view.php b/calendar/view.php
index 33704907e29..16b07823e11 100644
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -94,6 +94,20 @@
break;
}
+ if(isguest($USER->id)) {
+ $defaultcourses = calendar_get_default_courses();
+ calendar_set_filters($courses, $groups, $users, $defaultcourses, $defaultcourses);
+ }
+ else {
+ if($_GET['view'] == 'upcoming') {
+ $defaultcourses = calendar_get_default_courses();
+ calendar_set_filters($courses, $groups, $users, $defaultcourses, $defaultcourses, false);
+ }
+ else {
+ calendar_set_filters($courses, $groups, $users);
+ }
+ }
+
// Let's see if we are supposed to provide a referring course link
// but NOT for the "main page" course
if($SESSION->cal_course_referer > 1 &&
@@ -103,7 +117,6 @@
}
$strcalendar = get_string('calendar', 'calendar');
-
$prefsbutton = calendar_preferences_button();
// Print title and header
@@ -120,37 +133,6 @@
echo '
';
- if($_GET['view'] == 'month') {
- if(is_numeric($SESSION->cal_show_course)) {
- $defaultcourses = array($SESSION->cal_show_course => 1);
- }
- else if($SESSION->cal_show_course === true) {
- $defaultcourses = calendar_get_default_courses(true);
- }
- else if($SESSION->cal_show_course === false) {
- $defaultcourses = array();
- }
- }
- else {
- $defaultcourses = calendar_get_default_courses();
- }
-
- $courses = array();
-
- calendar_set_filters($courses, $groups, $users, $defaultcourses, $defaultcourses);
-/*
- // Are we left with a bad filter in effect?
- if($_GET['view'] != 'month' && !empty($SESSION->cal_course_referer)) {
- if(is_numeric($SESSION->cal_show_course)) {
- if($SESSION->cal_course_referer != $SESSION->cal_show_course) {
- $SESSION->cal_show_course = intval($SESSION->cal_course_referer);
- }
- }
- if(is_array($SESSION->cal_show_course) && !in_array($SESSION->cal_course_referer, $SESSION->cal_show_course)) {
- $SESSION->cal_show_course = intval($SESSION->cal_course_referer);
- }
- }
-*/
switch($_GET['view']) {
case 'event':
optional_variable($_GET['id'], 0);
@@ -368,6 +350,34 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
}
print_side_block_start($text, '', 'mycalendar');
+
+ if(isadmin($USER->id)) {
+ $coursesdata = get_courses('all', 'c.shortname');
+ }
+ elseif(!isguest($USER->id)) {
+ $coursesdata = get_my_courses($USER->id, 'shortname');
+ }
+ else {
+ $coursesdata = get_record('course', 'id', $SESSION->cal_course_referer);
+ }
+ $coursesdata = array_diff_assoc($coursesdata, array(1 => 1));
+
+ if(!isguest($USER->id)) {
+ echo ''.get_string('eventsfromcourse', 'calendar').': ';
+ echo '';
+ echo ''.get_string('all')." \n";
+ if($coursesdata !== false) {
+ foreach($coursesdata as $coursedata) {
+ echo "\ncal_courses_shown) && $coursedata->id == $SESSION->cal_courses_shown) {
+ echo ' selected';
+ }
+ echo '>'.$coursedata->shortname." \n";
+ }
+ }
+ echo '
';
+ }
+
echo calendar_top_controls('month', array('m' => $m, 'y' => $y));
// Start calendar display
@@ -502,58 +512,41 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').' ) '."\n";
}
- // Course events (this is kinda... tricky... :)
- echo '
cal_show_course !== false) {
- echo 'class="cal_event_course" ';
- }
- echo 'style="width: 8px;"> '.get_string('courseevents', 'calendar').': ';
-
- if(isadmin($USER->id)) {
- $coursesdata = get_courses('all', 'c.shortname');
+ // Course events
+ if(!empty($SESSION->cal_show_course)) {
+ echo ''.get_string('courseevents', 'calendar').': ';
+ echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').' )'."\n";
}
else {
- $coursesdata = get_my_courses($USER->id, 'shortname');
+ echo '
'.get_string('courseevents', 'calendar').': ';
+ echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').' )'."\n";
}
- $coursesdata = array_diff_assoc($coursesdata, array(1 => 1));
- echo '
';
- echo 'cal_show_course === false?' selected':'').'>'.get_string('hidden', 'calendar')." \n";
- echo 'cal_show_course === true?' selected':'').'>'.get_string('shown', 'calendar')." \n";
- if($coursesdata !== false) {
- foreach($coursesdata as $coursedata) {
- echo "\ncal_show_course) && $coursedata->id == $SESSION->cal_show_course) {
- echo ' selected';
- }
- echo '>'.$coursedata->shortname." \n";
+ echo "\n";
+
+ if(!isguest($USER->id)) {
+ echo '';
+ // Group events
+ if($SESSION->cal_show_groups) {
+ echo ''.get_string('groupevents', 'calendar').': ';
+ echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').' ) \n";
- echo '';
-
- // Group events
- if($SESSION->cal_show_groups) {
- echo ''.get_string('groupevents', 'calendar').': ';
- echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').' )'.get_string('groupevents', 'calendar').': ';
- echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').' )'.get_string('userevents', 'calendar').': ';
- echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').' )'.get_string('userevents', 'calendar').': ';
- echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').' )'.get_string('groupevents', 'calendar').': ';
+ echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').' )'.get_string('userevents', 'calendar').': ';
+ echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').' )'.get_string('userevents', 'calendar').': ';
+ echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').' ) \n";
}
- echo "\n";
echo ' 
';
$output[$outkey]->name = $event->name;
$output[$outkey]->time = $eventtime;
$output[$outkey]->description = $event->description;
@@ -382,21 +382,21 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve
calendar_get_course_cached($coursecache, $event->courseid);
$output[$outkey]->referer = ''.$coursecache[$event->courseid]->fullname.'';
- $output[$outkey]->icon = '';
+ $output[$outkey]->icon = '