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

force login in course calendar SC#349

Browse Source
This commit is contained in:
skodak 2007-01-17 19:53:03 +00:00
parent 60b5ecd3cf
commit 7dc30088bc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/view.php
View File

@ -44,8 +44,8 @@
require_once($CFG->dirroot.'/course/lib.php'); require_once($CFG->dirroot.'/course/lib.php');
require_once($CFG->dirroot.'/calendar/lib.php'); require_once($CFG->dirroot.'/calendar/lib.php');
$course = optional_param('course', 0); $courseid = optional_param('course', 0, PARAM_INT);
$view = optional_param('view', 'upcoming'); $view = optional_param('view', 'upcoming', PARAM_ALPHA);
$day = optional_param('cal_d', 0, PARAM_INT); $day = optional_param('cal_d', 0, PARAM_INT);
$mon = optional_param('cal_m', 0, PARAM_INT); $mon = optional_param('cal_m', 0, PARAM_INT);
$yr = optional_param('cal_y', 0, PARAM_INT); $yr = optional_param('cal_y', 0, PARAM_INT);
@ -54,7 +54,9 @@
redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php'); redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
} }
if ($CFG->forcelogin) { if ($courseid) {
require_login($courseid);
} else if ($CFG->forcelogin) {
require_login(); require_login();
} }
@ -87,8 +89,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 (!empty($course)) { if (!empty($courseid)) {
if ($course = get_record('course', 'id', $course)) { if ($course = get_record('course', 'id', $courseid)) {
if ($course->id == SITEID) { if ($course->id == SITEID) {
// If coming from the home page, show all courses // If coming from the home page, show all courses
$SESSION->cal_courses_shown = calendar_get_default_courses(true); $SESSION->cal_courses_shown = calendar_get_default_courses(true);
@ -100,6 +102,8 @@
calendar_set_referring_course($SESSION->cal_courses_shown); calendar_set_referring_course($SESSION->cal_courses_shown);
} }
} }
} else {
$course = null;
} }
if (empty($USER->id) or isguest()) { if (empty($USER->id) or isguest()) {