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

MDL-48010 grade import from URL: don't corrupt the URL.

Browse Source
This commit is contained in:
Tim Hunt
2014-10-31 19:53:34 +00:00
parent c268bbc9e6
commit 82bf77561f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/import/xml/import.php
+4 -4
View File
@@ -19,11 +19,11 @@ require_once '../../../config.php';
require_once 'lib.php';
require_once $CFG->libdir.'/filelib.php';
$url = required_param('url', PARAM_URL); // only real urls here
$gradesurl = required_param('url', PARAM_URL); // only real urls here
$id = required_param('id', PARAM_INT); // course id
$feedback = optional_param('feedback', 0, PARAM_BOOL);
$url = new moodle_url('/grade/import/xml/import.php', array('id'=>$id,'url'=>$url));
$url = new moodle_url('/grade/import/xml/import.php', array('id' => $id,'url' => $gradesurl));
if ($feedback !== 0) {
$url->param('feedback', $feedback);
}
@@ -46,10 +46,10 @@ require_capability('gradeimport/xml:view', $context);
core_php_time_limit::raise();
raise_memory_limit(MEMORY_EXTRA);
$text = download_file_content($url);
$text = download_file_content($gradesurl);
if ($text === false) {
print_error('cannotreadfile', 'error',
$CFG->wwwroot . '/grade/import/xml/index.php?id=' . $id, $url);
$CFG->wwwroot . '/grade/import/xml/index.php?id=' . $id, $gradesurl);
}
$error = '';