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

MDL-62491 privacy: Fix running the download script.

Browse Source 
Previously running the code to generate the download file
was very fagile. Now the code can be run anywhere without
problems occuring copying files.
This commit is contained in:
Adrian Greeve
2018-10-09 09:31:13 +08:00
parent f849b0faa9
commit ea81e783ef
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
privacy/classes/local/request/moodle_content_writer.php
+2 -8
View File
@@ -390,19 +390,13 @@ class moodle_content_writer implements content_writer {
* @param array $destination Destination path to copy the file to.
*/
protected function copy_data(array $path, array $destination) {
// Do we not have a moodle function to do something like this?
$systempath = getcwd();
// This is likely to be running from admin/cli.
if (stripos($systempath, 'admin' . DIRECTORY_SEPARATOR . 'cli') !== false) {
$bits = explode('admin' . DIRECTORY_SEPARATOR . 'cli', $systempath);
$systempath = implode('', $bits);
}
global $CFG;
$filename = array_pop($destination);
$destdirectory = implode(DIRECTORY_SEPARATOR, $destination);
$fulldestination = $this->path . DIRECTORY_SEPARATOR . $destdirectory;
check_dir_exists($fulldestination, true, true);
$fulldestination .= $filename;
$currentpath = $systempath . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $path);
$currentpath = $CFG->dirroot . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $path);
copy($currentpath, $fulldestination);
$this->files[$destdirectory . DIRECTORY_SEPARATOR . $filename] = $fulldestination;
}