From f1c23c24aaa7d333b38fbf8f568b1f909919ef4c Mon Sep 17 00:00:00 2001
From: Abdulrahman <saanina@gmail.com>
Date: Mon, 13 May 2019 20:43:35 +0300
Subject: [PATCH] fixes

---
 includes/adm/p_check_update.php | 29 ++++++++++++++++++++++-------
 includes/common.php             |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/includes/adm/p_check_update.php b/includes/adm/p_check_update.php
index 3e4f960..344b6e1 100755
--- a/includes/adm/p_check_update.php
+++ b/includes/adm/p_check_update.php
@@ -185,10 +185,18 @@ elseif ($current_smt == 'update2')
         $ex_folder = trim($zip->getNameIndex(0), '/');
         $zip->extractTo(PATH . 'cache/');
         $zip->close();
-        rename(
-            PATH . "cache/{$ex_folder}" , // the name of the folder after extract it
+        if(rename(
+            PATH . "cache/{$ex_folder}",
             PATH . "cache/kleeja-{$new_version}"
-        );
+        ) === false)
+        {
+            copy(
+                PATH . "cache/{$ex_folder}",
+                PATH . "cache/kleeja-{$new_version}"
+            );
+
+            kleeja_unlink(PATH . "cache/{$ex_folder}");
+        }
     }
 
     // let's check if there any update files in install folder
@@ -198,7 +206,10 @@ elseif ($current_smt == 'update2')
     {
         // move the update file from install folder to cache folder to include it later and delete install folder
         // becuse if install folder is exists , it can make some problems if dev mode is not active
-        rename($update_file, PATH . 'cache/update_schema.php');
+        if(rename($update_file, PATH . 'cache/update_schema.php') === false)
+        {
+            copy($update_file, PATH . 'cache/update_schema.php');
+        }
     }
 
     // skip some folders
@@ -282,10 +293,14 @@ elseif ($current_smt == 'update3')
                 file_get_contents($file->getPathname())
             ) === false)
             {
-                $update_failed = true;
-                array_push($failed_files, $file_path);
 
-                break;
+                if (copy($file->getPathname(), $file_path) === false)
+                {
+                    $update_failed = true;
+                    array_push($failed_files, $file_path);
+
+                    break;
+                }
             }
         }
         elseif ($file->isDir())
diff --git a/includes/common.php b/includes/common.php
index 999ee7e..57def01 100755
--- a/includes/common.php
+++ b/includes/common.php
@@ -37,7 +37,7 @@ if (! defined('PATH'))
     {
         define('__DIR__', dirname(__FILE__));
     }
-    define('PATH', str_replace(DIRECTORY_SEPARATOR . 'includes', '', __DIR__) . DIRECTORY_SEPARATOR);
+    define('PATH', str_replace('/includes', '', __DIR__) . '/');
 }
 
 //no config