mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-9266 Frontpage teachers cannot ad "site" events to calendar; merged from MOODLE_18_STABLE

Browse Source
This commit is contained in:
skodak 2007-04-15 21:07:36 +00:00
parent e28b762c35
commit bf8756a658
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/event.php
View File

@ -58,6 +58,8 @@
$cal_m = optional_param('cal_m'); $cal_m = optional_param('cal_m');
$cal_d = optional_param('cal_d'); $cal_d = optional_param('cal_d');
$focus = '';
if(!$site = get_site()) { if(!$site = get_site()) {
redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php'); redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
} }
@ -78,6 +80,8 @@
// If a course has been supplied in the URL, change the filters to show that one // If a course has been supplied in the URL, change the filters to show that one
if($urlcourse > 0 && record_exists('course', 'id', $urlcourse)) { if($urlcourse > 0 && record_exists('course', 'id', $urlcourse)) {
require_login($urlcourse, false);
if($urlcourse == SITEID) { if($urlcourse == SITEID) {
// If coming from the site page, show all courses // If coming from the site page, show all courses
$SESSION->cal_courses_shown = calendar_get_default_courses(true); $SESSION->cal_courses_shown = calendar_get_default_courses(true);
@ -247,7 +251,6 @@
$title=''; $title='';
break; break;
} }
if(empty($focus)) $focus = '';
// Let's see if we are supposed to provide a referring course link // Let's see if we are supposed to provide a referring course link
// but NOT for the "main page" course // but NOT for the "main page" course
@ -263,6 +266,7 @@
} else { } else {
$course = $site; $course = $site;
} }
require_login($course, false);
print_header($site->shortname.': '.$strcalendar.': '.$title, $strcalendar, $nav.' -> '.$title, print_header($site->shortname.': '.$strcalendar.': '.$title, $strcalendar, $nav.' -> '.$title,
'eventform.name', '', true, '', user_login_string($site)); 'eventform.name', '', true, '', user_login_string($site));
@ -593,7 +597,7 @@ function calendar_add_event_allowed($event) {
return false; return false;
} }
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); $sitecontext = get_context_instance(CONTEXT_SYSTEM);
// if user has manageentries at site level, always return true // if user has manageentries at site level, always return true
if (has_capability('moodle/calendar:manageentries', $sitecontext)) { if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
return true; return true;
@ -620,8 +624,10 @@ function calendar_add_event_allowed($event) {
//there is no 'break;' intentionally //there is no 'break;' intentionally
case 'site': case 'site':
return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, SITEID));
default: default:
return false; // should already return true above if having moodle/calendar:manageentries return false;
} }
} }
@ -631,7 +637,7 @@ function calendar_get_allowed_types(&$allowed) {
$allowed->user = true; // User events always allowed $allowed->user = true; // User events always allowed
$allowed->groups = false; // This may change just below $allowed->groups = false; // This may change just below
$allowed->courses = false; // This may change just below $allowed->courses = false; // This may change just below
$allowed->site = has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID)); $allowed->site = has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, SITEID));
if(!empty($SESSION->cal_course_referer) && $SESSION->cal_course_referer != SITEID && has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, $SESSION->cal_course_referer))) { if(!empty($SESSION->cal_course_referer) && $SESSION->cal_course_referer != SITEID && has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, $SESSION->cal_course_referer))) {
$course = get_record('course', 'id', $SESSION->cal_course_referer); $course = get_record('course', 'id', $SESSION->cal_course_referer);