Guess not... more towards upgrade

diff --git a/Classes/class-upgrade.php b/Classes/class-upgrade.php
index ce5f28e9cd830fcd7a6ef220695ffa997dbc0613..2f9ea49c75fcff34d49edaaaaaa13c61ba4e80d0 100644 (file)
--- a/Classes/class-upgrade.php
+++ b/Classes/class-upgrade.php
@@ -110,7 +110,10 @@ class Upgrade
     function cleanupOldFiles()
     {
         foreach ($this->compareAndGetFilesToDelete() as $file)
-            unlink($file);
+        {
+            unlink("$this->web_dir$file");
+            error_log("Deleting: $file");   
+        }
     }    
     function compareAndGetFilesToDelete() : array
     {
@@ -138,7 +141,7 @@ class Upgrade
         $zip = new ZipArchive;
         if ($zip->open($this->temp_dir."unrealircd-webpanel-upgrade.zip") === true)
         {
-            $extracted = $zip->extractTo(str_replace("//","/",get_config('base_url')));
+            $extracted = $zip->extractTo($this->web_dir);
             $zip->close();
             if (!$extracted)
             {

diff --git a/api/upgrade.php b/api/upgrade.php
index 195a70945d3b0aa7039777e7ea588d35e727f117..866c2ab3818e047eab8cd93ad7ece74833b419f6 100644 (file)
--- a/api/upgrade.php
+++ b/api/upgrade.php
@@ -3,9 +3,9 @@ require_once('common_api.php');
 
 if (!$rpc)
     die();
-error_log("Stuff");
+    
 $upgrade = new Upgrade();
-error_log("...");
+
 if ($upgrade->error)
 {
     error_log("Couldn't create dir.");
@@ -16,14 +16,18 @@ $upgrade->checkForNew();
 if (Upgrade::$upgrade_available)
 {
     error_log("Upgrade available, downloading and installing");
-    if (!$upgrade->downloadUpgradeZip()
-        || !$upgrade->extractZip()
-        || !$upgrade->extractToWebdir()
-        )
-        return error_log($upgrade->error);
+    if (!$upgrade->downloadUpgradeZip())
+        error_log($upgrade->error);
+    else if (!$upgrade->extractZip())
+        error_log($upgrade->error);
+        
     $upgrade->cleanupOldFiles();
+    
+    if(!$upgrade->extractToWebdir())
+        return error_log($upgrade->error);
+        
     $upgrade->cleanupDownloadFiles();
     error_log("Upgrade was successful!");
 }
 else 
-    error_log("no upgrade");
\ No newline at end of file
+    error_log("No upgrade available");
\ No newline at end of file