ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

Indentation +243 added lines, -243 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']))
@@ -266,16 +266,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));
@@ -297,11 +297,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);
@@ -432,14 +432,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"));
@@ -462,11 +462,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();
@@ -532,11 +532,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);
@@ -577,12 +577,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');
@@ -610,11 +610,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"))
@@ -647,14 +647,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";
@@ -682,17 +682,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";
@@ -724,10 +724,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);
@@ -777,12 +777,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)
@@ -796,11 +796,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);
@@ -859,12 +859,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);
@@ -939,9 +939,9 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Get current directory method
-     */
+	/**
+	 * Get current directory method
+	 */
 	public function get_current_directory_action()
 	{	
 		global $wpdb;
@@ -975,11 +975,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
@@ -1001,35 +1001,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 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;
-    }
+		return $numeric_val;
+	}
 
-    /**
-     * Check if backup archive os multipart
-     *
-     * @param $backup_name
-     * @return bool
-     */
+	/**
+	 * Check if backup archive os multipart
+	 *
+	 * @param $backup_name
+	 * @return bool
+	 */
 	public function is_multipart($backup_name)
 	{
 		if(stristr($backup_name, "-multipart"))
@@ -1038,13 +1038,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);
@@ -1058,12 +1058,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();
@@ -1084,58 +1084,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);
+	/**
+	 * 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){
+		usort($array,
+			function($a, $b) use($field, $direction){
 
-                $a = $a[$field];
-                $b = $b[$field];
+				$a = $a[$field];
+				$b = $b[$field];
 
-                if ($a == $b)
-                {
-                    return 0;
-                }
+				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;
-                    }
-                }
+				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 ($a.($direction == 'desc' ? '>' : '<').$b) ? -1 : 1;
+			}
+		);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Send response method
-     *
-     * @param int $status
-     * @param $response
-     */
+	/**
+	 * Send response method
+	 *
+	 * @param int $status
+	 * @param $response
+	 */
 	public static function send_response($status = 200, $response)
 	{
 		header("Access-Control-Allow-Origin: *");
@@ -1158,12 +1158,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)
 	{
@@ -1176,51 +1176,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;
 		}
 
 	}

admin/partials/xcloner_manage_backups_page.php

Indentation +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
 $storage_selection = "";
 
 if (isset($_GET['storage_selection']) and $_GET['storage_selection']) {
-    $storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
+	$storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
 }
 
 //$backup_list = $xcloner_file_system->get_backup_archives_list($storage_selection);
@@ -38,7 +38,7 @@ 
 
             <?php foreach ($available_storages as $storage => $text): ?>
                 <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection)
-                    echo "selected" ?>><?php echo $text ?></option>
+					echo "selected" ?>><?php echo $text ?></option>
             <?php endforeach ?>
         </select>
         <?php endif ?>
@@ -65,7 +65,7 @@ 
 
 
         <?php
-        /*$i = 0;
+		/*$i = 0;
         foreach ($backup_list as $file_info):?>
             <?php
             if ($storage_selection == "gdrive") {
@@ -302,7 +302,7 @@ 
                 <div class="row">
                     <div class="col s12 label">
                         <label><?php echo sprintf(__('Send %s to remote storage', 'xcloner-backup-and-restore'),
-                                "<span class='backup_name'></span>") ?></label>
+								"<span class='backup_name'></span>") ?></label>
                     </div>
                     <div class="input-field col s8 m10">
                         <select name="transfer_storage" id="transfer_storage" class="validate" required>

includes/class-xcloner-settings.php

Indentation +70 added lines, -70 removed lines

@@ -56,30 +56,30 @@ 
 
 	public function get_xcloner_encryption_key() {
 
-	    if(!get_option('xcloner_encryption_key') )
-        {
-	        return $this->randomString(35);
-        }
-
-	    return get_option('xcloner_encryption_key');
-    }
-
-    /**
-     * Create a random string
-     * @author	XEWeb <>
-     * @param $length the length of the string to create
-     * @return $str the string
-     */
-    private function randomString($length = 6) {
-        $str = "";
-        $characters = array_merge(range('A','Z'), range('a','z'), range('0','9'));
-        $max = count($characters) - 1;
-        for ($i = 0; $i < $length; $i++) {
-            $rand = mt_rand(0, $max);
-            $str .= $characters[$rand];
-        }
-        return $str;
-    }
+		if(!get_option('xcloner_encryption_key') )
+		{
+			return $this->randomString(35);
+		}
+
+		return get_option('xcloner_encryption_key');
+	}
+
+	/**
+	 * Create a random string
+	 * @author	XEWeb <>
+	 * @param $length the length of the string to create
+	 * @return $str the string
+	 */
+	private function randomString($length = 6) {
+		$str = "";
+		$characters = array_merge(range('A','Z'), range('a','z'), range('0','9'));
+		$max = count($characters) - 1;
+		for ($i = 0; $i < $length; $i++) {
+			$rand = mt_rand(0, $max);
+			$str .= $characters[$rand];
+		}
+		return $str;
+	}
 
 	public function get_xcloner_tmp_path_suffix() {
 		return "xcloner" . $this->get_hash();
@@ -328,40 +328,40 @@ 
 		);
 
 		register_setting( 'xcloner_general_settings_group', 'xcloner_store_path', array(
-            $this->xcloner_sanitization,
-            "sanitize_input_as_absolute_path"
-        ) );
-        add_settings_field(
-            'xcloner_store_path',
-            __( 'Backup Storage Location', 'xcloner-backup-and-restore' ),
-            array( $this, 'do_form_text_field' ),
-            'xcloner_settings_page',
-            'xcloner_general_settings_group',
-            array(
-                'xcloner_store_path',
-                __( 'Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore' ),
-                $this->get_xcloner_store_path(),
-                //'disabled'
-            )
-        );
-
-        register_setting( 'xcloner_general_settings_group', 'xcloner_encryption_key', array(
-            $this->xcloner_sanitization,
-            "sanitize_input_as_string"
-        ) );
-        add_settings_field(
-            'xcloner_encryption_key',
-            __( 'Backup Encryption Key', 'xcloner-backup-and-restore' ),
-            array( $this, 'do_form_text_field' ),
-            'xcloner_settings_page',
-            'xcloner_general_settings_group',
-            array(
-                'xcloner_encryption_key',
-                __( 'Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore' ),
-                $this->get_xcloner_encryption_key(),
-                //'disabled'
-            )
-        );
+			$this->xcloner_sanitization,
+			"sanitize_input_as_absolute_path"
+		) );
+		add_settings_field(
+			'xcloner_store_path',
+			__( 'Backup Storage Location', 'xcloner-backup-and-restore' ),
+			array( $this, 'do_form_text_field' ),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array(
+				'xcloner_store_path',
+				__( 'Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore' ),
+				$this->get_xcloner_store_path(),
+				//'disabled'
+			)
+		);
+
+		register_setting( 'xcloner_general_settings_group', 'xcloner_encryption_key', array(
+			$this->xcloner_sanitization,
+			"sanitize_input_as_string"
+		) );
+		add_settings_field(
+			'xcloner_encryption_key',
+			__( 'Backup Encryption Key', 'xcloner-backup-and-restore' ),
+			array( $this, 'do_form_text_field' ),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array(
+				'xcloner_encryption_key',
+				__( 'Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore' ),
+				$this->get_xcloner_encryption_key(),
+				//'disabled'
+			)
+		);
 
 		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_log', array(
 			$this->xcloner_sanitization,
@@ -627,18 +627,18 @@ 
 			)
 		);
 
-        register_setting( 'xcloner_system_settings_group', 'xcloner_disable_email_notification' );
-        add_settings_field(
-            'xcloner_disable_email_notification',
-            __( 'Disable Email Notifications', 'xcloner-backup-and-restore' ),
-            array( $this, 'do_form_switch_field' ),
-            'xcloner_system_settings_page',
-            'xcloner_system_settings_group',
-            array(
-                'xcloner_disable_email_notification',
-                sprintf( __( 'Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
-            )
-        );
+		register_setting( 'xcloner_system_settings_group', 'xcloner_disable_email_notification' );
+		add_settings_field(
+			'xcloner_disable_email_notification',
+			__( 'Disable Email Notifications', 'xcloner-backup-and-restore' ),
+			array( $this, 'do_form_switch_field' ),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array(
+				'xcloner_disable_email_notification',
+				sprintf( __( 'Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+			)
+		);
 
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
 		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(

includes/class-xcloner-activator.php

Indentation +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
 
 		if ( version_compare( phpversion(), Xcloner_Activator::xcloner_minimum_version, '<' ) ) {
 			wp_die( '<p>' . sprintf( __( "XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s" ), Xcloner_Activator::xcloner_minimum_version, phpversion() ) . '</p>', __( "XCloner Activation Error" ), array( 'response'  => 500,
-			                                                                                                                                                                                                                                                       'back_link' => true
+																																																																   'back_link' => true
 			) );
 		}
 
@@ -152,9 +152,9 @@ 
 			update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
 		}
 
-        if ( ! get_option( 'xcloner_regex_exclude' ) ) {
-            update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
-        }
+		if ( ! get_option( 'xcloner_regex_exclude' ) ) {
+			update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
+		}
 
 	}
 

includes/class-xcloner-api.php

Indentation +1100 added lines, -1100 removed lines

@@ -43,903 +43,903 @@ 
 class Xcloner_Api
 {
 
-    private $xcloner_database;
-    private $xcloner_settings;
-    private $xcloner_file_system;
-    private $xcloner_requirements;
-    private $xcloner_sanitization;
-    private $xcloner_encryption;
-    private $xcloner_remote_storage;
-    private $archive_system;
-    private $form_params;
-    private $logger;
-    private $xcloner_container;
-
-    /**
-     * XCloner_Api construct class
-     *
-     * @param Xcloner $xcloner_container [description]
-     */
-    public function __construct(Xcloner $xcloner_container)
-    {
-        global $wpdb;
-
-        if (WP_DEBUG) {
-            error_reporting(0);
-        }
-
-        if (ob_get_length()) {
-            ob_end_clean();
-        }
-        ob_start();
-
-        $wpdb->show_errors = false;
-
-        $this->xcloner_container = $xcloner_container;
-
-        $this->xcloner_settings         = $xcloner_container->get_xcloner_settings();
-        $this->logger                   = $xcloner_container->get_xcloner_logger()->withName("xcloner_api");
-        $this->xcloner_file_system      = $xcloner_container->get_xcloner_filesystem();
-        $this->xcloner_sanitization     = $xcloner_container->get_xcloner_sanitization();
-        $this->xcloner_requirements     = $xcloner_container->get_xcloner_requirements();
-        $this->archive_system           = $xcloner_container->get_archive_system();
-        $this->xcloner_database         = $xcloner_container->get_xcloner_database();
-        $this->xcloner_scheduler        = $xcloner_container->get_xcloner_scheduler();
-        $this->xcloner_encryption       = $xcloner_container->get_xcloner_encryption();
-        $this->xcloner_remote_storage   = $xcloner_container->get_xcloner_remote_storage();
-
-        if (isset($_POST['API_ID'])) {
-            $this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
-                    0, 15));
-        }
-
-    }
-
-    /**
-     * Get XCloner Container
-     * @return XCloner return the XCloner container
-     */
-    public function get_xcloner_container()
-    {
-        return $this->xcloner_container;
-    }
-
-    /**
-     * Check if user has access to this class
-     * @return die() returns die() if user is not allowed
-     * @link http://www.wordpress.org
-     */
-    private function check_access()
-    {
-        if (function_exists('current_user_can') && !current_user_can('manage_options')) {
-            die("Not allowed access here!");
-        }
-    }
-
-    /**
-     * Initialize the database connection
-     */
-    public function init_db()
-    {
-        return;
-
-
-        $data['dbHostname'] = $this->xcloner_settings->get_db_hostname();
-        $data['dbUsername'] = $this->xcloner_settings->get_db_username();
-        $data['dbPassword'] = $this->xcloner_settings->get_db_password();
-        $data['dbDatabase'] = $this->xcloner_settings->get_db_database();
-
-
-        $data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
-        $data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
-        $data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
-
-        try {
-            $this->xcloner_database->init($data);
-
-        } catch (Exception $e) {
-
-            $this->send_response($e->getMessage());
-            $this->logger->error($e->getMessage());
-
-        }
-
-        return $this->xcloner_database;
-
-
-    }
-
-    /*
+	private $xcloner_database;
+	private $xcloner_settings;
+	private $xcloner_file_system;
+	private $xcloner_requirements;
+	private $xcloner_sanitization;
+	private $xcloner_encryption;
+	private $xcloner_remote_storage;
+	private $archive_system;
+	private $form_params;
+	private $logger;
+	private $xcloner_container;
+
+	/**
+	 * XCloner_Api construct class
+	 *
+	 * @param Xcloner $xcloner_container [description]
+	 */
+	public function __construct(Xcloner $xcloner_container)
+	{
+		global $wpdb;
+
+		if (WP_DEBUG) {
+			error_reporting(0);
+		}
+
+		if (ob_get_length()) {
+			ob_end_clean();
+		}
+		ob_start();
+
+		$wpdb->show_errors = false;
+
+		$this->xcloner_container = $xcloner_container;
+
+		$this->xcloner_settings         = $xcloner_container->get_xcloner_settings();
+		$this->logger                   = $xcloner_container->get_xcloner_logger()->withName("xcloner_api");
+		$this->xcloner_file_system      = $xcloner_container->get_xcloner_filesystem();
+		$this->xcloner_sanitization     = $xcloner_container->get_xcloner_sanitization();
+		$this->xcloner_requirements     = $xcloner_container->get_xcloner_requirements();
+		$this->archive_system           = $xcloner_container->get_archive_system();
+		$this->xcloner_database         = $xcloner_container->get_xcloner_database();
+		$this->xcloner_scheduler        = $xcloner_container->get_xcloner_scheduler();
+		$this->xcloner_encryption       = $xcloner_container->get_xcloner_encryption();
+		$this->xcloner_remote_storage   = $xcloner_container->get_xcloner_remote_storage();
+
+		if (isset($_POST['API_ID'])) {
+			$this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
+					0, 15));
+		}
+
+	}
+
+	/**
+	 * Get XCloner Container
+	 * @return XCloner return the XCloner container
+	 */
+	public function get_xcloner_container()
+	{
+		return $this->xcloner_container;
+	}
+
+	/**
+	 * Check if user has access to this class
+	 * @return die() returns die() if user is not allowed
+	 * @link http://www.wordpress.org
+	 */
+	private function check_access()
+	{
+		if (function_exists('current_user_can') && !current_user_can('manage_options')) {
+			die("Not allowed access here!");
+		}
+	}
+
+	/**
+	 * Initialize the database connection
+	 */
+	public function init_db()
+	{
+		return;
+
+
+		$data['dbHostname'] = $this->xcloner_settings->get_db_hostname();
+		$data['dbUsername'] = $this->xcloner_settings->get_db_username();
+		$data['dbPassword'] = $this->xcloner_settings->get_db_password();
+		$data['dbDatabase'] = $this->xcloner_settings->get_db_database();
+
+
+		$data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		$data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
+		$data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
+
+		try {
+			$this->xcloner_database->init($data);
+
+		} catch (Exception $e) {
+
+			$this->send_response($e->getMessage());
+			$this->logger->error($e->getMessage());
+
+		}
+
+		return $this->xcloner_database;
+
+
+	}
+
+	/*
      * Save Schedule API
      */
-    public function save_schedule()
-    {
-        global $wpdb;
-
-        $this->check_access();
-
-        $scheduler = $this->xcloner_scheduler;
-        $params = array();
-        $schedule = array();
-        $response = array();
-
-        if (isset($_POST['data'])) {
-            $params = json_decode(stripslashes($_POST['data']));
-        }
-
-        $this->process_params($params);
-
-        if (isset($_POST['id'])) {
-
-            $this->form_params['backup_params']['backup_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_name']);
-            $this->form_params['backup_params']['email_notification'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['email_notification']);
-            if ($_POST['diff_start_date']) {
-                $this->form_params['backup_params']['diff_start_date'] = strtotime($this->xcloner_sanitization->sanitize_input_as_string($_POST['diff_start_date']));
-            } else {
-                $this->form_params['backup_params']['diff_start_date'] = "";
-            }
-            $this->form_params['backup_params']['schedule_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_name']);
-            $this->form_params['backup_params']['backup_encrypt'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['backup_encrypt']);
-            $this->form_params['backup_params']['start_at'] = strtotime($_POST['schedule_start_date']);
-            $this->form_params['backup_params']['schedule_frequency'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_frequency']);
-            $this->form_params['backup_params']['schedule_storage'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_storage']);
-            $this->form_params['database'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['table_params'])));
-            $this->form_params['excluded_files'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['excluded_files'])));
-
-            //$this->form_params['backup_params']['backup_type'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_type']);
-
-            $tables = explode(PHP_EOL, $this->form_params['database']);
-            $return = array();
-
-            foreach ($tables as $table) {
-                $table = str_replace("\r", "", $table);
-                $data = explode(".", $table);
-                if (isset($data[1])) {
-                    $return[$data[0]][] = $data[1];
-                }
-            }
-
-            $this->form_params['database'] = ($return);
-
-            $excluded_files = explode(PHP_EOL, $this->form_params['excluded_files']);
-            $return = array();
-
-            foreach ($excluded_files as $file) {
-                $file = str_replace("\r", "", $file);
-                if ($file) {
-                    $return[] = $file;
-                }
-            }
-
-            $this->form_params['excluded_files'] = ($return);
-
-            $schedule['start_at'] = $this->form_params['backup_params']['start_at'];
-
-            if (!isset($_POST['status'])) {
-                $schedule['status'] = 0;
-            } else {
-                $schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
-            }
-        } else {
-
-            $schedule['status'] = 1;
-            $schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
-                " " . $this->form_params['backup_params']['schedule_start_time']);
-
-            if ($schedule['start_at'] <= time()) {
-                $schedule['start_at'] = "";
-            }
-        }
-
-        if (!$schedule['start_at']) {
-            $schedule['start_at'] = date('Y-m-d H:i:s', time());
-        } else {
-            $schedule['start_at'] = date('Y-m-d H:i:s',
-                $schedule['start_at'] - (get_option('gmt_offset') * HOUR_IN_SECONDS));
-        }
-
-        $schedule['name'] = $this->form_params['backup_params']['schedule_name'];
-        $schedule['recurrence'] = $this->form_params['backup_params']['schedule_frequency'];
-        if (!isset($this->form_params['backup_params']['schedule_storage'])) {
-            $this->form_params['backup_params']['schedule_storage'] = "";
-        }
-        $schedule['remote_storage'] = $this->form_params['backup_params']['schedule_storage'];
-        //$schedule['backup_type'] = $this->form_params['backup_params']['backup_type'];
-        $schedule['params'] = json_encode($this->form_params);
-
-        if (!isset($_POST['id'])) {
-            $wpdb->insert(
-                $wpdb->prefix . 'xcloner_scheduler',
-                $schedule,
-                array(
-                    '%s',
-                    '%s'
-                )
-            );
-        } else {
-            $wpdb->update(
-                $wpdb->prefix . 'xcloner_scheduler',
-                $schedule,
-                array('id' => $_POST['id']),
-                array(
-                    '%s',
-                    '%s'
-                )
-            );
-        }
-        if (isset($_POST['id'])) {
-            $scheduler->update_cron_hook($_POST['id']);
-        }
-
-        if ($wpdb->last_error) {
-            $response['error'] = 1;
-            $response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/
-            ;
-
-        }
-
-        $scheduler->update_wp_cron_hooks();
-        $response['finished'] = 1;
-
-        $this->send_response($response);
-    }
-
-    /*
+	public function save_schedule()
+	{
+		global $wpdb;
+
+		$this->check_access();
+
+		$scheduler = $this->xcloner_scheduler;
+		$params = array();
+		$schedule = array();
+		$response = array();
+
+		if (isset($_POST['data'])) {
+			$params = json_decode(stripslashes($_POST['data']));
+		}
+
+		$this->process_params($params);
+
+		if (isset($_POST['id'])) {
+
+			$this->form_params['backup_params']['backup_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_name']);
+			$this->form_params['backup_params']['email_notification'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['email_notification']);
+			if ($_POST['diff_start_date']) {
+				$this->form_params['backup_params']['diff_start_date'] = strtotime($this->xcloner_sanitization->sanitize_input_as_string($_POST['diff_start_date']));
+			} else {
+				$this->form_params['backup_params']['diff_start_date'] = "";
+			}
+			$this->form_params['backup_params']['schedule_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_name']);
+			$this->form_params['backup_params']['backup_encrypt'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['backup_encrypt']);
+			$this->form_params['backup_params']['start_at'] = strtotime($_POST['schedule_start_date']);
+			$this->form_params['backup_params']['schedule_frequency'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_frequency']);
+			$this->form_params['backup_params']['schedule_storage'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_storage']);
+			$this->form_params['database'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['table_params'])));
+			$this->form_params['excluded_files'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['excluded_files'])));
+
+			//$this->form_params['backup_params']['backup_type'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_type']);
+
+			$tables = explode(PHP_EOL, $this->form_params['database']);
+			$return = array();
+
+			foreach ($tables as $table) {
+				$table = str_replace("\r", "", $table);
+				$data = explode(".", $table);
+				if (isset($data[1])) {
+					$return[$data[0]][] = $data[1];
+				}
+			}
+
+			$this->form_params['database'] = ($return);
+
+			$excluded_files = explode(PHP_EOL, $this->form_params['excluded_files']);
+			$return = array();
+
+			foreach ($excluded_files as $file) {
+				$file = str_replace("\r", "", $file);
+				if ($file) {
+					$return[] = $file;
+				}
+			}
+
+			$this->form_params['excluded_files'] = ($return);
+
+			$schedule['start_at'] = $this->form_params['backup_params']['start_at'];
+
+			if (!isset($_POST['status'])) {
+				$schedule['status'] = 0;
+			} else {
+				$schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
+			}
+		} else {
+
+			$schedule['status'] = 1;
+			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
+				" " . $this->form_params['backup_params']['schedule_start_time']);
+
+			if ($schedule['start_at'] <= time()) {
+				$schedule['start_at'] = "";
+			}
+		}
+
+		if (!$schedule['start_at']) {
+			$schedule['start_at'] = date('Y-m-d H:i:s', time());
+		} else {
+			$schedule['start_at'] = date('Y-m-d H:i:s',
+				$schedule['start_at'] - (get_option('gmt_offset') * HOUR_IN_SECONDS));
+		}
+
+		$schedule['name'] = $this->form_params['backup_params']['schedule_name'];
+		$schedule['recurrence'] = $this->form_params['backup_params']['schedule_frequency'];
+		if (!isset($this->form_params['backup_params']['schedule_storage'])) {
+			$this->form_params['backup_params']['schedule_storage'] = "";
+		}
+		$schedule['remote_storage'] = $this->form_params['backup_params']['schedule_storage'];
+		//$schedule['backup_type'] = $this->form_params['backup_params']['backup_type'];
+		$schedule['params'] = json_encode($this->form_params);
+
+		if (!isset($_POST['id'])) {
+			$wpdb->insert(
+				$wpdb->prefix . 'xcloner_scheduler',
+				$schedule,
+				array(
+					'%s',
+					'%s'
+				)
+			);
+		} else {
+			$wpdb->update(
+				$wpdb->prefix . 'xcloner_scheduler',
+				$schedule,
+				array('id' => $_POST['id']),
+				array(
+					'%s',
+					'%s'
+				)
+			);
+		}
+		if (isset($_POST['id'])) {
+			$scheduler->update_cron_hook($_POST['id']);
+		}
+
+		if ($wpdb->last_error) {
+			$response['error'] = 1;
+			$response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/
+			;
+
+		}
+
+		$scheduler->update_wp_cron_hooks();
+		$response['finished'] = 1;
+
+		$this->send_response($response);
+	}
+
+	/*
      *
      * Backup Files API
      *
      */
-    public function backup_files()
-    {
-        $this->check_access();
-
-        $params = json_decode(stripslashes($_POST['data']));
-
-        $init = (int)$_POST['init'];
-
-        if ($params === null) {
-            die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
-        }
-
-        $this->process_params($params);
-
-        $return['finished'] = 1;
-
-        //$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'], $this->form_params['extra'], $init);
-        try {
-            $return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
-                $this->form_params['extra'], $init);
-        } catch (Exception $e) {
-            $return = array();
-            $return['error'] = true;
-            $return['status'] = 500;
-            $return['error_message'] = $e->getMessage();
-
-            return $this->send_response($return, $hash = 1);
-        }
-
-        if ($return['finished']) {
-            $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-            if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
-                $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
-            }
-        }
-
-        $data = $return;
-
-        //check if backup is finished
-        if ($return['finished']) {
-            if (isset($this->form_params['backup_params']['email_notification']) and $to = $this->form_params['backup_params']['email_notification']) {
-                try {
-                    $from = "";
-                    $subject = "";
-                    $additional['lines_total'] = $return['extra']['lines_total'];
-                    $this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
-                        $this->form_params, "", $additional);
-                } catch (Exception $e) {
-                    $this->logger->error($e->getMessage());
-                }
-            }
-            $this->xcloner_file_system->remove_tmp_filesystem();
-        }
-
-        return $this->send_response($data, $hash = 1);
-    }
-
-    /*
+	public function backup_files()
+	{
+		$this->check_access();
+
+		$params = json_decode(stripslashes($_POST['data']));
+
+		$init = (int)$_POST['init'];
+
+		if ($params === null) {
+			die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
+		}
+
+		$this->process_params($params);
+
+		$return['finished'] = 1;
+
+		//$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'], $this->form_params['extra'], $init);
+		try {
+			$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
+				$this->form_params['extra'], $init);
+		} catch (Exception $e) {
+			$return = array();
+			$return['error'] = true;
+			$return['status'] = 500;
+			$return['error_message'] = $e->getMessage();
+
+			return $this->send_response($return, $hash = 1);
+		}
+
+		if ($return['finished']) {
+			$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
+			if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
+				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+			}
+		}
+
+		$data = $return;
+
+		//check if backup is finished
+		if ($return['finished']) {
+			if (isset($this->form_params['backup_params']['email_notification']) and $to = $this->form_params['backup_params']['email_notification']) {
+				try {
+					$from = "";
+					$subject = "";
+					$additional['lines_total'] = $return['extra']['lines_total'];
+					$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
+						$this->form_params, "", $additional);
+				} catch (Exception $e) {
+					$this->logger->error($e->getMessage());
+				}
+			}
+			$this->xcloner_file_system->remove_tmp_filesystem();
+		}
+
+		return $this->send_response($data, $hash = 1);
+	}
+
+	/*
      *
      * Backup Database API
      *
      */
-    public function backup_database()
-    {
-        $this->check_access();
+	public function backup_database()
+	{
+		$this->check_access();
 
-        $params = json_decode(stripslashes($_POST['data']));
+		$params = json_decode(stripslashes($_POST['data']));
 
-        $init = (int)$_POST['init'];
+		$init = (int)$_POST['init'];
 
-        if ($params === null) {
-            die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
-        }
+		if ($params === null) {
+			die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
+		}
 
-        $this->process_params($params);
+		$this->process_params($params);
 
-        //$xcloner_database = $this->init_db();
-        $return = $this->xcloner_database->start_database_recursion($this->form_params['database'],
-            $this->form_params['extra'], $init);
+		//$xcloner_database = $this->init_db();
+		$return = $this->xcloner_database->start_database_recursion($this->form_params['database'],
+			$this->form_params['extra'], $init);
 
-        if (isset($return['error']) and $return['error']) {
-            $data['finished'] = 1;
-        } else {
-            $data['finished'] = $return['finished'];
-        }
+		if (isset($return['error']) and $return['error']) {
+			$data['finished'] = 1;
+		} else {
+			$data['finished'] = $return['finished'];
+		}
 
-        $data['extra'] = $return;
+		$data['extra'] = $return;
 
-        return $this->send_response($data, $hash = 1);
-    }
+		return $this->send_response($data, $hash = 1);
+	}
 
-    /*
+	/*
      *
      * Scan Filesystem API
      *
      */
-    public function scan_filesystem()
-    {
-        $this->check_access();
+	public function scan_filesystem()
+	{
+		$this->check_access();
 
-        $params = json_decode(stripslashes($_POST['data']));
-        $init = (int)$_POST['init'];
+		$params = json_decode(stripslashes($_POST['data']));
+		$init = (int)$_POST['init'];
 
-        if ($params === null) {
-            die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
-        }
+		if ($params === null) {
+			die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
+		}
 
-        $hash = $this->process_params($params);
+		$hash = $this->process_params($params);
 
-        $this->xcloner_file_system->set_excluded_files($this->form_params['excluded_files']);
+		$this->xcloner_file_system->set_excluded_files($this->form_params['excluded_files']);
 
-        $return = $this->xcloner_file_system->start_file_recursion($init);
+		$return = $this->xcloner_file_system->start_file_recursion($init);
 
-        $data["finished"] = !$return;
-        $data["total_files_num"] = $this->xcloner_file_system->get_scanned_files_num();
-        $data["last_logged_file"] = $this->xcloner_file_system->last_logged_file();
-        $data["total_files_size"] = sprintf("%.2f",
-            $this->xcloner_file_system->get_scanned_files_total_size() / (1024 * 1024));
+		$data["finished"] = !$return;
+		$data["total_files_num"] = $this->xcloner_file_system->get_scanned_files_num();
+		$data["last_logged_file"] = $this->xcloner_file_system->last_logged_file();
+		$data["total_files_size"] = sprintf("%.2f",
+			$this->xcloner_file_system->get_scanned_files_total_size() / (1024 * 1024));
 
-        return $this->send_response($data, $hash = 1);
-    }
+		return $this->send_response($data, $hash = 1);
+	}
 
-    /*
+	/*
      *
      * Process params sent by the user
      *
      */
-    private function process_params($params)
-    {
-        if (isset($params->hash)) {
-            $this->xcloner_settings->set_hash($params->hash);
-        }
-
-        $this->form_params['extra'] = array();
-        $this->form_params['backup_params'] = array();
-
-        $this->form_params['database'] = array();
-
-        if (isset($params->backup_params)) {
-            foreach ($params->backup_params as $param) {
-                $this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
-                $this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
-                    'POST',
-                    'fields filter'
-                ));
-            }
-        }
-
-        $this->form_params['database'] = array();
-
-        if (isset($params->table_params)) {
-            foreach ($params->table_params as $param) {
-                $this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
-                $this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
-                    'POST',
-                    'database filter'
-                ));
-            }
-        }
-
-        $this->form_params['excluded_files'] = array();
-        if (isset($params->files_params)) {
-            foreach ($params->files_params as $param) {
-                $this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
-            }
-
-            $unique_exclude_files = array();
-
-            foreach ($params->files_params as $key => $param) {
-                if (!in_array($param->parent, $this->form_params['excluded_files'])) {
-                    //$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
-                    $unique_exclude_files[] = $param->id;
-                    $this->logger->debug("Adding file filter " . $param->id . "\n", array(
-                        'POST',
-                        'exclude files filter'
-                    ));
-                }
-            }
-            $this->form_params['excluded_files'] = (array)$unique_exclude_files;
-
-        }
-
-        //$this->form_params['excluded_files'] =  array_merge($this->form_params['excluded_files'], $this->exclude_files_by_default);
-
-        if (isset($params->extra)) {
-            foreach ($params->extra as $key => $value) {
-                $this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
-            }
-        }
-
-        if (isset($this->form_params['backup_params']['diff_start_date']) and $this->form_params['backup_params']['diff_start_date']) {
-            $this->form_params['backup_params']['diff_start_date'] = strtotime($this->form_params['backup_params']['diff_start_date']);
-            $this->xcloner_file_system->set_diff_timestamp_start($this->form_params['backup_params']['diff_start_date']);
-        }
-
-        return $this->xcloner_settings->get_hash();
-    }
-
-    /*
+	private function process_params($params)
+	{
+		if (isset($params->hash)) {
+			$this->xcloner_settings->set_hash($params->hash);
+		}
+
+		$this->form_params['extra'] = array();
+		$this->form_params['backup_params'] = array();
+
+		$this->form_params['database'] = array();
+
+		if (isset($params->backup_params)) {
+			foreach ($params->backup_params as $param) {
+				$this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
+				$this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
+					'POST',
+					'fields filter'
+				));
+			}
+		}
+
+		$this->form_params['database'] = array();
+
+		if (isset($params->table_params)) {
+			foreach ($params->table_params as $param) {
+				$this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
+				$this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
+					'POST',
+					'database filter'
+				));
+			}
+		}
+
+		$this->form_params['excluded_files'] = array();
+		if (isset($params->files_params)) {
+			foreach ($params->files_params as $param) {
+				$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
+			}
+
+			$unique_exclude_files = array();
+
+			foreach ($params->files_params as $key => $param) {
+				if (!in_array($param->parent, $this->form_params['excluded_files'])) {
+					//$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
+					$unique_exclude_files[] = $param->id;
+					$this->logger->debug("Adding file filter " . $param->id . "\n", array(
+						'POST',
+						'exclude files filter'
+					));
+				}
+			}
+			$this->form_params['excluded_files'] = (array)$unique_exclude_files;
+
+		}
+
+		//$this->form_params['excluded_files'] =  array_merge($this->form_params['excluded_files'], $this->exclude_files_by_default);
+
+		if (isset($params->extra)) {
+			foreach ($params->extra as $key => $value) {
+				$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
+			}
+		}
+
+		if (isset($this->form_params['backup_params']['diff_start_date']) and $this->form_params['backup_params']['diff_start_date']) {
+			$this->form_params['backup_params']['diff_start_date'] = strtotime($this->form_params['backup_params']['diff_start_date']);
+			$this->xcloner_file_system->set_diff_timestamp_start($this->form_params['backup_params']['diff_start_date']);
+		}
+
+		return $this->xcloner_settings->get_hash();
+	}
+
+	/*
      *
      * Get file list for tree view API
      *
      */
-    public function get_file_system_action()
-    {
-        $this->check_access();
-
-        $folder = $this->xcloner_sanitization->sanitize_input_as_relative_path($_POST['id']);
-
-        $data = array();
-
-        if ($folder == "#") {
-
-            $folder = "/";
-            $data[] = array(
-                'id' => $folder,
-                'parent' => '#',
-                'text' => $this->xcloner_settings->get_xcloner_start_path(),
-                //'children' => true,
-                'state' => array('selected' => false, 'opened' => true),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
-            );
-        }
-
-        try {
-            $files = $this->xcloner_file_system->list_directory($folder);
-        } catch (Exception $e) {
-
-            print $e->getMessage();
-            $this->logger->error($e->getMessage());
-
-            return;
-        }
-
-        $type = array();
-        foreach ($files as $key => $row) {
-            $type[$key] = $row['type'];
-        }
-        array_multisort($type, SORT_ASC, $files);
-
-        foreach ($files as $file) {
-            $children = false;
-            $text = $file['basename'];
-
-            if ($file['type'] == "dir") {
-                $children = true;
-            } else {
-                $text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
-            }
-
-            if ($this->xcloner_file_system->is_excluded($file)) {
-                $selected = true;
-            } else {
-                $selected = false;
-            }
-
-            $data[] = array(
-                'id' => $file['path'],
-                'parent' => $folder,
-                'text' => $text,
-                //'title' => "test",
-                'children' => $children,
-                'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
-                        0, 1)) . ".png"
-            );
-        }
-
-
-        return $this->send_response($data, 0);
-    }
-
-    /*
+	public function get_file_system_action()
+	{
+		$this->check_access();
+
+		$folder = $this->xcloner_sanitization->sanitize_input_as_relative_path($_POST['id']);
+
+		$data = array();
+
+		if ($folder == "#") {
+
+			$folder = "/";
+			$data[] = array(
+				'id' => $folder,
+				'parent' => '#',
+				'text' => $this->xcloner_settings->get_xcloner_start_path(),
+				//'children' => true,
+				'state' => array('selected' => false, 'opened' => true),
+				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
+			);
+		}
+
+		try {
+			$files = $this->xcloner_file_system->list_directory($folder);
+		} catch (Exception $e) {
+
+			print $e->getMessage();
+			$this->logger->error($e->getMessage());
+
+			return;
+		}
+
+		$type = array();
+		foreach ($files as $key => $row) {
+			$type[$key] = $row['type'];
+		}
+		array_multisort($type, SORT_ASC, $files);
+
+		foreach ($files as $file) {
+			$children = false;
+			$text = $file['basename'];
+
+			if ($file['type'] == "dir") {
+				$children = true;
+			} else {
+				$text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
+			}
+
+			if ($this->xcloner_file_system->is_excluded($file)) {
+				$selected = true;
+			} else {
+				$selected = false;
+			}
+
+			$data[] = array(
+				'id' => $file['path'],
+				'parent' => $folder,
+				'text' => $text,
+				//'title' => "test",
+				'children' => $children,
+				'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
+				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
+						0, 1)) . ".png"
+			);
+		}
+
+
+		return $this->send_response($data, 0);
+	}
+
+	/*
      *
      * Get databases/tables list for frontend tree display API
      *
      */
-    public function get_database_tables_action()
-    {
-        $this->check_access();
-
-        $database = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['id']);
-
-        $data = array();
-
-        $xcloner_backup_only_wp_tables = $this->xcloner_settings->get_xcloner_option('xcloner_backup_only_wp_tables');
-
-        if ($database == "#") {
-            try {
-                $return = $this->xcloner_database->get_all_databases();
-            } catch (Exception $e) {
-                $this->logger->error($e->getMessage());
-            }
-
-            foreach ($return as $database) {
-                if ($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database()) {
-                    continue;
-                }
-
-                $state = array();
-
-                if ($database['name'] == $this->xcloner_settings->get_db_database()) {
-                    $state['selected'] = true;
-                    if ($database['num_tables'] < 25) {
-                        $state['opened'] = false;
-                    }
-                }
-
-                $data[] = array(
-                    'id' => $database['name'],
-                    'parent' => '#',
-                    'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
-                    'children' => true,
-                    'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
-                );
-            }
-
-        } else {
-
-            try {
-                $return = $this->xcloner_database->list_tables($database, "", 1);
-            } catch (Exception $e) {
-                $this->logger->error($e->getMessage());
-            }
-
-            foreach ($return as $table) {
-                $state = array();
-
-                if ($xcloner_backup_only_wp_tables and !stristr($table['name'],
-                        $this->xcloner_settings->get_table_prefix())) {
-                    continue;
-                }
-
-                if (isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database()) {
-                    $state = array('selected' => true);
-                }
-
-                $data[] = array(
-                    'id' => $database . "." . $table['name'],
-                    'parent' => $database,
-                    'text' => $table['name'] . " (" . (int)$table['records'] . ")",
-                    'children' => false,
-                    'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
-                );
-            }
-        }
-
-        return $this->send_response($data, 0);
-    }
-
-    /*
+	public function get_database_tables_action()
+	{
+		$this->check_access();
+
+		$database = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['id']);
+
+		$data = array();
+
+		$xcloner_backup_only_wp_tables = $this->xcloner_settings->get_xcloner_option('xcloner_backup_only_wp_tables');
+
+		if ($database == "#") {
+			try {
+				$return = $this->xcloner_database->get_all_databases();
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage());
+			}
+
+			foreach ($return as $database) {
+				if ($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database()) {
+					continue;
+				}
+
+				$state = array();
+
+				if ($database['name'] == $this->xcloner_settings->get_db_database()) {
+					$state['selected'] = true;
+					if ($database['num_tables'] < 25) {
+						$state['opened'] = false;
+					}
+				}
+
+				$data[] = array(
+					'id' => $database['name'],
+					'parent' => '#',
+					'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
+					'children' => true,
+					'state' => $state,
+					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
+				);
+			}
+
+		} else {
+
+			try {
+				$return = $this->xcloner_database->list_tables($database, "", 1);
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage());
+			}
+
+			foreach ($return as $table) {
+				$state = array();
+
+				if ($xcloner_backup_only_wp_tables and !stristr($table['name'],
+						$this->xcloner_settings->get_table_prefix())) {
+					continue;
+				}
+
+				if (isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database()) {
+					$state = array('selected' => true);
+				}
+
+				$data[] = array(
+					'id' => $database . "." . $table['name'],
+					'parent' => $database,
+					'text' => $table['name'] . " (" . (int)$table['records'] . ")",
+					'children' => false,
+					'state' => $state,
+					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
+				);
+			}
+		}
+
+		return $this->send_response($data, 0);
+	}
+
+	/*
      *
      * Get schedule by id API
      *
      */
-    public function get_schedule_by_id()
-    {
-        $this->check_access();
+	public function get_schedule_by_id()
+	{
+		$this->check_access();
 
-        $schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
-        $scheduler = $this->xcloner_scheduler;
-        $data = $scheduler->get_schedule_by_id($schedule_id);
+		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
+		$scheduler = $this->xcloner_scheduler;
+		$data = $scheduler->get_schedule_by_id($schedule_id);
 
-        $data['start_at'] = date("Y-m-d H:i",
-            strtotime($data['start_at']) + (get_option('gmt_offset') * HOUR_IN_SECONDS));
-        if (isset($data['backup_params']->diff_start_date) && $data['backup_params']->diff_start_date != "") {
-            $data['backup_params']->diff_start_date = date("Y-m-d", ($data['backup_params']->diff_start_date));
-        }
+		$data['start_at'] = date("Y-m-d H:i",
+			strtotime($data['start_at']) + (get_option('gmt_offset') * HOUR_IN_SECONDS));
+		if (isset($data['backup_params']->diff_start_date) && $data['backup_params']->diff_start_date != "") {
+			$data['backup_params']->diff_start_date = date("Y-m-d", ($data['backup_params']->diff_start_date));
+		}
 
-        return $this->send_response($data);
-    }
+		return $this->send_response($data);
+	}
 
-    /*
+	/*
      *
      * Get Schedule list API
      *
      */
-    public function get_scheduler_list()
-    {
-        $this->check_access();
+	public function get_scheduler_list()
+	{
+		$this->check_access();
 
-        $scheduler = $this->xcloner_scheduler;
-        $data = $scheduler->get_scheduler_list();
-        $return['data'] = array();
+		$scheduler = $this->xcloner_scheduler;
+		$data = $scheduler->get_scheduler_list();
+		$return['data'] = array();
 
-        foreach ($data as $res) {
-            $action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
+		foreach ($data as $res) {
+			$action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
 					<a href=\"#" . $res->id . "\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
-            if ($res->status) {
-                $status = '<i class="material-icons active status">timer</i>';
-            } else {
-                $status = '<i class="material-icons status inactive">timer_off</i>';
-            }
-
-            $next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
-
-            $next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
-
-            $remote_storage = $res->remote_storage;
-
-            if (!$next_run_time >= time()) {
-                $next_run = " ";
-            }
-
-            if (trim($next_run)) {
-                $date_text = date(get_option('date_format') . " " . get_option('time_format'),
-                    $next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
-
-                if ($next_run_time >= time()) {
-                    $next_run = "in " . human_time_diff($next_run_time, time());
-                } else {
-                    $next_run = __("executed", 'xcloner-backup-and-restore');
-                }
-
-                $next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
-                //$next_run .=" ($date_text)";
-            }
-
-            $backup_text = "";
-            $backup_size = "";
-            $backup_time = "";
-
-            if ($res->last_backup) {
-                if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
-                    $metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
-                    $backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
-                    $backup_time = date(get_option('date_format') . " " . get_option('time_format'),
-                        $metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
-                }
-
-                $backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
-            }
-
-            $schedules = wp_get_schedules();
-
-            if (isset($schedules[$res->recurrence])) {
-                $res->recurrence = $schedules[$res->recurrence]['display'];
-            }
-
-            $return['data'][] = array(
-                $res->id,
-                $res->name,
-                $res->recurrence,/*$res->start_at,*/
-                $next_run,
-                $remote_storage,
-                $backup_text,
-                $status,
-                $action
-            );
-        }
-
-        return $this->send_response($return, 0);
-    }
-
-    /*
+			if ($res->status) {
+				$status = '<i class="material-icons active status">timer</i>';
+			} else {
+				$status = '<i class="material-icons status inactive">timer_off</i>';
+			}
+
+			$next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
+
+			$next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
+
+			$remote_storage = $res->remote_storage;
+
+			if (!$next_run_time >= time()) {
+				$next_run = " ";
+			}
+
+			if (trim($next_run)) {
+				$date_text = date(get_option('date_format') . " " . get_option('time_format'),
+					$next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
+
+				if ($next_run_time >= time()) {
+					$next_run = "in " . human_time_diff($next_run_time, time());
+				} else {
+					$next_run = __("executed", 'xcloner-backup-and-restore');
+				}
+
+				$next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
+				//$next_run .=" ($date_text)";
+			}
+
+			$backup_text = "";
+			$backup_size = "";
+			$backup_time = "";
+
+			if ($res->last_backup) {
+				if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
+					$metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
+					$backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
+					$backup_time = date(get_option('date_format') . " " . get_option('time_format'),
+						$metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
+				}
+
+				$backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
+			}
+
+			$schedules = wp_get_schedules();
+
+			if (isset($schedules[$res->recurrence])) {
+				$res->recurrence = $schedules[$res->recurrence]['display'];
+			}
+
+			$return['data'][] = array(
+				$res->id,
+				$res->name,
+				$res->recurrence,/*$res->start_at,*/
+				$next_run,
+				$remote_storage,
+				$backup_text,
+				$status,
+				$action
+			);
+		}
+
+		return $this->send_response($return, 0);
+	}
+
+	/*
      *
      * Delete Schedule by ID API
      *
      */
-    public function delete_schedule_by_id()
-    {
-        $this->check_access();
+	public function delete_schedule_by_id()
+	{
+		$this->check_access();
 
-        $schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
-        $scheduler = $this->xcloner_scheduler;
-        $data['finished'] = $scheduler->delete_schedule_by_id($schedule_id);
+		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
+		$scheduler = $this->xcloner_scheduler;
+		$data['finished'] = $scheduler->delete_schedule_by_id($schedule_id);
 
-        return $this->send_response($data);
-    }
+		return $this->send_response($data);
+	}
 
-    /*
+	/*
      *
      * Delete backup by name from the storage path
      *
      */
-    public function delete_backup_by_name()
-    {
-        $this->check_access();
+	public function delete_backup_by_name()
+	{
+		$this->check_access();
+
+		$backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_POST['name']);
+		$storage_selection = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_selection']);
+
+		$data['finished'] = $this->xcloner_file_system->delete_backup_by_name($backup_name, $storage_selection);
+
+		return $this->send_response($data);
+	}
+
+	/**
+	 *  API Incremental Backup Encryption Method
+	 */
+	public function backup_encryption()
+	{
+		$this->check_access();
+
+		$backup_parts = array();
+		$return = array();
 
-        $backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_POST['name']);
-        $storage_selection = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_selection']);
 
-        $data['finished'] = $this->xcloner_file_system->delete_backup_by_name($backup_name, $storage_selection);
+		if (isset($_POST['data'])) {
+			$params = json_decode(stripslashes($_POST['data']));
+
+			$this->process_params($params);
+			$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($this->form_params['extra']['backup_parent']);
+
+			if(isset($this->form_params['extra']['start'])) {
+				$start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
+			}else{
+				$start = 0;
+			}
+
+			if(isset($this->form_params['extra']['iv'])) {
+				$iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
+			}else{
+				$iv = "";
+			}
+
+			if(isset($this->form_params['extra']['part'])) {
+				$return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['part']);
+			}else{
+				$return['part'] = 0;
+			}
 
-        return $this->send_response($data);
-    }
+		}else{
+			$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+			$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
+			$iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
+			$return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+		}
 
-    /**
-     *  API Incremental Backup Encryption Method
-     */
-    public function backup_encryption()
-    {
-        $this->check_access();
-
-        $backup_parts = array();
-        $return = array();
-
-
-        if (isset($_POST['data'])) {
-            $params = json_decode(stripslashes($_POST['data']));
-
-            $this->process_params($params);
-            $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($this->form_params['extra']['backup_parent']);
-
-            if(isset($this->form_params['extra']['start'])) {
-                $start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
-            }else{
-                $start = 0;
-            }
-
-            if(isset($this->form_params['extra']['iv'])) {
-                $iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
-            }else{
-                $iv = "";
-            }
-
-            if(isset($this->form_params['extra']['part'])) {
-                $return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['part']);
-            }else{
-                $return['part'] = 0;
-            }
-
-        }else{
-            $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-            $start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
-            $iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
-            $return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
-        }
-
-        $backup_file = $source_backup_file;
-
-        if ($this->xcloner_file_system->is_multipart($backup_file)) {
-            $backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
-            $backup_file = $backup_parts[$return['part']];
-        }
-
-        $return['processing_file'] = $backup_file;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
-
-        try {
-            $this->logger->info(json_encode($_POST));
-            $this->logger->info($iv);
-            $return = array_merge($return,
-                $this->xcloner_encryption->encrypt_file($backup_file, "", "", $start, base64_decode($iv)));
-        }catch(\Exception $e){
-            $return['error'] = true;
-            $return['message'] = $e->getMessage();
-            $return['error_message'] = $e->getMessage();
-        }
-
-        //echo strlen($return['iv']);exit;
-
-        if($return['finished']) {
-            if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
-                $return['start'] = 0;
-
-                ++$return['part'];
-
-                if ($return['part'] < sizeof($backup_parts)) {
-                    $return['finished'] = 0;
-                }
-
-            }
-        }
-
-        if (isset($_POST['data'])) {
-            $return['extra'] = array_merge($this->form_params['extra'],  $return);
-        }
-
-        $this->send_response($return, 0);
-    }
-
-    /**
-     *  API Incremental Backup Decryption Method
-     */
-    public function backup_decryption()
-    {
-        $this->check_access();
+		$backup_file = $source_backup_file;
+
+		if ($this->xcloner_file_system->is_multipart($backup_file)) {
+			$backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
+			$backup_file = $backup_parts[$return['part']];
+		}
+
+		$return['processing_file'] = $backup_file;
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+
+		try {
+			$this->logger->info(json_encode($_POST));
+			$this->logger->info($iv);
+			$return = array_merge($return,
+				$this->xcloner_encryption->encrypt_file($backup_file, "", "", $start, base64_decode($iv)));
+		}catch(\Exception $e){
+			$return['error'] = true;
+			$return['message'] = $e->getMessage();
+			$return['error_message'] = $e->getMessage();
+		}
 
-        $backup_parts = array();
-        $return = array();
+		//echo strlen($return['iv']);exit;
 
-        $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
-        $iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
-        $decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']);;
-        $return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+		if($return['finished']) {
+			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
+				$return['start'] = 0;
 
-        $backup_file = $source_backup_file;
+				++$return['part'];
 
-        if ($this->xcloner_file_system->is_multipart($backup_file)) {
-            $backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
-            $backup_file = $backup_parts[$return['part']];
-        }
+				if ($return['part'] < sizeof($backup_parts)) {
+					$return['finished'] = 0;
+				}
 
-        $return['processing_file'] = $backup_file;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+			}
+		}
 
-        try {
-            $return = array_merge($return,
-                $this->xcloner_encryption->decrypt_file($backup_file, "", $decryption_key, $start, base64_decode($iv)));
-        }catch(\Exception $e){
-            $return['error'] = true;
-            $return['message'] = $e->getMessage();
-        }
+		if (isset($_POST['data'])) {
+			$return['extra'] = array_merge($this->form_params['extra'],  $return);
+		}
 
-        if($return['finished']) {
-            if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
-                $return['start'] = 0;
+		$this->send_response($return, 0);
+	}
 
-                ++$return['part'];
+	/**
+	 *  API Incremental Backup Decryption Method
+	 */
+	public function backup_decryption()
+	{
+		$this->check_access();
 
-                if ($return['part'] < sizeof($backup_parts)) {
-                    $return['finished'] = 0;
-                }
+		$backup_parts = array();
+		$return = array();
 
-            }
-        }
+		$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
+		$iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
+		$decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']);;
+		$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+
+		$backup_file = $source_backup_file;
 
-        $this->send_response($return, 0);
-    }
+		if ($this->xcloner_file_system->is_multipart($backup_file)) {
+			$backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
+			$backup_file = $backup_parts[$return['part']];
+		}
 
-    public function get_manage_backups_list() {
+		$return['processing_file'] = $backup_file;
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
 
-        $storage_selection = "";
+		try {
+			$return = array_merge($return,
+				$this->xcloner_encryption->decrypt_file($backup_file, "", $decryption_key, $start, base64_decode($iv)));
+		}catch(\Exception $e){
+			$return['error'] = true;
+			$return['message'] = $e->getMessage();
+		}
+
+		if($return['finished']) {
+			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
+				$return['start'] = 0;
 
-        if (isset($_GET['storage_selection']) and $_GET['storage_selection']) {
-            $storage_selection = $this->xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
-        }
-        $available_storages = $this->xcloner_remote_storage->get_available_storages();
+				++$return['part'];
+
+				if ($return['part'] < sizeof($backup_parts)) {
+					$return['finished'] = 0;
+				}
 
-        $backup_list = $this->xcloner_file_system->get_backup_archives_list($storage_selection);
-        $return = array();
+			}
+		}
 
-        $i = -1;
-        foreach ($backup_list as $file_info):?>
+		$this->send_response($return, 0);
+	}
+
+	public function get_manage_backups_list() {
+
+		$storage_selection = "";
+
+		if (isset($_GET['storage_selection']) and $_GET['storage_selection']) {
+			$storage_selection = $this->xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
+		}
+		$available_storages = $this->xcloner_remote_storage->get_available_storages();
+
+		$backup_list = $this->xcloner_file_system->get_backup_archives_list($storage_selection);
+		$return = array();
+
+		$i = -1;
+		foreach ($backup_list as $file_info):?>
             <?php
-            if ($storage_selection == "gdrive") {
-                $file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
-            }
-            $file_exists_on_local_storage = true;
-
-            if ($storage_selection) {
-                if (!$this->xcloner_file_system->get_storage_filesystem()->has($file_info['path'])) {
-                    $file_exists_on_local_storage = false;
-                }
-            }
-
-            ?>
+			if ($storage_selection == "gdrive") {
+				$file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
+			}
+			$file_exists_on_local_storage = true;
+
+			if ($storage_selection) {
+				if (!$this->xcloner_file_system->get_storage_filesystem()->has($file_info['path'])) {
+					$file_exists_on_local_storage = false;
+				}
+			}
+
+			?>
             <?php if (!isset($file_info['parent'])): ?>
 
                 <?php ob_start(); ?>
@@ -949,21 +949,21 @@ 
                             <label for="checkbox_<?php echo $i ?>">&nbsp;</label>
                         </p>
                 <?php
-                $return['data'][$i][] = ob_get_contents();
-                ob_end_clean();
-                ?>
+				$return['data'][$i][] = ob_get_contents();
+				ob_end_clean();
+				?>
 
                 <?php ob_start(); ?>
                         <span class=""><?php echo $file_info['path'] ?></span>
                         <?php if (!$file_exists_on_local_storage): ?>
                             <a href="#"
                                title="<?php echo __("File does not exists on local storage",
-                                   "xcloner-backup-and-restore") ?>"><i
+								   "xcloner-backup-and-restore") ?>"><i
                                         class="material-icons backup_warning">warning</i></a>
                         <?php endif ?>
                         <?php
-                        if (isset($file_info['childs']) and is_array($file_info['childs'])):
-                            ?>
+						if (isset($file_info['childs']) and is_array($file_info['childs'])):
+							?>
                             <a href="#" title="expand" class="expand-multipart add"><i
                                         class="material-icons">add</i></a>
                             <a href="#" title="collapse" class="expand-multipart remove"><i class="material-icons">remove</i></a>
@@ -972,17 +972,17 @@ 
                                     <li>
                                         <?php echo $child[0] ?> (<?php echo size_format($child[2]) ?>)
                                         <?php
-                                        $child_exists_on_local_storage = true;
-                                        if ($storage_selection) {
-                                            if (!$this->xcloner_file_system->get_storage_filesystem()->has($child[0])) {
-                                                $child_exists_on_local_storage = false;
-                                            }
-                                        }
-                                        ?>
+										$child_exists_on_local_storage = true;
+										if ($storage_selection) {
+											if (!$this->xcloner_file_system->get_storage_filesystem()->has($child[0])) {
+												$child_exists_on_local_storage = false;
+											}
+										}
+										?>
                                         <?php if (!$child_exists_on_local_storage): ?>
                                             <a href="#"
                                                title="<?php echo __("File does not exists on local storage",
-                                                   "xcloner-backup-and-restore") ?>"><i
+												   "xcloner-backup-and-restore") ?>"><i
                                                         class="material-icons backup_warning">warning</i></a>
                                         <?php endif ?>
                                         <?php if (!$storage_selection) : ?>
@@ -997,7 +997,7 @@ 
                                             <?php else: ?>
                                                 <a href="#<?php echo $child[0] ?>" class="list-backup-content"
                                                    title="<?php echo __('List Backup Content',
-                                                       'xcloner-backup-and-restore') ?>"><i
+													   'xcloner-backup-and-restore') ?>"><i
                                                             class="material-icons">folder_open</i></a>
 
                                                 <a href="#<?php echo $child[0] ?>" class="backup-encryption"
@@ -1009,7 +1009,7 @@ 
                                         <?php elseif ($storage_selection != "gdrive" && !$this->xcloner_file_system->get_storage_filesystem()->has($child[0])): ?>
                                             <a href="#<?php echo $child[0] ?>" class="copy-remote-to-local"
                                                title="<?php echo __('Push Backup To Local Storage',
-                                                   'xcloner-backup-and-restore') ?>"><i
+												   'xcloner-backup-and-restore') ?>"><i
                                                         class="material-icons">file_upload</i></a>
                                         <?php endif ?>
                                     </li>
@@ -1017,24 +1017,24 @@ 
                             </ul>
                         <?php endif; ?>
                 <?php
-                $return['data'][$i][] = ob_get_contents();
-                ob_end_clean();
-                ?>
+				$return['data'][$i][] = ob_get_contents();
+				ob_end_clean();
+				?>
                     <?php ob_start(); ?>
                         <?php if (isset($file_info['timestamp']))
-                            echo date("Y-m-d H:i", $file_info['timestamp'])
-                        ?>
+							echo date("Y-m-d H:i", $file_info['timestamp'])
+						?>
                     <?php
-                        $return['data'][$i][] = ob_get_contents();
-                        ob_end_clean();
-                        ?>
+						$return['data'][$i][] = ob_get_contents();
+						ob_end_clean();
+						?>
 
                     <?php ob_start(); ?>
                         <?php echo size_format($file_info['size']) ?>
                     <?php
-                        $return['data'][$i][] = ob_get_contents();
-                        ob_end_clean();
-                    ?>
+						$return['data'][$i][] = ob_get_contents();
+						ob_end_clean();
+					?>
 
                     <?php ob_start(); ?>
                         <?php if (!$storage_selection): ?>
@@ -1045,14 +1045,14 @@ 
                             <?php if (sizeof($available_storages)): ?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="cloud-upload"
                                    title="<?php echo __('Send Backup To Remote Storage',
-                                       'xcloner-backup-and-restore') ?>"><i
+									   'xcloner-backup-and-restore') ?>"><i
                                             class="material-icons">cloud_upload</i></a>
                             <?php endif ?>
                             <?php
-                            $basename = $file_info['basename'];
-                            if(isset($file_info['childs']) and sizeof($file_info['childs']))
-                                $basename = $file_info['childs'][0][0];
-                            ?>
+							$basename = $file_info['basename'];
+							if(isset($file_info['childs']) and sizeof($file_info['childs']))
+								$basename = $file_info['childs'][0][0];
+							?>
                             <?php if($this->xcloner_encryption->is_encrypted_file($basename)) :?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="backup-decryption"
                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
@@ -1081,193 +1081,193 @@ 
                         <?php endif ?>
 
                     <?php
-                        $return['data'][$i][] = ob_get_contents();
-                        ob_end_clean(); ?>
+						$return['data'][$i][] = ob_get_contents();
+						ob_end_clean(); ?>
 
             <?php endif ?>
         <?php endforeach ?>
     <?php
-        $this->send_response($return, 0);
-    }
-
-    /**
-     * API method to list internal backup files
-     */
-    public function list_backup_files()
-    {
-        $this->check_access();
-
-        $backup_parts = array();
-
-        $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
-        $return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
-
-        $backup_file = $source_backup_file;
-
-        if ($this->xcloner_file_system->is_multipart($backup_file)) {
-            $backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
-            $backup_file = $backup_parts[$return['part']];
-        }
-
-        if($this->xcloner_encryption->is_encrypted_file($backup_file)) {
-            $return['error'] = true;
-            $return['message'] = __("Backup archive is encrypted, please decrypt it first before you can list it's content.", "xcloner-backup-and-restore");
-            $this->send_response($return, 0);
-        }
-
-        try {
-            $tar = new Tar();
-            $tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
-
-            $data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
-        } catch (Exception $e) {
-            $return['error'] = true;
-            $return['message'] = $e->getMessage();
-            $this->send_response($return, 0);
-        }
-
-        $return['files'] = array();
-        $return['finished'] = 1;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
-        $i = 0;
-
-        if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
-            foreach ($data['extracted_files'] as $file) {
-                $return['files'][$i]['path'] = $file->getPath();
-                $return['files'][$i]['size'] = $file->getSize();
-                $return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
-                    $file->getMtime());
-
-                $i++;
-            }
-        }
-
-        if (isset($data['start'])) {
-            $return['start'] = $data['start'];
-            $return['finished'] = 0;
-        } else {
-            if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
-                $return['start'] = 0;
-
-                ++$return['part'];
-
-                if ($return['part'] < sizeof($backup_parts)) {
-                    $return['finished'] = 0;
-                }
-
-            }
-        }
-
-        $this->send_response($return, 0);
-    }
-
-    /*
+		$this->send_response($return, 0);
+	}
+
+	/**
+	 * API method to list internal backup files
+	 */
+	public function list_backup_files()
+	{
+		$this->check_access();
+
+		$backup_parts = array();
+
+		$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
+		$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+
+		$backup_file = $source_backup_file;
+
+		if ($this->xcloner_file_system->is_multipart($backup_file)) {
+			$backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
+			$backup_file = $backup_parts[$return['part']];
+		}
+
+		if($this->xcloner_encryption->is_encrypted_file($backup_file)) {
+			$return['error'] = true;
+			$return['message'] = __("Backup archive is encrypted, please decrypt it first before you can list it's content.", "xcloner-backup-and-restore");
+			$this->send_response($return, 0);
+		}
+
+		try {
+			$tar = new Tar();
+			$tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
+
+			$data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
+		} catch (Exception $e) {
+			$return['error'] = true;
+			$return['message'] = $e->getMessage();
+			$this->send_response($return, 0);
+		}
+
+		$return['files'] = array();
+		$return['finished'] = 1;
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$i = 0;
+
+		if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
+			foreach ($data['extracted_files'] as $file) {
+				$return['files'][$i]['path'] = $file->getPath();
+				$return['files'][$i]['size'] = $file->getSize();
+				$return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
+					$file->getMtime());
+
+				$i++;
+			}
+		}
+
+		if (isset($data['start'])) {
+			$return['start'] = $data['start'];
+			$return['finished'] = 0;
+		} else {
+			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
+				$return['start'] = 0;
+
+				++$return['part'];
+
+				if ($return['part'] < sizeof($backup_parts)) {
+					$return['finished'] = 0;
+				}
+
+			}
+		}
+
+		$this->send_response($return, 0);
+	}
+
+	/*
      * Copy remote backup to local storage
      */
-    public function copy_backup_remote_to_local()
-    {
+	public function copy_backup_remote_to_local()
+	{
 
-        $this->check_access();
+		$this->check_access();
 
-        $backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
+		$backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
 
-        $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+		$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-        $return = array();
+		$return = array();
 
-        try {
-            if (method_exists($xcloner_remote_storage, "copy_backup_remote_to_local")) {
-                $return = call_user_func_array(array(
-                    $xcloner_remote_storage,
-                    "copy_backup_remote_to_local"
-                ), array($backup_file, $storage_type));
-            }
-        } catch (Exception $e) {
+		try {
+			if (method_exists($xcloner_remote_storage, "copy_backup_remote_to_local")) {
+				$return = call_user_func_array(array(
+					$xcloner_remote_storage,
+					"copy_backup_remote_to_local"
+				), array($backup_file, $storage_type));
+			}
+		} catch (Exception $e) {
 
-            $return['error'] = 1;
-            $return['message'] = $e->getMessage();
-        }
+			$return['error'] = 1;
+			$return['message'] = $e->getMessage();
+		}
 
-        if (!$return) {
-            $return['error'] = 1;
-            $return['message'] = "Upload failed, please check the error log for more information!";
-        }
+		if (!$return) {
+			$return['error'] = 1;
+			$return['message'] = "Upload failed, please check the error log for more information!";
+		}
 
 
-        $this->send_response($return, 0);
+		$this->send_response($return, 0);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Upload backup to remote API
      *
      */
-    public function upload_backup_to_remote()
-    {
-        $this->check_access();
+	public function upload_backup_to_remote()
+	{
+		$this->check_access();
 
-        $backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
+		$backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
 
-        $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+		$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-        $return = array();
+		$return = array();
 
-        try {
-            if (method_exists($xcloner_remote_storage, "upload_backup_to_storage")) {
-                $return = call_user_func_array(array(
-                    $xcloner_remote_storage,
-                    "upload_backup_to_storage"
-                ), array($backup_file, $storage_type));
-            }
-        } catch (Exception $e) {
+		try {
+			if (method_exists($xcloner_remote_storage, "upload_backup_to_storage")) {
+				$return = call_user_func_array(array(
+					$xcloner_remote_storage,
+					"upload_backup_to_storage"
+				), array($backup_file, $storage_type));
+			}
+		} catch (Exception $e) {
 
-            $return['error'] = 1;
-            $return['message'] = $e->getMessage();
-        }
+			$return['error'] = 1;
+			$return['message'] = $e->getMessage();
+		}
 
-        if (!$return) {
-            $return['error'] = 1;
-            $return['message'] = "Upload failed, please check the error log for more information!";
-        }
+		if (!$return) {
+			$return['error'] = 1;
+			$return['message'] = "Upload failed, please check the error log for more information!";
+		}
 
 
-        $this->send_response($return, 0);
+		$this->send_response($return, 0);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Remote Storage Status Save
      *
      */
-    public function remote_storage_save_status()
-    {
-        $this->check_access();
+	public function remote_storage_save_status()
+	{
+		$this->check_access();
 
-        $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+		$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-        $return['finished'] = $xcloner_remote_storage->change_storage_status($_POST['id'], $_POST['value']);
+		$return['finished'] = $xcloner_remote_storage->change_storage_status($_POST['id'], $_POST['value']);
 
-        $this->send_response($return, 0);
-    }
+		$this->send_response($return, 0);
+	}
 
 
-    public function download_restore_script()
-    {
-        $this->check_access();
+	public function download_restore_script()
+	{
+		$this->check_access();
 
-        @ob_end_clean();
+		@ob_end_clean();
 
-        $adapter = new Local(dirname(__DIR__), LOCK_EX, 'SKIP_LINKS');
-        $xcloner_plugin_filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$adapter = new Local(dirname(__DIR__), LOCK_EX, 'SKIP_LINKS');
+		$xcloner_plugin_filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        /* Generate PHAR FILE
+		/* Generate PHAR FILE
         $file = 'restore/vendor.built';
 
         if(file_exists($file))
@@ -1283,178 +1283,178 @@ 
         $phar2->setStub($phar2->createDefaultStub('vendor/autoload.php', 'vendor/autoload.php'));
          * */
 
-        $tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
+		$tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
 
-        $tar = new Tar();
-        $tar->create($tmp_file);
+		$tar = new Tar();
+		$tar->create($tmp_file);
 
-        $tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
-        //$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
+		$tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
+		//$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 
-        $files = $xcloner_plugin_filesystem->listContents("vendor/", true);
-        foreach ($files as $file) {
-            $tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
-        }
+		$files = $xcloner_plugin_filesystem->listContents("vendor/", true);
+		foreach ($files as $file) {
+			$tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
+		}
 
-        $content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
-        $content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
+		$content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
+		$content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
 
-        $tar->addData("xcloner_restore.php", $content);
+		$tar->addData("xcloner_restore.php", $content);
 
-        $tar->close();
+		$tar->close();
 
-        if (file_exists($tmp_file)) {
-            header('Content-Description: File Transfer');
-            header('Content-Type: application/octet-stream');
-            header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
-            header('Expires: 0');
-            header('Cache-Control: must-revalidate');
-            header('Pragma: public');
-            header('Content-Length: ' . filesize($tmp_file));
-            readfile($tmp_file);
+		if (file_exists($tmp_file)) {
+			header('Content-Description: File Transfer');
+			header('Content-Type: application/octet-stream');
+			header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			header('Content-Length: ' . filesize($tmp_file));
+			readfile($tmp_file);
 
-        }
+		}
 
-        @unlink($tmp_file);
-        exit;
-    }
+		@unlink($tmp_file);
+		exit;
+	}
 
-    /*
+	/*
      *
      * Download backup by Name from the Storage Path
      *
      */
-    public function download_backup_by_name()
-    {
-        $this->check_access();
+	public function download_backup_by_name()
+	{
+		$this->check_access();
 
-        @ob_end_clean();
+		@ob_end_clean();
 
-        $backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_GET['name']);
+		$backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_GET['name']);
 
 
-        $metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($backup_name);
-        $read_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($backup_name);
+		$metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($backup_name);
+		$read_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($backup_name);
 
 
-        header('Pragma: public');
-        header('Expires: 0');
-        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-        header('Cache-Control: private', false);
-        header('Content-Transfer-Encoding: binary');
-        header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
-        header('Content-Type: application/octet-stream');
-        header('Content-Length: ' . $metadata['size']);
+		header('Pragma: public');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Cache-Control: private', false);
+		header('Content-Transfer-Encoding: binary');
+		header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
+		header('Content-Type: application/octet-stream');
+		header('Content-Length: ' . $metadata['size']);
 
-        @ob_end_clean();
+		@ob_end_clean();
 
-        $chunkSize = 1024 * 1024;
-        while (!feof($read_stream)) {
-            $buffer = fread($read_stream, $chunkSize);
-            echo $buffer;
-        }
-        fclose($read_stream);
-        exit;
+		$chunkSize = 1024 * 1024;
+		while (!feof($read_stream)) {
+			$buffer = fread($read_stream, $chunkSize);
+			echo $buffer;
+		}
+		fclose($read_stream);
+		exit;
 
-    }
+	}
 
-    /*
+	/*
      * Restore upload backup
      */
-    public function restore_upload_backup()
-    {
-        $this->check_access();
+	public function restore_upload_backup()
+	{
+		$this->check_access();
 
-        $return['part'] = 0;
-        $return['total_parts'] = 0;
-        $return['uploaded_size'] = 0;
-        $is_multipart = 0;
+		$return['part'] = 0;
+		$return['total_parts'] = 0;
+		$return['uploaded_size'] = 0;
+		$is_multipart = 0;
 
-        $file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $hash = $this->xcloner_sanitization->sanitize_input_as_string($_POST['hash']);
+		$file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$hash = $this->xcloner_sanitization->sanitize_input_as_string($_POST['hash']);
 
-        if (isset($_POST['part'])) {
-            $return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
-        }
+		if (isset($_POST['part'])) {
+			$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+		}
 
-        if (isset($_POST['uploaded_size'])) {
-            $return['uploaded_size'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['uploaded_size']);
-        }
+		if (isset($_POST['uploaded_size'])) {
+			$return['uploaded_size'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['uploaded_size']);
+		}
 
-        $start = $this->xcloner_sanitization->sanitize_input_as_string($_POST['start']);
-        $target_url = $this->xcloner_sanitization->sanitize_input_as_string($_POST['target_url']);
+		$start = $this->xcloner_sanitization->sanitize_input_as_string($_POST['start']);
+		$target_url = $this->xcloner_sanitization->sanitize_input_as_string($_POST['target_url']);
 
-        $return['total_size'] = $this->xcloner_file_system->get_backup_size($file);
+		$return['total_size'] = $this->xcloner_file_system->get_backup_size($file);
 
-        if ($this->xcloner_file_system->is_multipart($file)) {
-            $backup_parts = $this->xcloner_file_system->get_multipart_files($file);
+		if ($this->xcloner_file_system->is_multipart($file)) {
+			$backup_parts = $this->xcloner_file_system->get_multipart_files($file);
 
-            $return['total_parts'] = sizeof($backup_parts) + 1;
+			$return['total_parts'] = sizeof($backup_parts) + 1;
 
-            if ($return['part'] and isset($backup_parts[$return['part'] - 1])) {
-                $file = $backup_parts[$return['part'] - 1];
-            }
+			if ($return['part'] and isset($backup_parts[$return['part'] - 1])) {
+				$file = $backup_parts[$return['part'] - 1];
+			}
 
-            $is_multipart = 1;
-        }
+			$is_multipart = 1;
+		}
 
-        try {
+		try {
 
-            $xcloner_file_transfer = $this->get_xcloner_container()->get_xcloner_file_transfer();
-            $xcloner_file_transfer->set_target($target_url);
-            $return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
+			$xcloner_file_transfer = $this->get_xcloner_container()->get_xcloner_file_transfer();
+			$xcloner_file_transfer->set_target($target_url);
+			$return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $return = array();
-            $return['error'] = true;
-            $return['status'] = 500;
-            $return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
-            $this->send_response($return, 0);
+			$return = array();
+			$return['error'] = true;
+			$return['status'] = 500;
+			$return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
+			$this->send_response($return, 0);
 
-        }
+		}
 
-        $return['status'] = 200;
+		$return['status'] = 200;
 
-        //we have finished the upload
-        if (!$return['start'] and $is_multipart) {
-            $return['part']++;
-            $return['uploaded_size'] += $this->xcloner_file_system->get_storage_filesystem()->getSize($file);
-        }
+		//we have finished the upload
+		if (!$return['start'] and $is_multipart) {
+			$return['part']++;
+			$return['uploaded_size'] += $this->xcloner_file_system->get_storage_filesystem()->getSize($file);
+		}
 
-        $this->send_response($return, 0);
-    }
+		$this->send_response($return, 0);
+	}
 
-    /*
+	/*
      * Restore backup
      */
-    public function restore_backup()
-    {
-        $this->check_access();
+	public function restore_backup()
+	{
+		$this->check_access();
 
-        define("XCLONER_PLUGIN_ACCESS", 1);
-        include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
+		define("XCLONER_PLUGIN_ACCESS", 1);
+		include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
 
-        return;
-    }
+		return;
+	}
 
-    /*
+	/*
      *
      * Send the json response back
      *
      */
-    private function send_response($data, $attach_hash = 1)
-    {
+	private function send_response($data, $attach_hash = 1)
+	{
 
-        if ($attach_hash and null !== $this->xcloner_settings->get_hash()) {
-            $data['hash'] = $this->xcloner_settings->get_hash();
-        }
+		if ($attach_hash and null !== $this->xcloner_settings->get_hash()) {
+			$data['hash'] = $this->xcloner_settings->get_hash();
+		}
 
-        if (ob_get_length()) {
-            ob_clean();
-        }
-        wp_send_json($data);
+		if (ob_get_length()) {
+			ob_clean();
+		}
+		wp_send_json($data);
 
-        die();
-    }
+		die();
+	}
 }

includes/class-xcloner-scheduler.php

Indentation +48 added lines, -48 removed lines

@@ -188,7 +188,7 @@ 
 
 	public function update_last_backup( $schedule_id, $last_backup ) {
 
-	    $this->logger->info(sprintf('Updating last backup %s for schedule id #%s', $last_backup, $schedule_id));
+		$this->logger->info(sprintf('Updating last backup %s for schedule id #%s', $last_backup, $schedule_id));
 
 		$schedule['last_backup'] = $last_backup;
 
@@ -282,56 +282,56 @@ 
 		}
 		$this->logger->info( sprintf( "File archive process FINISHED." ), array( "CRON" ) );
 
-        //getting the last backup archive file
-        $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
+		//getting the last backup archive file
+		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
 		if ( $this->xcloner_file_system->is_part( $this->archive_system->get_archive_name_with_extension() ) ) {
 			$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
 		}
 
 		//Updating schedule last backup archive
-        $this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] );
+		$this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] );
 
 		//Encrypting the backup archive
-        $return_encrypted['finished'] = 0;
-        $return_encrypted['start'] = 0;
-        $return_encrypted['iv'] = '';
-        $return_encrypted['target_file'] = '';
-        $part = 0;
-        $backup_parts = array();
-
-        if( $schedule['backup_params']->backup_encrypt){
-            $this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) );
-
-            $backup_file = $return['extra']['backup_parent'];
-
-            if ($this->xcloner_file_system->is_multipart($return['extra']['backup_parent'])) {
-                $backup_parts = $this->xcloner_file_system->get_multipart_files($return['extra']['backup_parent']);
-                $backup_file = $backup_parts[$part];
-            }
-
-            while ( ! $return_encrypted['finished'] ) {
-                $return_encrypted = $this->xcloner_encryption->encrypt_file(
-                                            $backup_file,
-                                            "",
-                                            "",
-                                            "",
-                                            "",
-                                            true,
-                                            true
-                );
-
-                if($return_encrypted['finished']) {
-                    ++$part;
-
-                    if ($part < sizeof($backup_parts)) {
-                        $return_encrypted['finished'] = 0;
-                        $backup_file = $backup_parts[$part];
-                    }
-                }
-            }
-        }
-
-        //Sending backup to remote storage
+		$return_encrypted['finished'] = 0;
+		$return_encrypted['start'] = 0;
+		$return_encrypted['iv'] = '';
+		$return_encrypted['target_file'] = '';
+		$part = 0;
+		$backup_parts = array();
+
+		if( $schedule['backup_params']->backup_encrypt){
+			$this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) );
+
+			$backup_file = $return['extra']['backup_parent'];
+
+			if ($this->xcloner_file_system->is_multipart($return['extra']['backup_parent'])) {
+				$backup_parts = $this->xcloner_file_system->get_multipart_files($return['extra']['backup_parent']);
+				$backup_file = $backup_parts[$part];
+			}
+
+			while ( ! $return_encrypted['finished'] ) {
+				$return_encrypted = $this->xcloner_encryption->encrypt_file(
+											$backup_file,
+											"",
+											"",
+											"",
+											"",
+											true,
+											true
+				);
+
+				if($return_encrypted['finished']) {
+					++$part;
+
+					if ($part < sizeof($backup_parts)) {
+						$return_encrypted['finished'] = 0;
+						$backup_file = $backup_parts[$part];
+					}
+				}
+			}
+		}
+
+		//Sending backup to remote storage
 		if ( isset( $schedule['remote_storage'] ) && $schedule['remote_storage'] && array_key_exists( $schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages() ) ) {
 			$backup_file = $return['extra']['backup_parent'];
 
@@ -382,10 +382,10 @@ 
 		}
 
 		try {
-            if( get_option('xcloner_disable_email_notification') ) {
-                //we disable email notifications
-                $schedule['backup_params']->email_notification = "";
-            }
+			if( get_option('xcloner_disable_email_notification') ) {
+				//we disable email notifications
+				$schedule['backup_params']->email_notification = "";
+			}
 			$this->_xcloner_scheduler_callback( $id, $schedule );
 
 		} catch ( Exception $e ) {

includes/class-xcloner-file-system.php

Indentation +957 added lines, -957 removed lines

@@ -37,848 +37,848 @@ 
 class Xcloner_File_System
 {
 
-    private $excluded_files = "";
-    private $additional_regex_patterns = array();
-    private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
-    private $included_files_handler = "backup_files.csv";
-    private $temp_dir_handler = ".dir";
-    public $filesystem;
-    public $tmp_filesystem;
-    public $storage_filesystem;
-    private $xcloner_container;
-    private $diff_timestamp_start = "";
-
-    private $logger;
-    private $start_adapter;
-    private $tmp_adapter;
-    private $storage_adapter;
-    private $xcloner_settings;
-    private $start_filesystem;
-    private $tmp_filesystem_append;
-    private $storage_filesystem_append;
-
-    private $files_counter;
-    private $files_size;
-    private $last_logged_file;
-    private $folders_to_process_per_session = 25;
-    private $backup_archive_extensions = array("tar", "tgz", "tar.gz", "gz", "csv", "encrypted", "decrypted");
-    private $backup_name_tags = array('[time]', '[hostname]', '[domain]');
-
-    /**
-     * Xcloner_File_System constructor.
-     * @param Xcloner $xcloner_container
-     * @param string $hash
-     */
-    public function __construct(Xcloner $xcloner_container, $hash = "")
-    {
-        $this->xcloner_container = $xcloner_container;
-
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
-        $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-
-        try {
-
-            $this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->start_filesystem = new Filesystem($this->start_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-            $adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
-            $this->tmp_filesystem_append = new Filesystem($adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->storage_filesystem = new Filesystem($adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND,
-                'SKIP_LINKS');
-            $this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-        } catch (Exception $e) {
-            $this->logger->error("Filesystem Initialization Error: " . $e->getMessage());
-        }
-
-
-        if ($value = get_option('xcloner_directories_to_scan_per_request')) {
-            $this->folders_to_process_per_session = $value;
-        }
-
-    }
-
-    /**
-     * Set differential timestamp date
-     * @param string $timestamp
-     */
-    public function set_diff_timestamp_start($timestamp = "")
-    {
-        if ($timestamp) {
-            $this->logger->info(sprintf("Setting Differential Timestamp To %s", date("Y-m-d", $timestamp)), array(
-                "FILESYSTEM",
-                "DIFF"
-            ));
-            $this->diff_timestamp_start = $timestamp;
-        }
-    }
-
-    /**
-     * Gets the differential timestamp date
-     * @return string
-     */
-    public function get_diff_timestamp_start()
-    {
-        return $this->diff_timestamp_start;
-    }
-
-    private function get_xcloner_container()
-    {
-        return $this->xcloner_container;
-    }
-
-    public function set_hash($hash)
-    {
-        $this->xcloner_settings->set_hash($hash);
-    }
-
-    public function get_hash($hash)
-    {
-        $this->xcloner_settings->get_hash();
-    }
-
-    public function get_tmp_filesystem()
-    {
-        return $this->tmp_filesystem;
-    }
-
-    public function get_storage_filesystem($remote_storage_selection = "")
-    {
-        if ($remote_storage_selection != "") {
-            $remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
-            $method = "get_" . $remote_storage_selection . "_filesystem";
-
-            if (!method_exists($remote_storage, $method)) {
-                return false;
-            }
-
-            list($adapter, $filesystem) = $remote_storage->$method();
-
-            return $filesystem;
-        }
-
-        return $this->storage_filesystem;
-    }
-
-    public function get_tmp_filesystem_adapter()
-    {
-        return $this->tmp_adapter;
-    }
-
-    public function get_tmp_filesystem_append()
-    {
-        return $this->tmp_filesystem_append;
-    }
-
-    public function get_start_adapter()
-    {
-        return $this->start_adapter;
-    }
-
-    public function get_start_filesystem()
-    {
-        return $this->start_filesystem;
-    }
-
-    public function get_logger()
-    {
-        return $this->logger;
-    }
-
-    public function get_start_path_file_info($file)
-    {
-        $info = $this->getMetadataFull('start_adapter', $file);
-
-        return $this->start_filesystem->normalizeFileInfo($info);
-    }
-
-    public function get_storage_path_file_info($file)
-    {
-        return $this->getMetadataFull('storage_adapter', $file);
-    }
-
-    public function get_included_files_handler($metadata = 0)
-    {
-        $path = $this->included_files_handler;
-        if (!$metadata) {
-            return $path;
-        }
-
-        $spl_info = $this->getMetadataFull('tmp_adapter', $path);
-
-        return $spl_info;
-
-    }
-
-    public function get_temp_dir_handler()
-    {
-        return $this->temp_dir_handler;
-    }
-
-    public function get_latest_backup()
-    {
-        $files = $this->get_backup_archives_list();
-
-        if (is_array($files)) {
-            $this->sort_by($files, "timestamp", "desc");
-        }
-
-        $new_list = array();
-
-        foreach ($files as $key => $file) {
-            if (!isset($file['parent'])) {
-                $new_list[] = ($files[$key]);
-            }
-        }
-
-        if (isset($new_list[0])) {
-            return $new_list[0];
-        }
-    }
-
-    public function get_latest_backups()
-    {
-        $files = $this->get_backup_archives_list();
-
-        if (is_array($files)) {
-            $this->sort_by($files, "timestamp", "desc");
-        }
-
-        $new_list = array();
-
-        foreach ($files as $key => $file) {
-            if (!isset($file['parent'])) {
-                $new_list[] = ($files[$key]);
-            }
-        }
-
-        return $new_list;
-    }
-
-    public function get_storage_usage()
-    {
-        $files = $this->get_backup_archives_list();
-        $total = 0;
-
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                $total += $file['size'];
-            }
-        }
-
-        return $total;
-    }
-
-    public function is_part($backup_name)
-    {
-        if (stristr($backup_name, "-part")) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function is_multipart($backup_name)
-    {
-        if (stristr($backup_name, "-multipart")) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function get_backup_size($backup_name)
-    {
-        $backup_size = $this->get_storage_filesystem()->getSize($backup_name);
-        if ($this->is_multipart($backup_name)) {
-            $backup_parts = $this->get_multipart_files($backup_name);
-            foreach ($backup_parts as $part_file) {
-                $backup_size += $this->get_storage_filesystem()->getSize($part_file);
-            }
-        }
-
-        return $backup_size;
-    }
-
-    public function get_multipart_files($backup_name, $storage_selection = "")
-    {
-        $files = array();
-
-        if ($this->is_multipart($backup_name)) {
-            $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-            foreach ($lines as $line) {
-                if ($line) {
-                    $data = str_getcsv($line);
-                    $files[] = $data[0];
-                }
-            }
-        }
-
-        return $files;
-    }
-
-    public function delete_backup_by_name($backup_name, $storage_selection = "")
-    {
-        if ($this->is_multipart($backup_name)) {
-            $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-            foreach ($lines as $line) {
-                if ($line) {
-                    $data = str_getcsv($line);
-                    $this->get_storage_filesystem($storage_selection)->delete($data[0]);
-                }
-            }
-        }
-
-        if ($this->get_storage_filesystem($storage_selection)->delete($backup_name)) {
-            $return = true;
-        } else {
-            $return = false;
-        }
-
-        return $return;
-    }
-
-    public function getMetadataFull($adapter = "storage_adapter", $path)
-    {
-        $location = $this->$adapter->applyPathPrefix($path);
-        $spl_info = new SplFileInfo($location);
-
-        return ($spl_info);
-    }
-
-
-    public function get_backup_archives_list($storage_selection = "")
-    {
-        $list = array();
-
-
-        if (method_exists($this->get_storage_filesystem($storage_selection), "listContents")) {
-            $list = $this->get_storage_filesystem($storage_selection)->listContents();
-        }
-
-        $backup_files = array();
-        $parents = array();
-
-        foreach ($list as $file_info) {
-            if (isset($file_info['extension']) and $file_info['extension'] == "csv") {
-                $data = array();
-
-                $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($file_info['path']));
-                foreach ($lines as $line) {
-                    if ($line) {
-                        $data = str_getcsv($line);
-                        if (is_array($data)) {
-                            $parents[$data[0]] = $file_info['basename'];
-                            $file_info['childs'][] = $data;
-                            $file_info['size'] += $data[2];
-                        }
-                    }
-                }
-
-            }
-
-            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;
-            }
-        }
-
-        foreach ($backup_files as $key => $file_info) {
-            if (!isset($backup_files[$key]['timestamp'])) {
-                //$backup_files[$key]['timestamp'] = $this->get_storage_filesystem($storage_selection)->getTimestamp($file_info['path']);
-            }
-
-            if (isset($parents[$file_info['basename']])) {
-                $backup_files[$key]['parent'] = $parents[$file_info['basename']];
-            }
-        }
-
-        return $backup_files;
-    }
-
-    public function start_file_recursion($init = 0)
-    {
-        if ($init) {
-            $this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"),
-                $this->xcloner_settings->get_xcloner_start_path()));
-            $this->do_system_init();
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            //.dir exists, we presume we have files to iterate
-            $content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
-            $files = array_filter(explode("\n", $content));
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-
-            $counter = 0;
-            foreach ($files as $file) {
-                if ($counter < $this->folders_to_process_per_session) {
-                    $this->build_files_list($file);
-                    $counter++;
-                } else {
-                    $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
-                }
-            }
-        } else {
-            $this->build_files_list();
-        }
-
-        if ($this->scan_finished()) {
-            $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
-            $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-            $this->files_counter++;
-
-            //adding included dump file to the included files list
-            if ($this->get_tmp_filesystem()->has($this->get_included_files_handler())) {
-                $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
-                $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-                $this->files_counter++;
-            }
-
-            //adding a default index.html to the temp xcloner folder
-            if (!$this->get_tmp_filesystem()->has("index.html")) {
-                $this->get_tmp_filesystem()->write("index.html", "");
-            }
-
-            //adding the default log file
-            if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1))) {
-                $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
-                $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-                $this->files_counter++;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    public function get_backup_attachments()
-    {
-        $return = array();
-
-        $files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
-        if (file_exists($files_list_file)) {
-            $return[] = $files_list_file;
-        }
-
-        if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $log_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->xcloner_settings->get_logger_filename(1);
-            if (!file_exists($log_file)) {
-                $log_file = $this->xcloner_settings->get_xcloner_store_path() . DS . $this->xcloner_settings->get_logger_filename();
-            }
-
-            if (file_exists($log_file)) {
-                $return[] = $log_file;
-            }
-        }
-
-        return $return;
-    }
-
-    public function remove_tmp_filesystem()
-    {
-        //delete the temporary folder
-        $this->logger->debug(sprintf("Deleting the temporary storage folder %s",
-            $this->xcloner_settings->get_xcloner_tmp_path()));
-
-        $contents = $this->get_tmp_filesystem()->listContents();
-
-        if (is_array($contents)) {
-            foreach ($contents as $file_info) {
-                $this->get_tmp_filesystem()->delete($file_info['path']);
-            }
-        }
-
-        @rmdir($this->xcloner_settings->get_xcloner_tmp_path());
-
-        return;
-    }
-
-    public function cleanup_tmp_directories()
-    {
-        $adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
-        $tmp_filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
-
-        $contents = $tmp_filesystem->listContents();
-
-        foreach ($contents as $file) {
-
-            if (preg_match("/.xcloner-(.*)/", $file['path'])) {
-                if ($file['timestamp'] < strtotime("-1days")) {
-                    $tmp_filesystem->deleteDir($file['path']);
-                    $this->logger->debug(sprintf("Delete temporary directory %s", $file['path']));
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private function do_system_init()
-    {
-        $this->files_counter = 0;
-
-        if (!$this->storage_filesystem->has("index.html")) {
-            $this->storage_filesystem->write("index.html", "");
-        }
-
-        if (!$this->tmp_filesystem->has("index.html")) {
-            $this->tmp_filesystem->write("index.html", "");
-        }
-
-        if ($this->tmp_filesystem->has($this->get_included_files_handler())) {
-            $this->tmp_filesystem->delete($this->get_included_files_handler());
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-        }
-    }
-
-    public function get_scanned_files_num()
-    {
-        return $this->files_counter;
-    }
-
-    public function get_scanned_files_total_size()
-    {
-        return $this->files_size;
-    }
-
-    public function last_logged_file()
-    {
-        return $this->last_logged_file;
-    }
-
-    public static function is_regex($regex)
-    {
-        return preg_match("/^\^(.*)\$$/i", $regex);
-    }
+	private $excluded_files = "";
+	private $additional_regex_patterns = array();
+	private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
+	private $included_files_handler = "backup_files.csv";
+	private $temp_dir_handler = ".dir";
+	public $filesystem;
+	public $tmp_filesystem;
+	public $storage_filesystem;
+	private $xcloner_container;
+	private $diff_timestamp_start = "";
+
+	private $logger;
+	private $start_adapter;
+	private $tmp_adapter;
+	private $storage_adapter;
+	private $xcloner_settings;
+	private $start_filesystem;
+	private $tmp_filesystem_append;
+	private $storage_filesystem_append;
+
+	private $files_counter;
+	private $files_size;
+	private $last_logged_file;
+	private $folders_to_process_per_session = 25;
+	private $backup_archive_extensions = array("tar", "tgz", "tar.gz", "gz", "csv", "encrypted", "decrypted");
+	private $backup_name_tags = array('[time]', '[hostname]', '[domain]');
+
+	/**
+	 * Xcloner_File_System constructor.
+	 * @param Xcloner $xcloner_container
+	 * @param string $hash
+	 */
+	public function __construct(Xcloner $xcloner_container, $hash = "")
+	{
+		$this->xcloner_container = $xcloner_container;
+
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+
+		try {
+
+			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->start_filesystem = new Filesystem($this->start_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+			$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
+			$this->tmp_filesystem_append = new Filesystem($adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->storage_filesystem = new Filesystem($adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND,
+				'SKIP_LINKS');
+			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+		} catch (Exception $e) {
+			$this->logger->error("Filesystem Initialization Error: " . $e->getMessage());
+		}
+
+
+		if ($value = get_option('xcloner_directories_to_scan_per_request')) {
+			$this->folders_to_process_per_session = $value;
+		}
+
+	}
+
+	/**
+	 * Set differential timestamp date
+	 * @param string $timestamp
+	 */
+	public function set_diff_timestamp_start($timestamp = "")
+	{
+		if ($timestamp) {
+			$this->logger->info(sprintf("Setting Differential Timestamp To %s", date("Y-m-d", $timestamp)), array(
+				"FILESYSTEM",
+				"DIFF"
+			));
+			$this->diff_timestamp_start = $timestamp;
+		}
+	}
+
+	/**
+	 * Gets the differential timestamp date
+	 * @return string
+	 */
+	public function get_diff_timestamp_start()
+	{
+		return $this->diff_timestamp_start;
+	}
+
+	private function get_xcloner_container()
+	{
+		return $this->xcloner_container;
+	}
+
+	public function set_hash($hash)
+	{
+		$this->xcloner_settings->set_hash($hash);
+	}
+
+	public function get_hash($hash)
+	{
+		$this->xcloner_settings->get_hash();
+	}
+
+	public function get_tmp_filesystem()
+	{
+		return $this->tmp_filesystem;
+	}
+
+	public function get_storage_filesystem($remote_storage_selection = "")
+	{
+		if ($remote_storage_selection != "") {
+			$remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+			$method = "get_" . $remote_storage_selection . "_filesystem";
+
+			if (!method_exists($remote_storage, $method)) {
+				return false;
+			}
+
+			list($adapter, $filesystem) = $remote_storage->$method();
+
+			return $filesystem;
+		}
+
+		return $this->storage_filesystem;
+	}
+
+	public function get_tmp_filesystem_adapter()
+	{
+		return $this->tmp_adapter;
+	}
+
+	public function get_tmp_filesystem_append()
+	{
+		return $this->tmp_filesystem_append;
+	}
+
+	public function get_start_adapter()
+	{
+		return $this->start_adapter;
+	}
+
+	public function get_start_filesystem()
+	{
+		return $this->start_filesystem;
+	}
+
+	public function get_logger()
+	{
+		return $this->logger;
+	}
+
+	public function get_start_path_file_info($file)
+	{
+		$info = $this->getMetadataFull('start_adapter', $file);
+
+		return $this->start_filesystem->normalizeFileInfo($info);
+	}
+
+	public function get_storage_path_file_info($file)
+	{
+		return $this->getMetadataFull('storage_adapter', $file);
+	}
+
+	public function get_included_files_handler($metadata = 0)
+	{
+		$path = $this->included_files_handler;
+		if (!$metadata) {
+			return $path;
+		}
+
+		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
+
+		return $spl_info;
+
+	}
+
+	public function get_temp_dir_handler()
+	{
+		return $this->temp_dir_handler;
+	}
+
+	public function get_latest_backup()
+	{
+		$files = $this->get_backup_archives_list();
+
+		if (is_array($files)) {
+			$this->sort_by($files, "timestamp", "desc");
+		}
+
+		$new_list = array();
+
+		foreach ($files as $key => $file) {
+			if (!isset($file['parent'])) {
+				$new_list[] = ($files[$key]);
+			}
+		}
+
+		if (isset($new_list[0])) {
+			return $new_list[0];
+		}
+	}
+
+	public function get_latest_backups()
+	{
+		$files = $this->get_backup_archives_list();
+
+		if (is_array($files)) {
+			$this->sort_by($files, "timestamp", "desc");
+		}
+
+		$new_list = array();
+
+		foreach ($files as $key => $file) {
+			if (!isset($file['parent'])) {
+				$new_list[] = ($files[$key]);
+			}
+		}
+
+		return $new_list;
+	}
+
+	public function get_storage_usage()
+	{
+		$files = $this->get_backup_archives_list();
+		$total = 0;
+
+		if (is_array($files)) {
+			foreach ($files as $file) {
+				$total += $file['size'];
+			}
+		}
+
+		return $total;
+	}
+
+	public function is_part($backup_name)
+	{
+		if (stristr($backup_name, "-part")) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function is_multipart($backup_name)
+	{
+		if (stristr($backup_name, "-multipart")) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function get_backup_size($backup_name)
+	{
+		$backup_size = $this->get_storage_filesystem()->getSize($backup_name);
+		if ($this->is_multipart($backup_name)) {
+			$backup_parts = $this->get_multipart_files($backup_name);
+			foreach ($backup_parts as $part_file) {
+				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			}
+		}
+
+		return $backup_size;
+	}
+
+	public function get_multipart_files($backup_name, $storage_selection = "")
+	{
+		$files = array();
+
+		if ($this->is_multipart($backup_name)) {
+			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
+			foreach ($lines as $line) {
+				if ($line) {
+					$data = str_getcsv($line);
+					$files[] = $data[0];
+				}
+			}
+		}
+
+		return $files;
+	}
+
+	public function delete_backup_by_name($backup_name, $storage_selection = "")
+	{
+		if ($this->is_multipart($backup_name)) {
+			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
+			foreach ($lines as $line) {
+				if ($line) {
+					$data = str_getcsv($line);
+					$this->get_storage_filesystem($storage_selection)->delete($data[0]);
+				}
+			}
+		}
+
+		if ($this->get_storage_filesystem($storage_selection)->delete($backup_name)) {
+			$return = true;
+		} else {
+			$return = false;
+		}
+
+		return $return;
+	}
+
+	public function getMetadataFull($adapter = "storage_adapter", $path)
+	{
+		$location = $this->$adapter->applyPathPrefix($path);
+		$spl_info = new SplFileInfo($location);
+
+		return ($spl_info);
+	}
+
+
+	public function get_backup_archives_list($storage_selection = "")
+	{
+		$list = array();
+
+
+		if (method_exists($this->get_storage_filesystem($storage_selection), "listContents")) {
+			$list = $this->get_storage_filesystem($storage_selection)->listContents();
+		}
+
+		$backup_files = array();
+		$parents = array();
+
+		foreach ($list as $file_info) {
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv") {
+				$data = array();
+
+				$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($file_info['path']));
+				foreach ($lines as $line) {
+					if ($line) {
+						$data = str_getcsv($line);
+						if (is_array($data)) {
+							$parents[$data[0]] = $file_info['basename'];
+							$file_info['childs'][] = $data;
+							$file_info['size'] += $data[2];
+						}
+					}
+				}
+
+			}
+
+			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;
+			}
+		}
+
+		foreach ($backup_files as $key => $file_info) {
+			if (!isset($backup_files[$key]['timestamp'])) {
+				//$backup_files[$key]['timestamp'] = $this->get_storage_filesystem($storage_selection)->getTimestamp($file_info['path']);
+			}
+
+			if (isset($parents[$file_info['basename']])) {
+				$backup_files[$key]['parent'] = $parents[$file_info['basename']];
+			}
+		}
+
+		return $backup_files;
+	}
+
+	public function start_file_recursion($init = 0)
+	{
+		if ($init) {
+			$this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"),
+				$this->xcloner_settings->get_xcloner_start_path()));
+			$this->do_system_init();
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			//.dir exists, we presume we have files to iterate
+			$content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
+			$files = array_filter(explode("\n", $content));
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+
+			$counter = 0;
+			foreach ($files as $file) {
+				if ($counter < $this->folders_to_process_per_session) {
+					$this->build_files_list($file);
+					$counter++;
+				} else {
+					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
+				}
+			}
+		} else {
+			$this->build_files_list();
+		}
+
+		if ($this->scan_finished()) {
+			$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
+			$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+			$this->files_counter++;
+
+			//adding included dump file to the included files list
+			if ($this->get_tmp_filesystem()->has($this->get_included_files_handler())) {
+				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
+				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+				$this->files_counter++;
+			}
+
+			//adding a default index.html to the temp xcloner folder
+			if (!$this->get_tmp_filesystem()->has("index.html")) {
+				$this->get_tmp_filesystem()->write("index.html", "");
+			}
+
+			//adding the default log file
+			if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1))) {
+				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
+				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+				$this->files_counter++;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	public function get_backup_attachments()
+	{
+		$return = array();
+
+		$files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
+		if (file_exists($files_list_file)) {
+			$return[] = $files_list_file;
+		}
+
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+			$log_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->xcloner_settings->get_logger_filename(1);
+			if (!file_exists($log_file)) {
+				$log_file = $this->xcloner_settings->get_xcloner_store_path() . DS . $this->xcloner_settings->get_logger_filename();
+			}
+
+			if (file_exists($log_file)) {
+				$return[] = $log_file;
+			}
+		}
+
+		return $return;
+	}
+
+	public function remove_tmp_filesystem()
+	{
+		//delete the temporary folder
+		$this->logger->debug(sprintf("Deleting the temporary storage folder %s",
+			$this->xcloner_settings->get_xcloner_tmp_path()));
+
+		$contents = $this->get_tmp_filesystem()->listContents();
+
+		if (is_array($contents)) {
+			foreach ($contents as $file_info) {
+				$this->get_tmp_filesystem()->delete($file_info['path']);
+			}
+		}
+
+		@rmdir($this->xcloner_settings->get_xcloner_tmp_path());
+
+		return;
+	}
+
+	public function cleanup_tmp_directories()
+	{
+		$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
+		$tmp_filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
+
+		$contents = $tmp_filesystem->listContents();
+
+		foreach ($contents as $file) {
+
+			if (preg_match("/.xcloner-(.*)/", $file['path'])) {
+				if ($file['timestamp'] < strtotime("-1days")) {
+					$tmp_filesystem->deleteDir($file['path']);
+					$this->logger->debug(sprintf("Delete temporary directory %s", $file['path']));
+				}
+			}
+		}
+
+		return true;
+	}
+
+	private function do_system_init()
+	{
+		$this->files_counter = 0;
+
+		if (!$this->storage_filesystem->has("index.html")) {
+			$this->storage_filesystem->write("index.html", "");
+		}
+
+		if (!$this->tmp_filesystem->has("index.html")) {
+			$this->tmp_filesystem->write("index.html", "");
+		}
+
+		if ($this->tmp_filesystem->has($this->get_included_files_handler())) {
+			$this->tmp_filesystem->delete($this->get_included_files_handler());
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
+	}
+
+	public function get_scanned_files_num()
+	{
+		return $this->files_counter;
+	}
+
+	public function get_scanned_files_total_size()
+	{
+		return $this->files_size;
+	}
+
+	public function last_logged_file()
+	{
+		return $this->last_logged_file;
+	}
+
+	public static function is_regex($regex)
+	{
+		return preg_match("/^\^(.*)\$$/i", $regex);
+	}
 
-    public function set_excluded_files($excluded_files = array())
-    {
-        if (!is_array($excluded_files)) {
-            $excluded_files = array();
-        }
+	public function set_excluded_files($excluded_files = array())
+	{
+		if (!is_array($excluded_files)) {
+			$excluded_files = array();
+		}
 
-        foreach ($excluded_files as $excl) {
+		foreach ($excluded_files as $excl) {
 
-            if ($this->is_regex($excl)) {
-                $this->additional_regex_patterns[] = $excl;
-            }
-        }
+			if ($this->is_regex($excl)) {
+				$this->additional_regex_patterns[] = $excl;
+			}
+		}
 
-        $this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
+		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
 
-        return $this->excluded_files;
-    }
+		return $this->excluded_files;
+	}
 
-    public function get_excluded_files()
-    {
-        return $this->excluded_files_by_default;
-    }
+	public function get_excluded_files()
+	{
+		return $this->excluded_files_by_default;
+	}
 
-    public function list_directory($path)
-    {
-        return $this->start_filesystem->listContents($path);
-    }
+	public function list_directory($path)
+	{
+		return $this->start_filesystem->listContents($path);
+	}
 
-    public function build_files_list($folder = "")
-    {
-        $this->logger->debug(sprintf(("Building the files system list")));
+	public function build_files_list($folder = "")
+	{
+		$this->logger->debug(sprintf(("Building the files system list")));
 
-        //if we start with the root folder(empty value), we initializa the file system
-        if (!$folder) {
+		//if we start with the root folder(empty value), we initializa the file system
+		if (!$folder) {
 
-        }
+		}
 
-        try {
+		try {
 
-            $files = $this->start_filesystem->listContents($folder);
-            foreach ($files as $file) {
-                if (!is_readable($this->xcloner_settings->get_xcloner_start_path() . DS . $file['path'])) {
-                    $this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"),
-                        $file['path']), array(
-                        "FILESYSTEM SCAN",
-                        "NOT READABLE"
-                    ));
-                } elseif (!$matching_pattern = $this->is_excluded($file)) {
-                    $this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array(
-                        "FILESYSTEM SCAN",
-                        "INCLUDE"
-                    ));
-                    $file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
-                    if ($this->store_file($file)) {
-                        $this->files_counter++;
-                    }
-                    if (isset($file['size'])) {
-                        $this->files_size += $file['size'];
-                    }
-
-                } else {
-                    $this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"),
-                        $file['path'], $matching_pattern), array(
-                        "FILESYSTEM SCAN",
-                        "EXCLUDE"
-                    ));
-                }
-            }
+			$files = $this->start_filesystem->listContents($folder);
+			foreach ($files as $file) {
+				if (!is_readable($this->xcloner_settings->get_xcloner_start_path() . DS . $file['path'])) {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"),
+						$file['path']), array(
+						"FILESYSTEM SCAN",
+						"NOT READABLE"
+					));
+				} elseif (!$matching_pattern = $this->is_excluded($file)) {
+					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array(
+						"FILESYSTEM SCAN",
+						"INCLUDE"
+					));
+					$file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
+					if ($this->store_file($file)) {
+						$this->files_counter++;
+					}
+					if (isset($file['size'])) {
+						$this->files_size += $file['size'];
+					}
+
+				} else {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"),
+						$file['path'], $matching_pattern), array(
+						"FILESYSTEM SCAN",
+						"EXCLUDE"
+					));
+				}
+			}
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $this->logger->error($e->getMessage());
+			$this->logger->error($e->getMessage());
 
-        }
+		}
 
-    }
+	}
 
-    public function estimate_read_write_time()
-    {
-        $tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
+	public function estimate_read_write_time()
+	{
+		$tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
 
-        $start_time = microtime(true);
+		$start_time = microtime(true);
 
-        $data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
+		$data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
 
-        try {
-            $this->tmp_filesystem->write($tmp_file, $data);
+		try {
+			$this->tmp_filesystem->write($tmp_file, $data);
 
-            $end_time = microtime(true) - $start_time;
+			$end_time = microtime(true) - $start_time;
 
-            $return['writing_time'] = $end_time;
+			$return['writing_time'] = $end_time;
 
-            $return['reading_time'] = $this->estimate_reading_time($tmp_file);
+			$return['reading_time'] = $this->estimate_reading_time($tmp_file);
 
-            $this->tmp_filesystem->delete($tmp_file);
+			$this->tmp_filesystem->delete($tmp_file);
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $this->logger->error($e->getMessage());
+			$this->logger->error($e->getMessage());
 
-        }
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    public function backup_storage_cleanup()
-    {
-        $this->logger->info(sprintf(("Cleaning the backup storage on matching rules")));
+	public function backup_storage_cleanup()
+	{
+		$this->logger->info(sprintf(("Cleaning the backup storage on matching rules")));
 
-        $_storage_size = 0;
-        $_backup_files_list = array();
+		$_storage_size = 0;
+		$_backup_files_list = array();
 
-        //rule date limit
-        $current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
+		//rule date limit
+		$current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
 
-        $files = $this->storage_filesystem->listContents();
+		$files = $this->storage_filesystem->listContents();
 
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions)) {
-                    $_storage_size += $file['size']; //bytes
-                    $_backup_files_list[] = $file;
-                }
-            }
-        }
+		if (is_array($files)) {
+			foreach ($files as $file) {
+				if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions)) {
+					$_storage_size += $file['size']; //bytes
+					$_backup_files_list[] = $file;
+				}
+			}
+		}
 
 
-        $this->sort_by($_backup_files_list, "timestamp", "asc");
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
 
-        $_backups_counter = sizeof($_backup_files_list);
+		$_backups_counter = sizeof($_backup_files_list);
 
-        foreach ($_backup_files_list as $file) {
-            //processing rule folder capacity
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
-            {
-                $this->storage_filesystem->delete($file['path']);
-                $_storage_size -= $file['size'];
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "STORAGE SIZE LIMIT",
-                    $_storage_size . " >= " . $set_storage_limit
-                ));
-            }
-
-            //processing rule days limit
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp']) {
-                $this->storage_filesystem->delete($file['path']);
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "RETENTION LIMIT TIMESTAMP",
-                    $file['timestamp'] . " =< " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
-                ));
-            }
-
-            //processing backup countert limit
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')) {
-                $this->storage_filesystem->delete($file['path']);
-                $_backups_counter--;
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "BACKUP QUANTITY LIMIT",
-                    $_backups_counter . " >= " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
-                ));
-            }
+		foreach ($_backup_files_list as $file) {
+			//processing rule folder capacity
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
+				$_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
+			{
+				$this->storage_filesystem->delete($file['path']);
+				$_storage_size -= $file['size'];
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"STORAGE SIZE LIMIT",
+					$_storage_size . " >= " . $set_storage_limit
+				));
+			}
+
+			//processing rule days limit
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp']) {
+				$this->storage_filesystem->delete($file['path']);
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"RETENTION LIMIT TIMESTAMP",
+					$file['timestamp'] . " =< " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
+				));
+			}
+
+			//processing backup countert limit
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')) {
+				$this->storage_filesystem->delete($file['path']);
+				$_backups_counter--;
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"BACKUP QUANTITY LIMIT",
+					$_backups_counter . " >= " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
+				));
+			}
 
 
-        }
+		}
 
-    }
+	}
 
-    public function estimate_reading_time($tmp_file)
-    {
-        $this->logger->debug(sprintf(("Estimating file system reading time")));
+	public function estimate_reading_time($tmp_file)
+	{
+		$this->logger->debug(sprintf(("Estimating file system reading time")));
 
-        $start_time = microtime(true);
+		$start_time = microtime(true);
 
-        if ($this->tmp_filesystem->has($tmp_file)) {
-            $this->tmp_filesystem->read($tmp_file);
-        }
-
-        $end_time = microtime(true) - $start_time;
-
-        return $end_time;
-
-    }
-
-    public function process_backup_name($name = "", $max_length = 100)
-    {
-        if (!$name) {
-            $name = $this->xcloner_settings->get_default_backup_name();
-        }
-
-        foreach ($this->backup_name_tags as $tag) {
-            if ($tag == '[time]') {
-                $name = str_replace($tag, date("Y-m-d_H-i"), $name);
-            } elseif ($tag == '[hostname]') {
-                $name = str_replace($tag, gethostname(), $name);
-            } elseif ($tag == '[domain]') {
-                $domain = parse_url(admin_url(), PHP_URL_HOST);
-                $name = str_replace($tag, $domain, $name);
-            }
-        }
-
-        if ($max_length) {
-            $name = substr($name, 0, $max_length);
-        }
-
-        return $name;
-    }
-
-    public function sort_by(&$array, $field, $direction = 'asc')
-    {
-        if (strtolower($direction) == "desc" || $direction == SORT_DESC) {
-            $direction = SORT_DESC;
-        } else {
-            $direction = SORT_ASC;
-        }
-
-        $array = $this->array_orderby($array, $field, $direction);
-
-        return true;
-    }
-
-    private function array_orderby()
-    {
-        $args = func_get_args();
-        $data = array_shift($args);
-
-        foreach ($args as $n => $field) {
-            if (is_string($field)) {
-                $tmp = array();
-                foreach ($data as $key => $row) {
-                    if (is_array($row)) {
-                        $tmp[$key] = $row[$field];
-                    } else {
-                        $tmp[$key] = $row->$field;
-                    }
-                }
-                $args[$n] = $tmp;
-            }
-        }
-        $args[] = &$data;
-
-        call_user_func_array('array_multisort', $args);
-
-        return array_pop($args);
-    }
-
-    private function check_file_diff_time($file)
-    {
-        if ($this->get_diff_timestamp_start() != "") {
-            $fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
-            $timestamp = $fileMeta->getMTime();
-            if ($timestamp < $fileMeta->getCTime()) {
-                $timestamp = $fileMeta->getCTime();
-            }
-
-            if ($timestamp <= $this->get_diff_timestamp_start()) {
-                return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
-            }
-        }
-
-        return false;
-    }
-
-    public function is_excluded($file)
-    {
-        $this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
-
-        if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb')) {
-            if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
-                return "> " . $xcloner_exclude_files_larger_than_mb . "MB";
-            }
-        }
-
-        if (!is_array($this->excluded_files) || !sizeof($this->excluded_files)) {
-            $this->set_excluded_files();
-        }
-
-        if (is_array($this->excluded_files)) {
-            foreach ($this->excluded_files as $excluded_file_pattern) {
-                if ($excluded_file_pattern == "/") {
-                    $needle = "$";
-                } else {
-                    $needle = "$" . $excluded_file_pattern;
-                }
-
-                if (strstr("$" . $file['path'], $needle)) {
-                    return $excluded_file_pattern;
-                }
-            }
-        }
-
-        if ($regex = $this->is_excluded_regex($file)) {
-            return $regex;
-        }
-
-        if ($file['type'] == "file") {
-            $check_file_diff_timestamp = $this->check_file_diff_time($file);
-            if ($check_file_diff_timestamp) {
-                return $check_file_diff_timestamp;
-            }
-        }
-
-        return false;
-    }
-
-    /*REGEX examples
+		if ($this->tmp_filesystem->has($tmp_file)) {
+			$this->tmp_filesystem->read($tmp_file);
+		}
+
+		$end_time = microtime(true) - $start_time;
+
+		return $end_time;
+
+	}
+
+	public function process_backup_name($name = "", $max_length = 100)
+	{
+		if (!$name) {
+			$name = $this->xcloner_settings->get_default_backup_name();
+		}
+
+		foreach ($this->backup_name_tags as $tag) {
+			if ($tag == '[time]') {
+				$name = str_replace($tag, date("Y-m-d_H-i"), $name);
+			} elseif ($tag == '[hostname]') {
+				$name = str_replace($tag, gethostname(), $name);
+			} elseif ($tag == '[domain]') {
+				$domain = parse_url(admin_url(), PHP_URL_HOST);
+				$name = str_replace($tag, $domain, $name);
+			}
+		}
+
+		if ($max_length) {
+			$name = substr($name, 0, $max_length);
+		}
+
+		return $name;
+	}
+
+	public function sort_by(&$array, $field, $direction = 'asc')
+	{
+		if (strtolower($direction) == "desc" || $direction == SORT_DESC) {
+			$direction = SORT_DESC;
+		} else {
+			$direction = SORT_ASC;
+		}
+
+		$array = $this->array_orderby($array, $field, $direction);
+
+		return true;
+	}
+
+	private function array_orderby()
+	{
+		$args = func_get_args();
+		$data = array_shift($args);
+
+		foreach ($args as $n => $field) {
+			if (is_string($field)) {
+				$tmp = array();
+				foreach ($data as $key => $row) {
+					if (is_array($row)) {
+						$tmp[$key] = $row[$field];
+					} else {
+						$tmp[$key] = $row->$field;
+					}
+				}
+				$args[$n] = $tmp;
+			}
+		}
+		$args[] = &$data;
+
+		call_user_func_array('array_multisort', $args);
+
+		return array_pop($args);
+	}
+
+	private function check_file_diff_time($file)
+	{
+		if ($this->get_diff_timestamp_start() != "") {
+			$fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
+			$timestamp = $fileMeta->getMTime();
+			if ($timestamp < $fileMeta->getCTime()) {
+				$timestamp = $fileMeta->getCTime();
+			}
+
+			if ($timestamp <= $this->get_diff_timestamp_start()) {
+				return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
+			}
+		}
+
+		return false;
+	}
+
+	public function is_excluded($file)
+	{
+		$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
+
+		if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb')) {
+			if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
+				return "> " . $xcloner_exclude_files_larger_than_mb . "MB";
+			}
+		}
+
+		if (!is_array($this->excluded_files) || !sizeof($this->excluded_files)) {
+			$this->set_excluded_files();
+		}
+
+		if (is_array($this->excluded_files)) {
+			foreach ($this->excluded_files as $excluded_file_pattern) {
+				if ($excluded_file_pattern == "/") {
+					$needle = "$";
+				} else {
+					$needle = "$" . $excluded_file_pattern;
+				}
+
+				if (strstr("$" . $file['path'], $needle)) {
+					return $excluded_file_pattern;
+				}
+			}
+		}
+
+		if ($regex = $this->is_excluded_regex($file)) {
+			return $regex;
+		}
+
+		if ($file['type'] == "file") {
+			$check_file_diff_timestamp = $this->check_file_diff_time($file);
+			if ($check_file_diff_timestamp) {
+				return $check_file_diff_timestamp;
+			}
+		}
+
+		return false;
+	}
+
+	/*REGEX examples
      *
     * exclude all except .php file
     * PATTERN: ^(.*)\.(.+)$(?<!(php))
@@ -910,163 +910,163 @@ 
     * exclude the backup folders
     * PATTERN: (^|^\/)(wp-content\/backups|administrator\/backups)(.*)$";
     */
-    private function is_excluded_regex($file)
-    {
-        //$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
-
-        $regex_patterns = explode(PHP_EOL, $this->xcloner_settings->get_xcloner_option('xcloner_regex_exclude'));
-
-        if (is_array($this->additional_regex_patterns)) {
-            $regex_patterns = array_merge($regex_patterns, $this->additional_regex_patterns);
-        }
-
-        //print_r($regex_patterns);exit;
-
-        if (is_array($regex_patterns)) {
-            //$this->excluded_files = array();
-            //$this->excluded_files[] ="(.*)\.(git)(.*)$";
-            //$this->excluded_files[] ="wp-content\/backups(.*)$";
-
-            foreach ($regex_patterns as $excluded_file_pattern) {
-
-                if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1,
-                        strlen($excluded_file_pattern)) == "\r") {
-                    $excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
-                }
-
-                if ($file['path'] == "/") {
-                    $needle = "/";
-                } else {
-                    $needle = "/" . $file['path'];
-                }
-                //echo $needle."---".$excluded_file_pattern."---\n";
-
-                if (@preg_match("/(^|^\/)" . $excluded_file_pattern . "/i", $needle)) {
-                    return $excluded_file_pattern;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public function store_file($file, $storage = 'start_filesystem')
-    {
-        $this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
-
-        if (!isset($file['size'])) {
-            $file['size'] = 0;
-        }
-        if (!isset($file['visibility'])) {
-            $file['visibility'] = "private";
-        }
-
-        $csv_filename = str_replace('"', '""', $file['path']);
-
-        $line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
-
-        $this->last_logged_file = $file['path'];
-
-        if ($file['type'] == "dir") {
-            try {
-                $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path'] . "\n");
-            } catch (Exception $e) {
-                $this->logger->error($e->getMessage());
-            }
-        }
-
-        if ($this->get_diff_timestamp_start()) {
-            if ($file['type'] != "file" && $response = $this->check_file_diff_time($file)) {
-                $this->logger->info(sprintf("Directory %s archiving skipped on differential backup %s", $file['path'],
-                    $response), array(
-                    "FILESYSTEM SCAN",
-                    "DIR DIFF"
-                ));
-
-                return false;
-            }
-        }
-
-        try {
-            if (!$this->tmp_filesystem_append->has($this->get_included_files_handler())) {
-                //adding fix for UTF-8 CSV preview
-                $start_line = "\xEF\xBB\xBF" . '"Filename","Timestamp","Size","Visibility","Storage"' . PHP_EOL;
-                $this->tmp_filesystem_append->write($this->get_included_files_handler(), $start_line);
-            }
-
-            $this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
-
-        } catch (Exception $e) {
-
-            $this->logger->error($e->getMessage());
-        }
-
-        return true;
-    }
-
-    public function get_fileystem_handler()
-    {
-        return $this;
-    }
-
-    public function get_filesystem($system = "")
-    {
-        if ($system == "storage_filesystem_append") {
-            return $this->storage_filesystem_append;
-        } elseif ($system == "tmp_filesystem_append") {
-            return $this->tmp_filesystem_append;
-        } elseif ($system == "tmp_filesystem") {
-            return $this->tmp_filesystem;
-        } elseif ($system == "storage_filesystem") {
-            return $this->storage_filesystem;
-        } else {
-            return $this->start_filesystem;
-        }
-    }
-
-    public function get_adapter($system)
-    {
-        if ($system == "tmp_filesystem") {
-            return $this->tmp_adapter;
-        } elseif ($system == "storage_filesystem") {
-            return $this->storage_adapter;
-        } else {
-            return $this->start_adapter;
-        }
-    }
-
-    /**
-     * File scan finished
-     * Method called when file scan is finished
-     *
-     * @return bool
-     */
-    private function scan_finished()
-    {
-        if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) &&
-            $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
-            return false;
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-        }
-
-        $this->logger->debug(sprintf(("File scan finished")));
-
-        return true;
-    }
-
-    /**
-     * Calculate bytes from MB value
-     *
-     * @param int $mb_size
-     *
-     * @return float|int
-     */
-    private function calc_to_bytes($mb_size)
-    {
-        return $mb_size * (1024 * 1024);
-    }
+	private function is_excluded_regex($file)
+	{
+		//$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
+
+		$regex_patterns = explode(PHP_EOL, $this->xcloner_settings->get_xcloner_option('xcloner_regex_exclude'));
+
+		if (is_array($this->additional_regex_patterns)) {
+			$regex_patterns = array_merge($regex_patterns, $this->additional_regex_patterns);
+		}
+
+		//print_r($regex_patterns);exit;
+
+		if (is_array($regex_patterns)) {
+			//$this->excluded_files = array();
+			//$this->excluded_files[] ="(.*)\.(git)(.*)$";
+			//$this->excluded_files[] ="wp-content\/backups(.*)$";
+
+			foreach ($regex_patterns as $excluded_file_pattern) {
+
+				if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1,
+						strlen($excluded_file_pattern)) == "\r") {
+					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
+				}
+
+				if ($file['path'] == "/") {
+					$needle = "/";
+				} else {
+					$needle = "/" . $file['path'];
+				}
+				//echo $needle."---".$excluded_file_pattern."---\n";
+
+				if (@preg_match("/(^|^\/)" . $excluded_file_pattern . "/i", $needle)) {
+					return $excluded_file_pattern;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	public function store_file($file, $storage = 'start_filesystem')
+	{
+		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
+
+		if (!isset($file['size'])) {
+			$file['size'] = 0;
+		}
+		if (!isset($file['visibility'])) {
+			$file['visibility'] = "private";
+		}
+
+		$csv_filename = str_replace('"', '""', $file['path']);
+
+		$line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
+
+		$this->last_logged_file = $file['path'];
+
+		if ($file['type'] == "dir") {
+			try {
+				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path'] . "\n");
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage());
+			}
+		}
+
+		if ($this->get_diff_timestamp_start()) {
+			if ($file['type'] != "file" && $response = $this->check_file_diff_time($file)) {
+				$this->logger->info(sprintf("Directory %s archiving skipped on differential backup %s", $file['path'],
+					$response), array(
+					"FILESYSTEM SCAN",
+					"DIR DIFF"
+				));
+
+				return false;
+			}
+		}
+
+		try {
+			if (!$this->tmp_filesystem_append->has($this->get_included_files_handler())) {
+				//adding fix for UTF-8 CSV preview
+				$start_line = "\xEF\xBB\xBF" . '"Filename","Timestamp","Size","Visibility","Storage"' . PHP_EOL;
+				$this->tmp_filesystem_append->write($this->get_included_files_handler(), $start_line);
+			}
+
+			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
+
+		} catch (Exception $e) {
+
+			$this->logger->error($e->getMessage());
+		}
+
+		return true;
+	}
+
+	public function get_fileystem_handler()
+	{
+		return $this;
+	}
+
+	public function get_filesystem($system = "")
+	{
+		if ($system == "storage_filesystem_append") {
+			return $this->storage_filesystem_append;
+		} elseif ($system == "tmp_filesystem_append") {
+			return $this->tmp_filesystem_append;
+		} elseif ($system == "tmp_filesystem") {
+			return $this->tmp_filesystem;
+		} elseif ($system == "storage_filesystem") {
+			return $this->storage_filesystem;
+		} else {
+			return $this->start_filesystem;
+		}
+	}
+
+	public function get_adapter($system)
+	{
+		if ($system == "tmp_filesystem") {
+			return $this->tmp_adapter;
+		} elseif ($system == "storage_filesystem") {
+			return $this->storage_adapter;
+		} else {
+			return $this->start_adapter;
+		}
+	}
+
+	/**
+	 * File scan finished
+	 * Method called when file scan is finished
+	 *
+	 * @return bool
+	 */
+	private function scan_finished()
+	{
+		if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) &&
+			$this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
+			return false;
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
+
+		$this->logger->debug(sprintf(("File scan finished")));
+
+		return true;
+	}
+
+	/**
+	 * Calculate bytes from MB value
+	 *
+	 * @param int $mb_size
+	 *
+	 * @return float|int
+	 */
+	private function calc_to_bytes($mb_size)
+	{
+		return $mb_size * (1024 * 1024);
+	}
 
 }

includes/class-xcloner-file-transfer.php

Indentation +99 added lines, -99 removed lines

@@ -29,137 +29,137 @@
 class Xcloner_File_Transfer extends Xcloner_File_System
 {
 
-    /**
-     * Target url web address of the restore script
-     * @var string
-     */
-    private $target_url;
-    /**
-     * Transfer data limit in bytes
-     * @var int
-     */
-    private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
+	/**
+	 * Target url web address of the restore script
+	 * @var string
+	 */
+	private $target_url;
+	/**
+	 * Transfer data limit in bytes
+	 * @var int
+	 */
+	private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
 
 
-    /**
-     * @param $target_url
-     *
-     * @return mixed
-     */
-    public function set_target($target_url)
-    {
-        return $this->target_url = $target_url;
-    }
+	/**
+	 * @param $target_url
+	 *
+	 * @return mixed
+	 */
+	public function set_target($target_url)
+	{
+		return $this->target_url = $target_url;
+	}
 
-    /**
-     * @return mixed
-     */
-    public function get_target()
-    {
-        return $this->target_url;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function get_target()
+	{
+		return $this->target_url;
+	}
 
 
-    /**
-     * @param $file
-     * @param int $start
-     * @param string $hash
-     *
-     * @return bool|int
-     * @throws Exception
-     */
-    public function transfer_file($file, $start = 0, $hash = "")
-    {
-        if (!$this->target_url) {
-            throw new Exception("Please setup a target url for upload");
-        }
+	/**
+	 * @param $file
+	 * @param int $start
+	 * @param string $hash
+	 *
+	 * @return bool|int
+	 * @throws Exception
+	 */
+	public function transfer_file($file, $start = 0, $hash = "")
+	{
+		if (!$this->target_url) {
+			throw new Exception("Please setup a target url for upload");
+		}
 
 
-        $fp = $this->get_storage_filesystem()->readStream($file);
+		$fp = $this->get_storage_filesystem()->readStream($file);
 
-        fseek($fp, $start, SEEK_SET);
+		fseek($fp, $start, SEEK_SET);
 
-        $binary_data = fread($fp, $this->transfer_limit);
+		$binary_data = fread($fp, $this->transfer_limit);
 
-        $tmp_filename = "xcloner_upload_" . substr(md5(time()), 0, 5);
+		$tmp_filename = "xcloner_upload_" . substr(md5(time()), 0, 5);
 
-        $this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
+		$this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
 
-        $tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
+		$tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
 
-        $send_array = array();
+		$send_array = array();
 
-        $send_array['file'] = $file;
-        $send_array['start'] = $start;
-        $send_array['xcloner_action'] = "write_file";
-        $send_array['hash'] = $hash;
-        #$send_array['blob'] 	= $binary_data;
-        $send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
+		$send_array['file'] = $file;
+		$send_array['start'] = $start;
+		$send_array['xcloner_action'] = "write_file";
+		$send_array['hash'] = $hash;
+		#$send_array['blob'] 	= $binary_data;
+		$send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
 
-        //$data = http_build_query($send_array);
+		//$data = http_build_query($send_array);
 
-        $this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
-            $this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
+		$this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
+			$this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
 
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->target_url);
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $this->target_url);
 
-        curl_setopt($ch, CURLOPT_POST, 1);
-        //curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
-        //curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
-        curl_setopt($ch, CURLOPT_VERBOSE, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
+		curl_setopt($ch, CURLOPT_VERBOSE, true);
 
-        $original_result = curl_exec($ch);
+		$original_result = curl_exec($ch);
 
 
-        $this->get_tmp_filesystem()->delete($tmp_filename);
+		$this->get_tmp_filesystem()->delete($tmp_filename);
 
-        $result = json_decode($original_result);
+		$result = json_decode($original_result);
 
-        if (!$result) {
-            throw new Exception("We have received no valid response from the remote host, original message: " . $original_result);
-        }
+		if (!$result) {
+			throw new Exception("We have received no valid response from the remote host, original message: " . $original_result);
+		}
 
-        if ($result->status != 200) {
-            throw new Exception($result->response);
-        }
+		if ($result->status != 200) {
+			throw new Exception($result->response);
+		}
 
-        if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
-            $this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
-                $file, $this->target_url, ftell($fp)));
-            $this->remove_tmp_filesystem();
+		if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
+			$this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
+				$file, $this->target_url, ftell($fp)));
+			$this->remove_tmp_filesystem();
 
-            return false;
-        }
+			return false;
+		}
 
-        return ftell($fp);
-    }
+		return ftell($fp);
+	}
 
-    /**
-     * @param $filename
-     * @param string $mimetype
-     * @param string $postname
-     *
-     * @return CURLFile|string
-     */
-    private function curl_file_create($filename, $mimetype = '', $postname = '')
-    {
-        if (!function_exists('curl_file_create')) {
+	/**
+	 * @param $filename
+	 * @param string $mimetype
+	 * @param string $postname
+	 *
+	 * @return CURLFile|string
+	 */
+	private function curl_file_create($filename, $mimetype = '', $postname = '')
+	{
+		if (!function_exists('curl_file_create')) {
 
-            return "@$filename;filename="
-                . ($postname ?: basename($filename))
-                . ($mimetype ? ";type=$mimetype" : '');
+			return "@$filename;filename="
+				. ($postname ?: basename($filename))
+				. ($mimetype ? ";type=$mimetype" : '');
 
-        } else {
+		} else {
 
-            return curl_file_create($filename, $mimetype, $postname);
+			return curl_file_create($filename, $mimetype, $postname);
 
-        }
-    }
+		}
+	}
 }

includes/class-xcloner-encryption.php

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 false;
-
-    }
-
-    /**
-     * 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 $verfication   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 false;
+
+	}
+
+	/**
+	 * 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 $verfication   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();
 }