'.
diff --git a/blocks/community/communitycourse.php b/blocks/community/communitycourse.php
index dbd9e075d77..3e6497f1161 100644
--- a/blocks/community/communitycourse.php
+++ b/blocks/community/communitycourse.php
@@ -36,7 +36,7 @@ require_login();
$courseid = required_param('courseid', PARAM_INT); //if no courseid is given
$parentcourse = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
-$context = get_context_instance(CONTEXT_COURSE, $courseid);
+$context = context_course::instance($courseid);
$PAGE->set_course($parentcourse);
$PAGE->set_url('/blocks/community/communitycourse.php');
$PAGE->set_heading($SITE->fullname);
@@ -67,8 +67,8 @@ $communitymanager = new block_community_manager();
$renderer = $PAGE->get_renderer('block_community');
/// Check if the page has been called with trust argument
-$add = optional_param('add', -1, PARAM_INTEGER);
-$confirm = optional_param('confirmed', false, PARAM_INTEGER);
+$add = optional_param('add', -1, PARAM_INT);
+$confirm = optional_param('confirmed', false, PARAM_INT);
if ($add != -1 and $confirm and confirm_sesskey()) {
$course = new stdClass();
$course->name = optional_param('coursefullname', '', PARAM_TEXT);
@@ -93,8 +93,8 @@ if ($usercandownload and $cancelrestore and confirm_sesskey()) {
/// Download
$huburl = optional_param('huburl', false, PARAM_URL);
-$download = optional_param('download', -1, PARAM_INTEGER);
-$downloadcourseid = optional_param('downloadcourseid', '', PARAM_INTEGER);
+$download = optional_param('download', -1, PARAM_INT);
+$downloadcourseid = optional_param('downloadcourseid', '', PARAM_INT);
$coursefullname = optional_param('coursefullname', '', PARAM_ALPHANUMEXT);
$backupsize = optional_param('backupsize', 0, PARAM_INT);
if ($usercandownload and $download != -1 and !empty($downloadcourseid) and confirm_sesskey()) {
@@ -125,8 +125,8 @@ if ($usercandownload and $download != -1 and !empty($downloadcourseid) and confi
}
/// Remove community
-$remove = optional_param('remove', '', PARAM_INTEGER);
-$communityid = optional_param('communityid', '', PARAM_INTEGER);
+$remove = optional_param('remove', '', PARAM_INT);
+$communityid = optional_param('communityid', '', PARAM_INT);
if ($remove != -1 and !empty($communityid) and confirm_sesskey()) {
$communitymanager->block_community_remove_course($communityid, $USER->id);
echo $OUTPUT->header();
@@ -152,8 +152,8 @@ $hubselectorform->set_data($fromformdata);
//Retrieve courses by web service
$courses = null;
-if (optional_param('executesearch', 0, PARAM_INTEGER) and confirm_sesskey()) {
- $downloadable = optional_param('downloadable', false, PARAM_INTEGER);
+if (optional_param('executesearch', 0, PARAM_INT) and confirm_sesskey()) {
+ $downloadable = optional_param('downloadable', false, PARAM_INT);
$options = new stdClass();
if (!empty($fromformdata['coverage'])) {
@@ -178,7 +178,7 @@ if (optional_param('executesearch', 0, PARAM_INTEGER) and confirm_sesskey()) {
$options->orderby = $fromformdata['orderby'];
//the range of course requested
- $options->givememore = optional_param('givememore', 0, PARAM_INTEGER);
+ $options->givememore = optional_param('givememore', 0, PARAM_INT);
//check if the selected hub is from the registered list (in this case we use the private token)
$token = 'publichub';
diff --git a/blocks/community/forms.php b/blocks/community/forms.php
index fafab8a6035..075ab2af6c8 100644
--- a/blocks/community/forms.php
+++ b/blocks/community/forms.php
@@ -191,7 +191,7 @@ class community_hub_search_form extends moodleform {
//display enrol/download select box if the USER has the download capability on the course
if (has_capability('moodle/community:download',
- get_context_instance(CONTEXT_COURSE, $this->_customdata['courseid']))) {
+ context_course::instance($this->_customdata['courseid']))) {
$options = array(0 => get_string('enrollable', 'block_community'),
1 => get_string('downloadable', 'block_community'));
$mform->addElement('select', 'downloadable', get_string('enroldownload', 'block_community'),
diff --git a/blocks/community/locallib.php b/blocks/community/locallib.php
index 5c39f75348e..b2ec8ab5a5c 100644
--- a/blocks/community/locallib.php
+++ b/blocks/community/locallib.php
@@ -113,7 +113,7 @@ class block_community_manager {
$fs = get_file_storage();
$record = new stdClass();
- $record->contextid = get_context_instance(CONTEXT_USER, $USER->id)->id;
+ $record->contextid = context_user::instance($USER->id)->id;
$record->component = 'user';
$record->filearea = 'private';
$record->itemid = 0;
diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php
index 52cd48d23d1..2b598ce767f 100644
--- a/blocks/completionstatus/block_completionstatus.php
+++ b/blocks/completionstatus/block_completionstatus.php
@@ -51,7 +51,7 @@ class block_completionstatus extends block_base {
$this->content = new stdClass;
// Can edit settings?
- $can_edit = has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $this->page->course->id));
+ $can_edit = has_capability('moodle/course:update', context_course::instance($this->page->course->id));
// Get course completion data
$info = new completion_info($this->page->course);
@@ -84,7 +84,7 @@ class block_completionstatus extends block_base {
// Check this user is enroled
if (!$info->is_tracked_user($USER->id)) {
// If not enrolled, but are can view the report:
- if (has_capability('report/completion:view', get_context_instance(CONTEXT_COURSE, $COURSE->id))) {
+ if (has_capability('report/completion:view', context_course::instance($COURSE->id))) {
$this->content->text = ''.get_string('viewcoursereport', 'completion').'';
return $this->content;
diff --git a/blocks/completionstatus/details.php b/blocks/completionstatus/details.php
index a1ac77177b0..a71da02635a 100644
--- a/blocks/completionstatus/details.php
+++ b/blocks/completionstatus/details.php
@@ -52,8 +52,8 @@ if ($userid) {
// Check permissions
require_login($course);
-$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-$personalcontext = get_context_instance(CONTEXT_USER, $user->id);
+$coursecontext = context_course::instance($course->id);
+$personalcontext = context_user::instance($user->id);
$can_view = false;
diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index 282f9e22d07..39db54993e8 100644
--- a/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@ -33,17 +33,17 @@ class block_course_list extends block_list {
}
if (empty($CFG->disablemycourses) and isloggedin() and !isguestuser() and
- !(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) and $adminseesall)) { // Just print My Courses
+ !(has_capability('moodle/course:update', context_system::instance()) and $adminseesall)) { // Just print My Courses
if ($courses = enrol_get_my_courses(NULL, 'visible DESC, fullname ASC')) {
foreach ($courses as $course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$linkcss = $course->visible ? "" : " class=\"dimmed\" ";
$this->content->items[]="
shortname, true, array('context' => $coursecontext)) . "\" ".
"href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".$icon.format_string($course->fullname). "";
}
$this->title = get_string('mycourses');
/// If we can update any course of the view all isn't hidden, show the view all courses link
- if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
+ if (has_capability('moodle/course:update', context_system::instance()) || empty($CFG->block_course_list_hideallcourseslink)) {
$this->content->footer = "
wwwroot/course/index.php\">".get_string("fulllistofcourses")." ...";
}
}
@@ -57,12 +57,12 @@ class block_course_list extends block_list {
if ($categories) { //Check we have categories
if (count($categories) > 1 || (count($categories) == 1 && $DB->count_records('course') > 200)) { // Just print top level category links
foreach ($categories as $category) {
- $categoryname = format_string($category->name, true, array('context' => get_context_instance(CONTEXT_COURSECAT, $category->id)));
+ $categoryname = format_string($category->name, true, array('context' => context_coursecat::instance($category->id)));
$linkcss = $category->visible ? "" : " class=\"dimmed\" ";
$this->content->items[]="
wwwroot/course/category.php?id=$category->id\">".$icon . $categoryname . "";
}
/// If we can update any course of the view all isn't hidden, show the view all courses link
- if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
+ if (has_capability('moodle/course:update', context_system::instance()) || empty($CFG->block_course_list_hideallcourseslink)) {
$this->content->footer .= "
wwwroot/course/index.php\">".get_string('fulllistofcourses').' ...';
}
$this->title = get_string('categories');
@@ -72,16 +72,16 @@ class block_course_list extends block_list {
if ($courses) {
foreach ($courses as $course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$linkcss = $course->visible ? "" : " class=\"dimmed\" ";
$this->content->items[]="
shortname, true, array('context' => $coursecontext))."\" ".
"href=\"$CFG->wwwroot/course/view.php?id=$course->id\">"
- .$icon. format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . "";
+ .$icon. format_string($course->fullname, true, array('context' => context_course::instance($course->id))) . "";
}
/// If we can update any course of the view all isn't hidden, show the view all courses link
- if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
+ if (has_capability('moodle/course:update', context_system::instance()) || empty($CFG->block_course_list_hideallcourseslink)) {
$this->content->footer .= "
wwwroot/course/index.php\">".get_string('fulllistofcourses').' ...';
}
$this->get_remote_courses();
@@ -89,7 +89,7 @@ class block_course_list extends block_list {
$this->content->icons[] = '';
$this->content->items[] = get_string('nocoursesyet');
- if (has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id))) {
+ if (has_capability('moodle/course:create', context_coursecat::instance($category->id))) {
$this->content->footer = '
'.get_string("addnewcourse").' ...';
}
$this->get_remote_courses();
@@ -120,7 +120,7 @@ class block_course_list extends block_list {
$this->content->items[] = get_string('remotecourses','mnet');
$this->content->icons[] = '';
foreach ($courses as $course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$this->content->items[]="
shortname, true, array('context' => $coursecontext)) . "\" ".
"href=\"{$CFG->wwwroot}/auth/mnet/jump.php?hostid={$course->hostid}&wantsurl=/course/view.php?id={$course->remoteid}\">"
.$icon. format_string($course->fullname) . "";
diff --git a/blocks/course_overview/block_course_overview.php b/blocks/course_overview/block_course_overview.php
index df79e3bf2d4..55e0764f7de 100644
--- a/blocks/course_overview/block_course_overview.php
+++ b/blocks/course_overview/block_course_overview.php
@@ -1,5 +1,4 @@
dirroot.'/blocks/course_overview/locallib.php');
-require_once($CFG->dirroot.'/lib/weblib.php');
-require_once($CFG->dirroot . '/lib/formslib.php');
-
+/**
+ * Course overview block
+ *
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
class block_course_overview extends block_base {
/**
- * block initializations
+ * Block initialization
*/
public function init() {
$this->title = get_string('pluginname', 'block_course_overview');
}
/**
- * block contents
+ * Return contents of course_overview block
*
- * @return object
+ * @return stdClass contents of block
*/
public function get_content() {
- global $USER, $CFG;
+ global $USER, $CFG, $DB;
+ require_once($CFG->dirroot.'/user/profile/lib.php');
+
if($this->content !== NULL) {
return $this->content;
}
+ $config = get_config('block_course_overview');
+
$this->content = new stdClass();
$this->content->text = '';
$this->content->footer = '';
$content = array();
- // limits the number of courses showing up
- $courses_limit = 21;
- // FIXME: this should be a block setting, rather than a global setting
- if (isset($CFG->mycoursesperpage)) {
- $courses_limit = $CFG->mycoursesperpage;
+ $updatemynumber = optional_param('mynumber', -1, PARAM_INT);
+ if ($updatemynumber >= 0) {
+ block_course_overview_update_mynumber($updatemynumber);
}
- $morecourses = false;
- if ($courses_limit > 0) {
- $courses_limit = $courses_limit + 1;
+ profile_load_custom_fields($USER);
+ list($sortedcourses, $sitecourses, $totalcourses) = block_course_overview_get_sorted_courses();
+ $overviews = block_course_overview_get_overviews($sitecourses);
+
+ $renderer = $this->page->get_renderer('block_course_overview');
+ if (!empty($config->showwelcomearea)) {
+ require_once($CFG->dirroot.'/message/lib.php');
+ $msgcount = message_count_unread_messages();
+ $this->content->text = $renderer->welcome_area($msgcount);
}
- $courses = enrol_get_my_courses('id, shortname, modinfo', 'visible DESC,sortorder ASC', $courses_limit);
- $site = get_site();
- $course = $site; //just in case we need the old global $course hack
-
- if (is_enabled_auth('mnet')) {
- $remote_courses = get_my_remotecourses();
- }
- if (empty($remote_courses)) {
- $remote_courses = array();
+ // Number of sites to display.
+ if ($this->page->user_is_editing() && empty($config->forcedefaultmaxcourses)) {
+ $this->content->text .= $renderer->editing_bar_head($totalcourses);
}
- if (($courses_limit > 0) && (count($courses)+count($remote_courses) >= $courses_limit)) {
- // get rid of any remote courses that are above the limit
- $remote_courses = array_slice($remote_courses, 0, $courses_limit - count($courses), true);
- if (count($courses) >= $courses_limit) {
- //remove the 'marker' course that we retrieve just to see if we have more than $courses_limit
- array_pop($courses);
- }
- $morecourses = true;
- }
-
-
- if (array_key_exists($site->id,$courses)) {
- unset($courses[$site->id]);
- }
-
- foreach ($courses as $c) {
- if (isset($USER->lastcourseaccess[$c->id])) {
- $courses[$c->id]->lastaccess = $USER->lastcourseaccess[$c->id];
- } else {
- $courses[$c->id]->lastaccess = 0;
- }
- }
-
- if (empty($courses) && empty($remote_courses)) {
- $content[] = get_string('nocourses','my');
+ if (empty($sortedcourses)) {
+ $this->content->text .= get_string('nocourses','my');
} else {
- ob_start();
-
- require_once $CFG->dirroot."/course/lib.php";
- print_overview($courses, $remote_courses);
-
- $content[] = ob_get_contents();
- ob_end_clean();
+ // For each course, build category cache.
+ $this->content->text .= $renderer->course_overview($sortedcourses, $overviews);
+ $this->content->text .= $renderer->hidden_courses($totalcourses - count($sortedcourses));
+ if ($this->page->user_is_editing() && ajaxenabled()) {
+ $this->page->requires->js_init_call('M.block_course_overview.add_handles');
+ }
}
- // if more than 20 courses
- if ($morecourses) {
- $content[] = '
...';
- }
-
- $this->content->text = implode($content);
-
return $this->content;
}
/**
- * allow the block to have a configuration page
+ * Allow the block to have a configuration page
*
* @return boolean
*/
public function has_config() {
- return false;
+ return true;
}
/**
- * locations where block can be displayed
+ * Locations where block can be displayed
*
* @return array
*/
public function applicable_formats() {
- return array('my-index'=>true);
+ return array('my-index' => true);
}
-}
-?>
+
+ /**
+ * Sets block header to be hidden or visible
+ *
+ * @return bool if true then header will be visible.
+ */
+ public function hide_header() {
+ // Hide header if welcome area is show.
+ $config = get_config('block_course_overview');
+ return !empty($config->showwelcomearea);
+ }
+}
\ No newline at end of file
diff --git a/blocks/course_overview/lang/en/block_course_overview.php b/blocks/course_overview/lang/en/block_course_overview.php
index c103d8e2543..0419efcf9e2 100644
--- a/blocks/course_overview/lang/en/block_course_overview.php
+++ b/blocks/course_overview/lang/en/block_course_overview.php
@@ -1,2 +1,53 @@
.
+
+/**
+ * Lang strings for course_overview block
+ *
+ * @package block_course_overview
+ * @copyright 2012 Adam Olley
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
$string['pluginname'] = 'Course overview';
+$string['activityoverview'] = 'You have {$a}s that need attention';
+$string['alwaysshowall'] = 'Always Show All';
+$string['collapseall'] = 'Collapse All Course Lists';
+$string['configotherexpanded'] = 'If enabled, Other Courses will be expanded by default unless overriden by user preferences.';
+$string['configpreservestates'] = 'If enabled, the collapsed/expanded states set by the user are stored and used on each load.';
+$string['defaultmaxcourses'] = 'Default maximum courses';
+$string['defaultmaxcoursesdesc'] = 'Maximum courses which should be displayed on course overview block, 0 will show all courses';
+$string['expandall'] = 'Expand All Course Lists';
+$string['forcedefaultmaxcourses'] = 'Force maximum courses';
+$string['forcedefaultmaxcoursesdesc'] = 'If set then user will not be able to change his/her personal setting';
+$string['hiddencoursecount'] = 'You have {$a} hidden course';
+$string['hiddencoursecountplural'] = 'You have {$a} hidden courses';
+$string['message'] = 'message';
+$string['messages'] = 'messages';
+$string['movecoursehere'] = 'Move course here';
+$string['numtodisplay'] = 'Number of courses to display: ';
+$string['otherexpanded'] = 'Other Courses Expanded';
+$string['preservestates'] = 'Preserve Expanded States';
+$string['shortnameprefix'] = 'Includes {$a}';
+$string['shortnamesufixsingular'] = ' (and {$a} other)';
+$string['shortnamesufixprural'] = ' (and {$a} others)';
+$string['showchildren'] = 'Show Children';
+$string['showchildrendesc'] = 'Should child courses be listed underneath the main course title?';
+$string['showwelcomearea'] = 'Show welcome area';
+$string['showwelcomeareadesc'] = 'Show the welcome area above the course list?';
+$string['view_edit_profile'] = '(View and edit your profile.)';
+$string['welcome'] = 'Welcome {$a}';
+$string['youhavemessages'] = 'You have {$a} unread ';
+$string['youhavenomessages'] = 'You have no unread ';
\ No newline at end of file
diff --git a/blocks/course_overview/locallib.php b/blocks/course_overview/locallib.php
new file mode 100644
index 00000000000..45d5747c897
--- /dev/null
+++ b/blocks/course_overview/locallib.php
@@ -0,0 +1,193 @@
+.
+
+/**
+ * Helper functions for course_overview block
+ *
+ * @package block_course_overview
+ * @copyright 2012 Adam Olley
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Display overview for courses
+ *
+ * @param array $courses courses for which overview needs to be shown
+ * @return array html overview
+ */
+function block_course_overview_get_overviews($courses) {
+ $htmlarray = array();
+ if ($modules = get_plugin_list_with_function('mod', 'print_overview')) {
+ foreach ($modules as $fname) {
+ $fname($courses,$htmlarray);
+ }
+ }
+ return $htmlarray;
+}
+
+/**
+ * Sets user preference for maximum courses to be displayed in course_overview block
+ *
+ * @param int $number maximum courses which should be visible
+ */
+function block_course_overview_update_mynumber($number) {
+ set_user_preference('course_overview_number_of_courses', $number);
+}
+
+/**
+ * Sets user course sorting preference in course_overview block
+ *
+ * @param array $sortorder sort order of course
+ */
+function block_course_overview_update_myorder($sortorder) {
+ set_user_preference('course_overview_course_order', serialize($sortorder));
+}
+
+/**
+ * Returns shortname of activities in course
+ *
+ * @param int $courseid id of course for which activity shortname is needed
+ * @return string|bool list of child shortname
+ */
+function block_course_overview_get_child_shortnames($courseid) {
+ global $DB;
+ $ctxselect = context_helper::get_preload_record_columns_sql('ctx');
+ $sql = "SELECT c.id, c.shortname, $ctxselect
+ FROM {enrol} e
+ JOIN {course} c ON (c.id = e.customint1)
+ JOIN {context} ctx ON (ctx.instanceid = e.customint1)
+ WHERE e.courseid = :courseid AND e.enrol = :method AND ctx.contextlevel = :contextlevel ORDER BY e.sortorder";
+ $params = array('method' => 'meta', 'courseid' => $courseid, 'contextlevel' => CONTEXT_COURSE);
+
+ if ($results = $DB->get_records_sql($sql, $params)) {
+ $shortnames = array();
+ // Preload the context we will need it to format the category name shortly.
+ foreach ($results as $res) {
+ context_helper::preload_from_record($res);
+ $context = context_course::instance($res->id);
+ $shortnames[] = format_string($res->shortname, true, $context);
+ }
+ $total = count($shortnames);
+ $suffix = '';
+ if ($total > 10) {
+ $shortnames = array_slice($shortnames, 0, 10);
+ $diff = $total - count($shortnames);
+ if ($diff > 1) {
+ $suffix = get_string('shortnamesufixprural', 'block_course_overview', $diff);
+ } else {
+ $suffix = get_string('shortnamesufixsingular', 'block_course_overview', $diff);
+ }
+ }
+ $shortnames = get_string('shortnameprefix', 'block_course_overview', implode('; ', $shortnames));
+ $shortnames .= $suffix;
+ }
+
+ return isset($shortnames) ? $shortnames : false;
+}
+
+/**
+ * Returns maximum number of courses which will be displayed in course_overview block
+ *
+ * @return int maximum number of courses
+ */
+function block_course_overview_get_max_user_courses() {
+ // Get block configuration
+ $config = get_config('block_course_overview');
+ $limit = $config->defaultmaxcourses;
+
+ // If max course is not set then try get user preference
+ if (empty($config->forcedefaultmaxcourses)) {
+ $limit = get_user_preferences('course_overview_number_of_courses', $limit);
+ }
+ return $limit;
+}
+
+/**
+ * Return sorted list of user courses
+ *
+ * @return array list of sorted courses and count of courses.
+ */
+function block_course_overview_get_sorted_courses() {
+ global $USER;
+
+ $limit = block_course_overview_get_max_user_courses();
+
+ $courses = enrol_get_my_courses('id, shortname, fullname, modinfo');
+ $site = get_site();
+
+ if (array_key_exists($site->id,$courses)) {
+ unset($courses[$site->id]);
+ }
+
+ foreach ($courses as $c) {
+ if (isset($USER->lastcourseaccess[$c->id])) {
+ $courses[$c->id]->lastaccess = $USER->lastcourseaccess[$c->id];
+ } else {
+ $courses[$c->id]->lastaccess = 0;
+ }
+ }
+
+ // Get remote courses.
+ $remotecourses = array();
+ if (is_enabled_auth('mnet')) {
+ $remotecourses = get_my_remotecourses();
+ }
+ // Remote courses will have -ve remoteid as key, so it can be differentiated from normal courses
+ foreach ($remotecourses as $id => $val) {
+ $remoteid = $val->remoteid * -1;
+ $val->id = $remoteid;
+ $courses[$remoteid] = $val;
+ }
+
+ $order = array();
+ if (!is_null($usersortorder = get_user_preferences('course_overview_course_order'))) {
+ $order = unserialize($usersortorder);
+ }
+
+ $sortedcourses = array();
+ $counter = 0;
+ // Get courses in sort order into list.
+ foreach ($order as $key => $cid) {
+ if (($counter >= $limit) && ($limit != 0)) {
+ break;
+ }
+
+ // Make sure user is still enroled.
+ if (isset($courses[$cid])) {
+ $sortedcourses[$cid] = $courses[$cid];
+ $counter++;
+ }
+ }
+ // Append unsorted courses if limit allows
+ foreach ($courses as $c) {
+ if (($limit != 0) && ($counter >= $limit)) {
+ break;
+ }
+ if (!in_array($c->id, $order)) {
+ $sortedcourses[$c->id] = $c;
+ $counter++;
+ }
+ }
+
+ // From list extract site courses for overview
+ $sitecourses = array();
+ foreach ($sortedcourses as $key => $course) {
+ if ($course->id > 0) {
+ $sitecourses[$key] = $course;
+ }
+ }
+ return array($sortedcourses, $sitecourses, count($courses));
+}
diff --git a/blocks/course_overview/module.js b/blocks/course_overview/module.js
new file mode 100644
index 00000000000..6a6536d56e9
--- /dev/null
+++ b/blocks/course_overview/module.js
@@ -0,0 +1,226 @@
+M.block_course_overview = {}
+
+M.block_course_overview.add_handles = function(Y) {
+ M.block_course_overview.Y = Y;
+ YUI().use('dd-constrain', 'dd-proxy', 'dd-drop', 'dd-plugin', function(Y) {
+ //Static Vars
+ var goingUp = false, lastY = 0;
+
+ var list = Y.Node.all('#course_list .coursebox');
+ list.each(function(v, k) {
+ var dd = new Y.DD.Drag({
+ node: v,
+ target: {
+ padding: '0 0 0 20'
+ }
+ }).plug(Y.Plugin.DDProxy, {
+ moveOnEnd: false
+ }).plug(Y.Plugin.DDConstrained, {
+ constrain2node: '#course_list'
+ });
+ dd.addHandle('.course_title .move');
+ });
+
+ var drops = Y.Node.all('#coursebox');
+ drops.each(function(v, k) {
+ var tar = new Y.DD.Drop({
+ node: v
+ });
+ });
+
+ Y.DD.DDM.on('drag:start', function(e) {
+ //Get our drag object
+ var drag = e.target;
+ //Set some styles here
+ drag.get('node').setStyle('opacity', '.25');
+ drag.get('dragNode').addClass('block_course_overview');
+ drag.get('dragNode').set('innerHTML', drag.get('node').get('innerHTML'));
+ drag.get('dragNode').setStyles({
+ opacity: '.5',
+ borderColor: drag.get('node').getStyle('borderColor'),
+ backgroundColor: drag.get('node').getStyle('backgroundColor')
+ });
+ });
+
+ Y.DD.DDM.on('drag:end', function(e) {
+ var drag = e.target;
+ //Put our styles back
+ drag.get('node').setStyles({
+ visibility: '',
+ opacity: '1'
+ });
+ M.block_course_overview.save(Y);
+ });
+
+ Y.DD.DDM.on('drag:drag', function(e) {
+ //Get the last y point
+ var y = e.target.lastXY[1];
+ //is it greater than the lastY var?
+ if (y < lastY) {
+ //We are going up
+ goingUp = true;
+ } else {
+ //We are going down.
+ goingUp = false;
+ }
+ //Cache for next check
+ lastY = y;
+ });
+
+ Y.DD.DDM.on('drop:over', function(e) {
+ //Get a reference to our drag and drop nodes
+ var drag = e.drag.get('node'),
+ drop = e.drop.get('node');
+
+ //Are we dropping on a li node?
+ if (drop.hasClass('coursebox')) {
+ //Are we not going up?
+ if (!goingUp) {
+ drop = drop.get('nextSibling');
+ }
+ //Add the node to this list
+ e.drop.get('node').get('parentNode').insertBefore(drag, drop);
+ //Resize this nodes shim, so we can drop on it later.
+ e.drop.sizeShim();
+ }
+ });
+
+ Y.DD.DDM.on('drag:drophit', function(e) {
+ var drop = e.drop.get('node'),
+ drag = e.drag.get('node');
+
+ //if we are not on an li, we must have been dropped on a ul
+ if (!drop.hasClass('coursebox')) {
+ if (!drop.contains(drag)) {
+ drop.appendChild(drag);
+ }
+ }
+ });
+ });
+}
+
+M.block_course_overview.save = function() {
+ var Y = M.block_course_overview.Y;
+ var sortorder = Y.one('#course_list').get('children').getAttribute('id');
+ for (var i = 0; i < sortorder.length; i++) {
+ sortorder[i] = sortorder[i].substring(7);
+ }
+ var params = {
+ sesskey : M.cfg.sesskey,
+ sortorder : sortorder
+ };
+ Y.io(M.cfg.wwwroot+'/blocks/course_overview/save.php', {
+ method: 'POST',
+ data: build_querystring(params),
+ context: this
+ });
+}
+
+/**
+ * Init a collapsible region, see print_collapsible_region in weblib.php
+ * @param {YUI} Y YUI3 instance with all libraries loaded
+ * @param {String} id the HTML id for the div.
+ * @param {String} userpref the user preference that records the state of this box. false if none.
+ * @param {String} strtooltip
+ */
+M.block_course_overview.collapsible = function(Y, id, userpref, strtooltip) {
+ if (userpref) {
+ M.block_course_overview.userpref = true;
+ }
+ Y.use('anim', function(Y) {
+ new M.block_course_overview.CollapsibleRegion(Y, id, userpref, strtooltip);
+ });
+};
+
+/**
+ * Object to handle a collapsible region : instantiate and forget styled object
+ *
+ * @class
+ * @constructor
+ * @param {YUI} Y YUI3 instance with all libraries loaded
+ * @param {String} id The HTML id for the div.
+ * @param {String} userpref The user preference that records the state of this box. false if none.
+ * @param {String} strtooltip
+ */
+M.block_course_overview.CollapsibleRegion = function(Y, id, userpref, strtooltip) {
+ // Record the pref name
+ this.userpref = userpref;
+
+ // Find the divs in the document.
+ this.div = Y.one('#'+id);
+
+ // Get the caption for the collapsible region
+ var caption = this.div.one('#'+id + '_caption');
+ caption.setAttribute('title', strtooltip);
+
+ // Create a link
+ var a = Y.Node.create('');
+ // Create a local scoped lamba function to move nodes to a new link
+ var movenode = function(node){
+ node.remove();
+ a.append(node);
+ };
+ // Apply the lamba function on each of the captions child nodes
+ caption.get('children').each(movenode, this);
+ caption.prepend(a);
+
+ // Get the height of the div at this point before we shrink it if required
+ var height = this.div.get('offsetHeight');
+ if (this.div.hasClass('collapsed')) {
+ // Shrink the div as it is collapsed by default
+ this.div.setStyle('height', caption.get('offsetHeight')+'px');
+ }
+
+ // Create the animation.
+ var animation = new Y.Anim({
+ node: this.div,
+ duration: 0.3,
+ easing: Y.Easing.easeBoth,
+ to: {height:caption.get('offsetHeight')},
+ from: {height:height}
+ });
+
+ // Handler for the animation finishing.
+ animation.on('end', function() {
+ this.div.toggleClass('collapsed');
+ }, this);
+
+ // Hook up the event handler.
+ caption.on('click', function(e, animation) {
+ e.preventDefault();
+ // Animate to the appropriate size.
+ if (animation.get('running')) {
+ animation.stop();
+ }
+ animation.set('reverse', this.div.hasClass('collapsed'));
+ // Update the user preference.
+ if (this.userpref) {
+ M.util.set_user_preference(this.userpref, !this.div.hasClass('collapsed'));
+ }
+ animation.run();
+ }, this, animation);
+};
+
+M.block_course_overview.userpref = false;
+
+/**
+ * The user preference that stores the state of this box.
+ * @property userpref
+ * @type String
+ */
+M.block_course_overview.CollapsibleRegion.prototype.userpref = null;
+
+/**
+ * The key divs that make up this
+ * @property div
+ * @type Y.Node
+ */
+M.block_course_overview.CollapsibleRegion.prototype.div = null;
+
+/**
+ * The key divs that make up this
+ * @property icon
+ * @type Y.Node
+ */
+M.block_course_overview.CollapsibleRegion.prototype.icon = null;
+
diff --git a/blocks/course_overview/move.php b/blocks/course_overview/move.php
new file mode 100644
index 00000000000..8cb7b1b5b4f
--- /dev/null
+++ b/blocks/course_overview/move.php
@@ -0,0 +1,73 @@
+.
+
+/**
+ * Move/order course functionality for course_overview block.
+ *
+ * @package block_course_overview
+ * @copyright 2012 Adam Olley
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+require_once(dirname(__FILE__) . '/../../config.php');
+require_once(dirname(__FILE__) . '/locallib.php');
+
+require_sesskey();
+require_login();
+
+$source = required_param('source', PARAM_INT);
+$move = required_param('move', PARAM_INT);
+
+list($courses_sorted, $sitecourses, $coursecount) = block_course_overview_get_sorted_courses();
+$sortorder = array_keys($courses_sorted);
+// Now resort based on new weight for chosen course.
+$neworder = array();
+
+$sourcekey = array_search($source, $sortorder);
+if ($sourcekey === false) {
+ print_error("invalidcourseid", null, null, $source);
+}
+
+$destination = $sourcekey + $move;
+if ($destination < 0) {
+ print_error("listcantmoveup");
+} else if ($destination >= count($courses_sorted)) {
+ print_error("listcantmovedown");
+}
+
+// Create neworder list for courses.
+unset($sortorder[$sourcekey]);
+if ($move == -1) {
+ if ($destination > 0) {
+ $neworder = array_slice($sortorder, 0, $destination, true);
+ }
+ $neworder[] = $source;
+ $remaningcourses = array_slice($sortorder, $destination);
+ foreach ($remaningcourses as $courseid) {
+ $neworder[] = $courseid;
+ }
+} else if (($move == 1)) {
+ $neworder = array_slice($sortorder, 0, $destination);
+ $neworder[] = $source;
+ if (($destination) < count($courses_sorted)) {
+ $remaningcourses = array_slice($sortorder, $destination);
+ foreach ($remaningcourses as $courseid) {
+ $neworder[] = $courseid;
+ }
+ }
+}
+
+block_course_overview_update_myorder($neworder);
+redirect(new moodle_url('/my/index.php'));
diff --git a/blocks/course_overview/renderer.php b/blocks/course_overview/renderer.php
new file mode 100644
index 00000000000..7c19c9e3560
--- /dev/null
+++ b/blocks/course_overview/renderer.php
@@ -0,0 +1,307 @@
+.
+
+/**
+ * course_overview block rendrer
+ *
+ * @package block_course_overview
+ * @copyright 2012 Adam Olley
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+defined('MOODLE_INTERNAL') || die;
+
+/**
+ * Course_overview block rendrer
+ *
+ * @copyright 2012 Adam Olley
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class block_course_overview_renderer extends plugin_renderer_base {
+
+ /**
+ * Construct contents of course_overview block
+ *
+ * @param array $courses list of courses in sorted order
+ * @param array $overviews list of course overviews
+ * @return string html to be displayed in course_overview block
+ */
+ public function course_overview($courses, $overviews) {
+ $html = '';
+ $config = get_config('block_course_overview');
+
+ $html .= html_writer::start_tag('div', array('id' => 'course_list'));
+ $courseordernumber = 0;
+ $maxcourses = count($courses);
+ // Intialize string/icon etc if user is editing.
+ $url = null;
+ $moveicon = null;
+ $moveup[] = null;
+ $movedown[] = null;
+ if ($this->page->user_is_editing()) {
+ if (ajaxenabled()) {
+ $moveicon = html_writer::tag('div',
+ html_writer::empty_tag('img',
+ array('src' => $this->pix_url('i/move_2d')->out(false),
+ 'alt' => get_string('move'), 'class' => 'cursor',
+ 'title' => get_string('move'))
+ ), array('class' => 'move')
+ );
+ } else {
+ $url = new moodle_url('/blocks/course_overview/move.php', array('sesskey' => sesskey()));
+ $moveup['str'] = get_string('moveup');
+ $moveup['icon'] = $this->pix_url('t/up');
+ $movedown['str'] = get_string('movedown');
+ $movedown['icon'] = $this->pix_url('t/down');
+ }
+ }
+
+ foreach ($courses as $key => $course) {
+ $html .= $this->output->box_start('coursebox', "course-{$course->id}");
+ $html .= html_writer::start_tag('div', array('class' => 'course_title'));
+ // Ajax enabled then add moveicon html
+ if (!is_null($moveicon)) {
+ $html .= $moveicon;
+ } else if (!is_null($url)) {
+ // Add course id to move link
+ $url->param('source', $course->id);
+ $html .= html_writer::start_tag('div', array('class' => 'moveicons'));
+ // Add an arrow to move course up.
+ if ($courseordernumber > 0) {
+ $url->param('move', -1);
+ $html .= html_writer::link($url,
+ html_writer::empty_tag('img', array('src' => $moveup['icon'],
+ 'class' => 'up', 'alt' => $moveup['str'])),
+ array('title' => $moveup['str'], 'class' => 'moveup'));
+ } else {
+ // Add a spacer to keep keep down arrow icons at right position.
+ $html .= html_writer::empty_tag('img', array('src' => $this->pix_url('spacer'),
+ 'class' => 'movedownspacer'));
+ }
+ // Add an arrow to move course down.
+ if ($courseordernumber <= $maxcourses-2) {
+ $url->param('move', 1);
+ $html .= html_writer::link($url, html_writer::empty_tag('img',
+ array('src' => $movedown['icon'], 'class' => 'down', 'alt' => $movedown['str'])),
+ array('title' => $movedown['str'], 'class' => 'movedown'));
+ } else {
+ // Add a spacer to keep keep up arrow icons at right position.
+ $html .= html_writer::empty_tag('img', array('src' => $this->pix_url('spacer'),
+ 'class' => 'moveupspacer'));
+ }
+ $html .= html_writer::end_tag('div');
+ }
+
+ $attributes = array('title' => s($course->fullname));
+ if ($course->id > 0) {
+ $link = html_writer::link(new moodle_url('/course/view.php', array('id' => $course->id)), format_string($course->shortname, true, $course->id), $attributes);
+ $html .= $this->output->heading($link, 2, 'title');
+ } else {
+ $html .= $this->output->heading(html_writer::link(
+ new moodle_url('/auth/mnet/jump.php', array('hostid' => $course->hostid, 'wantsurl' => '/course/view.php?id='.$course->remoteid)),
+ format_string($course->shortname, true, $course->id), $attributes) . ' (' . format_string($course->hostname) . ')', 2, 'title');
+ }
+ $html .= $this->output->box('', 'flush');
+ $html .= html_writer::end_tag('div');
+
+ if (!empty($config->showchildren) && ($course->id > 0)) {
+ // List children here.
+ if ($children = block_course_overview_get_child_shortnames($course->id)) {
+ $html .= html_writer::tag('span', $children, array('class' => 'coursechildren'));
+ }
+ }
+
+ if (isset($overviews[$course->id])) {
+ $html .= $this->activity_display($course->id, $overviews[$course->id]);
+ }
+
+ $html .= $this->output->box('', 'flush');
+ $html .= $this->output->box_end();
+ $courseordernumber++;
+ }
+ $html .= html_writer::end_tag('div');
+
+ return $html;
+ }
+
+ /**
+ * Coustuct activities overview for a course
+ *
+ * @param int $cid course id
+ * @param array $overview overview of activities in course
+ * @return string html of activities overview
+ */
+ protected function activity_display($cid, $overview) {
+ $output = html_writer::start_tag('div', array('class' => 'activity_info'));
+ foreach (array_keys($overview) as $module) {
+ $output .= html_writer::start_tag('div', array('class' => 'activity_overview'));
+ $url = new moodle_url("/mod/$module/index.php", array('id' => $cid));
+ $modulename = get_string('modulename', $module);
+ $icontext = html_writer::link($url, $this->output->pix_icon('icon', $modulename, 'mod_'.$module, array('class'=>'icon')).' ');
+ if (get_string_manager()->string_exists("activityoverview", $module)) {
+ $icontext .= get_string("activityoverview", $module);
+ } else {
+ $icontext .= get_string("activityoverview", 'block_course_overview', $modulename);
+ }
+
+ // Add collapsible region with overview text in it.
+ $output .= $this->collapsible_region($overview[$module], '', 'region_'.$cid.'_'.$module, $icontext, '', true);
+
+ $output .= html_writer::end_tag('div');
+ }
+ $output .= html_writer::end_tag('div');
+ return $output;
+ }
+
+ /**
+ * Constructs header in editing mode
+ *
+ * @param int $max maximum number of courses
+ * @return string html of header bar.
+ */
+ public function editing_bar_head($max = 0) {
+ $output = $this->output->box_start('notice');
+
+ $options = array('0' => get_string('alwaysshowall', 'block_course_overview'));
+ for ($i = 1; $i <= $max; $i++) {
+ $options[$i] = $i;
+ }
+ $url = new moodle_url('/my/index.php');
+ $select = new single_select($url, 'mynumber', $options, block_course_overview_get_max_user_courses(), array());
+ $select->set_label(get_string('numtodisplay', 'block_course_overview'));
+ $output .= $this->output->render($select);
+
+ $output .= $this->output->box_end();
+ return $output;
+ }
+
+ /**
+ * Show hidden courses count
+ *
+ * @param int $total count of hidden courses
+ * @return string html
+ */
+ public function hidden_courses($total) {
+ if ($total <= 0) {
+ return;
+ }
+ $output = $this->output->box_start('notice');
+ $plural = $total > 1 ? 'plural' : '';
+ $output .= get_string('hiddencoursecount'.$plural, 'block_course_overview', $total);
+ $output .= $this->output->box_end();
+ return $output;
+ }
+
+ /**
+ * Creates collapsable region
+ *
+ * @param string $contents existing contents
+ * @param string $classes class names added to the div that is output.
+ * @param string $id id added to the div that is output. Must not be blank.
+ * @param string $caption text displayed at the top. Clicking on this will cause the region to expand or contract.
+ * @param string $userpref the name of the user preference that stores the user's preferred default state.
+ * (May be blank if you do not wish the state to be persisted.
+ * @param bool $default Initial collapsed state to use if the user_preference it not set.
+ * @return bool if true, return the HTML as a string, rather than printing it.
+ */
+ protected function collapsible_region($contents, $classes, $id, $caption, $userpref = '', $default = false) {
+ $output = $this->collapsible_region_start($classes, $id, $caption, $userpref, $default);
+ $output .= $contents;
+ $output .= $this->collapsible_region_end();
+
+ return $output;
+ }
+
+ /**
+ * Print (or return) the start of a collapsible region, that has a caption that can
+ * be clicked to expand or collapse the region. If JavaScript is off, then the region
+ * will always be expanded.
+ *
+ * @param string $classes class names added to the div that is output.
+ * @param string $id id added to the div that is output. Must not be blank.
+ * @param string $caption text displayed at the top. Clicking on this will cause the region to expand or contract.
+ * @param string $userpref the name of the user preference that stores the user's preferred default state.
+ * (May be blank if you do not wish the state to be persisted.
+ * @param bool $default Initial collapsed state to use if the user_preference it not set.
+ * @return bool if true, return the HTML as a string, rather than printing it.
+ */
+ protected function collapsible_region_start($classes, $id, $caption, $userpref = '', $default = false) {
+ // Work out the initial state.
+ if (!empty($userpref) and is_string($userpref)) {
+ user_preference_allow_ajax_update($userpref, PARAM_BOOL);
+ $collapsed = get_user_preferences($userpref, $default);
+ } else {
+ $collapsed = $default;
+ $userpref = false;
+ }
+
+ if ($collapsed) {
+ $classes .= ' collapsed';
+ }
+
+ $output = '';
+ $output .= '';
+ $output .= '
';
+ $output .= '
';
+ $output .= $caption . ' ';
+ $output .= '
';
+ $this->page->requires->js_init_call('M.block_course_overview.collapsible', array($id, $userpref, get_string('clicktohideshow')));
+
+ return $output;
+ }
+
+ /**
+ * Close a region started with print_collapsible_region_start.
+ *
+ * @return string return the HTML as a string, rather than printing it.
+ */
+ protected function collapsible_region_end() {
+ $output = '
';
} else {
diff --git a/blocks/glossary_random/edit_form.php b/blocks/glossary_random/edit_form.php
index 70682bd3e83..95fa6a0b960 100644
--- a/blocks/glossary_random/edit_form.php
+++ b/blocks/glossary_random/edit_form.php
@@ -38,7 +38,7 @@ class block_glossary_random_edit_form extends block_edit_form {
$mform->addElement('text', 'config_title', get_string('title', 'block_glossary_random'));
$mform->setDefault('config_title', get_string('pluginname','block_glossary_random'));
- $mform->setType('config_title', PARAM_MULTILANG);
+ $mform->setType('config_title', PARAM_TEXT);
// Select glossaries to put in dropdown box ...
$glossaries = $DB->get_records_menu('glossary', array('course' => $this->block->course->id), 'name', 'id,name');
@@ -49,7 +49,7 @@ class block_glossary_random_edit_form extends block_edit_form {
$mform->addElement('text', 'config_refresh', get_string('refresh', 'block_glossary_random'), array('size' => 5));
$mform->setDefault('config_refresh', 0);
- $mform->setType('config_refresh', PARAM_INTEGER);
+ $mform->setType('config_refresh', PARAM_INT);
// and select quotetypes to put in dropdown box
$types = array(
diff --git a/blocks/html/edit_form.php b/blocks/html/edit_form.php
index aa7b4661de8..b7251905e58 100644
--- a/blocks/html/edit_form.php
+++ b/blocks/html/edit_form.php
@@ -35,7 +35,7 @@ class block_html_edit_form extends block_edit_form {
$mform->addElement('header', 'configheader', get_string('blocksettings', 'block'));
$mform->addElement('text', 'config_title', get_string('configtitle', 'block_html'));
- $mform->setType('config_title', PARAM_MULTILANG);
+ $mform->setType('config_title', PARAM_TEXT);
$editoroptions = array('maxfiles' => EDITOR_UNLIMITED_FILES, 'noclean'=>true, 'context'=>$this->block->context);
$mform->addElement('editor', 'config_text', get_string('configcontent', 'block_html'), null, $editoroptions);
diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php
index 2d92009e486..e834e114526 100644
--- a/blocks/login/block_login.php
+++ b/blocks/login/block_login.php
@@ -35,7 +35,7 @@ class block_login extends block_base {
// TODO: now that we have multiauth it is hard to find out if there is a way to change password
$forgot = $wwwroot . '/login/forgot_password.php';
- if (empty($CFG->xmlstrictheaders) and !empty($CFG->loginpasswordautocomplete)) {
+ if (!empty($CFG->loginpasswordautocomplete)) {
$autocomplete = 'autocomplete="off"';
} else {
$autocomplete = '';
diff --git a/blocks/mentees/edit_form.php b/blocks/mentees/edit_form.php
index 760d5fdbe0b..5b3430d7939 100644
--- a/blocks/mentees/edit_form.php
+++ b/blocks/mentees/edit_form.php
@@ -35,6 +35,6 @@ class block_mentees_edit_form extends block_edit_form {
$mform->addElement('header', 'configheader', get_string('blocksettings', 'block'));
$mform->addElement('text', 'config_title', get_string('configtitleblankhides', 'block_mentees'));
- $mform->setType('config_title', PARAM_MULTILANG);
+ $mform->setType('config_title', PARAM_TEXT);
}
}
\ No newline at end of file
diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index 3c6916bf09c..2021fefe151 100644
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -10,7 +10,7 @@ class block_mnet_hosts extends block_list {
}
function applicable_formats() {
- if (has_capability('moodle/site:mnetlogintoremote', get_context_instance(CONTEXT_SYSTEM), NULL, false)) {
+ if (has_capability('moodle/site:mnetlogintoremote', context_system::instance(), NULL, false)) {
return array('all' => true, 'mod' => false, 'tag' => false);
} else {
return array('site' => true);
@@ -59,7 +59,7 @@ class block_mnet_hosts extends block_list {
}
}
- if (!has_capability('moodle/site:mnetlogintoremote', get_context_instance(CONTEXT_SYSTEM), NULL, false)) {
+ if (!has_capability('moodle/site:mnetlogintoremote', context_system::instance(), NULL, false)) {
if (debugging() and !empty($CFG->debugdisplay)) {
$this->content = new stdClass();
$this->content->footer = html_writer::tag('span',
diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 3d67dd707ab..d5a20a254ac 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -418,7 +418,7 @@ class block_base {
$this->config = unserialize(base64_decode($instance->configdata));
}
$this->instance = $instance;
- $this->context = get_context_instance(CONTEXT_BLOCK, $instance->id);
+ $this->context = context_block::instance($instance->id);
$this->page = $page;
$this->specialization();
}
diff --git a/blocks/navigation/renderer.php b/blocks/navigation/renderer.php
index fe91aed2b10..4c3d28cf507 100644
--- a/blocks/navigation/renderer.php
+++ b/blocks/navigation/renderer.php
@@ -77,6 +77,11 @@ class block_navigation_renderer extends plugin_renderer_base {
$isexpandable = (empty($expansionlimit) || ($item->type > navigation_node::TYPE_ACTIVITY || $item->type < $expansionlimit) || ($item->contains_active_node() && $item->children->count() > 0));
$isbranch = $isexpandable && ($item->children->count() > 0 || ($item->has_children() && (isloggedin() || $item->type <= navigation_node::TYPE_CATEGORY)));
+ // Skip elements which have no content and no action - no point in showing them
+ if (!$isexpandable && empty($item->action)) {
+ continue;
+ }
+
$hasicon = ((!$isbranch || $item->type == navigation_node::TYPE_ACTIVITY || $item->type == navigation_node::TYPE_RESOURCE) && $item->icon instanceof renderable);
if ($hasicon) {
diff --git a/blocks/news_items/block_news_items.php b/blocks/news_items/block_news_items.php
index 6fcd152ae72..d6515e8e147 100644
--- a/blocks/news_items/block_news_items.php
+++ b/blocks/news_items/block_news_items.php
@@ -41,7 +41,7 @@ class block_news_items extends block_base {
return '';
}
- $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $context = context_module::instance($cm->id);
/// User must have perms to view discussions in that forum
if (!has_capability('mod/forum:viewdiscussion', $context)) {
@@ -84,9 +84,7 @@ class block_news_items extends block_base {
''.
'
'.userdate($discussion->modified, $strftimerecent).'
'.
'
'.fullname($discussion).'
';
@@ -595,7 +595,7 @@ function calendar_add_event_metadata($event) {
} else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event
calendar_get_course_cached($coursecache, $event->courseid);
- $context = get_context_instance(CONTEXT_COURSE, $event->courseid);
+ $context = context_course::instance($event->courseid);
$fullname = format_string($coursecache[$event->courseid]->fullname, true, array('context' => $context));
$event->icon = ' . ')
';
@@ -1374,7 +1374,7 @@ function calendar_set_filters(array $courseeventsfrom, $ignorefilters = false) {
if (count($courseeventsfrom)==1) {
$course = reset($courseeventsfrom);
- if (has_any_capability($allgroupscaps, get_context_instance(CONTEXT_COURSE, $course->id))) {
+ if (has_any_capability($allgroupscaps, context_course::instance($course->id))) {
$coursegroups = groups_get_all_groups($course->id, 0, 0, 'g.id');
$group = array_keys($coursegroups);
}
@@ -1430,7 +1430,7 @@ function calendar_edit_event_allowed($event) {
return false;
}
- $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+ $sitecontext = context_system::instance();
// if user has manageentries at site level, return true
if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
return true;
@@ -1698,14 +1698,14 @@ function calendar_get_allowed_types(&$allowed, $course = null) {
$allowed->user = has_capability('moodle/calendar:manageownentries', get_system_context());
$allowed->groups = 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_COURSE, SITEID));
+ $allowed->site = has_capability('moodle/calendar:manageentries', context_course::instance(SITEID));
if (!empty($course)) {
if (!is_object($course)) {
$course = $DB->get_record('course', array('id' => $course), '*', MUST_EXIST);
}
if ($course->id != SITEID) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$allowed->user = has_capability('moodle/calendar:manageownentries', $coursecontext);
if (has_capability('moodle/calendar:manageentries', $coursecontext)) {
@@ -1752,7 +1752,7 @@ function calendar_add_event_allowed($event) {
return false;
}
- $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+ $sitecontext = context_system::instance();
// if user has manageentries at site level, always return true
if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
return true;
@@ -1953,20 +1953,20 @@ class calendar_event {
$context = null;
if (isset($data->courseid) && $data->courseid > 0) {
- $context = get_context_instance(CONTEXT_COURSE, $data->courseid);
+ $context = context_course::instance($data->courseid);
} else if (isset($data->course) && $data->course > 0) {
- $context = get_context_instance(CONTEXT_COURSE, $data->course);
+ $context = context_course::instance($data->course);
} else if (isset($data->groupid) && $data->groupid > 0) {
$group = $DB->get_record('groups', array('id'=>$data->groupid));
- $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
+ $context = context_course::instance($group->courseid);
} else if (isset($data->userid) && $data->userid > 0 && $data->userid == $USER->id) {
- $context = get_context_instance(CONTEXT_USER, $data->userid);
+ $context = context_user::instance($data->userid);
} else if (isset($data->userid) && $data->userid > 0 && $data->userid != $USER->id &&
isset($data->instance) && $data->instance > 0) {
$cm = get_coursemodule_from_instance($data->modulename, $data->instance, 0, false, MUST_EXIST);
- $context = get_context_instance(CONTEXT_COURSE, $cm->course);
+ $context = context_course::instance($cm->course);
} else {
- $context = get_context_instance(CONTEXT_USER);
+ $context = context_user::instance();
}
return $context;
diff --git a/calendar/renderer.php b/calendar/renderer.php
index a2f8a7b9a90..60e3a743174 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -687,7 +687,7 @@ class core_calendar_renderer extends plugin_renderer_base {
return '';
}
- if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) {
+ if (has_capability('moodle/calendar:manageentries', context_system::instance()) && !empty($CFG->calendar_adminseesall)) {
$courses = get_courses('all', 'c.shortname','c.id,c.shortname');
} else {
$courses = enrol_get_my_courses();
@@ -698,7 +698,7 @@ class core_calendar_renderer extends plugin_renderer_base {
$courseoptions = array();
$courseoptions[SITEID] = get_string('fulllistofcourses');
foreach ($courses as $course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$courseoptions[$course->id] = format_string($course->shortname, true, array('context' => $coursecontext));
}
diff --git a/calendar/set.php b/calendar/set.php
index c02069e07d7..255027e5610 100644
--- a/calendar/set.php
+++ b/calendar/set.php
@@ -53,7 +53,7 @@ if ($courseid != -1) {
}
$url = new moodle_url('/calendar/set.php', array('return'=>base64_encode($return->out(false)), 'course' => $courseid, 'var'=>$var, 'sesskey'=>sesskey()));
$PAGE->set_url($url);
-$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
+$PAGE->set_context(context_system::instance());
switch($var) {
case 'showgroups':
diff --git a/cohort/edit_form.php b/cohort/edit_form.php
index d449980f87e..957607171c8 100644
--- a/cohort/edit_form.php
+++ b/cohort/edit_form.php
@@ -43,7 +43,7 @@ class cohort_edit_form extends moodleform {
$mform->addElement('text', 'name', get_string('name', 'cohort'), 'maxlength="254" size="50"');
$mform->addRule('name', get_string('required'), 'required', null, 'client');
- $mform->setType('name', PARAM_MULTILANG);
+ $mform->setType('name', PARAM_TEXT);
$options = $this->get_category_options($cohort->contextid);
$mform->addElement('select', 'contextid', get_string('context', 'role'), $options);
@@ -93,12 +93,12 @@ class cohort_edit_form extends moodleform {
$parentlist = array();
make_categories_list($displaylist, $parentlist, 'moodle/cohort:manage');
$options = array();
- $syscontext = get_context_instance(CONTEXT_SYSTEM);
+ $syscontext = context_system::instance();
if (has_capability('moodle/cohort:manage', $syscontext)) {
$options[$syscontext->id] = print_context_name($syscontext);
}
foreach ($displaylist as $cid=>$name) {
- $context = get_context_instance(CONTEXT_COURSECAT, $cid, MUST_EXIST);
+ $context = context_coursecat::instance($cid);
$options[$context->id] = $name;
}
// always add current - this is not likely, but if the logic gets changed it might be a problem
diff --git a/cohort/index.php b/cohort/index.php
index 9c18bb72f01..026bcb855e9 100644
--- a/cohort/index.php
+++ b/cohort/index.php
@@ -37,7 +37,7 @@ require_login();
if ($contextid) {
$context = get_context_instance_by_id($contextid, MUST_EXIST);
} else {
- $context = get_context_instance(CONTEXT_SYSTEM);
+ $context = context_system::instance();
}
if ($context->contextlevel != CONTEXT_COURSECAT and $context->contextlevel != CONTEXT_SYSTEM) {
diff --git a/cohort/lib.php b/cohort/lib.php
index 367b19ec9de..223644b52e6 100644
--- a/cohort/lib.php
+++ b/cohort/lib.php
@@ -110,14 +110,14 @@ function cohort_delete_category($category) {
global $DB;
// TODO: make sure that cohorts are really, really not used anywhere and delete, for now just move to parent or system context
- $oldcontext = get_context_instance(CONTEXT_COURSECAT, $category->id, MUST_EXIST);
+ $oldcontext = context_coursecat::instance($category->id);
if ($category->parent and $parent = $DB->get_record('course_categories', array('id'=>$category->parent))) {
- $parentcontext = get_context_instance(CONTEXT_COURSECAT, $parent->id, MUST_EXIST);
+ $parentcontext = context_coursecat::instance($parent->id);
$sql = "UPDATE {cohort} SET contextid = :newcontext WHERE contextid = :oldcontext";
$params = array('oldcontext'=>$oldcontext->id, 'newcontext'=>$parentcontext->id);
} else {
- $syscontext = get_context_instance(CONTEXT_SYSTEM);
+ $syscontext = context_system::instance();
$sql = "UPDATE {cohort} SET contextid = :newcontext WHERE contextid = :oldcontext";
$params = array('oldcontext'=>$oldcontext->id, 'newcontext'=>$syscontext->id);
}
@@ -165,7 +165,7 @@ function cohort_remove_member($cohortid, $userid) {
function cohort_get_visible_list($course) {
global $DB, $USER;
- $context = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST);
+ $context = context_course::instance($course->id);
list($esql, $params) = get_enrolled_sql($context);
$parentsql = get_related_contexts_string($context);
diff --git a/lib/completion/completion_aggregation.php b/completion/completion_aggregation.php
similarity index 98%
rename from lib/completion/completion_aggregation.php
rename to completion/completion_aggregation.php
index e6e626a4de9..0c4d4575505 100644
--- a/lib/completion/completion_aggregation.php
+++ b/completion/completion_aggregation.php
@@ -26,7 +26,7 @@
*/
defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
/**
* Course completion critieria aggregation
diff --git a/lib/completion/completion_completion.php b/completion/completion_completion.php
similarity index 98%
rename from lib/completion/completion_completion.php
rename to completion/completion_completion.php
index 73c2446b91d..e8e80197bdf 100644
--- a/lib/completion/completion_completion.php
+++ b/completion/completion_completion.php
@@ -25,7 +25,7 @@
*/
defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
/**
* Course completion status for a particular user/course
diff --git a/lib/completion/completion_criteria_completion.php b/completion/completion_criteria_completion.php
similarity index 98%
rename from lib/completion/completion_criteria_completion.php
rename to completion/completion_criteria_completion.php
index a2879db4d69..bf4f7a770eb 100644
--- a/lib/completion/completion_criteria_completion.php
+++ b/completion/completion_criteria_completion.php
@@ -25,7 +25,7 @@
*/
defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
/**
* Completion data for a specific user, course and critieria
@@ -149,7 +149,7 @@ class completion_criteria_completion extends data_object {
$record = $DB->get_record('course_completion_criteria', $params);
- $this->attach_criteria(completion_criteria::factory($record));
+ $this->attach_criteria(completion_criteria::factory((array) $record));
}
return $this->_criteria;
diff --git a/lib/completion/completion_criteria.php b/completion/criteria/completion_criteria.php
similarity index 97%
rename from lib/completion/completion_criteria.php
rename to completion/criteria/completion_criteria.php
index 31f5187edcb..a87abd3d676 100644
--- a/lib/completion/completion_criteria.php
+++ b/completion/criteria/completion_criteria.php
@@ -25,8 +25,8 @@
*/
defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
-require_once($CFG->libdir.'/completion/completion_criteria_completion.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_completion.php');
/**
* Self completion criteria type
@@ -172,7 +172,7 @@ abstract class completion_criteria extends data_object {
}
$class = 'completion_criteria_'.$COMPLETION_CRITERIA_TYPES[$params['criteriatype']];
- require_once($CFG->libdir.'/completion/'.$class.'.php');
+ require_once($CFG->dirroot.'/completion/criteria/'.$class.'.php');
return new $class($params, false);
}
diff --git a/lib/completion/completion_criteria_activity.php b/completion/criteria/completion_criteria_activity.php
similarity index 100%
rename from lib/completion/completion_criteria_activity.php
rename to completion/criteria/completion_criteria_activity.php
diff --git a/lib/completion/completion_criteria_course.php b/completion/criteria/completion_criteria_course.php
similarity index 100%
rename from lib/completion/completion_criteria_course.php
rename to completion/criteria/completion_criteria_course.php
diff --git a/lib/completion/completion_criteria_date.php b/completion/criteria/completion_criteria_date.php
similarity index 100%
rename from lib/completion/completion_criteria_date.php
rename to completion/criteria/completion_criteria_date.php
diff --git a/lib/completion/completion_criteria_duration.php b/completion/criteria/completion_criteria_duration.php
similarity index 100%
rename from lib/completion/completion_criteria_duration.php
rename to completion/criteria/completion_criteria_duration.php
diff --git a/lib/completion/completion_criteria_grade.php b/completion/criteria/completion_criteria_grade.php
similarity index 100%
rename from lib/completion/completion_criteria_grade.php
rename to completion/criteria/completion_criteria_grade.php
diff --git a/lib/completion/completion_criteria_role.php b/completion/criteria/completion_criteria_role.php
similarity index 100%
rename from lib/completion/completion_criteria_role.php
rename to completion/criteria/completion_criteria_role.php
diff --git a/lib/completion/completion_criteria_self.php b/completion/criteria/completion_criteria_self.php
similarity index 100%
rename from lib/completion/completion_criteria_self.php
rename to completion/criteria/completion_criteria_self.php
diff --git a/lib/completion/completion_criteria_unenrol.php b/completion/criteria/completion_criteria_unenrol.php
similarity index 100%
rename from lib/completion/completion_criteria_unenrol.php
rename to completion/criteria/completion_criteria_unenrol.php
diff --git a/lib/completion/cron.php b/completion/cron.php
similarity index 99%
rename from lib/completion/cron.php
rename to completion/cron.php
index bf2a646accf..23e682c84c6 100644
--- a/lib/completion/cron.php
+++ b/completion/cron.php
@@ -207,7 +207,7 @@ function completion_cron_criteria() {
foreach ($COMPLETION_CRITERIA_TYPES as $type) {
$object = 'completion_criteria_'.$type;
- require_once $CFG->libdir.'/completion/'.$object.'.php';
+ require_once $CFG->dirroot.'/completion/criteria/'.$object.'.php';
$class = new $object();
diff --git a/lib/completion/data_object.php b/completion/data_object.php
similarity index 100%
rename from lib/completion/data_object.php
rename to completion/data_object.php
diff --git a/course/category.php b/course/category.php
index 935b83a2043..91efb2d199b 100644
--- a/course/category.php
+++ b/course/category.php
@@ -93,7 +93,7 @@ if ($editingon && $sesskeyprovided) {
// Some courses are being moved
// user must have category update in both cats to perform this
require_capability('moodle/category:manage', $context);
- require_capability('moodle/category:manage', get_context_instance(CONTEXT_COURSECAT, $moveto));
+ require_capability('moodle/category:manage', context_coursecat::instance($moveto));
if (!$destcategory = $DB->get_record('course_categories', array('id' => $data->moveto))) {
print_error('cannotfindcategory', '', '', $data->moveto);
@@ -129,7 +129,7 @@ if ($editingon && $sesskeyprovided) {
}
if ($course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
require_capability('moodle/course:visibility', $coursecontext);
// Set the visibility of the course. we set the old flag when user manually changes visibility of course.
$DB->update_record('course', array('id' => $course->id, 'visible' => $visible, 'visibleold' => $visible, 'timemodified' => time()));
@@ -268,7 +268,7 @@ $baseurl = new moodle_url('/course/category.php');
foreach ($subcategories as $subcategory) {
// Preload the context we will need it to format the category name shortly.
context_helper::preload_from_record($subcategory);
- $context = get_context_instance(CONTEXT_COURSECAT, $subcategory->id);
+ $context = context_coursecat::instance($subcategory->id);
// Prepare the things we need to create a link to the subcategory
$attributes = $subcategory->visible ? array() : array('class' => 'dimmed');
$text = format_string($subcategory->name, true, array('context' => $context));
@@ -332,7 +332,7 @@ if (!$courses) {
$baseurl = new moodle_url('/course/category.php', $urlparams + array('sesskey' => sesskey()));
foreach ($courses as $acourse) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $acourse->id);
+ $coursecontext = context_course::instance($acourse->id);
$count++;
$up = ($count > 1 || !$atfirstpage);
@@ -447,7 +447,7 @@ if (has_capability('moodle/course:create', $context)) {
}
if (!empty($CFG->enablecourserequests) && $category->id == $CFG->defaultrequestcategory) {
- print_course_request_buttons(get_context_instance(CONTEXT_SYSTEM));
+ print_course_request_buttons(context_system::instance());
}
echo ' ';
diff --git a/course/completion.php b/course/completion.php
index a25c2af30f9..559ccdb5e88 100644
--- a/course/completion.php
+++ b/course/completion.php
@@ -28,14 +28,14 @@
require_once('../config.php');
require_once('lib.php');
require_once($CFG->libdir.'/completionlib.php');
-require_once($CFG->libdir.'/completion/completion_criteria_self.php');
-require_once($CFG->libdir.'/completion/completion_criteria_date.php');
-require_once($CFG->libdir.'/completion/completion_criteria_unenrol.php');
-require_once($CFG->libdir.'/completion/completion_criteria_activity.php');
-require_once($CFG->libdir.'/completion/completion_criteria_duration.php');
-require_once($CFG->libdir.'/completion/completion_criteria_grade.php');
-require_once($CFG->libdir.'/completion/completion_criteria_role.php');
-require_once($CFG->libdir.'/completion/completion_criteria_course.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_self.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_date.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_unenrol.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_activity.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_duration.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_grade.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_role.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_course.php');
require_once $CFG->libdir.'/gradelib.php';
require_once('completion_form.php');
@@ -53,7 +53,7 @@ if ($id) { // editing course
print_error('invalidcourseid');
}
require_login($course);
- require_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id));
+ require_capability('moodle/course:update', context_course::instance($course->id));
} else {
require_login();
diff --git a/course/completion_form.php b/course/completion_form.php
index f13f2af69ce..1f681017bbd 100644
--- a/course/completion_form.php
+++ b/course/completion_form.php
@@ -105,7 +105,7 @@ class course_completion_form extends moodleform {
$selectbox = array();
$selected = array();
foreach ($courses as $c) {
- $selectbox[$c->id] = $list[$c->category] . ' / ' . format_string($c->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $c->id)));
+ $selectbox[$c->id] = $list[$c->category] . ' / ' . format_string($c->fullname, true, array('context' => context_course::instance($c->id)));
// If already selected
if ($c->selected) {
@@ -134,7 +134,7 @@ class course_completion_form extends moodleform {
// Role completion criteria
$mform->addElement('header', 'roles', get_string('manualcompletionby', 'completion'));
- $roles = get_roles_with_capability('moodle/course:markcomplete', CAP_ALLOW, get_context_instance(CONTEXT_COURSE, $course->id));
+ $roles = get_roles_with_capability('moodle/course:markcomplete', CAP_ALLOW, context_course::instance($course->id, IGNORE_MISSING));
if (!empty($roles)) {
$mform->addElement('select', 'role_aggregation', get_string('aggregationmethod', 'completion'), $aggregation_methods);
diff --git a/course/delete.php b/course/delete.php
index ebe6b788e7d..a47822bf3d6 100644
--- a/course/delete.php
+++ b/course/delete.php
@@ -8,7 +8,7 @@
$delete = optional_param('delete', '', PARAM_ALPHANUM); // delete confirmation hash
$PAGE->set_url('/course/delete.php', array('id' => $id));
- $PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
+ $PAGE->set_context(context_system::instance());
require_login();
$site = get_site();
@@ -25,15 +25,15 @@
print_error("invalidcourseid");
}
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
if (!can_delete_course($id)) {
print_error('cannotdeletecourse');
}
$category = $DB->get_record("course_categories", array("id"=>$course->category));
- $courseshortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
- $categoryname = format_string($category->name, true, array('context' => get_context_instance(CONTEXT_COURSECAT, $category->id)));
+ $courseshortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id)));
+ $categoryname = format_string($category->name, true, array('context' => context_coursecat::instance($category->id)));
$PAGE->navbar->add($stradministration, new moodle_url('/admin/index.php/'));
$PAGE->navbar->add($strcategories, new moodle_url('/course/index.php'));
diff --git a/course/delete_category_form.php b/course/delete_category_form.php
index 0ceeb8e59a7..8c32405e5ca 100644
--- a/course/delete_category_form.php
+++ b/course/delete_category_form.php
@@ -16,7 +16,7 @@ class delete_category_form extends moodleform {
$mform =& $this->_form;
$category = $this->_customdata;
- $categorycontext = get_context_instance(CONTEXT_COURSECAT, $category->id);
+ $categorycontext = context_coursecat::instance($category->id);
$this->_category = $category;
/// Check permissions, to see if it OK to give the option to delete
@@ -30,7 +30,7 @@ class delete_category_form extends moodleform {
$checkcat = array_pop($tocheck);
$childcategoryids[] = $checkcat->id;
$tocheck = $tocheck + get_child_categories($checkcat->id);
- $chcontext = get_context_instance(CONTEXT_COURSECAT, $checkcat->id);
+ $chcontext = context_coursecat::instance($checkcat->id);
if ($candeletecontent && !has_capability('moodle/category:manage', $chcontext)) {
$candeletecontent = false;
}
diff --git a/course/edit.php b/course/edit.php
index d8a08c8acb4..3147bad79ea 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -44,7 +44,7 @@ if ($id) { // editing course
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
require_login($course);
$category = $DB->get_record('course_categories', array('id'=>$course->category), '*', MUST_EXIST);
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
require_capability('moodle/course:update', $coursecontext);
$PAGE->url->param('id',$id);
@@ -52,7 +52,7 @@ if ($id) { // editing course
$course = null;
require_login();
$category = $DB->get_record('course_categories', array('id'=>$categoryid), '*', MUST_EXIST);
- $catcontext = get_context_instance(CONTEXT_COURSECAT, $category->id);
+ $catcontext = context_coursecat::instance($category->id);
require_capability('moodle/course:create', $catcontext);
$PAGE->url->param('category',$categoryid);
$PAGE->set_context($catcontext);
@@ -109,7 +109,7 @@ if ($editform->is_cancelled()) {
$course = create_course($data, $editoroptions);
// Get the context of the newly created course
- $context = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST);
+ $context = context_course::instance($course->id, MUST_EXIST);
if (!empty($CFG->creatornewroleid) and !is_viewing($context, NULL, 'moodle/role:assign') and !is_enrolled($context, NULL, 'moodle/role:assign')) {
// deal with course creators - enrol them internally with default role
diff --git a/course/edit_form.php b/course/edit_form.php
index 1b7584981b5..be69a6ff377 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -19,11 +19,11 @@ class course_edit_form extends moodleform {
$editoroptions = $this->_customdata['editoroptions'];
$returnto = $this->_customdata['returnto'];
- $systemcontext = get_context_instance(CONTEXT_SYSTEM);
- $categorycontext = get_context_instance(CONTEXT_COURSECAT, $category->id);
+ $systemcontext = context_system::instance();
+ $categorycontext = context_coursecat::instance($category->id);
if (!empty($course->id)) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$context = $coursecontext;
} else {
$coursecontext = null;
@@ -79,7 +79,7 @@ class course_edit_form extends moodleform {
$mform->addElement('text','fullname', get_string('fullnamecourse'),'maxlength="254" size="50"');
$mform->addHelpButton('fullname', 'fullnamecourse');
$mform->addRule('fullname', get_string('missingfullname'), 'required', null, 'client');
- $mform->setType('fullname', PARAM_MULTILANG);
+ $mform->setType('fullname', PARAM_TEXT);
if (!empty($course->id) and !has_capability('moodle/course:changefullname', $coursecontext)) {
$mform->hardFreeze('fullname');
$mform->setConstant('fullname', $course->fullname);
@@ -88,7 +88,7 @@ class course_edit_form extends moodleform {
$mform->addElement('text', 'shortname', get_string('shortnamecourse'), 'maxlength="100" size="20"');
$mform->addHelpButton('shortname', 'shortnamecourse');
$mform->addRule('shortname', get_string('missingshortname'), 'required', null, 'client');
- $mform->setType('shortname', PARAM_MULTILANG);
+ $mform->setType('shortname', PARAM_TEXT);
if (!empty($course->id) and !has_capability('moodle/course:changeshortname', $coursecontext)) {
$mform->hardFreeze('shortname');
$mform->setConstant('shortname', $course->shortname);
diff --git a/course/editcategory.php b/course/editcategory.php
index 0a9dc89a450..f6d47e83864 100644
--- a/course/editcategory.php
+++ b/course/editcategory.php
@@ -40,7 +40,7 @@ if ($id) {
print_error('unknowcategory');
}
$PAGE->set_url('/course/editcategory.php', array('id' => $id));
- $categorycontext = get_context_instance(CONTEXT_COURSECAT, $id);
+ $categorycontext = context_coursecat::instance($id);
$PAGE->set_context($categorycontext);
require_capability('moodle/category:manage', $categorycontext);
$strtitle = get_string('editcategorysettings');
@@ -54,7 +54,7 @@ if ($id) {
if (!$DB->record_exists('course_categories', array('id' => $parent))) {
print_error('unknowcategory');
}
- $context = get_context_instance(CONTEXT_COURSECAT, $parent);
+ $context = context_coursecat::instance($parent);
} else {
$context = get_system_context();
}
diff --git a/course/editsection.php b/course/editsection.php
index 87ce0d5fa7f..056aac5c6f7 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -41,7 +41,7 @@ $section = $DB->get_record('course_sections', array('id' => $id), '*', MUST_EXIS
$course = $DB->get_record('course', array('id' => $section->course), '*', MUST_EXIST);
require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
require_capability('moodle/course:update', $context);
$editoroptions = array('context'=>$context ,'maxfiles' => EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>false, 'noclean'=>true);
diff --git a/course/externallib.php b/course/externallib.php
index cceca17ddb1..22e2e4ef9f0 100644
--- a/course/externallib.php
+++ b/course/externallib.php
@@ -85,7 +85,7 @@ class core_course_external extends external_api {
}
// now security checks
- $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ $context = context_course::instance($course->id, IGNORE_MISSING);
try {
self::validate_context($context);
} catch (Exception $e) {
@@ -144,7 +144,7 @@ class core_course_external extends external_api {
$module['modicon'] = $cm->get_icon_url()->out(false);
$module['indent'] = $cm->indent;
- $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $modcontext = context_module::instance($cm->id);
if (!empty($cm->showdescription)) {
$module['description'] = $cm->get_content();
@@ -157,7 +157,7 @@ class core_course_external extends external_api {
}
$canviewhidden = has_capability('moodle/course:viewhiddenactivities',
- get_context_instance(CONTEXT_MODULE, $cm->id));
+ context_module::instance($cm->id));
//user that can view hidden module should know about the visibility
$module['visible'] = $cm->visible;
@@ -297,7 +297,7 @@ class core_course_external extends external_api {
foreach ($courses as $course) {
// now security checks
- $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ $context = context_course::instance($course->id, IGNORE_MISSING);
try {
self::validate_context($context);
} catch (Exception $e) {
@@ -511,7 +511,7 @@ class core_course_external extends external_api {
foreach ($params['courses'] as $course) {
// Ensure the current user is allowed to run this function
- $context = get_context_instance(CONTEXT_COURSECAT, $course['categoryid']);
+ $context = context_coursecat::instance($course['categoryid'], IGNORE_MISSING);
try {
self::validate_context($context);
} catch (Exception $e) {
diff --git a/course/format/social/format.php b/course/format/social/format.php
index f989f6fc830..b661c225576 100644
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -9,7 +9,7 @@
if ($forum = forum_get_course_forum($course->id, 'social')) {
$cm = get_coursemodule_from_instance('forum', $forum->id);
- $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $context = context_module::instance($cm->id);
/// Print forum intro above posts MDL-18483
if (trim($forum->intro) != '') {
diff --git a/course/format/topics/lib.php b/course/format/topics/lib.php
index 3728ab29788..7c840847180 100644
--- a/course/format/topics/lib.php
+++ b/course/format/topics/lib.php
@@ -60,7 +60,7 @@ function callback_topics_definition() {
function callback_topics_get_section_name($course, $section) {
// We can't add a node without any text
if ((string)$section->name !== '') {
- return format_string($section->name, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
+ return format_string($section->name, true, array('context' => context_course::instance($course->id)));
} else if ($section->section == 0) {
return get_string('section0name', 'format_topics');
} else {
diff --git a/course/index.php b/course/index.php
index ce1466a494f..3a40df856c1 100644
--- a/course/index.php
+++ b/course/index.php
@@ -38,7 +38,7 @@ $movedown = optional_param('movedown',0,PARAM_INT);
$site = get_site();
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+$systemcontext = context_system::instance();
$PAGE->set_url('/course/index.php');
$PAGE->set_context($systemcontext);
@@ -121,7 +121,7 @@ if (!empty($delete) and confirm_sesskey()) {
if (!$deletecat = $DB->get_record('course_categories', array('id'=>$delete))) {
print_error('invalidcategoryid');
}
- $context = get_context_instance(CONTEXT_COURSECAT, $delete);
+ $context = context_coursecat::instance($delete);
require_capability('moodle/category:manage', $context);
require_capability('moodle/category:manage', get_category_or_system_context($deletecat->parent));
@@ -174,7 +174,7 @@ if (!$categories = get_categories()) { /// No category yet!
$tempcat = new stdClass();
$tempcat->name = get_string('miscellaneous');
$tempcat->id = $DB->insert_record('course_categories', $tempcat);
- $tempcat->context = get_context_instance(CONTEXT_COURSECAT, $tempcat->id);
+ $tempcat->context = context_coursecat::instance($tempcat->id);
mark_context_dirty('/'.SYSCONTEXTID);
fix_course_sortorder(); // Required to build course_categories.depth and .path.
set_config('defaultrequestcategory', $tempcat->id);
@@ -215,14 +215,14 @@ if ((!empty($moveup) or !empty($movedown)) and confirm_sesskey()) {
$swapcategory = NULL;
if (!empty($moveup)) {
- require_capability('moodle/category:manage', get_context_instance(CONTEXT_COURSECAT, $moveup));
+ require_capability('moodle/category:manage', context_coursecat::instance($moveup));
if ($movecategory = $DB->get_record('course_categories', array('id'=>$moveup))) {
if ($swapcategory = $DB->get_records_select('course_categories', "sortordersortorder, $movecategory->parent), 'sortorder DESC', '*', 0, 1)) {
$swapcategory = reset($swapcategory);
}
}
} else {
- require_capability('moodle/category:manage', get_context_instance(CONTEXT_COURSECAT, $movedown));
+ require_capability('moodle/category:manage', context_coursecat::instance($movedown));
if ($movecategory = $DB->get_record('course_categories', array('id'=>$movedown))) {
if ($swapcategory = $DB->get_records_select('course_categories', "sortorder>? AND parent=?", array($movecategory->sortorder, $movecategory->parent), 'sortorder ASC', '*', 0, 1)) {
$swapcategory = reset($swapcategory);
@@ -306,7 +306,7 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
if (!empty($category)) {
if (!isset($category->context)) {
- $category->context = get_context_instance(CONTEXT_COURSECAT, $category->id);
+ $category->context = context_coursecat::instance($category->id);
}
echo '';
diff --git a/course/info.php b/course/info.php
index dfdfde98b9f..9440168adc9 100644
--- a/course/info.php
+++ b/course/info.php
@@ -28,7 +28,7 @@
require_login();
}
- $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ $context = context_course::instance($course->id);
if (!$course->visible and !has_capability('moodle/course:viewhiddencourses', $context)) {
print_error('coursehidden', '', $CFG->wwwroot .'/');
}
@@ -51,38 +51,8 @@
echo $OUTPUT->box_end();
}
- echo $OUTPUT->box_start('generalbox info');
-
- $course->summary = file_rewrite_pluginfile_urls($course->summary, 'pluginfile.php', $context->id, 'course', 'summary', NULL);
- echo format_text($course->summary, $course->summaryformat, array('overflowdiv'=>true), $course->id);
-
- if (!empty($CFG->coursecontact)) {
- $coursecontactroles = explode(',', $CFG->coursecontact);
- foreach ($coursecontactroles as $roleid) {
- if ($users = get_role_users($roleid, $context, true)) {
- foreach ($users as $teacher) {
- $role = new stdClass();
- $role->id = $teacher->roleid;
- $role->name = $teacher->rolename;
- $role->shortname = $teacher->roleshortname;
- $role->coursealias = $teacher->rolecoursealias;
- $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context));
- $namesarray[] = role_get_name($role, $context).': '.$fullname.'';
- }
- }
- }
-
- if (!empty($namesarray)) {
- echo "\n- ";
- echo implode('
- ', $namesarray);
- echo "
";
- }
- }
-
-// TODO: print some enrol icons
-
- echo $OUTPUT->box_end();
+ $courserenderer = $PAGE->get_renderer('core', 'course');
+ echo $courserenderer->course_info_box($course);
echo "
";
diff --git a/course/lib.php b/course/lib.php
index 838e194f56f..c2bc4054a78 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -143,7 +143,7 @@ function build_mnet_logs_array($hostid, $course, $user=0, $date=0, $order="l.tim
/// If the group mode is separate, and this user does not have editing privileges,
/// then only the user's group can be viewed.
- //if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_COURSE, $course->id))) {
+ //if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/course:managegroups', context_course::instance($course->id))) {
// $groupid = get_current_group($course->id);
//}
/// If this course doesn't have groups, no groupid can be specified.
@@ -229,7 +229,7 @@ function build_logs_array($course, $user=0, $date=0, $order="l.time ASC", $limit
/// If the group mode is separate, and this user does not have editing privileges,
/// then only the user's group can be viewed.
- if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_COURSE, $course->id))) {
+ if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/course:managegroups', context_course::instance($course->id))) {
if (isset($SESSION->currentgroup[$course->id])) {
$groupid = $SESSION->currentgroup[$course->id];
} else {
@@ -409,7 +409,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
$link = new moodle_url("/iplookup/index.php?ip=$log->ip&user=$log->userid");
$row[] = $OUTPUT->action_link($link, $log->ip, new popup_action('click', $link, 'iplookup', array('height' => 440, 'width' => 700)));
- $row[] = html_writer::link(new moodle_url("/user/view.php?id={$log->userid}&course={$log->course}"), fullname($log, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id))));
+ $row[] = html_writer::link(new moodle_url("/user/view.php?id={$log->userid}&course={$log->course}"), fullname($log, has_capability('moodle/site:viewfullnames', context_course::instance($course->id))));
$displayaction="$log->module $log->action";
if ($brokenurl) {
@@ -505,7 +505,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
echo ' |