ovidiul / XCloner-Wordpress

includes/class-xcloner-encryption.php

Doc Comments +7 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
     /**
      * Returns the filename with encrypted suffix
      *
-     * @param $filename
+     * @param string $filename
      * @return string
      */
     public function get_encrypted_target_backup_file_name( $filename ) {
@@ -81,7 +81,7 @@ 
     /**
      * Returns the filename without encrypted suffix
      *
-     * @param $filename
+     * @param string $filename
      * @return string
      */
     public function get_decrypted_target_backup_file_name( $filename ) {
@@ -96,7 +96,7 @@ 
      * @param string $dest   File name where the encryped file should be written to.
      * @param string $key    The key used for the encryption
      * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
+     * @param integer $iv   The IV key to use.
      * @param bool $verification   Weather we should we try to verify the decryption.
      * @return string|false  Returns the file name that has been created or FALSE if an error occured
     */
@@ -206,6 +206,9 @@ 
         return array("target_file" => $dest, "finished" => 1);
     }
 
+    /**
+     * @param string $file
+     */
     public function verify_encrypted_file($file) {
         if(is_object($this->logger)) {
             $this->logger->info(sprintf('Verifying encrypted file %s', $file));
@@ -224,7 +227,7 @@ 
      * @param string $dest   File name where the decryped file should be written to.
      * @param string $key    The key used for the decryption (must be the same as for encryption)
      * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
+     * @param integer $iv   The IV key to use.
      * @return string|false  Returns the file name that has been created or FALSE if an error occured
      */
     public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)

Indentation +359 added lines, -359 removed lines

@@ -10,370 +10,370 @@
 
 class Xcloner_Encryption
 {
-    const FILE_ENCRYPTION_BLOCKS = 1024*1024;
-    const FILE_ENCRYPTION_SUFFIX = ".encrypted";
-    const FILE_DECRYPTION_SUFFIX = ".decrypted";
-
-    private $xcloner_settings;
-    private $logger;
-    private $verification = false;
-
-    public function __construct(Xcloner $xcloner_container)
-    {
-        $this->xcloner_container = $xcloner_container;
-        if(method_exists($xcloner_container, 'get_xcloner_settings')) {
-            $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        }else{
-            $this->xcloner_settings = "";
-        }
-
-        if(method_exists($xcloner_container, 'get_xcloner_logger')) {
-            $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
-        }else{
-            $this->logger = "";
-        }
-    }
-
-    /**
-     * Returns the backup encryption key
-     *
-     * @return SECURE_AUTH_SALT|null
-     */
-    public function get_backup_encryption_key()
-    {
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_encryption_key();
-        }
-
-        return "";
-
-    }
-
-    /**
-     * Check if provided filename has encrypted suffix
-     *
-     * @param $filename
-     * @return bool
-     */
-    public function is_encrypted_file($filename) {
-        $fp = fopen($this->get_xcloner_path() .$filename, 'r');
-        $encryption_length = fread($fp, 16);
-        fclose($fp);
-        if(is_numeric($encryption_length)) {
-            return true;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Returns the filename with encrypted suffix
-     *
-     * @param $filename
-     * @return string
-     */
-    public function get_encrypted_target_backup_file_name( $filename ) {
-
-        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
-    }
-
-    /**
-     * Returns the filename without encrypted suffix
-     *
-     * @param $filename
-     * @return string
-     */
-    public function get_decrypted_target_backup_file_name( $filename ) {
-
-        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
-    }
-
-    /**
-     * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
-     *
-     * @param string $source Path to file that should be encrypted
-     * @param string $dest   File name where the encryped file should be written to.
-     * @param string $key    The key used for the encryption
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
-     * @param bool $verification   Weather we should we try to verify the decryption.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-    */
-    public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
-    {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
-            $key = self::get_backup_encryption_key();
-        }
-        $key_digest = openssl_digest ($key, "md5", true);
-
-        $keep_local = 1;
-        if(!$dest) {
-            $dest = $this->get_encrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if(!$iv || !$start) {
-            //$iv = openssl_random_pseudo_bytes(16);
-            $iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
-        }
-
-        if( !$start ) {
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
-        }else{
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
-        }
-
-        if ( $fpOut ) {
-
-            // Put the initialization vector to the beginning of the file
-            if(!$start) {
-                fwrite($fpOut, $iv);
-            }
-
-            if (file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
-
-                fseek($fpIn, (int)$start);
-
-                if (!feof($fpIn)) {
-
-                    $plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
-                    $ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-                    //$iv = openssl_random_pseudo_bytes(16);
-
-                    fwrite($fpOut, $ciphertext);
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut );
-
-                    if(!feof($fpIn)) {
-                        fclose($fpIn);
-                        //echo "\n NEW:".$key.md5($iv);
-                        //self::encryptFile($source, $dest, $key, $start, $iv);
-                        if($recursive ){
-                            $this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
-                        }else {
-
-                            if(($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                        }
-                    }
-
-                }
-            } else {
-                if(is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for encryption.');
-                }
-                throw new \Exception("Unable to read source file for encryption.");
-            }
-        } else {
-            if(is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for encryption.');
-            }
-            throw new \Exception("Unable to write destination file for encryption.");
-        }
-
-        if($verification) {
-            $this->verify_encrypted_file($dest);
-        }
-
-        //we replace the original backup with the encrypted one
-        if( !$keep_local && copy($this->get_xcloner_path() .$dest,
-             $this->get_xcloner_path() .$source) ) {
-            unlink($this->get_xcloner_path() .$dest);
-        }
-
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    public function verify_encrypted_file($file) {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Verifying encrypted file %s', $file));
-        }
-
-        $this->verification = true;
-        $this->decrypt_file($file);
-        $this->verification = false;
-    }
-
-    /**
-     * Dencrypt the passed file and saves the result in a new file, removing the
-     * last 4 characters from file name.
-     *
-     * @param string $source Path to file that should be decrypted
-     * @param string $dest   File name where the decryped file should be written to.
-     * @param string $key    The key used for the decryption (must be the same as for encryption)
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-     */
-    public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
-    {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
-            $key = self::get_backup_encryption_key();
-        }
-
-        $key_digest = openssl_digest ($key, "md5", true);
-
-        $keep_local = 1;
-        if(!$dest) {
-            $dest = $this->get_decrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if( !$start ) {
-            if($this->verification){
-                $fpOut = fopen("php://stdout", 'w');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
-            }
-        }else{
-            if($this->verification){
-                $fpOut = fopen("php://stdout", 'a');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
-            }
-        }
-
-        if ( $fpOut ) {
-            if ( file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
-
-                $encryption_length = (int)fread($fpIn, 16);
-                if(!$encryption_length) {
-                    $encryption_length = self::FILE_ENCRYPTION_BLOCKS;
-                }
-
-                fseek($fpIn, (int)$start);
-
-                // Get the initialzation vector from the beginning of the file
-                if(!$iv) {
-                    $iv = fread($fpIn, 16);
-                }
-
-                if (!feof($fpIn)) {
-
-                    // we have to read one block more for decrypting than for encrypting
-                    $ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
-                    $plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    if(!$plaintext){
-                        unlink($this->get_xcloner_path() . $dest);
-                        if(is_object($this->logger)) {
-                            $this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
-                        }
-                        throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
-                    }
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-
-                    if( !$this->verification) {
-                        fwrite($fpOut, $plaintext);
-                    }
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut );
-
-                    if(!feof($fpIn)) {
-                        fclose($fpIn);
-                        if($this->verification || $recursive) {
-                            $ciphertext = "";
-                            $plaintext = "";
-                            $this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
-                        }else {
-                            if(($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "encryption_length" => $encryption_length,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                    }
-                    }
-
-                }
-            } else {
-                if(is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for decryption');
-                }
-                throw new \Exception("Unable to read source file for decryption");
-            }
-        } else {
-            if(is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for decryption');
-            }
-            throw new \Exception("Unable to write destination file for decryption");
-        }
-
-        //we replace the original backup with the encrypted one
-        if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
-            $this->get_xcloner_path()  .$source) ) {
-            unlink($this->get_xcloner_path()  .$dest);
-        }
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    public function get_xcloner_path(){
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_store_path() . DS;
-        }
-
-        return null;
-    }
+	const FILE_ENCRYPTION_BLOCKS = 1024*1024;
+	const FILE_ENCRYPTION_SUFFIX = ".encrypted";
+	const FILE_DECRYPTION_SUFFIX = ".decrypted";
+
+	private $xcloner_settings;
+	private $logger;
+	private $verification = false;
+
+	public function __construct(Xcloner $xcloner_container)
+	{
+		$this->xcloner_container = $xcloner_container;
+		if(method_exists($xcloner_container, 'get_xcloner_settings')) {
+			$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+		}else{
+			$this->xcloner_settings = "";
+		}
+
+		if(method_exists($xcloner_container, 'get_xcloner_logger')) {
+			$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
+		}else{
+			$this->logger = "";
+		}
+	}
+
+	/**
+	 * Returns the backup encryption key
+	 *
+	 * @return SECURE_AUTH_SALT|null
+	 */
+	public function get_backup_encryption_key()
+	{
+		if(is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_encryption_key();
+		}
+
+		return "";
+
+	}
+
+	/**
+	 * Check if provided filename has encrypted suffix
+	 *
+	 * @param $filename
+	 * @return bool
+	 */
+	public function is_encrypted_file($filename) {
+		$fp = fopen($this->get_xcloner_path() .$filename, 'r');
+		$encryption_length = fread($fp, 16);
+		fclose($fp);
+		if(is_numeric($encryption_length)) {
+			return true;
+		}
+
+		return false;
+
+	}
+
+	/**
+	 * Returns the filename with encrypted suffix
+	 *
+	 * @param $filename
+	 * @return string
+	 */
+	public function get_encrypted_target_backup_file_name( $filename ) {
+
+		return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Returns the filename without encrypted suffix
+	 *
+	 * @param $filename
+	 * @return string
+	 */
+	public function get_decrypted_target_backup_file_name( $filename ) {
+
+		return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
+	 *
+	 * @param string $source Path to file that should be encrypted
+	 * @param string $dest   File name where the encryped file should be written to.
+	 * @param string $key    The key used for the encryption
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param string $iv   The IV key to use.
+	 * @param bool $verification   Weather we should we try to verify the decryption.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
+	{
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if(!$key){
+			$key = self::get_backup_encryption_key();
+		}
+		$key_digest = openssl_digest ($key, "md5", true);
+
+		$keep_local = 1;
+		if(!$dest) {
+			$dest = $this->get_encrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if(!$iv || !$start) {
+			//$iv = openssl_random_pseudo_bytes(16);
+			$iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
+		}
+
+		if( !$start ) {
+			$fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
+		}else{
+			$fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
+		}
+
+		if ( $fpOut ) {
+
+			// Put the initialization vector to the beginning of the file
+			if(!$start) {
+				fwrite($fpOut, $iv);
+			}
+
+			if (file_exists($this->get_xcloner_path() .$source) &&
+				$fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+
+				fseek($fpIn, (int)$start);
+
+				if (!feof($fpIn)) {
+
+					$plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
+					$ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+					//$iv = openssl_random_pseudo_bytes(16);
+
+					fwrite($fpOut, $ciphertext);
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut );
+
+					if(!feof($fpIn)) {
+						fclose($fpIn);
+						//echo "\n NEW:".$key.md5($iv);
+						//self::encryptFile($source, $dest, $key, $start, $iv);
+						if($recursive ){
+							$this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
+						}else {
+
+							if(($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+						}
+					}
+
+				}
+			} else {
+				if(is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for encryption.');
+				}
+				throw new \Exception("Unable to read source file for encryption.");
+			}
+		} else {
+			if(is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for encryption.');
+			}
+			throw new \Exception("Unable to write destination file for encryption.");
+		}
+
+		if($verification) {
+			$this->verify_encrypted_file($dest);
+		}
+
+		//we replace the original backup with the encrypted one
+		if( !$keep_local && copy($this->get_xcloner_path() .$dest,
+			 $this->get_xcloner_path() .$source) ) {
+			unlink($this->get_xcloner_path() .$dest);
+		}
+
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	public function verify_encrypted_file($file) {
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Verifying encrypted file %s', $file));
+		}
+
+		$this->verification = true;
+		$this->decrypt_file($file);
+		$this->verification = false;
+	}
+
+	/**
+	 * Dencrypt the passed file and saves the result in a new file, removing the
+	 * last 4 characters from file name.
+	 *
+	 * @param string $source Path to file that should be decrypted
+	 * @param string $dest   File name where the decryped file should be written to.
+	 * @param string $key    The key used for the decryption (must be the same as for encryption)
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param string $iv   The IV key to use.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
+	{
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if(!$key){
+			$key = self::get_backup_encryption_key();
+		}
+
+		$key_digest = openssl_digest ($key, "md5", true);
+
+		$keep_local = 1;
+		if(!$dest) {
+			$dest = $this->get_decrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if( !$start ) {
+			if($this->verification){
+				$fpOut = fopen("php://stdout", 'w');
+			}else {
+				$fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
+			}
+		}else{
+			if($this->verification){
+				$fpOut = fopen("php://stdout", 'a');
+			}else {
+				$fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
+			}
+		}
+
+		if ( $fpOut ) {
+			if ( file_exists($this->get_xcloner_path() .$source) &&
+				$fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+
+				$encryption_length = (int)fread($fpIn, 16);
+				if(!$encryption_length) {
+					$encryption_length = self::FILE_ENCRYPTION_BLOCKS;
+				}
+
+				fseek($fpIn, (int)$start);
+
+				// Get the initialzation vector from the beginning of the file
+				if(!$iv) {
+					$iv = fread($fpIn, 16);
+				}
+
+				if (!feof($fpIn)) {
+
+					// we have to read one block more for decrypting than for encrypting
+					$ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
+					$plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					if(!$plaintext){
+						unlink($this->get_xcloner_path() . $dest);
+						if(is_object($this->logger)) {
+							$this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
+						}
+						throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
+					}
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+
+					if( !$this->verification) {
+						fwrite($fpOut, $plaintext);
+					}
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut );
+
+					if(!feof($fpIn)) {
+						fclose($fpIn);
+						if($this->verification || $recursive) {
+							$ciphertext = "";
+							$plaintext = "";
+							$this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
+						}else {
+							if(($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"encryption_length" => $encryption_length,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+					}
+					}
+
+				}
+			} else {
+				if(is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for decryption');
+				}
+				throw new \Exception("Unable to read source file for decryption");
+			}
+		} else {
+			if(is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for decryption');
+			}
+			throw new \Exception("Unable to write destination file for decryption");
+		}
+
+		//we replace the original backup with the encrypted one
+		if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
+			$this->get_xcloner_path()  .$source) ) {
+			unlink($this->get_xcloner_path()  .$dest);
+		}
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	public function get_xcloner_path(){
+		if(is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_store_path() . DS;
+		}
+
+		return null;
+	}
 
 }
 
 
 try {
 
-    if(isset($argv[1])) {
-
-        class Xcloner {
-            public function __construct()
-            {
-            }
-        }
-        $xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
-
-        if ($argv[1] == "-e") {
-            $xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
-        } elseif ($argv[1] == "-d") {
-            $xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
-        }
-    }
+	if(isset($argv[1])) {
+
+		class Xcloner {
+			public function __construct()
+			{
+			}
+		}
+		$xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
+
+		if ($argv[1] == "-e") {
+			$xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
+		} elseif ($argv[1] == "-d") {
+			$xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
+		}
+	}
 }catch(\Exception $e) {
-    echo "CAUGHT: " . $e->getMessage();
+	echo "CAUGHT: " . $e->getMessage();
 }

Spacing +78 added lines, -78 removed lines

@@ -10,7 +10,7 @@ 
 
 class Xcloner_Encryption
 {
-    const FILE_ENCRYPTION_BLOCKS = 1024*1024;
+    const FILE_ENCRYPTION_BLOCKS = 1024 * 1024;
     const FILE_ENCRYPTION_SUFFIX = ".encrypted";
     const FILE_DECRYPTION_SUFFIX = ".decrypted";
 
@@ -21,15 +21,15 @@ 
     public function __construct(Xcloner $xcloner_container)
     {
         $this->xcloner_container = $xcloner_container;
-        if(method_exists($xcloner_container, 'get_xcloner_settings')) {
+        if (method_exists($xcloner_container, 'get_xcloner_settings')) {
             $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        }else{
+        } else {
             $this->xcloner_settings = "";
         }
 
-        if(method_exists($xcloner_container, 'get_xcloner_logger')) {
+        if (method_exists($xcloner_container, 'get_xcloner_logger')) {
             $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
-        }else{
+        } else {
             $this->logger = "";
         }
     }
@@ -41,7 +41,7 @@ 
      */
     public function get_backup_encryption_key()
     {
-        if(is_object($this->xcloner_settings)) {
+        if (is_object($this->xcloner_settings)) {
             return $this->xcloner_settings->get_xcloner_encryption_key();
         }
 
@@ -56,10 +56,10 @@ 
      * @return bool
      */
     public function is_encrypted_file($filename) {
-        $fp = fopen($this->get_xcloner_path() .$filename, 'r');
+        $fp = fopen($this->get_xcloner_path().$filename, 'r');
         $encryption_length = fread($fp, 16);
         fclose($fp);
-        if(is_numeric($encryption_length)) {
+        if (is_numeric($encryption_length)) {
             return true;
         }
 
@@ -73,9 +73,9 @@ 
      * @param $filename
      * @return string
      */
-    public function get_encrypted_target_backup_file_name( $filename ) {
+    public function get_encrypted_target_backup_file_name($filename) {
 
-        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
+        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename).self::FILE_ENCRYPTION_SUFFIX;
     }
 
     /**
@@ -84,9 +84,9 @@ 
      * @param $filename
      * @return string
      */
-    public function get_decrypted_target_backup_file_name( $filename ) {
+    public function get_decrypted_target_backup_file_name($filename) {
 
-        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
+        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename).self::FILE_DECRYPTION_SUFFIX;
     }
 
     /**
@@ -100,44 +100,44 @@ 
      * @param bool $verification   Weather we should we try to verify the decryption.
      * @return string|false  Returns the file name that has been created or FALSE if an error occured
     */
-    public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
+    public function encrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $verification = true, $recursive = false)
     {
-        if(is_object($this->logger)) {
+        if (is_object($this->logger)) {
             $this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
         }
 
         //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
+        if (!$key) {
             $key = self::get_backup_encryption_key();
         }
-        $key_digest = openssl_digest ($key, "md5", true);
+        $key_digest = openssl_digest($key, "md5", true);
 
         $keep_local = 1;
-        if(!$dest) {
+        if (!$dest) {
             $dest = $this->get_encrypted_target_backup_file_name($source);
             $keep_local = 0;
         }
 
-        if(!$iv || !$start) {
+        if (!$iv || !$start) {
             //$iv = openssl_random_pseudo_bytes(16);
             $iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
         }
 
-        if( !$start ) {
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
-        }else{
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
+        if (!$start) {
+            $fpOut = fopen($this->get_xcloner_path().$dest, 'w');
+        } else {
+            $fpOut = fopen($this->get_xcloner_path().$dest, 'a');
         }
 
-        if ( $fpOut ) {
+        if ($fpOut) {
 
             // Put the initialization vector to the beginning of the file
-            if(!$start) {
+            if (!$start) {
                 fwrite($fpOut, $iv);
             }
 
-            if (file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+            if (file_exists($this->get_xcloner_path().$source) &&
+                $fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
 
                 fseek($fpIn, (int)$start);
 
@@ -154,17 +154,17 @@ 
 
                     $start = ftell($fpIn);
 
-                    fclose($fpOut );
+                    fclose($fpOut);
 
-                    if(!feof($fpIn)) {
+                    if (!feof($fpIn)) {
                         fclose($fpIn);
                         //echo "\n NEW:".$key.md5($iv);
                         //self::encryptFile($source, $dest, $key, $start, $iv);
-                        if($recursive ){
+                        if ($recursive) {
                             $this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
-                        }else {
+                        } else {
 
-                            if(($iv) != base64_decode(base64_encode($iv)))
+                            if (($iv) != base64_decode(base64_encode($iv)))
                             {
                                 throw new \Exception('Could not encode IV for transport');
                             }
@@ -180,26 +180,26 @@ 
 
                 }
             } else {
-                if(is_object($this->logger)) {
+                if (is_object($this->logger)) {
                     $this->logger->error('Unable to read source file for encryption.');
                 }
                 throw new \Exception("Unable to read source file for encryption.");
             }
         } else {
-            if(is_object($this->logger)) {
+            if (is_object($this->logger)) {
                 $this->logger->error('Unable to write destination file for encryption.');
             }
             throw new \Exception("Unable to write destination file for encryption.");
         }
 
-        if($verification) {
+        if ($verification) {
             $this->verify_encrypted_file($dest);
         }
 
         //we replace the original backup with the encrypted one
-        if( !$keep_local && copy($this->get_xcloner_path() .$dest,
-             $this->get_xcloner_path() .$source) ) {
-            unlink($this->get_xcloner_path() .$dest);
+        if (!$keep_local && copy($this->get_xcloner_path().$dest,
+             $this->get_xcloner_path().$source)) {
+            unlink($this->get_xcloner_path().$dest);
         }
 
 
@@ -207,7 +207,7 @@ 
     }
 
     public function verify_encrypted_file($file) {
-        if(is_object($this->logger)) {
+        if (is_object($this->logger)) {
             $this->logger->info(sprintf('Verifying encrypted file %s', $file));
         }
 
@@ -229,50 +229,50 @@ 
      */
     public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
     {
-        if(is_object($this->logger)) {
+        if (is_object($this->logger)) {
             $this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
         }
 
         //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
+        if (!$key) {
             $key = self::get_backup_encryption_key();
         }
 
-        $key_digest = openssl_digest ($key, "md5", true);
+        $key_digest = openssl_digest($key, "md5", true);
 
         $keep_local = 1;
-        if(!$dest) {
+        if (!$dest) {
             $dest = $this->get_decrypted_target_backup_file_name($source);
             $keep_local = 0;
         }
 
-        if( !$start ) {
-            if($this->verification){
+        if (!$start) {
+            if ($this->verification) {
                 $fpOut = fopen("php://stdout", 'w');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
+            } else {
+                $fpOut = fopen($this->get_xcloner_path().$dest, 'w');
             }
-        }else{
-            if($this->verification){
+        } else {
+            if ($this->verification) {
                 $fpOut = fopen("php://stdout", 'a');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
+            } else {
+                $fpOut = fopen($this->get_xcloner_path().$dest, 'a');
             }
         }
 
-        if ( $fpOut ) {
-            if ( file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+        if ($fpOut) {
+            if (file_exists($this->get_xcloner_path().$source) &&
+                $fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
 
                 $encryption_length = (int)fread($fpIn, 16);
-                if(!$encryption_length) {
+                if (!$encryption_length) {
                     $encryption_length = self::FILE_ENCRYPTION_BLOCKS;
                 }
 
                 fseek($fpIn, (int)$start);
 
                 // Get the initialzation vector from the beginning of the file
-                if(!$iv) {
+                if (!$iv) {
                     $iv = fread($fpIn, 16);
                 }
 
@@ -282,9 +282,9 @@ 
                     $ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
                     $plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
 
-                    if(!$plaintext){
-                        unlink($this->get_xcloner_path() . $dest);
-                        if(is_object($this->logger)) {
+                    if (!$plaintext) {
+                        unlink($this->get_xcloner_path().$dest);
+                        if (is_object($this->logger)) {
                             $this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
                         }
                         throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
@@ -293,22 +293,22 @@ 
                     // Use the first 16 bytes of the ciphertext as the next initialization vector
                     $iv = substr($ciphertext, 0, 16);
 
-                    if( !$this->verification) {
+                    if (!$this->verification) {
                         fwrite($fpOut, $plaintext);
                     }
 
                     $start = ftell($fpIn);
 
-                    fclose($fpOut );
+                    fclose($fpOut);
 
-                    if(!feof($fpIn)) {
+                    if (!feof($fpIn)) {
                         fclose($fpIn);
-                        if($this->verification || $recursive) {
+                        if ($this->verification || $recursive) {
                             $ciphertext = "";
                             $plaintext = "";
                             $this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
-                        }else {
-                            if(($iv) != base64_decode(base64_encode($iv)))
+                        } else {
+                            if (($iv) != base64_decode(base64_encode($iv)))
                             {
                                 throw new \Exception('Could not encode IV for transport');
                             }
@@ -325,30 +325,30 @@ 
 
                 }
             } else {
-                if(is_object($this->logger)) {
+                if (is_object($this->logger)) {
                     $this->logger->error('Unable to read source file for decryption');
                 }
                 throw new \Exception("Unable to read source file for decryption");
             }
         } else {
-            if(is_object($this->logger)) {
+            if (is_object($this->logger)) {
                 $this->logger->error('Unable to write destination file for decryption');
             }
             throw new \Exception("Unable to write destination file for decryption");
         }
 
         //we replace the original backup with the encrypted one
-        if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
-            $this->get_xcloner_path()  .$source) ) {
-            unlink($this->get_xcloner_path()  .$dest);
+        if (!$keep_local && !$this->verification && copy($this->get_xcloner_path().$dest,
+            $this->get_xcloner_path().$source)) {
+            unlink($this->get_xcloner_path().$dest);
         }
 
         return array("target_file" => $dest, "finished" => 1);
     }
 
-    public function get_xcloner_path(){
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_store_path() . DS;
+    public function get_xcloner_path() {
+        if (is_object($this->xcloner_settings)) {
+            return $this->xcloner_settings->get_xcloner_store_path().DS;
         }
 
         return null;
@@ -359,21 +359,21 @@ 
 
 try {
 
-    if(isset($argv[1])) {
+    if (isset($argv[1])) {
 
         class Xcloner {
             public function __construct()
             {
             }
         }
-        $xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
+        $xcloner_encryption = new Xcloner_Encryption(new Xcloner());
 
         if ($argv[1] == "-e") {
-            $xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
+            $xcloner_encryption->encrypt_file($argv[2], $argv[2].".enc", $argv[4], '', '', '', true);
         } elseif ($argv[1] == "-d") {
-            $xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
+            $xcloner_encryption->decrypt_file($argv[2], $argv[2].".dec", $argv[4], '', '', true);
         }
     }
-}catch(\Exception $e) {
-    echo "CAUGHT: " . $e->getMessage();
+}catch (\Exception $e) {
+    echo "CAUGHT: ".$e->getMessage();
 }

restore/xcloner_restore.php

Indentation +255 added lines, -255 removed lines

@@ -106,11 +106,11 @@ 
 	private $backup_storage_dir;
 	private $parent_api;
 
-    /**
-     * Xcloner_Restore constructor.
-     * @param string $parent_api
-     * @throws Exception
-     */
+	/**
+	 * Xcloner_Restore constructor.
+	 * @param string $parent_api
+	 * @throws Exception
+	 */
 	public function __construct($parent_api = "")
 	{
 		register_shutdown_function(array($this, 'exception_handler'));
@@ -150,9 +150,9 @@ 
 
 	}
 
-    /**
-     * Exception handler method
-     */
+	/**
+	 * Exception handler method
+	 */
 	public function exception_handler() {
 		
 		$error = error_get_last();
@@ -164,20 +164,20 @@ 
 	
 	}
 
-    /**
-     * @param $type
-     * @return mixed|string
-     */
+	/**
+	 * @param $type
+	 * @return mixed|string
+	 */
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 	
 	public function get_logger_filename()
@@ -187,12 +187,12 @@ 
 		return $filename;
 	}
 
-    /**
-     * Init method
-     *
-     * @return mixed|void
-     * @throws Exception
-     */
+	/**
+	 * Init method
+	 *
+	 * @return mixed|void
+	 * @throws Exception
+	 */
 	public function init()
 	{
 		if(isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
@@ -216,12 +216,12 @@ 
 		return $this->check_system();
 	}
 
-    /**
-     * Write file method
-     *
-     * @return bool|int
-     * @throws Exception
-     */
+	/**
+	 * Write file method
+	 *
+	 * @return bool|int
+	 * @throws Exception
+	 */
 	public function write_file_action()
 	{
 		if(isset($_POST['file']))
@@ -248,10 +248,10 @@ 
 					throw new Exception("Unable to write data to file $target_file");
 
 				try {
-                    unlink($_FILES['blob']['tmp_name']);
-                }catch(Exception $e){
+					unlink($_FILES['blob']['tmp_name']);
+				}catch(Exception $e){
 
-                }
+				}
 
 			}elseif(isset($_POST['blob'])){
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
@@ -271,16 +271,16 @@ 
 		
 	}
 
-    /**
-     * Connect to mysql server method
-     *
-     * @param $remote_mysql_host
-     * @param $remote_mysql_user
-     * @param $remote_mysql_pass
-     * @param $remote_mysql_db
-     * @return mysqli
-     * @throws Exception
-     */
+	/**
+	 * Connect to mysql server method
+	 *
+	 * @param $remote_mysql_host
+	 * @param $remote_mysql_user
+	 * @param $remote_mysql_pass
+	 * @param $remote_mysql_db
+	 * @return mysqli
+	 * @throws Exception
+	 */
 	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db )
 	{
 		$this->logger->info(sprintf('Connecting to mysql database %s with %s@%s', $remote_mysql_db, $remote_mysql_user, $remote_mysql_host));
@@ -302,11 +302,11 @@ 
 		return $mysqli;	
 	}
 
-    /**
-     * Restore mysql backup file
-     *
-     * @throws Exception
-     */
+	/**
+	 * Restore mysql backup file
+	 *
+	 * @throws Exception
+	 */
 	public function restore_mysql_backup_action()
 	{
 		$mysqldump_file 	= filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
@@ -437,14 +437,14 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Url replace method inside database backup file
-     *
-     * @param $search
-     * @param $replace
-     * @param $query
-     * @return mixed|string|string[]|null
-     */
+	/**
+	 * Url replace method inside database backup file
+	 *
+	 * @param $search
+	 * @param $replace
+	 * @param $query
+	 * @return mixed|string|string[]|null
+	 */
 	private function url_replace($search, $replace, $query)
 	{
 		$this->logger->info(sprintf("Doing url replace on query with length %s", strlen($query)), array("QUERY_REPLACE"));
@@ -467,11 +467,11 @@ 
 		return $query;
 	}
 
-    /**
-     * List backup files method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * List backup files method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function list_backup_files_action()
 	{
 		$backup_parts = array();
@@ -537,11 +537,11 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Finish backup restore method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Finish backup restore method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function restore_finish_action()
 	{
 		$remote_path 		= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
@@ -582,12 +582,12 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Delete backup temporary folder
-     *
-     * @param $remote_path
-     * @return bool
-     */
+	/**
+	 * Delete backup temporary folder
+	 *
+	 * @param $remote_path
+	 * @return bool
+	 */
 	private function delete_backup_temporary_folder($remote_path)
 	{
 		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
@@ -615,11 +615,11 @@ 
 	
 	}
 
-    /**
-     * Delete restore script method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Delete restore script method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	private function delete_self()
 	{
 		if($this->filesystem->has("vendor.phar"))
@@ -652,14 +652,14 @@ 
 		
 	}
 
-    /**
-     * Update Wordpress url in wp-config.php method
-     * @param $wp_path
-     * @param $url
-     * @param $mysqli
-     * @return bool
-     * @throws Exception
-     */
+	/**
+	 * Update Wordpress url in wp-config.php method
+	 * @param $wp_path
+	 * @param $url
+	 * @param $mysqli
+	 * @return bool
+	 * @throws Exception
+	 */
 	private function update_wp_url($wp_path, $url, $mysqli)
 	{
 		$wp_config = $wp_path.DS."wp-config.php";
@@ -687,17 +687,17 @@ 
 		return true;
 	}
 
-    /**
-     * Update local wp-config.php file method
-     *
-     * @param $remote_path
-     * @param $remote_mysql_host
-     * @param $remote_mysql_user
-     * @param $remote_mysql_pass
-     * @param $remote_mysql_db
-     * @return string
-     * @throws Exception
-     */
+	/**
+	 * Update local wp-config.php file method
+	 *
+	 * @param $remote_path
+	 * @param $remote_mysql_host
+	 * @param $remote_mysql_user
+	 * @param $remote_mysql_pass
+	 * @param $remote_mysql_db
+	 * @return string
+	 * @throws Exception
+	 */
 	private function update_wp_config($remote_path, $remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db)
 	{
 		$wp_config = $remote_path.DS."wp-config.php";
@@ -729,10 +729,10 @@ 
 		
 	}
 
-    /**
-     * List mysqldump database backup files
-     *
-     */
+	/**
+	 * List mysqldump database backup files
+	 *
+	 */
 	public function list_mysqldump_backups_action()
 	{
 		$source_backup_file = filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
@@ -782,12 +782,12 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Get backup hash method
-     *
-     * @param $backup_file
-     * @return bool
-     */
+	/**
+	 * Get backup hash method
+	 *
+	 * @param $backup_file
+	 * @return bool
+	 */
 	private function get_hash_from_backup($backup_file)
 	{
 		if(!$backup_file)
@@ -801,11 +801,11 @@ 
 		return false;
 	}
 
-    /**
-     * List backup archives found on local system
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * List backup archives found on local system
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function list_backup_archives_action()
 	{
 		$local_backup_file = filter_input(INPUT_POST, 'local_backup_file', FILTER_SANITIZE_STRING);
@@ -864,12 +864,12 @@ 
 		
 	}
 
-    /**
-     * Restore backup archive to local path
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     * @throws \splitbrain\PHPArchive\ArchiveIOException
-     */
+	/**
+	 * Restore backup archive to local path
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 * @throws \splitbrain\PHPArchive\ArchiveIOException
+	 */
 	public function restore_backup_to_path_action()
 	{
 		$source_backup_file 	= filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
@@ -944,9 +944,9 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Get current directory method
-     */
+	/**
+	 * Get current directory method
+	 */
 	public function get_current_directory_action()
 	{	
 		global $wpdb;
@@ -980,11 +980,11 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Check current filesystem
-     *
-     * @throws Exception
-     */
+	/**
+	 * Check current filesystem
+	 *
+	 * @throws Exception
+	 */
 	public function check_system()
 	{
 		//check if i can write
@@ -1006,35 +1006,35 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Return bytes from human readable value
-     *
-     * @param $val
-     * @return int
-     *
-     */
-    private function return_bytes($val) {
-        $numeric_val = (int)trim($val);
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
-            // The 'G' modifier is available since PHP 5.1.0
-            case 'g':
-                $numeric_val *= 1024;
-            case 'm':
-                $numeric_val *= 1024;
-            case 'k':
-                $numeric_val *= 1024;
-        }
-
-        return $numeric_val;
-    }
-
-    /**
-     * Check if backup archive os multipart
-     *
-     * @param $backup_name
-     * @return bool
-     */
+	/**
+	 * Return bytes from human readable value
+	 *
+	 * @param $val
+	 * @return int
+	 *
+	 */
+	private function return_bytes($val) {
+		$numeric_val = (int)trim($val);
+		$last = strtolower($val[strlen($val)-1]);
+		switch($last) {
+			// The 'G' modifier is available since PHP 5.1.0
+			case 'g':
+				$numeric_val *= 1024;
+			case 'm':
+				$numeric_val *= 1024;
+			case 'k':
+				$numeric_val *= 1024;
+		}
+
+		return $numeric_val;
+	}
+
+	/**
+	 * Check if backup archive os multipart
+	 *
+	 * @param $backup_name
+	 * @return bool
+	 */
 	public function is_multipart($backup_name)
 	{
 		if(stristr($backup_name, "-multipart"))
@@ -1043,13 +1043,13 @@ 
 		return false;	
 	}
 
-    /**
-     * Get backup archive size
-     *
-     * @param $backup_name
-     * @return bool|false|int
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Get backup archive size
+	 *
+	 * @param $backup_name
+	 * @return bool|false|int
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->filesystem->getSize($backup_name);
@@ -1063,12 +1063,12 @@ 
 		return $backup_size;
 	}
 
-    /**
-     * Get multipart backup files list
-     * @param $backup_name
-     * @return array
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Get multipart backup files list
+	 * @param $backup_name
+	 * @return array
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function get_multipart_files($backup_name)
 	{
 		$files = array();
@@ -1089,58 +1089,58 @@ 
 		return $files;
 	}
 
-    /**
-     * Sort_by method
-     *
-     * @param $array
-     * @param $field
-     * @param string $direction
-     * @return bool
-     */
-    private function sort_by( &$array, $field, $direction = 'asc')
-    {
-        $direction = strtolower($direction);
-
-        usort($array,
-            function($a, $b) use($field, $direction){
-
-                $a = $a[$field];
-                $b = $b[$field];
-
-                if ($a == $b)
-                {
-                    return 0;
-                }
-
-                if($direction == 'desc') {
-                    if($a > $b) {
-                        return -1;
-                    }
-                    else{
-                        return 1;
-                    }
-                }else {
-                    if($a < $b) {
-                        return -1;
-                    }
-                    else{
-                        return 1;
-                    }
-                }
-
-                //return ($a.($direction == 'desc' ? '>' : '<').$b) ? -1 : 1;
-            }
-        );
-
-        return true;
-    }
-
-    /**
-     * Send response method
-     *
-     * @param int $status
-     * @param $response
-     */
+	/**
+	 * Sort_by method
+	 *
+	 * @param $array
+	 * @param $field
+	 * @param string $direction
+	 * @return bool
+	 */
+	private function sort_by( &$array, $field, $direction = 'asc')
+	{
+		$direction = strtolower($direction);
+
+		usort($array,
+			function($a, $b) use($field, $direction){
+
+				$a = $a[$field];
+				$b = $b[$field];
+
+				if ($a == $b)
+				{
+					return 0;
+				}
+
+				if($direction == 'desc') {
+					if($a > $b) {
+						return -1;
+					}
+					else{
+						return 1;
+					}
+				}else {
+					if($a < $b) {
+						return -1;
+					}
+					else{
+						return 1;
+					}
+				}
+
+				//return ($a.($direction == 'desc' ? '>' : '<').$b) ? -1 : 1;
+			}
+		);
+
+		return true;
+	}
+
+	/**
+	 * Send response method
+	 *
+	 * @param int $status
+	 * @param $response
+	 */
 	public static function send_response($status = 200, $response)
 	{
 		header("Access-Control-Allow-Origin: *");
@@ -1163,12 +1163,12 @@ 
 		exit;
 	}
 
-    /**
-     * Serialize fix methods below for mysql query lines
-     *
-     * @param $query
-     * @return string|string[]|null
-     */
+	/**
+	 * Serialize fix methods below for mysql query lines
+	 *
+	 * @param $query
+	 * @return string|string[]|null
+	 */
 	 
 	function do_serialized_fix($query)
 	{
@@ -1181,51 +1181,51 @@ 
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
-	              //return $this->unescape_quotes($data);
+				  //return $this->unescape_quotes($data);
 	              
-	              return $data;
-	            }, $query);
+				  return $data;
+				}, $query);
 	}
 
-    /**
-     * Unescape quotes method
-     *
-     * @param $value
-     * @return mixed
-     */
+	/**
+	 * Unescape quotes method
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
 	private function unescape_quotes($value) {
 		return str_replace('\"', '"', $value);
 	}
 
-    /**
-     * Unescape mysql method
-     *
-     * @param $value
-     * @return mixed
-     */
+	/**
+	 * Unescape mysql method
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
 	private function unescape_mysql($value) {
 		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z",  "\'", '\"'),
 						   array("\\",   "\0",  "\n",  "\r",  "\x1a", "'", '"'), 
 						   $value);
 	}
 
-    /**
-     * Check if string is in serialized format
-     *
-     * @param $s
-     * @return bool
-     */
+	/**
+	 * Check if string is in serialized format
+	 *
+	 * @param $s
+	 * @return bool
+	 */
 	private function has_serialized($s)
 	{
 		if(
-		    stristr($s, '{' ) !== false &&
-		    stristr($s, '}' ) !== false &&
-		    stristr($s, ';' ) !== false &&
-		    stristr($s, ':' ) !== false
-		    ){
-		    return true;
+			stristr($s, '{' ) !== false &&
+			stristr($s, '}' ) !== false &&
+			stristr($s, ';' ) !== false &&
+			stristr($s, ':' ) !== false
+			){
+			return true;
 		}else{
-		    return false;
+			return false;
 		}
 
 	}

Spacing +194 added lines, -194 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-if(!defined('AUTH_KEY'))
+if (!defined('AUTH_KEY'))
 {
 	define('AUTH_KEY', '');
 }
 
-if(!defined("DS"))
+if (!defined("DS"))
 {
 	define("DS", DIRECTORY_SEPARATOR);
 }
 
-if(!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
+if (!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
 {	
-	if(!AUTH_KEY)
+	if (!AUTH_KEY)
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, AUTH_KEY not set!");
 			exit;
 	}
 	
-	if(!isset($_REQUEST['hash']))
+	if (!isset($_REQUEST['hash']))
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, sent HASH is empty!");
 			exit;
 	}
 	
-	if($_REQUEST['hash'] != AUTH_KEY)
+	if ($_REQUEST['hash'] != AUTH_KEY)
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, AUTH_KEY doesn't match the sent HASH!");
 			exit;
@@ -32,28 +32,28 @@ 
 }
 
 //check minimum PHP version
-if(version_compare(phpversion(), Xcloner_Restore::xcloner_minimum_version, '<'))
+if (version_compare(phpversion(), Xcloner_Restore::xcloner_minimum_version, '<'))
 {
-	Xcloner_Restore::send_response(500, sprintf(("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"),Xcloner_Restore::xcloner_minimum_version, phpversion()) );
+	Xcloner_Restore::send_response(500, sprintf(("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"), Xcloner_Restore::xcloner_minimum_version, phpversion()));
 	exit;
 
 }
 
-$file = dirname( __DIR__ )  . DS.'vendor'.DS.'autoload.php';
+$file = dirname(__DIR__).DS.'vendor'.DS.'autoload.php';
 
-if(file_exists($file))
+if (file_exists($file))
 {
 	
 	require_once($file);
 }
-elseif(file_exists("vendor.phar") and extension_loaded('phar'))
+elseif (file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
-}else{	
+} else {	
 	
-	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
+	$file = dirname(__FILE__).DS.'vendor'.DS.'autoload.php';
 	
-	if(!file_exists($file))
+	if (!file_exists($file))
 	{
 		Xcloner_Restore::send_response("404", "File $file does not exists, please extract the vendor.tgz archive on the server or enable PHP Phar module!");
 		exit;
@@ -78,16 +78,16 @@ 
 
 //do not modify below
 $that = "";
-if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 {
 	$that = $this;
 }
 $xcloner_restore = new Xcloner_Restore($that);
 
-try{
+try {
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch(Exception $e){
+}catch (Exception $e) {
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -96,10 +96,10 @@ 
 	
 	const 	xcloner_minimum_version = "5.4.0";
 	
-	private $backup_archive_extensions 		= array("zip", "tar", "tgz", "tar.gz", "gz", "csv");
-	private $process_files_limit 			= 150;
-	private $process_files_limit_list 		= 350;
-	private $process_mysql_records_limit 	= 250;
+	private $backup_archive_extensions = array("zip", "tar", "tgz", "tar.gz", "gz", "csv");
+	private $process_files_limit = 150;
+	private $process_files_limit_list = 350;
+	private $process_mysql_records_limit = 250;
 	private $adapter;
 	private $filesystem;
 	private $logger;
@@ -115,12 +115,12 @@ 
 	{
 		register_shutdown_function(array($this, 'exception_handler'));
 
-		if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+		if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 		{
 			$dir = $parent_api->get_xcloner_container()->get_xcloner_settings()->get_xcloner_store_path();
 		}
 		
-		if(!isset($dir) || !$dir){
+		if (!isset($dir) || !$dir) {
 			$dir = dirname(__FILE__);
 		}
 		
@@ -128,7 +128,7 @@ 
 		
 		$this->backup_storage_dir = $dir;
 		
-		$this->adapter = new Local($dir ,LOCK_EX, 'SKIP_LINKS');
+		$this->adapter = new Local($dir, LOCK_EX, 'SKIP_LINKS');
 		$this->filesystem = new Filesystem($this->adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -137,15 +137,15 @@ 
 		
 		$logger_path = $this->get_logger_filename();
 		
-		if(!is_writeable($logger_path) and !touch($logger_path))
+		if (!is_writeable($logger_path) and !touch($logger_path))
 		{
 			$logger_path = "php://stderr";
 		}
 		
 		$this->logger->pushHandler(new StreamHandler($logger_path, Logger::DEBUG));
 		
-		if(isset($_POST['API_ID'])){
-			$this->logger->info("Processing ajax request ID ".substr(filter_input(INPUT_POST, 'API_ID', FILTER_SANITIZE_STRING), 0 , 15));
+		if (isset($_POST['API_ID'])) {
+			$this->logger->info("Processing ajax request ID ".substr(filter_input(INPUT_POST, 'API_ID', FILTER_SANITIZE_STRING), 0, 15));
 		}
 
 	}
@@ -157,9 +157,9 @@ 
 		
 		$error = error_get_last();
 		
-		if($error['type'] and $this->logger)
+		if ($error['type'] and $this->logger)
 		{
-			$this->logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$this->logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 	
 	}
@@ -169,12 +169,12 @@ 
      * @return mixed|string
      */
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
+	    static $levels = null;
+	    if ($levels === null) {
+	        $levels = [];
 	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+	            if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 	        }
 	    }
 	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -182,7 +182,7 @@ 
 	
 	public function get_logger_filename()
 	{
-		$filename = $this->backup_storage_dir .DS. "xcloner_restore.log";
+		$filename = $this->backup_storage_dir.DS."xcloner_restore.log";
 		
 		return $filename;
 	}
@@ -195,7 +195,7 @@ 
      */
 	public function init()
 	{
-		if(isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
+		if (isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
 		{
 			$method = filter_input(INPUT_POST, 'xcloner_action', FILTER_SANITIZE_STRING);
 			
@@ -203,13 +203,13 @@ 
 			
 			$method .= "_action";
 			
-			if(method_exists($this, $method))
+			if (method_exists($this, $method))
 			{
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
-				throw new Exception($method ." does not exists");
+			} else {
+				throw new Exception($method." does not exists");
 				}
 		}
 		
@@ -224,43 +224,43 @@ 
      */
 	public function write_file_action()
 	{
-		if(isset($_POST['file']))
+		if (isset($_POST['file']))
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
+			if (!$_POST['start'])
 				$fp = fopen($target_file, "wb+");
 			else
 				$fp = fopen($target_file, "ab+");	
 			
-			if(!$fp)
+			if (!$fp)
 				throw new Exception("Unable to open $target_file file for writing");
 			
 			fseek($fp, $_POST['start']);
 			
-			if(isset($_FILES['blob']))
+			if (isset($_FILES['blob']))
 			{
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using FILES blob', filesize($_FILES['blob']['tmp_name']), $target_file, $_POST['start']));
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
 
 				try {
                     unlink($_FILES['blob']['tmp_name']);
-                }catch(Exception $e){
+                }catch (Exception $e) {
 
                 }
 
-			}elseif(isset($_POST['blob'])){
+			}elseif (isset($_POST['blob'])) {
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
-			}else{
+			} else {
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -281,20 +281,20 @@ 
      * @return mysqli
      * @throws Exception
      */
-	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db )
+	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db)
 	{
 		$this->logger->info(sprintf('Connecting to mysql database %s with %s@%s', $remote_mysql_db, $remote_mysql_user, $remote_mysql_host));
 
 		$mysqli = new mysqli($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 
 		if ($mysqli->connect_error) {
-			throw new Exception('Connect Error (' . $mysqli->connect_errno . ') '
+			throw new Exception('Connect Error ('.$mysqli->connect_errno.') '
 				. $mysqli->connect_error);
 		}
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
+		if (isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
 			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
 		else
 			$mysqli->query("SET NAMES utf8;");
@@ -309,15 +309,15 @@ 
      */
 	public function restore_mysql_backup_action()
 	{
-		$mysqldump_file 	= filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
-		$remote_path 		= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
+		$mysqldump_file = filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
+		$remote_path = filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
 		$remote_mysql_user 	= filter_input(INPUT_POST, 'remote_mysql_user', FILTER_SANITIZE_STRING);
 		$remote_mysql_pass 	= filter_input(INPUT_POST, 'remote_mysql_pass', FILTER_SANITIZE_STRING);
-		$remote_mysql_db 	= filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
+		$remote_mysql_db = filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
 		$remote_mysql_host 	= filter_input(INPUT_POST, 'remote_mysql_host', FILTER_SANITIZE_STRING);
-		$execute_query 		= trim(stripslashes($_POST['query']));
-		$error_line			= filter_input(INPUT_POST, 'error_line', FILTER_SANITIZE_NUMBER_INT);
-		$start			 	= filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
+		$execute_query = trim(stripslashes($_POST['query']));
+		$error_line = filter_input(INPUT_POST, 'error_line', FILTER_SANITIZE_NUMBER_INT);
+		$start = filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
 		
 		$wp_home_url 		= filter_input(INPUT_POST, 'wp_home_url', FILTER_SANITIZE_STRING);
 		$remote_restore_url = filter_input(INPUT_POST, 'remote_restore_url', FILTER_SANITIZE_STRING);
@@ -327,8 +327,8 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if(!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		if (!file_exists($mysql_backup_file))
+			throw new Exception(sprintf("Mysql backup file %s does not exists", $mysql_backup_file));
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -342,7 +342,7 @@ 
 		}*/
 		
 		{
-			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db );
+			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 		}
 		
 		$line_count = 0;
@@ -352,7 +352,7 @@ 
 		$return['backup_size']	= filesize($mysql_backup_file);
 		
 		$fp = fopen($mysql_backup_file, "r");
-		if($fp)
+		if ($fp)
 		{
 			$this->logger->info(sprintf("Opening mysql dump file %s at position %s.", $mysql_backup_file, $start));
 			fseek($fp, $start);
@@ -360,49 +360,49 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if(substr($line, 0, 1) == "#")
+				if (substr($line, 0, 1) == "#")
 					continue;
 				
 				//check if line is empty	
-				if($line == "\n" or trim($line) == "")
+				if ($line == "\n" or trim($line) == "")
 					continue;
 					
-				if(substr($line, strlen($line)-2, strlen($line)) == ";\n")
+				if (substr($line, strlen($line) - 2, strlen($line)) == ";\n")
 					$query .= $line;
-				else{
+				else {
 					$query .= $line;
 					continue;
 				}
 				
-				if($execute_query)
+				if ($execute_query)
 				{
-					$query  = (($execute_query));
+					$query = (($execute_query));
 					$execute_query = "";
 				}	
 				
 				//Doing serialized url replace here
 				
-				if($wp_site_url and $wp_home_url and strlen($wp_home_url) < strlen($wp_site_url))
+				if ($wp_site_url and $wp_home_url and strlen($wp_home_url) < strlen($wp_site_url))
 				{
-					list($wp_home_url,$wp_site_url) 			= array($wp_site_url,$wp_home_url);
-					list($remote_restore_url,$restore_site_url) = array($restore_site_url,$remote_restore_url);
+					list($wp_home_url, $wp_site_url) = array($wp_site_url, $wp_home_url);
+					list($remote_restore_url, $restore_site_url) = array($restore_site_url, $remote_restore_url);
 					
 				}
 				
-				if($wp_home_url and $remote_restore_url and strpos($query, $wp_home_url) !== false)
+				if ($wp_home_url and $remote_restore_url and strpos($query, $wp_home_url) !== false)
 				{
 					$query = $this->url_replace($wp_home_url, $remote_restore_url, $query);
 				}
 				
-				if($wp_site_url and $restore_site_url and strpos($query, $wp_site_url) !== false)
+				if ($wp_site_url and $restore_site_url and strpos($query, $wp_site_url) !== false)
 				{
 					$query = $this->url_replace($wp_site_url, $restore_site_url, $query);
 				}
 				
-				if(!$mysqli->query($query) && !stristr($mysqli->error,"Duplicate entry"))
+				if (!$mysqli->query($query) && !stristr($mysqli->error, "Duplicate entry"))
 				{
 					//$return['error_line'] = $line_count;
-					$return['start'] = ftell($fp)-strlen($line);
+					$return['start'] = ftell($fp) - strlen($line);
 					$return['query_error'] = true;
 					$return['query'] = $query;
 					$return['message'] = sprintf("Mysql Error: %s\n", $mysqli->error);
@@ -423,12 +423,12 @@ 
 		
 		$return['start'] = ftell($fp);
 		
-		$this->logger->info(sprintf("Executed %s queries of size %s bytes", $line_count, ($return['start']-$start)));
+		$this->logger->info(sprintf("Executed %s queries of size %s bytes", $line_count, ($return['start'] - $start)));
 		
-		if(!feof($fp))
+		if (!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else {
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -451,12 +451,12 @@ 
 		$query = str_replace($search, $replace, $query);
 		$original_query = $query;
 		
-		if($this->has_serialized($query))
+		if ($this->has_serialized($query))
 		{
 			$this->logger->info(sprintf("Query contains serialized data, doing serialized size fix"), array("QUERY_REPLACE"));
 			$query = $this->do_serialized_fix($query);
 			
-			if(!$query)
+			if (!$query)
 			{
 				$this->logger->info(sprintf("Serialization probably failed here..."), array("QUERY_REPLACE"));
 				$query = $original_query;
@@ -477,37 +477,37 @@ 
 		$backup_parts = array();
 		
 		$source_backup_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
-		$start 				= (int)filter_input(INPUT_POST, 'start', FILTER_SANITIZE_STRING);
-		$return['part'] 	= (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_STRING);
+		$start = (int)filter_input(INPUT_POST, 'start', FILTER_SANITIZE_STRING);
+		$return['part'] = (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_STRING);
 		
 		$backup_file = $source_backup_file;
 		
-		if($this->is_multipart($backup_file))
+		if ($this->is_multipart($backup_file))
 		{
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];
 		}
 		
-		try{
+		try {
 			$tar = new Tar();
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch(Exception $e)
+		}catch (Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$this->send_response(200, $return);
 		}
 		
-		$return['files'] 		= array();
-		$return['finished'] 	= 1;
-		$return['total_size'] 	= filesize($this->backup_storage_dir.DS.$backup_file);
+		$return['files'] = array();
+		$return['finished'] = 1;
+		$return['total_size'] = filesize($this->backup_storage_dir.DS.$backup_file);
 		$i = 0;
 		
-		if(isset($data['extracted_files']) and is_array($data['extracted_files']))
+		if (isset($data['extracted_files']) and is_array($data['extracted_files']))
 		{
-			foreach($data['extracted_files'] as $file)
+			foreach ($data['extracted_files'] as $file)
 			{
 				$return['files'][$i]['path'] = $file->getPath();
 				$return['files'][$i]['size'] = $file->getSize();
@@ -517,18 +517,18 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
-			if($this->is_multipart($source_backup_file))
+		} else {
+			if ($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
+				if ($return['part'] < sizeof($backup_parts))	
 					$return['finished'] = 0;
 				
 			}
@@ -551,28 +551,28 @@ 
 		
 		$remote_mysql_user 	= filter_input(INPUT_POST, 'remote_mysql_user', FILTER_SANITIZE_STRING);
 		$remote_mysql_pass 	= filter_input(INPUT_POST, 'remote_mysql_pass', FILTER_SANITIZE_STRING);
-		$remote_mysql_db 	= filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
+		$remote_mysql_db = filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
 		$remote_mysql_host 	= filter_input(INPUT_POST, 'remote_mysql_host', FILTER_SANITIZE_STRING);
 		
-		$update_remote_site_url			 	= filter_input(INPUT_POST, 'update_remote_site_url', FILTER_SANITIZE_NUMBER_INT);
-		$delete_restore_script			 	= filter_input(INPUT_POST, 'delete_restore_script', FILTER_SANITIZE_NUMBER_INT);
-		$delete_backup_temporary_folder		= filter_input(INPUT_POST, 'delete_backup_temporary_folder', FILTER_SANITIZE_NUMBER_INT);
+		$update_remote_site_url = filter_input(INPUT_POST, 'update_remote_site_url', FILTER_SANITIZE_NUMBER_INT);
+		$delete_restore_script = filter_input(INPUT_POST, 'delete_restore_script', FILTER_SANITIZE_NUMBER_INT);
+		$delete_backup_temporary_folder = filter_input(INPUT_POST, 'delete_backup_temporary_folder', FILTER_SANITIZE_NUMBER_INT);
 				
-		if($update_remote_site_url)
+		if ($update_remote_site_url)
 		{
-			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db );
+			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 			$this->update_wp_config($remote_path, $remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 			$this->update_wp_url($remote_path, $remote_restore_url, $mysqli);
 		}
 		
-		if($delete_backup_temporary_folder)
+		if ($delete_backup_temporary_folder)
 		{
 			$this->delete_backup_temporary_folder($remote_path);
 		}
 		
-		if(!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
+		if (!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
 		{
-			if($delete_restore_script)
+			if ($delete_restore_script)
 			{
 				$this->delete_self();
 			}
@@ -590,7 +590,7 @@ 
      */
 	private function delete_backup_temporary_folder($remote_path)
 	{
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -598,13 +598,13 @@ 
 		$mysqldump_list = array();
 		$list = $this->target_filesystem->listContents();
 		
-		foreach($list as $file)
+		foreach ($list as $file)
 		{
 			$matches = array();
 			
-			if($file['type'] == "dir")
+			if ($file['type'] == "dir")
 			{
-				if(preg_match("/xcloner-(\w*)/", $file['basename'], $matches)){
+				if (preg_match("/xcloner-(\w*)/", $file['basename'], $matches)) {
 					$this->logger->info(sprintf('Deleting temporary folder %s', $file['path']));
 					$this->target_filesystem->deleteDir($file['path']);
 				}
@@ -622,29 +622,29 @@ 
      */
 	private function delete_self()
 	{
-		if($this->filesystem->has("vendor.phar"))
+		if ($this->filesystem->has("vendor.phar"))
 		{
 			$this->logger->info(sprintf('Deleting vendor.phar'));
 			$this->filesystem->delete("vendor.phar");
 		}
-		if($this->filesystem->has("vendor"))
+		if ($this->filesystem->has("vendor"))
 		{
 			$this->logger->info(sprintf('Deleting vendor folder'));
 			$this->filesystem->deleteDir("vendor");
 		}
-		if($this->filesystem->has("xcloner_restore.php"))
+		if ($this->filesystem->has("xcloner_restore.php"))
 		{
 			$this->logger->info(sprintf('Deleting xcloner_restore.php'));
 			$this->filesystem->delete("xcloner_restore.php");
 		}
 		
-		if($this->filesystem->has("xcloner_restore.log"))
+		if ($this->filesystem->has("xcloner_restore.log"))
 		{
 			$this->logger->info(sprintf('Deleting xcloner_restore.log'));
 			$this->filesystem->delete("xcloner_restore.log");
 		}
 		
-		if($this->filesystem->has($this->get_logger_filename()))
+		if ($this->filesystem->has($this->get_logger_filename()))
 		{
 			$this->logger->info(sprintf('Deleting logger file %s', $this->get_logger_filename()));
 			$this->filesystem->delete($this->get_logger_filename());
@@ -666,11 +666,11 @@ 
 		
 		$this->logger->info(sprintf('Updating site url to %s', $url));
 		
-		if(file_exists($wp_config))
+		if (file_exists($wp_config))
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if(isset($matches[1]))
+			if (isset($matches[1]))
 				$table_prefix = $matches[1];
 			else
 				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
@@ -678,10 +678,10 @@ 
 		else
 			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
 			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
 		
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
 			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
 		
 		return true;
@@ -702,7 +702,7 @@ 
 	{
 		$wp_config = $remote_path.DS."wp-config.php";
 		
-		if(!file_exists($wp_config))
+		if (!file_exists($wp_config))
 		{
 			throw new Exception("Could not find the wp-config.php in ".$remote_path);
 		}
@@ -720,7 +720,7 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if(!file_put_contents($wp_config, $content))
+		if (!file_put_contents($wp_config, $content))
 			throw new Exception("Could not write updated config data to ".$wp_config);
 		
 		chmod($wp_config, $file_perms);
@@ -740,7 +740,7 @@ 
 	
 		$hash = $this->get_hash_from_backup($source_backup_file);	
 		
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -748,25 +748,25 @@ 
 		$mysqldump_list = array();
 		$list = $this->target_filesystem->listContents();
 		
-		foreach($list as $file)
+		foreach ($list as $file)
 		{
 			$matches = array();
 			
-			if($file['type'] == "dir")
+			if ($file['type'] == "dir")
 			{
-				if(preg_match("/xcloner-(\w*)/", $file['basename'], $matches))
+				if (preg_match("/xcloner-(\w*)/", $file['basename'], $matches))
 				{
 					$files = $this->target_filesystem->listContents($file['basename']);
-					foreach($files as $file)
+					foreach ($files as $file)
 					{
-						if($file['extension'] == "sql")
+						if ($file['extension'] == "sql")
 						{
 							$this->logger->info(sprintf('Found %s mysql backup file', $file['path']));
 							$mysqldump_list[$file['path']]['path'] = $file['path'];
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
-							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i",$file['timestamp']);
+							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i", $file['timestamp']);
 							
-							if($hash and $hash == $matches[1])
+							if ($hash and $hash == $matches[1])
 								$mysqldump_list[$file['path']]['selected'] = "selected";
 							else
 								$mysqldump_list[$file['path']]['selected'] = "";	
@@ -776,7 +776,7 @@ 
 			}	
 		}
 		
-		$this->sort_by($mysqldump_list, 'timestamp','desc');
+		$this->sort_by($mysqldump_list, 'timestamp', 'desc');
 		$return['files'] = $mysqldump_list;
 		
 		$this->send_response(200, $return);
@@ -790,12 +790,12 @@ 
      */
 	private function get_hash_from_backup($backup_file)
 	{
-		if(!$backup_file)
+		if (!$backup_file)
 			return false;
 			
-		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file)-10, strlen($backup_file)), $matches)	;
+		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file) - 10, strlen($backup_file)), $matches);
 		
-		if($result and isset($matches[1]))
+		if ($result and isset($matches[1]))
 			return ($matches[1]);
 		
 		return false;
@@ -814,18 +814,18 @@ 
 		$backup_files = array();
 		$parents = array();
 		
-		foreach($list as $file_info)
+		foreach ($list as $file_info)
 		{
 			$data = array();
 			
-			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->filesystem->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach ($lines as $line)
+					if ($line)
 					{
 						$data = str_getcsv($line);
-						if(is_array($data)){
+						if (is_array($data)) {
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
 							$file_info['size'] += $data[2];
@@ -834,19 +834,19 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
 				$backup_files[$file_info['path']] = $file_info;
 		}
 		
 		$new_list = array();
 		
-		foreach($backup_files as $key=>$file_info)
+		foreach ($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
+			if (isset($parents[$file_info['path']]))
 				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else{
+			else {
 				
-				if($local_backup_file and ($file_info['basename'] == $local_backup_file))
+				if ($local_backup_file and ($file_info['basename'] == $local_backup_file))
 					$file_info['selected'] = 'selected';
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
@@ -856,7 +856,7 @@ 
 				
 		}
 		
-		$this->sort_by($new_list, "timestamp","desc");
+		$this->sort_by($new_list, "timestamp", "desc");
 		
 		$return['files'] = $new_list;
 		
@@ -872,15 +872,15 @@ 
      */
 	public function restore_backup_to_path_action()
 	{
-		$source_backup_file 	= filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
-		$remote_path 			= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
+		$source_backup_file = filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
+		$remote_path = filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
 		$include_filter_files 	= filter_input(INPUT_POST, 'filter_files', FILTER_SANITIZE_STRING);
 		$exclude_filter_files 	= "";
-		$start 					= filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
-		$return['part'] 		= (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_NUMBER_INT);
+		$start = filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
+		$return['part'] = (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_NUMBER_INT);
 		$return['processed'] 	= (int)filter_input(INPUT_POST, 'processed', FILTER_SANITIZE_NUMBER_INT);
 				
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -892,9 +892,9 @@ 
 		$return['total_size'] = $this->get_backup_size($backup_file);
 		
 		$backup_archive = new Tar();
-		if($this->is_multipart($backup_file))
+		if ($this->is_multipart($backup_file))
 		{
-			if(!$return['part'])
+			if (!$return['part'])
 				$return['processed'] += $this->filesystem->getSize($backup_file);
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
@@ -902,41 +902,41 @@ 
 		}	
 		
 		$this->logger->info(sprintf('Opening backup archive %s at position %s', $backup_file, $start));
-		$backup_archive->open($this->backup_storage_dir .DS. $backup_file, $start);
+		$backup_archive->open($this->backup_storage_dir.DS.$backup_file, $start);
 
-		$data = $backup_archive->extract($remote_path, '',$exclude_filter_files,$include_filter_files, $this->process_files_limit);
+		$data = $backup_archive->extract($remote_path, '', $exclude_filter_files, $include_filter_files, $this->process_files_limit);
 		
-		if(isset($data['extracted_files']))
+		if (isset($data['extracted_files']))
 		{
-			foreach($data['extracted_files'] as $spl_fileinfo)
+			foreach ($data['extracted_files'] as $spl_fileinfo)
 			{
 				$this->logger->info(sprintf('Extracted %s file', $spl_fileinfo->getPath()));
 				$return['extracted_files'][] = $spl_fileinfo->getPath()." (".$spl_fileinfo->getSize()." bytes)";
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
 			$return['start'] = $data['start'];
-		}else{
+		} else {
 			
 			$return['processed'] += $start;
 			
-			if($this->is_multipart($source_backup_file))
+			if ($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
+				if ($return['part'] < sizeof($backup_parts))	
 					$return['finished'] = 0;
 				
 			}
 		}
 		
-		if($return['finished'])
+		if ($return['finished'])
 			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
 		
 		$return['backup_file'] = $backup_file;
@@ -953,24 +953,24 @@ 
 		
 		$restore_script_url = filter_input(INPUT_POST, 'restore_script_url', FILTER_SANITIZE_STRING);
 		
-		$pathinfo = pathinfo( __FILE__);
+		$pathinfo = pathinfo(__FILE__);
 		
 		$suffix = "";
 		$return['remote_mysql_host'] 	= "localhost";
 		$return['remote_mysql_user'] 	= "";
 		$return['remote_mysql_pass'] 	= "";
-		$return['remote_mysql_db'] 		= "";
+		$return['remote_mysql_db'] = "";
 		
-		if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+		if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 		{
 			$return['dir'] = realpath(get_home_path().DS.$suffix);
-			$return['restore_script_url']  	= get_site_url();
+			$return['restore_script_url'] = get_site_url();
 			$return['remote_mysql_host'] 	= $wpdb->dbhost;
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
-			$return['remote_mysql_db'] 		= $wpdb->dbname;
+			$return['remote_mysql_db'] = $wpdb->dbname;
 		}
-		else{
+		else {
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -989,17 +989,17 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if(!file_put_contents($tmp_file, "++"))
+		if (!file_put_contents($tmp_file, "++"))
 			throw new Exception("Could not write to new host");
 		
-		if(!unlink($tmp_file))
+		if (!unlink($tmp_file))
 			throw new Exception("Could not delete temporary file from new host");
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
 
 		$return['max_upload_size'] = min($max_upload, $max_post); // bytes
-		$return['status']		= true;
+		$return['status'] = true;
 		
 		$this->logger->info(sprintf('Current filesystem max upload size is %s bytes', $return['max_upload_size']));
 		
@@ -1015,8 +1015,8 @@ 
      */
     private function return_bytes($val) {
         $numeric_val = (int)trim($val);
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
+        $last = strtolower($val[strlen($val) - 1]);
+        switch ($last) {
             // The 'G' modifier is available since PHP 5.1.0
             case 'g':
                 $numeric_val *= 1024;
@@ -1037,7 +1037,7 @@ 
      */
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -1053,10 +1053,10 @@ 
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->filesystem->getSize($backup_name);
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
+			foreach ($backup_parts as $part_file)
 				$backup_size += $this->filesystem->getSize($part_file);
 		}
 		
@@ -1073,12 +1073,12 @@ 
 	{
 		$files = array();
 		
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->filesystem->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$files[] = $data[0];
@@ -1097,7 +1097,7 @@ 
      * @param string $direction
      * @return bool
      */
-    private function sort_by( &$array, $field, $direction = 'asc')
+    private function sort_by(&$array, $field, $direction = 'asc')
     {
         $direction = strtolower($direction);
 
@@ -1112,18 +1112,18 @@ 
                     return 0;
                 }
 
-                if($direction == 'desc') {
-                    if($a > $b) {
+                if ($direction == 'desc') {
+                    if ($a > $b) {
                         return -1;
                     }
-                    else{
+                    else {
                         return 1;
                     }
-                }else {
-                    if($a < $b) {
+                } else {
+                    if ($a < $b) {
                         return -1;
                     }
-                    else{
+                    else {
                         return 1;
                     }
                 }
@@ -1149,11 +1149,11 @@ 
 		$return['status'] = $status;
 		$return['statusText'] = $response;
 		
-		if(isset($response['error']) && $response['error'])
+		if (isset($response['error']) && $response['error'])
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif($status != 200 and $status != 418)
+		}elseif ($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -1172,12 +1172,12 @@ 
 	 
 	function do_serialized_fix($query)
 	{
-		$query = str_replace(array("\\n","\\r","\\'"), array("","","\""), ($query));
+		$query = str_replace(array("\\n", "\\r", "\\'"), array("", "", "\""), ($query));
 		
-		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function ($m) {
+		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function($m) {
 				  $data = "";
 				  	
-				  if(!isset($m[3]))
+				  if (!isset($m[3]))
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
@@ -1204,8 +1204,8 @@ 
      * @return mixed
      */
 	private function unescape_mysql($value) {
-		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z",  "\'", '\"'),
-						   array("\\",   "\0",  "\n",  "\r",  "\x1a", "'", '"'), 
+		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z", "\'", '\"'),
+						   array("\\", "\0", "\n", "\r", "\x1a", "'", '"'), 
 						   $value);
 	}
 
@@ -1217,14 +1217,14 @@ 
      */
 	private function has_serialized($s)
 	{
-		if(
-		    stristr($s, '{' ) !== false &&
-		    stristr($s, '}' ) !== false &&
-		    stristr($s, ';' ) !== false &&
-		    stristr($s, ':' ) !== false
-		    ){
+		if (
+		    stristr($s, '{') !== false &&
+		    stristr($s, '}') !== false &&
+		    stristr($s, ';') !== false &&
+		    stristr($s, ':') !== false
+		    ) {
 		    return true;
-		}else{
+		} else {
 		    return false;
 		}
 

Braces +117 added lines, -93 removed lines

@@ -45,11 +45,10 @@ 
 {
 	
 	require_once($file);
-}
-elseif(file_exists("vendor.phar") and extension_loaded('phar'))
+} elseif(file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
-}else{	
+} else{	
 	
 	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
 	
@@ -87,7 +86,7 @@ 
 try{
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch(Exception $e){
+} catch(Exception $e){
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -208,7 +207,7 @@ 
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
+			} else{
 				throw new Exception($method ." does not exists");
 				}
 		}
@@ -228,13 +227,15 @@ 
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
-				$fp = fopen($target_file, "wb+");
-			else
-				$fp = fopen($target_file, "ab+");	
+			if(!$_POST['start']) {
+							$fp = fopen($target_file, "wb+");
+			} else {
+							$fp = fopen($target_file, "ab+");
+			}
 			
-			if(!$fp)
-				throw new Exception("Unable to open $target_file file for writing");
+			if(!$fp) {
+							throw new Exception("Unable to open $target_file file for writing");
+			}
 			
 			fseek($fp, $_POST['start']);
 			
@@ -244,23 +245,25 @@ 
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
 
 				try {
                     unlink($_FILES['blob']['tmp_name']);
-                }catch(Exception $e){
+                } catch(Exception $e){
 
                 }
 
-			}elseif(isset($_POST['blob'])){
+			} elseif(isset($_POST['blob'])){
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
-			}else{
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
+			} else{
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -294,10 +297,11 @@ 
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
-			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
-		else
-			$mysqli->query("SET NAMES utf8;");
+		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file']) {
+					$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
+		} else {
+					$mysqli->query("SET NAMES utf8;");
+		}
 			
 		return $mysqli;	
 	}
@@ -327,8 +331,9 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if(!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		if(!file_exists($mysql_backup_file)) {
+					throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		}
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -360,16 +365,18 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if(substr($line, 0, 1) == "#")
-					continue;
+				if(substr($line, 0, 1) == "#") {
+									continue;
+				}
 				
 				//check if line is empty	
-				if($line == "\n" or trim($line) == "")
-					continue;
+				if($line == "\n" or trim($line) == "") {
+									continue;
+				}
 					
-				if(substr($line, strlen($line)-2, strlen($line)) == ";\n")
-					$query .= $line;
-				else{
+				if(substr($line, strlen($line)-2, strlen($line)) == ";\n") {
+									$query .= $line;
+				} else{
 					$query .= $line;
 					continue;
 				}
@@ -428,7 +435,7 @@ 
 		if(!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else{
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -493,7 +500,7 @@ 
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
@@ -521,15 +528,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -670,19 +678,22 @@ 
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if(isset($matches[1]))
-				$table_prefix = $matches[1];
-			else
-				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			if(isset($matches[1])) {
+							$table_prefix = $matches[1];
+			} else {
+							throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			}
+		} else {
+					throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 		}
-		else
-			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
-			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'")) {
+					throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		}
 		
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
-			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'")) {
+					throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		}
 		
 		return true;
 	}
@@ -720,8 +731,9 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if(!file_put_contents($wp_config, $content))
-			throw new Exception("Could not write updated config data to ".$wp_config);
+		if(!file_put_contents($wp_config, $content)) {
+					throw new Exception("Could not write updated config data to ".$wp_config);
+		}
 		
 		chmod($wp_config, $file_perms);
 		
@@ -766,10 +778,11 @@ 
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
 							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i",$file['timestamp']);
 							
-							if($hash and $hash == $matches[1])
-								$mysqldump_list[$file['path']]['selected'] = "selected";
-							else
-								$mysqldump_list[$file['path']]['selected'] = "";	
+							if($hash and $hash == $matches[1]) {
+															$mysqldump_list[$file['path']]['selected'] = "selected";
+							} else {
+															$mysqldump_list[$file['path']]['selected'] = "";
+							}
 						}
 					}
 				}
@@ -790,13 +803,15 @@ 
      */
 	private function get_hash_from_backup($backup_file)
 	{
-		if(!$backup_file)
-			return false;
+		if(!$backup_file) {
+					return false;
+		}
 			
 		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file)-10, strlen($backup_file)), $matches)	;
 		
-		if($result and isset($matches[1]))
-			return ($matches[1]);
+		if($result and isset($matches[1])) {
+					return ($matches[1]);
+		}
 		
 		return false;
 	}
@@ -821,10 +836,11 @@ 
 			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->filesystem->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach($lines as $line) {
+									if($line)
 					{
 						$data = str_getcsv($line);
+				}
 						if(is_array($data)){
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
@@ -834,20 +850,22 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
-				$backup_files[$file_info['path']] = $file_info;
+			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions)) {
+							$backup_files[$file_info['path']] = $file_info;
+			}
 		}
 		
 		$new_list = array();
 		
 		foreach($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else{
+			if(isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			} else{
 				
-				if($local_backup_file and ($file_info['basename'] == $local_backup_file))
-					$file_info['selected'] = 'selected';
+				if($local_backup_file and ($file_info['basename'] == $local_backup_file)) {
+									$file_info['selected'] = 'selected';
+				}
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
 					
@@ -894,8 +912,9 @@ 
 		$backup_archive = new Tar();
 		if($this->is_multipart($backup_file))
 		{
-			if(!$return['part'])
-				$return['processed'] += $this->filesystem->getSize($backup_file);
+			if(!$return['part']) {
+							$return['processed'] += $this->filesystem->getSize($backup_file);
+			}
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];	
@@ -915,12 +934,13 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
-		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
+		if(isset($data['start'])) {
+				//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
+		}
 			$return['start'] = $data['start'];
-		}else{
+		} else{
 			
 			$return['processed'] += $start;
 			
@@ -930,14 +950,16 @@ 
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}
 		
-		if($return['finished'])
-			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		if($return['finished']) {
+					$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		}
 		
 		$return['backup_file'] = $backup_file;
 		
@@ -969,8 +991,7 @@ 
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
 			$return['remote_mysql_db'] 		= $wpdb->dbname;
-		}
-		else{
+		} else{
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -989,11 +1010,13 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if(!file_put_contents($tmp_file, "++"))
-			throw new Exception("Could not write to new host");
+		if(!file_put_contents($tmp_file, "++")) {
+					throw new Exception("Could not write to new host");
+		}
 		
-		if(!unlink($tmp_file))
-			throw new Exception("Could not delete temporary file from new host");
+		if(!unlink($tmp_file)) {
+					throw new Exception("Could not delete temporary file from new host");
+		}
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
@@ -1037,8 +1060,9 @@ 
      */
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -1056,8 +1080,9 @@ 
 		if($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
-				$backup_size += $this->filesystem->getSize($part_file);
+			foreach($backup_parts as $part_file) {
+							$backup_size += $this->filesystem->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -1115,15 +1140,13 @@ 
                 if($direction == 'desc') {
                     if($a > $b) {
                         return -1;
-                    }
-                    else{
+                    } else{
                         return 1;
                     }
-                }else {
+                } else {
                     if($a < $b) {
                         return -1;
-                    }
-                    else{
+                    } else{
                         return 1;
                     }
                 }
@@ -1153,7 +1176,7 @@ 
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif($status != 200 and $status != 418)
+		} elseif($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -1177,8 +1200,9 @@ 
 		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function ($m) {
 				  $data = "";
 				  	
-				  if(!isset($m[3]))
-					$m[3] = "";
+				  if(!isset($m[3])) {
+				  					$m[3] = "";
+				  }
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
 	              //return $this->unescape_quotes($data);
@@ -1224,7 +1248,7 @@ 
 		    stristr($s, ':' ) !== false
 		    ){
 		    return true;
-		}else{
+		} else{
 		    return false;
 		}