L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-23616 fixed deleting of events

Browse Source
This commit is contained in:
Petr Skoda
2010-08-02 12:49:08 +00:00
parent dcd79f46e3
commit ae53bd1da3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/delete.php
+3 -4
View File
@@ -49,10 +49,9 @@ $event = calendar_event::load($eventid);
* a course
*/
if ($event->eventtype !== 'user' && $event->eventtype !== 'site') {
if ($courseid !== $event->courseid) {
print_error('invalidcourse');
}
require_login($event->courseid);
$courseid = $event->courseid;
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
require_login($course);
} else {
require_login();
}
calendar/lib.php
+4 -4
View File
@@ -536,7 +536,7 @@ function calendar_add_event_metadata($event) {
* @deprecated 2.0
*/
function calendar_print_event($event, $showactions=true) {
global $CFG, $USER, $OUTPUT;
global $CFG, $USER, $OUTPUT, $PAGE;
debugging('calendar_print_event is deprecated please update your code', DEBUG_DEVELOPER);
$renderer = $PAGE->get_renderer('core_calendar');
if (!($event instanceof calendar_event)) {
@@ -681,7 +681,7 @@ function calendar_top_controls($type, $data) {
list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']);
$nextlink = calendar_get_link_next(get_string('monthnext', 'access'), 'index.php?', 0, $nextmonth, $nextyear, $accesshide=true);
$prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), 'index.php?', 0, $prevmonth, $prevyear, true);
if (right_to_left()) {
$content .= "\n".'<div class="calendar-controls">'. $nextlink;
$content .= '<span class="hide"> | </span><span class="current"><a href="'.calendar_get_link_href(CALENDAR_URL.'view.php?view=month'.$courseid.'&amp;', 1, $data['m'], $data['y']).'">'.userdate($time, get_string('strftimemonthyear')).'</a></span>';
@@ -693,7 +693,7 @@ function calendar_top_controls($type, $data) {
$content .= '<span class="hide"> | </span>'. $nextlink ."\n";
$content .= "<span class=\"clearer\"><!-- --></span></div>\n";
}
break;
case 'course':
list($prevmonth, $prevyear) = calendar_sub_month($data['m'], $data['y']);
@@ -934,7 +934,7 @@ function calendar_get_link_previous($text, $linkbase, $d, $m, $y, $accesshide=fa
function calendar_get_link_next($text, $linkbase, $d, $m, $y, $accesshide=false) {
$href = calendar_get_link_href($linkbase, $d, $m, $y);
if(empty($href)) return $text;
return link_arrow_right($text, $href, $accesshide, 'next');
}