mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-34458-master-integration' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-07-24 17:24:15 +08:00
commit effe1c20c0
29 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
question/addquestion.php
View File

@ -47,11 +47,11 @@ if (!$category = $DB->get_record('question_categories', array('id' => $categoryi
if ($cmid) {
list($module, $cm) = get_module_from_cmid($cmid);
require_login($cm->course, false, $cm);
$thiscontext = get_context_instance(CONTEXT_MODULE, $cmid);
$thiscontext = context_module::instance($cmid);
$hiddenparams['cmid'] = $cmid;
} else if ($courseid) {
require_login($courseid, false);
$thiscontext = get_context_instance(CONTEXT_COURSE, $courseid);
$thiscontext = context_course::instance($courseid);
$module = null;
$cm = null;
$hiddenparams['courseid'] = $courseid;

4
question/editlib.php
View File

@ -1586,7 +1586,7 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
$courseid = $cm->course;
$thispageurl->params(compact('cmid'));
require_login($courseid, false, $cm);
$thiscontext = get_context_instance(CONTEXT_MODULE, $cmid);
$thiscontext = context_module::instance($cmid);
} else {
$module = null;
$cm = null;
@ -1598,7 +1598,7 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
if ($courseid){
$thispageurl->params(compact('courseid'));
require_login($courseid, false);
$thiscontext = get_context_instance(CONTEXT_COURSE, $courseid);
$thiscontext = context_course::instance($courseid);
} else {
$thiscontext = null;
}

2
question/engine/datalib.php
View File

@ -1240,7 +1240,7 @@ class question_file_saver {
global $USER;
$fs = get_file_storage();
$usercontext = get_context_instance(CONTEXT_USER, $USER->id);
$usercontext = context_user::instance($USER->id);
$files = $fs->get_area_files($usercontext->id, 'user', 'draft',
$draftitemid, 'sortorder, filepath, filename', false);

2
question/engine/tests/helpers.php
View File

@ -628,7 +628,7 @@ abstract class qbehaviour_walkthrough_test_base extends question_testcase {
$this->displayoptions = new question_display_options();
$this->quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
}
protected function tearDown() {

2
question/engine/tests/questionattemptiterator_test.php
View File

@ -44,7 +44,7 @@ class question_attempt_iterator_test extends advanced_testcase {
protected function setUp() {
$this->quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
$this->quba->set_preferred_behaviour('deferredfeedback');
$slot = $this->quba->add_question(test_question_maker::make_question('description'));

14
question/engine/tests/questionusagebyactivity_test.php
View File

@ -42,7 +42,7 @@ class question_usage_by_activity_test extends advanced_testcase {
public function test_set_get_preferred_model() {
// Set up
$quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
// Exercise SUT and verify.
$quba->set_preferred_behaviour('deferredfeedback');
@ -52,7 +52,7 @@ class question_usage_by_activity_test extends advanced_testcase {
public function test_set_get_id() {
// Set up
$quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
// Exercise SUT and verify
$quba->set_id_from_database(123);
@ -62,7 +62,7 @@ class question_usage_by_activity_test extends advanced_testcase {
public function test_fake_id() {
// Set up
$quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
// Exercise SUT and verify
$this->assertNotEmpty($quba->get_id());
@ -70,7 +70,7 @@ class question_usage_by_activity_test extends advanced_testcase {
public function test_create_usage_and_add_question() {
// Exercise SUT
$context = get_context_instance(CONTEXT_SYSTEM);
$context = context_system::instance();
$quba = question_engine::make_questions_usage_by_activity('unit_test', $context);
$quba->set_preferred_behaviour('deferredfeedback');
$tf = test_question_maker::make_question('truefalse', 'true');
@ -87,7 +87,7 @@ class question_usage_by_activity_test extends advanced_testcase {
public function test_get_question() {
// Set up.
$quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
$quba->set_preferred_behaviour('deferredfeedback');
$tf = test_question_maker::make_question('truefalse', 'true');
$slot = $quba->add_question($tf);
@ -103,7 +103,7 @@ class question_usage_by_activity_test extends advanced_testcase {
// Start a deferred feedback attempt with CBM and add the question to it.
$tf = test_question_maker::make_question('truefalse', 'true');
$quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
$quba->set_preferred_behaviour('deferredcbm');
$slot = $quba->add_question($tf);
$quba->start_all_questions();
@ -129,7 +129,7 @@ class question_usage_by_activity_test extends advanced_testcase {
// Start a deferred feedback attempt with CBM and add the question to it.
$tf = test_question_maker::make_question('truefalse', 'true');
$quba = question_engine::make_questions_usage_by_activity('unit_test',
get_context_instance(CONTEXT_SYSTEM));
context_system::instance());
$quba->set_preferred_behaviour('deferredcbm');
$slot = $quba->add_question($tf);
$quba->start_all_questions();

4
question/preview.php
View File

@ -50,11 +50,11 @@ $question = question_bank::load_question($id);
if ($cmid = optional_param('cmid', 0, PARAM_INT)) {
$cm = get_coursemodule_from_id(false, $cmid);
require_login($cm->course, false, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cmid);
$context = context_module::instance($cmid);
} else if ($courseid = optional_param('courseid', 0, PARAM_INT)) {
require_login($courseid);
$context = get_context_instance(CONTEXT_COURSE, $courseid);
$context = context_course::instance($courseid);
} else {
require_login();

4
question/question.php
View File

@ -100,10 +100,10 @@ if ($movecontext && !$id){
if ($cmid){
list($module, $cm) = get_module_from_cmid($cmid);
require_login($cm->course, false, $cm);
$thiscontext = get_context_instance(CONTEXT_MODULE, $cmid);
$thiscontext = context_module::instance($cmid);
} elseif ($courseid) {
require_login($courseid, false);
$thiscontext = get_context_instance(CONTEXT_COURSE, $courseid);
$thiscontext = context_course::instance($courseid);
$module = null;
$cm = null;
} else {

2
question/type/questiontypebase.php
View File

@ -1005,7 +1005,7 @@ class question_type {
$form->penalty = 0.3333333;
$form->generalfeedback = "Well done";
$context = get_context_instance(CONTEXT_COURSE, $courseid);
$context = context_course::instance($courseid);
$newcategory = question_make_default_categories(array($context));
$form->category = $newcategory->id . ',1';

2
report/backups/index.php
View File

@ -76,7 +76,7 @@ foreach ($rs as $backuprow) {
// Create the row and add it to the table
$cells = array(
format_string($backuprow->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $backuprow->courseid))),
format_string($backuprow->fullname, true, array('context' => context_course::instance($backuprow->courseid))),
userdate($backuprow->laststarttime, $strftimedatetime),
'-',
userdate($backuprow->lastendtime, $strftimedatetime),

4
report/completion/index.php
View File

@ -507,8 +507,8 @@ if (!$csv) {
// Display icon
$iconlink = $CFG->wwwroot.'/course/view.php?id='.$criterion->courseinstance;
$icontitle = format_string($crs->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $crs->id, MUST_EXIST)));
$iconalt = format_string($crs->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $crs->id)));
$icontitle = format_string($crs->fullname, true, array('context' => context_course::instance($crs->id, MUST_EXIST)));
$iconalt = format_string($crs->shortname, true, array('context' => context_course::instance($crs->id)));
break;
case COMPLETION_CRITERIA_TYPE_ROLE:

2
report/completion/user.php
View File

@ -175,7 +175,7 @@ foreach ($courses as $type => $infos) {
// Get course info
$c_course = $DB->get_record('course', array('id' => $c_info->course_id));
$course_context = get_context_instance(CONTEXT_COURSE, $c_course->id, MUST_EXIST);
$course_context = context_course::instance($c_course->id, MUST_EXIST);
$course_name = format_string($c_course->fullname, true, array('context' => $course_context));
// Get completions

2
report/courseoverview/index.php
View File

@ -32,7 +32,7 @@ $time = optional_param('time', 0, PARAM_INT);
$numcourses = optional_param('numcourses', 20, PARAM_INT);
if (empty($CFG->enablestats)) {
if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
if (has_capability('moodle/site:config', context_system::instance())) {
redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
} else {
print_error('statsdisable');

2
report/courseoverview/reportsgraph.php
View File

@ -33,7 +33,7 @@ $numcourses = required_param('numcourses', PARAM_INT);
require_login();
require_capability('report/courseoverview:view', get_context_instance(CONTEXT_SYSTEM));
require_capability('report/courseoverview:view', context_system::instance());
stats_check_uptodate();

2
report/log/index.php
View File

@ -111,7 +111,7 @@ if ($hostid == $CFG->mnet_localhost_id) {
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
require_capability('report/log:view', $context);

8
report/log/locallib.php
View File

@ -97,12 +97,12 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
$showcourses = 1;
}
$sitecontext = get_context_instance(CONTEXT_SYSTEM);
$sitecontext = context_system::instance();
// Context for remote data is always SITE
// Groups for remote data are always OFF
if ($hostid == $CFG->mnet_localhost_id) {
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
/// Setup for group handling.
if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context)) {
@ -397,8 +397,8 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate=
$showcourses = 1;
}
$sitecontext = get_context_instance(CONTEXT_SYSTEM);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$sitecontext = context_system::instance();
$context = context_course::instance($course->id);
/// Setup for group handling.
if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context)) {

2
report/outline/index.php
View File

@ -34,7 +34,7 @@ $PAGE->set_url('/report/outline/index.php', array('id'=>$id));
$PAGE->set_pagelayout('report');
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
require_capability('report/outline:view', $context);
add_to_log($course->id, 'course', 'report outline', "report/outline/index.php?id=$course->id", $course->id);

2
report/participation/index.php
View File

@ -60,7 +60,7 @@ if ($roleid != 0 and !$role = $DB->get_record('role', array('id'=>$roleid))) {
}
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
require_capability('report/participation:view', $context);
add_to_log($course->id, "course", "report participation", "report/participation/index.php?id=$course->id", $course->id);

2
report/security/locallib.php
View File

@ -781,7 +781,7 @@ function report_security_check_riskbackup($detailed=false) {
$result->status = null;
$result->link = null;
$syscontext = get_context_instance(CONTEXT_SYSTEM);
$syscontext = context_system::instance();
$params = array('capability'=>'moodle/backup:userinfo', 'permission'=>CAP_ALLOW, 'contextid'=>$syscontext->id);
$sql = "SELECT DISTINCT r.id, r.name, r.shortname, r.sortorder, r.archetype

4
report/stats/index.php
View File

@ -58,7 +58,7 @@ if (!empty($userid)) {
}
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
require_capability('report/stats:view', $context);
$PAGE->set_url(new moodle_url('/report/stats/index.php', array('course' => $course->id,
@ -87,7 +87,7 @@ if ($course->id == SITEID) {
report_stats_report($course, $report, $mode, $user, $roleid, $time);
if (empty($CFG->enablestats)) {
if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
if (has_capability('moodle/site:config', context_system::instance())) {
redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
} else {
print_error('statsdisable');

8
report/stats/locallib.php
View File

@ -41,7 +41,7 @@ function report_stats_mode_menu($course, $mode, $time, $url) {
$options = array();
$options[STATS_MODE_GENERAL] = get_string('statsmodegeneral');
$options[STATS_MODE_DETAILED] = get_string('statsmodedetailed');
if (has_capability('report/stats:view', get_context_instance(CONTEXT_SYSTEM))) {
if (has_capability('report/stats:view', context_system::instance())) {
$options[STATS_MODE_RANKED] = get_string('reports');
}
$popupurl = $url."?course=$course->id&time=$time";
@ -88,7 +88,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
$courseoptions = array();
foreach ($courses as $c) {
$context = get_context_instance(CONTEXT_COURSE, $c->id);
$context = context_course::instance($c->id);
if (has_capability('report/stats:view', $context)) {
$courseoptions[$c->id] = format_string($c->shortname, true, array('context' => $context));
@ -228,7 +228,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
$a[] = $stat->line2;
}
if (empty($CFG->loglifetime) || ($stat->timeend-(60*60*24)) >= (time()-60*60*24*$CFG->loglifetime)) {
if (has_capability('report/log:view', get_context_instance(CONTEXT_COURSE, $course->id))) {
if (has_capability('report/log:view', context_course::instance($course->id))) {
$a[] = '<a href="'.$CFG->wwwroot.'/report/log/index.php?id='.
$course->id.'&amp;chooselog=1&amp;showusers=1&amp;showcourses=1&amp;user='
.$userid.'&amp;date='.usergetmidnight($stat->timeend-(60*60*24)).'">'
@ -282,7 +282,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
krsort($rolesdata);
$row = array_merge(array($times[$time]),$rolesdata);
if (empty($CFG->loglifetime) || ($stat->timeend-(60*60*24)) >= (time()-60*60*24*$CFG->loglifetime)) {
if (has_capability('report/log:view', get_context_instance(CONTEXT_COURSE, $course->id))) {
if (has_capability('report/log:view', context_course::instance($course->id))) {
$row[] = '<a href="'.$CFG->wwwroot.'/report/log/index.php?id='
.$course->id.'&amp;chooselog=1&amp;showusers=1&amp;showcourses=1&amp;user='.$userid
.'&amp;date='.usergetmidnight($time-(60*60*24)).'">'

2
repository/coursefiles/lib.php
View File

@ -74,7 +74,7 @@ class repository_coursefiles extends repository {
$filepath = null;
list($context, $course, $cm) = get_context_info_array($this->context->id);
$courseid = is_object($course) ? $course->id : SITEID;
$context = get_context_instance(CONTEXT_COURSE, $courseid);
$context = context_course::instance($courseid);
}
if ($fileinfo = $browser->get_file_info($context, $component, $filearea, $itemid, $filepath, $filename)) {

2
repository/draftfiles_ajax.php
View File

@ -41,7 +41,7 @@ $action = required_param('action', PARAM_ALPHA);
$draftid = required_param('itemid', PARAM_INT);
$filepath = optional_param('filepath', '/', PARAM_PATH);
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$user_context = context_user::instance($USER->id);
echo $OUTPUT->header(); // send headers

2
repository/draftfiles_manager.php
View File

@ -63,7 +63,7 @@ $newfilename = optional_param('newfilename', '', PARAM_FILE);
$draftpath = optional_param('draftpath', '/', PARAM_PATH);
// user context
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$user_context = context_user::instance($USER->id);
$PAGE->set_context($user_context);

10
repository/lib.php
View File

@ -642,7 +642,7 @@ abstract class repository {
public static function draftfile_exists($itemid, $filepath, $filename) {
global $USER;
$fs = get_file_storage();
$usercontext = get_context_instance(CONTEXT_USER, $USER->id);
$usercontext = context_user::instance($USER->id);
if ($fs->get_file($usercontext->id, 'user', 'draft', $itemid, $filepath, $filename)) {
return true;
} else {
@ -2200,7 +2200,7 @@ abstract class repository {
public static function overwrite_existing_draftfile($itemid, $filepath, $filename, $newfilepath, $newfilename) {
global $USER;
$fs = get_file_storage();
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$user_context = context_user::instance($USER->id);
if ($file = $fs->get_file($user_context->id, 'user', 'draft', $itemid, $filepath, $filename)) {
if ($tempfile = $fs->get_file($user_context->id, 'user', 'draft', $itemid, $newfilepath, $newfilename)) {
// delete existing file to release filename
@ -2226,7 +2226,7 @@ abstract class repository {
public static function delete_tempfile_from_draft($draftitemid, $filepath, $filename) {
global $USER;
$fs = get_file_storage();
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$user_context = context_user::instance($USER->id);
if ($file = $fs->get_file($user_context->id, 'user', 'draft', $draftitemid, $filepath, $filename)) {
$file->delete();
return true;
@ -2643,13 +2643,13 @@ function initialise_filepicker($args) {
$disable_types = $args->disable_types;
}
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$user_context = context_user::instance($USER->id);
list($context, $course, $cm) = get_context_info_array($context->id);
$contexts = array($user_context, get_system_context());
if (!empty($course)) {
// adding course context
$contexts[] = get_context_instance(CONTEXT_COURSE, $course->id);
$contexts[] = context_course::instance($course->id);
}
$externallink = (int)get_config(null, 'repositoryallowexternallinks');
$repositories = repository::get_instances(array(

4
repository/local/lib.php
View File

@ -74,7 +74,7 @@ class repository_local extends repository {
if (!empty($this->context)) {
list($context, $course, $cm) = get_context_info_array($this->context->id);
if (is_object($course)) {
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
} else {
$context = get_system_context();
}
@ -373,7 +373,7 @@ class repository_local_file {
} else if ($this->fileinfo instanceof file_info_context_coursecat) {
// This is a course category. For non-admins we do not display categories
$this->skip = empty($CFG->navshowmycoursecategories) &&
!has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM));
!has_capability('moodle/course:update', context_system::instance());
}
}
return $this->skip;

2
repository/repository_ajax.php
View File

@ -206,7 +206,7 @@ switch ($action) {
$record->filepath = trim($record->filepath, '/');
$record->filepath = '/'.$record->filepath.'/';
}
$usercontext = get_context_instance(CONTEXT_USER, $USER->id);
$usercontext = context_user::instance($USER->id);
$now = time();
$record->contextid = $usercontext->id;
$record->timecreated = $now;

2
repository/upload/lib.php
View File

@ -97,7 +97,7 @@ class repository_upload extends repository {
$record->license = $license;
$record->author = $author;
$context = get_context_instance(CONTEXT_USER, $USER->id);
$context = context_user::instance($USER->id);
$elname = 'repo_upload_file';
$fs = get_file_storage();

2
repository/user/lib.php
View File

@ -74,7 +74,7 @@ class repository_user extends repository {
$filearea = 'private';
$component = 'user';
$itemid = 0;
$context = get_context_instance(CONTEXT_USER, $USER->id);
$context = context_user::instance($USER->id);
try {
$browser = get_file_browser();