mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-12 09:56:45 +02:00
Code Issues Projects Releases Wiki Activity

Under Win32, we need backslashes in paths. Now it works!!

Browse Source 
Merged from MOODLE_14_STABLE
This commit is contained in:
stronk7
2004-10-10 23:25:57 +00:00
parent 6cf2fe0336
commit 76dc1ad2cf
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/moodlelib.php
View File

@ -4296,6 +4296,10 @@ function zip_files ($originalfiles, $destination) {
$command = 'cd '.escapeshellarg($origpath).$separator. $command = 'cd '.escapeshellarg($origpath).$separator.
escapeshellarg($CFG->zip).' -r '. escapeshellarg($CFG->zip).' -r '.
escapeshellarg(cleardoubleslashes("$destpath/$destfilename")).' '.$filestozip; escapeshellarg(cleardoubleslashes("$destpath/$destfilename")).' '.$filestozip;
//All converted to backslashes in WIN
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$command = str_replace('/','\\',$command);
}
Exec($command); Exec($command);
} }
return true; return true;
@ -4364,6 +4368,10 @@ function unzip_file ($zipfile, $destination = '') {
escapeshellarg($CFG->unzip).' -o '. escapeshellarg($CFG->unzip).' -o '.
escapeshellarg(cleardoubleslashes("$zippath/$zipfilename")).' -d '. escapeshellarg(cleardoubleslashes("$zippath/$zipfilename")).' -d '.
escapeshellarg($destpath).$redirection; escapeshellarg($destpath).$redirection;
//All converted to backslashes in WIN
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$command = str_replace('/','\\',$command);
}
Exec($command,$list); Exec($command,$list);
} }