Ooops I commited some debug source code in previous

versions. Going back. Sorry.

diff --git a/backup/backuplib.php b/backup/backuplib.php
index a69feb5f48d54f3ddb2b48fee00d57060a5d739f..ba6ce1bbf8a16f035e8cbd470a16d6abf508be06 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -929,6 +929,7 @@
             $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."/";
                 //}
@@ -937,16 +938,16 @@
                 $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);
+            //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("$basedir/$name");
             if (($list = $archive->create($files,PCLZIP_OPT_REMOVE_PATH,$basedir)) == 0) {
                 error($archive->errorInfo(true));
                 $status = false;
             } 
-            PclTraceDisplay();
-            PclTraceOff();
+            //PclTraceDisplay();                                           //Debug
+            //PclTraceOff();                                               //Debug
         } else {                   // Use external zip program
             //echo "<br>Using external zip";                               //Debug
             $files = "";

diff --git a/backup/restore_execute.html b/backup/restore_execute.html
index a12214d6b222c0a8ef335c0a57fe90874e1cb3a4..07e2d83bb5d16944be652fad14d1e7c56684f888 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 3a06fe3df2299958f40a6f840978b2b4765b9a49..22365e017c4a69b7d3006f2efeaf3928df5ef0b4 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -11,15 +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);
+            //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($file);
             if (!$list = $archive->extract(dirname($file))) {
                 $status = false;
             }
-            PclTraceDisplay();
-            PclTraceOff();
+            //PclTraceDisplay();                                       //Debug
+            //PclTraceOff();                                           //Debug
         } else {                     // Use external unzip program
             $command = "cd ".dirname($file)."; $CFG->unzip -o ".basename($file);
             Exec($command);