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

Merge branch 'MDL-62782-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2018-08-28 07:07:59 +08:00
parent 351552597e d2761afa21
commit 3cb27d07cd
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/lib.php
+7 -7
View File
@@ -45,23 +45,23 @@ function assignfeedback_editpdf_pluginfile($course,
array $options=array()) {
global $USER, $DB, $CFG;
require_once($CFG->dirroot . '/mod/assign/locallib.php');
if ($context->contextlevel == CONTEXT_MODULE) {
require_login($course, false, $cm);
$itemid = (int)array_shift($args);
if (!$assign = $DB->get_record('assign', array('id'=>$cm->instance))) {
return false;
}
$assign = new assign($context, $cm, $course);
$record = $DB->get_record('assign_grades', array('id'=>$itemid), 'userid,assignment', MUST_EXIST);
$record = $DB->get_record('assign_grades', array('id' => $itemid), 'userid,assignment', MUST_EXIST);
$userid = $record->userid;
if ($assign->id != $record->assignment) {
if ($assign->get_instance()->id != $record->assignment) {
return false;
}
// Check is users feedback or has grading permission.
if ($USER->id != $userid and !has_capability('mod/assign:grade', $context)) {
// Rely on mod_assign checking permissions.
if (!$assign->can_view_submission($userid)) {
return false;
}
mod/assign/feedback/file/lib.php
+9 -9
View File
@@ -42,27 +42,27 @@ function assignfeedback_file_pluginfile($course,
$args,
$forcedownload,
array $options=array()) {
global $USER, $DB;
global $USER, $DB, $CFG, $PAGE;
if ($context->contextlevel != CONTEXT_MODULE) {
return false;
}
require_once($CFG->dirroot . '/mod/assign/locallib.php');
require_login($course, false, $cm);
$itemid = (int)array_shift($args);
$record = $DB->get_record('assign_grades', array('id'=>$itemid), 'userid,assignment', MUST_EXIST);
$record = $DB->get_record('assign_grades', array('id' => $itemid), 'userid,assignment', MUST_EXIST);
$userid = $record->userid;
if (!$assign = $DB->get_record('assign', array('id'=>$cm->instance))) {
$assign = new assign($context, $cm, $course);
if ($assign->get_instance()->id != $record->assignment) {
return false;
}
if ($assign->id != $record->assignment) {
return false;
}
// Check is users feedback or has grading permission.
if ($USER->id != $userid and !has_capability('mod/assign:grade', $context)) {
// Rely on mod_assign checking permissions.
if (!$assign->can_view_submission($userid)) {
return false;
}