moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Now backup and restore are using central zip & unzip functions.

Browse source 
Merged from MOODLE_14_STABLE
This commit is contained in:
stronk7 2004-10-16 17:34:56 +00:00
parent 0e919226b1
commit 17841181b6
2 changed files with 8 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

43
backup/backuplib.php
View file

@ -1266,46 +1266,17 @@
$basedir = cleardoubleslashes($CFG->dataroot."/temp/backup/".$preferences->backup_unique_code);
//Backup zip file name
$name = $preferences->backup_name;
//List base_dir files and directories
//List of files and directories
$filelist = list_directories_and_files ($basedir);
if (empty($CFG->zip)) { // Use built-in php-based zip function
//echo "<br />Using pclzip"; //Debug
$files = array();
foreach ($filelist as $file) {
//If directory, append "/"
//Commented. Not needed wit version 2.0 of pclzip !!
//if (is_dir($basedir."/".$file)) {
// $file = $file."/";
//}
//Include into array
//echo "<br />Adding file/dir ".$file; //Debug
$files[] = cleardoubleslashes($basedir."/".$file);
}
include_once("$CFG->dirroot/lib/pclzip/pclzip.lib.php");
//include_once("$CFG->dirroot/lib/pclzip/pclerror.lib.php"); //Debug
//include_once("$CFG->dirroot/lib/pclzip/pcltrace.lib.php"); //Debug
//PclTraceOn(2); //Debug
$archive = new PclZip(cleardoubleslashes("$basedir/$name"));
if (($list = $archive->create($files,PCLZIP_OPT_REMOVE_PATH,rtrim(cleardoubleslashes($basedir), "/"))) == 0) {
error($archive->errorInfo(true));
$status = false;
}
//PclTraceDisplay(); //Debug
//PclTraceOff(); //Debug
} else { // Use external zip program
//echo "<br />Using external zip"; //Debug
$files = "";
foreach ($filelist as $file) {
$files .= basename($file);
$files .= " ";
}
$command = "cd $basedir ; $CFG->zip -r $name $files";
//echo "<br />Executing command: ".$command; //Debug
$status = Exec($command);
//Convert them to full paths
foreach ($filelist as $file) {
$files[] = "$basedir/$file";
}
//echo "<br />Status: ".$status; //Debug
$status = zip_files($files, "$basedir/$name");
//echo "<br>Status: ".$status; //Debug
return $status;
}