Solved one problem when copying empty directories.

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 252a501b54756c0e19907ae739607c1fb47c08a2..a69feb5f48d54f3ddb2b48fee00d57060a5d739f 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -929,19 +929,24 @@
             $files = array();
             foreach ($filelist as $file) {
                 //If directory, append "/"
-                if (is_dir($basedir."/".$file)) {
-                    $file = $file."/";
-                }
+                //if (is_dir($basedir."/".$file)) {
+                //    $file = $file."/";
+                //}
                 //Include into array
                 //echo "<br>Adding file/dir ".$file;                       //Debug
                 $files[] = $basedir."/".$file;
             }
             include_once("$CFG->dirroot/lib/pclzip/pclzip.lib.php");
+            include_once("$CFG->dirroot/lib/pclzip/pclerror.lib.php");
+            include_once("$CFG->dirroot/lib/pclzip/pcltrace.lib.php");
+            PclTraceOn(2);
             $archive = new PclZip("$basedir/$name");
             if (($list = $archive->create($files,PCLZIP_OPT_REMOVE_PATH,$basedir)) == 0) {
                 error($archive->errorInfo(true));
                 $status = false;
             } 
+            PclTraceDisplay();
+            PclTraceOff();
         } else {                   // Use external zip program
             //echo "<br>Using external zip";                               //Debug
             $files = "";

diff --git a/backup/lib.php b/backup/lib.php
index c504e079b1ec773a3ef68f8c6b371672b45c0a25..4b7f91ba800481aba9a04c9974b2b4ca96cd4522 100644 (file)
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -272,7 +272,7 @@
 
         if (!is_dir($to_file)) {
             //echo "<br>Creating ".$to_file;                                //Debug
-            mkdir($to_file,$CFG->directorypermissions);
+            $status = mkdir($to_file,$CFG->directorypermissions);
         }
         $dir = opendir($from_file);
         while ($file=readdir($dir)) {

diff --git a/backup/restore_execute.html b/backup/restore_execute.html
index 07e2d83bb5d16944be652fad14d1e7c56684f888..a12214d6b222c0a8ef335c0a57fe90874e1cb3a4 100644 (file)
--- a/backup/restore_execute.html
+++ b/backup/restore_execute.html
@@ -276,9 +276,9 @@
     //Cleanup temps (files and db)
     if ($status) {
         echo "<li>".get_string("cleaningtempdata");
-        if (!$status = clean_temp_data ($restore)) {
-            notify("Could not clean up temporary data from files and database");
-        }
+        //if (!$status = clean_temp_data ($restore)) {
+        //    notify("Could not clean up temporary data from files and database");
+        //}
     }
 
     //End the main ul

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 4eb191c92b3a5982764c1623b7370dee834b70a8..3a06fe3df2299958f40a6f840978b2b4765b9a49 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -11,10 +11,15 @@
 
         if (empty($CFG->unzip)) {    // Use built-in php-based unzip function
             include_once("$CFG->dirroot/lib/pclzip/pclzip.lib.php");
+            include_once("$CFG->dirroot/lib/pclzip/pclerror.lib.php");
+            include_once("$CFG->dirroot/lib/pclzip/pcltrace.lib.php");
+            PclTraceOn(2);
             $archive = new PclZip($file);
             if (!$list = $archive->extract(dirname($file))) {
                 $status = false;
             }
+            PclTraceDisplay();
+            PclTraceOff();
         } else {                     // Use external unzip program
             $command = "cd ".dirname($file)."; $CFG->unzip -o ".basename($file);
             Exec($command);