mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

A few unrelated changes, sorry for not being tidy.

Browse Source 
1. Possible fix for bug 2410, also bug report at http://moodle.org/mod/forum/discuss.php?d=19173.

2. Group events may be edited by teachers without course editing rights.

3. Cosmetics for the DST display (this is a work in progress).
This commit is contained in:
defacer 2005-02-26 06:30:19 +00:00
parent 8dc3f6cf5e
commit 69244b9128
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/lib.php
View File

@ -106,7 +106,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
$display->tstart = gmmktime(0, 0, 0, $m, 1, $y); // This is GMT
$display->tend = gmmktime(23, 59, 59, $m, $display->maxdays, $y); // GMT
$startwday = gmdate('w', $display->tstart); // $display->tstart is already GMT, so don't use date(): messes with server's TZ
$startwday = dayofweek(1, $m, $y);
// Align the starting weekday to fall in our display range
// This is simple, not foolproof.
@ -115,6 +115,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
}
// Get the events matching our criteria. Don't forget to offset the timestamps for the user's TZ!
// TODO: usertime() doesn't compensate for DST. Thus the line below is wrong.
$whereclause = calendar_sql_where(usertime($display->tstart), usertime($display->tend), $users, $groups, $courses);
if($whereclause === false) {
@ -1070,17 +1071,15 @@ function calendar_edit_event_allowed($event) {
if (isadmin($USER->id)) return true; // Admins are allowed anything
if ($event->courseid != 0) {
// Course event, only editing teachers may... edit :P
if(isteacheredit($event->courseid)) {
return true;
}
if ($event->courseid != 0 && isteacher($event->courseid)) {
return true;
} else if($event->courseid == 0 && $event->groupid != 0) {
// Group event
$group = get_record('groups', 'id', $event->groupid);
if($group === false) return false;
if(isteacheredit($group->courseid)) {
if($group === false) {
return false;
}
if(isteacher($group->courseid)) {
return true;
}
@ -1202,7 +1201,8 @@ function calendar_human_readable_dst($preset) {
$options->activate_weekday = ($preset->activate_day < 0) ? get_string('day', 'calendar') : get_string($weekdays[$preset->activate_day], 'calendar');
$options->activate_month = date('F', mktime(0, 0, 0, $preset->activate_month, 1, 2000));
$options->offset = abs($preset->apply_offset);
$options->direction = $preset->apply_offset > 0 ? get_string('timeforward', 'calendar') : get_string('timerewind', 'calendar');
//$options->direction = $preset->apply_offset > 0 ? get_string('timeforward', 'calendar') : get_string('timerewind', 'calendar');
$options->direction = get_string('timeforward', 'calendar');
$options->deactivate_index = ($preset->deactivate_index == -1) ? get_string('last', 'calendar') : get_string('nth', 'calendar', $preset->deactivate_index);
$options->deactivate_weekday = ($preset->deactivate_day < 0) ? get_string('day', 'calendar') : get_string($weekdays[$preset->deactivate_day], 'calendar');
$options->deactivate_month = date('F', mktime(0, 0, 0, $preset->deactivate_month, 1, 2000));