ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

Unused Use Statements -5 removed lines

@@ -65,13 +65,8 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
-
 use splitbrain\PHPArchive\Tar;
-use splitbrain\PHPArchive\Archive;
-use splitbrain\PHPArchive\FileInfo;
-
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
 

Braces +109 added lines, -85 removed lines

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

includes/class-xcloner-api.php

Unused Use Statements -5 removed lines

@@ -28,13 +28,8 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
-
 use splitbrain\PHPArchive\Tar;
-use splitbrain\PHPArchive\Zip;
-use splitbrain\PHPArchive\Archive;
-use splitbrain\PHPArchive\FileInfo;
 
 
 /**

Spacing +72 added lines, -72 removed lines

@@ -89,7 +89,7 @@ 
 		$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']),
+			$this->logger->info("Processing ajax request ID ".substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
 					0, 15));
 		}
 
@@ -131,13 +131,13 @@ 
 
 
 		$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";
+		$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) {
+		}catch (Exception $e) {
 
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -223,8 +223,8 @@ 
 		} else {
 
 			$schedule['status'] = 1;
-			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
-				" " . $this->form_params['backup_params']['schedule_start_time']);
+			$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'] = "";
@@ -249,7 +249,7 @@ 
 
 		if (!isset($_POST['id'])) {
 			$wpdb->insert(
-				$wpdb->prefix . 'xcloner_scheduler',
+				$wpdb->prefix.'xcloner_scheduler',
 				$schedule,
 				array(
 					'%s',
@@ -258,7 +258,7 @@ 
 			);
 		} else {
 			$wpdb->update(
-				$wpdb->prefix . 'xcloner_scheduler',
+				$wpdb->prefix.'xcloner_scheduler',
 				$schedule,
 				array('id' => $_POST['id']),
 				array(
@@ -309,7 +309,7 @@ 
 		try {
 			$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
 				$this->form_params['extra'], $init);
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 			$return = array();
 			$return['error'] = true;
 			$return['status'] = 500;
@@ -336,7 +336,7 @@ 
 					$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) {
+				}catch (Exception $e) {
 					$this->logger->error($e->getMessage());
 				}
 			}
@@ -430,7 +430,7 @@ 
 		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(
+				$this->logger->debug("Adding form parameter ".$param->name.".".$param->value."\n", array(
 					'POST',
 					'fields filter'
 				));
@@ -442,7 +442,7 @@ 
 		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(
+				$this->logger->debug("Adding database filter ".$param->parent.".".$param->id."\n", array(
 					'POST',
 					'database filter'
 				));
@@ -461,7 +461,7 @@ 
 				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(
+					$this->logger->debug("Adding file filter ".$param->id."\n", array(
 						'POST',
 						'exclude files filter'
 					));
@@ -509,13 +509,13 @@ 
 				'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"
+				'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-root.png"
 			);
 		}
 
 		try {
 			$files = $this->xcloner_file_system->list_directory($folder);
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			print $e->getMessage();
 			$this->logger->error($e->getMessage());
@@ -536,7 +536,7 @@ 
 			if ($file['type'] == "dir") {
 				$children = true;
 			} else {
-				$text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
+				$text .= " (".$this->xcloner_requirements->file_format_size($file['size']).")";
 			}
 
 			if ($this->xcloner_file_system->is_excluded($file)) {
@@ -552,8 +552,8 @@ 
 				//'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"
+				'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-".strtolower(substr($file['type'],
+						0, 1)).".png"
 			);
 		}
 
@@ -579,7 +579,7 @@ 
 		if ($database == "#") {
 			try {
 				$return = $this->xcloner_database->get_all_databases();
-			} catch (Exception $e) {
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -600,10 +600,10 @@ 
 				$data[] = array(
 					'id' => $database['name'],
 					'parent' => '#',
-					'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
+					'text' => $database['name']." (".(int)$database['num_tables'].")",
 					'children' => true,
 					'state' => $state,
-					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
+					'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/database-icon.png"
 				);
 			}
 
@@ -611,7 +611,7 @@ 
 
 			try {
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			} catch (Exception $e) {
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -628,12 +628,12 @@ 
 				}
 
 				$data[] = array(
-					'id' => $database . "." . $table['name'],
+					'id' => $database.".".$table['name'],
 					'parent' => $database,
-					'text' => $table['name'] . " (" . (int)$table['records'] . ")",
+					'text' => $table['name']." (".(int)$table['records'].")",
 					'children' => false,
 					'state' => $state,
-					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
+					'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/table-icon.png"
 				);
 			}
 		}
@@ -677,17 +677,17 @@ 
 		$return['data'] = array();
 
 		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>";
+			$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_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);
+			$next_run = date(get_option('date_format')." ".get_option('time_format'), $next_run_time);
 
 			$remote_storage = $res->remote_storage;
 
@@ -696,16 +696,16 @@ 
 			}
 
 			if (trim($next_run)) {
-				$date_text = date(get_option('date_format') . " " . get_option('time_format'),
+				$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());
+					$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 = "<a href='#' title='".$date_text."'>".$next_run."</a>";
 				//$next_run .=" ($date_text)";
 			}
 
@@ -717,11 +717,11 @@ 
 				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'),
+					$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>";
+				$backup_text = "<span title='".$backup_time."' class='shorten_string'>".$res->last_backup." (".$backup_size.")</span>";
 			}
 
 			$schedules = wp_get_schedules();
@@ -733,7 +733,7 @@ 
 			$return['data'][] = array(
 				$res->id,
 				$res->name,
-				$res->recurrence,/*$res->start_at,*/
+				$res->recurrence, /*$res->start_at,*/
 				$next_run,
 				$remote_storage,
 				$backup_text,
@@ -795,25 +795,25 @@ 
 			$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'])) {
+			if (isset($this->form_params['extra']['start'])) {
 				$start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
-			}else{
+			} else {
 				$start = 0;
 			}
 
-			if(isset($this->form_params['extra']['iv'])) {
+			if (isset($this->form_params['extra']['iv'])) {
 				$iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
-			}else{
+			} else {
 				$iv = "";
 			}
 
-			if(isset($this->form_params['extra']['part'])) {
+			if (isset($this->form_params['extra']['part'])) {
 				$return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['part']);
-			}else{
+			} else {
 				$return['part'] = 0;
 			}
 
-		}else{
+		} 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']);
@@ -828,14 +828,14 @@ 
 		}
 
 		$return['processing_file'] = $backup_file;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $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){
+		}catch (\Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$return['error_message'] = $e->getMessage();
@@ -843,7 +843,7 @@ 
 
 		//echo strlen($return['iv']);exit;
 
-		if($return['finished']) {
+		if ($return['finished']) {
 			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
 				$return['start'] = 0;
 
@@ -857,7 +857,7 @@ 
 		}
 
 		if (isset($_POST['data'])) {
-			$return['extra'] = array_merge($this->form_params['extra'],  $return);
+			$return['extra'] = array_merge($this->form_params['extra'], $return);
 		}
 
 		$this->send_response($return, 0);
@@ -876,7 +876,7 @@ 
 		$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']);;
+		$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;
@@ -887,17 +887,17 @@ 
 		}
 
 		$return['processing_file'] = $backup_file;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $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){
+		}catch (\Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 		}
 
-		if($return['finished']) {
+		if ($return['finished']) {
 			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
 				$return['start'] = 0;
 
@@ -929,7 +929,7 @@ 
 		foreach ($backup_list as $file_info):?>
             <?php
 			if ($storage_selection == "gdrive") {
-				$file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
+				$file_info['path'] = $file_info['filename'].".".$file_info['extension'];
 			}
 			$file_exists_on_local_storage = true;
 
@@ -1050,10 +1050,10 @@ 
                             <?php endif ?>
                             <?php
 							$basename = $file_info['basename'];
-							if(isset($file_info['childs']) and sizeof($file_info['childs']))
+							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)) :?>
+                            <?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') ?>">
                                     <i class="material-icons">enhanced_encryption</i>
@@ -1110,7 +1110,7 @@ 
 			$backup_file = $backup_parts[$return['part']];
 		}
 
-		if($this->xcloner_encryption->is_encrypted_file($backup_file)) {
+		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);
@@ -1118,10 +1118,10 @@ 
 
 		try {
 			$tar = new Tar();
-			$tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
+			$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) {
+		}catch (Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$this->send_response($return, 0);
@@ -1129,14 +1129,14 @@ 
 
 		$return['files'] = array();
 		$return['finished'] = 1;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$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'),
+				$return['files'][$i]['mtime'] = date(get_option('date_format')." ".get_option('time_format'),
 					$file->getMtime());
 
 				$i++;
@@ -1184,7 +1184,7 @@ 
 					"copy_backup_remote_to_local"
 				), array($backup_file, $storage_type));
 			}
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1223,7 +1223,7 @@ 
 					"upload_backup_to_storage"
 				), array($backup_file, $storage_type));
 			}
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1283,21 +1283,21 @@ 
         $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->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
+		$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']);
+			$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);
 
@@ -1306,11 +1306,11 @@ 
 		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('Content-Disposition: attachment; filename="'.basename($tmp_file).'"');
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate');
 			header('Pragma: public');
-			header('Content-Length: ' . filesize($tmp_file));
+			header('Content-Length: '.filesize($tmp_file));
 			readfile($tmp_file);
 
 		}
@@ -1342,9 +1342,9 @@ 
 		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-Disposition: attachment; filename="'.$metadata['path'].'";');
 		header('Content-Type: application/octet-stream');
-		header('Content-Length: ' . $metadata['size']);
+		header('Content-Length: '.$metadata['size']);
 
 		@ob_end_clean();
 
@@ -1404,12 +1404,12 @@ 
 			$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();
+			$return['message'] = "CURL communication error with the restore host. ".$e->getMessage();
 			$this->send_response($return, 0);
 
 		}
@@ -1433,7 +1433,7 @@ 
 		$this->check_access();
 
 		define("XCLONER_PLUGIN_ACCESS", 1);
-		include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
+		include_once(dirname(__DIR__).DS."restore".DS."xcloner_restore.php");
 
 		return;
 	}

Braces +21 added lines, -13 removed lines

@@ -797,23 +797,23 @@ 
 
 			if(isset($this->form_params['extra']['start'])) {
 				$start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
-			}else{
+			} else{
 				$start = 0;
 			}
 
 			if(isset($this->form_params['extra']['iv'])) {
 				$iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
-			}else{
+			} 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{
+			} else{
 				$return['part'] = 0;
 			}
 
-		}else{
+		} 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']);
@@ -835,7 +835,7 @@ 
 			$this->logger->info($iv);
 			$return = array_merge($return,
 				$this->xcloner_encryption->encrypt_file($backup_file, "", "", $start, base64_decode($iv)));
-		}catch(\Exception $e){
+		} catch(\Exception $e){
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$return['error_message'] = $e->getMessage();
@@ -892,7 +892,7 @@ 
 		try {
 			$return = array_merge($return,
 				$this->xcloner_encryption->decrypt_file($backup_file, "", $decryption_key, $start, base64_decode($iv)));
-		}catch(\Exception $e){
+		} catch(\Exception $e){
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 		}
@@ -994,7 +994,8 @@ 
                                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
                                                     <i class="material-icons">enhanced_encryption</i>
                                                 </a>
-                                            <?php else: ?>
+                                            <?php else {
+	: ?>
                                                 <a href="#<?php echo $child[0] ?>" class="list-backup-content"
                                                    title="<?php echo __('List Backup Content',
 													   'xcloner-backup-and-restore') ?>"><i
@@ -1013,7 +1014,9 @@ 
                                                         class="material-icons">file_upload</i></a>
                                         <?php endif ?>
                                     </li>
-                                <?php endforeach; ?>
+                                <?php endforeach;
+}
+?>
                             </ul>
                         <?php endif; ?>
                 <?php
@@ -1021,11 +1024,12 @@ 
 				ob_end_clean();
 				?>
                     <?php ob_start(); ?>
-                        <?php if (isset($file_info['timestamp']))
+                        <?php if (isset($file_info['timestamp'])) {
 							echo date("Y-m-d H:i", $file_info['timestamp'])
 						?>
                     <?php
 						$return['data'][$i][] = ob_get_contents();
+}
 						ob_end_clean();
 						?>
 
@@ -1050,15 +1054,17 @@ 
                             <?php endif ?>
                             <?php
 							$basename = $file_info['basename'];
-							if(isset($file_info['childs']) and sizeof($file_info['childs']))
-								$basename = $file_info['childs'][0][0];
+							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') ?>">
                                     <i class="material-icons">enhanced_encryption</i>
                                 </a>
-                            <?php else: ?>
+                            <?php else {
+	: ?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="list-backup-content"
                                     title="<?php echo __('List Backup Content', 'xcloner-backup-and-restore') ?>"><i
                                     class="material-icons">folder_open</i></a>
@@ -1068,7 +1074,9 @@ 
                                     <i class="material-icons">no_encryption</i>
                                 </a>
                             <?php endif?>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
 
                         <a href="#<?php echo $file_info['basename'] ?>" class="delete"
                            title="<?php echo __('Delete Backup', 'xcloner-backup-and-restore') ?>">

includes/class-xcloner-file-system.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
 
 /**

Indentation +975 added lines, -975 removed lines

@@ -37,857 +37,857 @@ 
 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);
-    }
-
-    /**
-     * @param string $file
-     */
-    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);
+	}
+
+	/**
+	 * @param string $file
+	 */
+	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");
-
-        $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;
-                }
-            }
-        }
+		//rule date limit
+		$current_timestamp = strtotime("-".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')." days");
+
+		$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;
+				}
+			}
+		}
 
 
-        $this->sort_by($_backup_files_list, "timestamp", "asc");
-
-        $_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')
-                ));
-            }
-
-
-        }
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
+
+		$_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')
+				));
+			}
+
+
+		}
 
-    }
+	}
 
-    /**
-     * @param string $tmp_file
-     */
-    public function estimate_reading_time($tmp_file)
-    {
-        $this->logger->debug(sprintf(("Estimating file system reading time")));
-
-        $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;
-    }
-
-    /**
-     * @param string $field
-     */
-    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
+	/**
+	 * @param string $tmp_file
+	 */
+	public function estimate_reading_time($tmp_file)
+	{
+		$this->logger->debug(sprintf(("Estimating file system reading time")));
+
+		$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;
+	}
+
+	/**
+	 * @param string $field
+	 */
+	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))
@@ -919,163 +919,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);
+	}
 
 }

Braces +8 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
             $this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
                 'disable_asserts' => true,
             ]));
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
         }
 
@@ -645,7 +645,7 @@ 
                 }
             }
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -672,7 +672,7 @@ 
 
             $this->tmp_filesystem->delete($tmp_file);
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -710,9 +710,11 @@ 
         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
+                $_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",
@@ -979,7 +981,7 @@ 
         if ($file['type'] == "dir") {
             try {
                 $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
-            }catch (Exception $e) {
+            } catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
         }
@@ -1005,7 +1007,7 @@ 
 
             $this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
         }

includes/class-xcloner-remote-storage.php

Unused Use Statements -7 removed lines

@@ -28,23 +28,16 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-
 use League\Flysystem\Adapter\Ftp as Adapter;
-
 use League\Flysystem\Sftp\SftpAdapter;
-
 use Srmklive\Dropbox\Client\DropboxClient;
 use Srmklive\Dropbox\Adapter\DropboxAdapter;
-
 use MicrosoftAzure\Storage\Common\ServicesBuilder;
 use League\Flysystem\Azure\AzureAdapter;
-
 use Aws\S3\S3Client;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
-
 use Mhetreramesh\Flysystem\BackblazeAdapter;
 use BackblazeB2\Client as B2Client;
-
 use Sabre\DAV\Client as SabreClient;
 use League\Flysystem\WebDAV\WebDAVAdapter;
 

Spacing +67 added lines, -67 removed lines

@@ -162,26 +162,26 @@ 
 	private $logger;
 	private $xcloner;
 
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 		$this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
 		$this->xcloner_file_system  = $xcloner_container->get_xcloner_filesystem();
-		$this->logger               = $xcloner_container->get_xcloner_logger()->withName( "xcloner_remote_storage" );
+		$this->logger               = $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
 		$this->xcloner              = $xcloner_container;
 
-		foreach($this->storage_fields as $main_key=>$array){
+		foreach ($this->storage_fields as $main_key=>$array) {
 
-			if(is_array($array)) {
+			if (is_array($array)) {
 				foreach ($array as $key => $type) {
 
-					if( $type == "raw") {
-						add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
-							function ($value) {
+					if ($type == "raw") {
+						add_filter("pre_update_option_".$this->storage_fields['option_prefix'].$key,
+							function($value) {
 
 								return $this->simple_crypt($value, 'e');
 
 							}, 10, 1);
 
-						add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
+						add_filter("option_".$this->storage_fields['option_prefix'].$key, function($value) {
 
 							return $this->simple_crypt($value, 'd');
 
@@ -201,22 +201,22 @@ 
 	 * @param string $action
 	 * @return string
 	 */
-	private function simple_crypt( $string, $action = 'e' ) {
+	private function simple_crypt($string, $action = 'e') {
 		// you may change these values to your own
 		$secret_key = NONCE_KEY;
 		$secret_iv = NONCE_SALT;
 
 		$output = $string;
 		$encrypt_method = "AES-256-CBC";
-		$key = hash( 'sha256', $secret_key );
-		$iv = substr( hash( 'sha256', $secret_iv ), 0, 16 );
+		$key = hash('sha256', $secret_key);
+		$iv = substr(hash('sha256', $secret_iv), 0, 16);
 
-		if( $action == 'e' && function_exists('openssl_encrypt')) {
-			$output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) );
+		if ($action == 'e' && function_exists('openssl_encrypt')) {
+			$output = base64_encode(openssl_encrypt($string, $encrypt_method, $key, 0, $iv));
 		}
-		else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
-			$decrypt = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv );
-			if($decrypt) {
+		else if ($action == 'd' && function_exists('openssl_decrypt') && base64_decode($string)) {
+			$decrypt = openssl_decrypt(base64_decode($string), $encrypt_method, $key, 0, $iv);
+			if ($decrypt) {
 				//we check if decrypt was succesful
 				$output = $decrypt;
 			}
@@ -231,121 +231,121 @@ 
 
 	public function get_available_storages() {
 		$return = array();
-		foreach ( $this->storage_fields as $storage => $data ) {
-			$check_field = $this->storage_fields["option_prefix"] . $storage . "_enable";
-			if ( get_option( $check_field ) ) {
-				$return[ $storage ] = $data['text'];
+		foreach ($this->storage_fields as $storage => $data) {
+			$check_field = $this->storage_fields["option_prefix"].$storage."_enable";
+			if (get_option($check_field)) {
+				$return[$storage] = $data['text'];
 			}
 		}
 
 		return $return;
 	}
 
-	public function save( $action = "ftp" ) {
-		if ( ! $action ) {
+	public function save($action = "ftp") {
+		if (!$action) {
 			return false;
 		}
 
-		$storage = $this->xcloner_sanitization->sanitize_input_as_string( $action );
-		$this->logger->debug( sprintf( "Saving the remote storage %s options", strtoupper( $action ) ) );
+		$storage = $this->xcloner_sanitization->sanitize_input_as_string($action);
+		$this->logger->debug(sprintf("Saving the remote storage %s options", strtoupper($action)));
 
-		if ( is_array( $this->storage_fields[ $storage ] ) ) {
-			foreach ( $this->storage_fields[ $storage ] as $field => $validation ) {
-				$check_field     = $this->storage_fields["option_prefix"] . $field;
-				$sanitize_method = "sanitize_input_as_" . $validation;
+		if (is_array($this->storage_fields[$storage])) {
+			foreach ($this->storage_fields[$storage] as $field => $validation) {
+				$check_field     = $this->storage_fields["option_prefix"].$field;
+				$sanitize_method = "sanitize_input_as_".$validation;
 
-				if ( ! isset( $_POST[ $check_field ] ) ) {
-					$_POST[ $check_field ] = 0;
+				if (!isset($_POST[$check_field])) {
+					$_POST[$check_field] = 0;
 				}
 
-				if ( ! method_exists( $this->xcloner_sanitization, $sanitize_method ) ) {
+				if (!method_exists($this->xcloner_sanitization, $sanitize_method)) {
 					$sanitize_method = "sanitize_input_as_string";
 				}
 
-				$sanitized_value = $this->xcloner_sanitization->$sanitize_method( stripslashes( $_POST[ $check_field ] ) );
-				update_option( $check_field, $sanitized_value );
+				$sanitized_value = $this->xcloner_sanitization->$sanitize_method(stripslashes($_POST[$check_field]));
+				update_option($check_field, $sanitized_value);
 			}
 
-			$this->xcloner->trigger_message( __( "%s storage settings saved.", 'xcloner-backup-and-restore' ), "success", $this->storage_fields[ $action ]['text'] );
+			$this->xcloner->trigger_message(__("%s storage settings saved.", 'xcloner-backup-and-restore'), "success", $this->storage_fields[$action]['text']);
 		}
 
 	}
 
-	public function check( $action = "ftp" ) {
+	public function check($action = "ftp") {
 		try {
-			$this->verify_filesystem( $action );
-			$this->xcloner->trigger_message( __( "%s connection is valid.", 'xcloner-backup-and-restore' ), "success", $this->storage_fields[ $action ]['text'] );
-			$this->logger->debug( sprintf( "Connection to remote storage %s is valid", strtoupper( $action ) ) );
-		} catch ( Exception $e ) {
-			$this->xcloner->trigger_message( "%s connection error: " . $e->getMessage(), "error", $this->storage_fields[ $action ]['text'] );
+			$this->verify_filesystem($action);
+			$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", $this->storage_fields[$action]['text']);
+			$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));
+		}catch (Exception $e) {
+			$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", $this->storage_fields[$action]['text']);
 		}
 	}
 
 	/**
 	 * @param string $storage_type
 	 */
-	public function verify_filesystem( $storage_type ) {
-		$method = "get_" . $storage_type . "_filesystem";
+	public function verify_filesystem($storage_type) {
+		$method = "get_".$storage_type."_filesystem";
 
-		$this->logger->info( sprintf( "Checking validity of the remote storage %s filesystem", strtoupper( $storage_type ) ) );
+		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem", strtoupper($storage_type)));
 
-		if ( ! method_exists( $this, $method ) ) {
+		if (!method_exists($this, $method)) {
 			return false;
 		}
 
-		list( $adapter, $filesystem ) = $this->$method();
+		list($adapter, $filesystem) = $this->$method();
 
-		$test_file = substr( ".xcloner_" . md5( time() ), 0, 15 );
+		$test_file = substr(".xcloner_".md5(time()), 0, 15);
 
-		if ( $storage_type == "gdrive" ) {
-			if ( ! is_array( $filesystem->listContents() ) ) {
-				throw new Exception( __( "Could not read data", 'xcloner-backup-and-restore' ) );
+		if ($storage_type == "gdrive") {
+			if (!is_array($filesystem->listContents())) {
+				throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
 			}
-			$this->logger->debug( sprintf( "I can list data from remote storage %s", strtoupper( $storage_type ) ) );
+			$this->logger->debug(sprintf("I can list data from remote storage %s", strtoupper($storage_type)));
 
 			return true;
 		}
 
 		//testing write access
-		if ( ! $filesystem->write( $test_file, "data" ) ) {
-			throw new Exception( __( "Could not write data", 'xcloner-backup-and-restore' ) );
+		if (!$filesystem->write($test_file, "data")) {
+			throw new Exception(__("Could not write data", 'xcloner-backup-and-restore'));
 		}
-		$this->logger->debug( sprintf( "I can write data to remote storage %s", strtoupper( $storage_type ) ) );
+		$this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));
 
 		//testing read access
-		if ( ! $filesystem->has( $test_file ) ) {
-			throw new Exception( __( "Could not read data", 'xcloner-backup-and-restore' ) );
+		if (!$filesystem->has($test_file)) {
+			throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
 		}
-		$this->logger->debug( sprintf( "I can read data to remote storage %s", strtoupper( $storage_type ) ) );
+		$this->logger->debug(sprintf("I can read data to remote storage %s", strtoupper($storage_type)));
 
 		//delete test file
-		if ( ! $filesystem->delete( $test_file ) ) {
-			throw new Exception( __( "Could not delete data", 'xcloner-backup-and-restore' ) );
+		if (!$filesystem->delete($test_file)) {
+			throw new Exception(__("Could not delete data", 'xcloner-backup-and-restore'));
 		}
-		$this->logger->debug( sprintf( "I can delete data to remote storage %s", strtoupper( $storage_type ) ) );
+		$this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));
 
 		return true;
 	}
 
-	public function upload_backup_to_storage( $file, $storage ) {
-		if ( ! $this->xcloner_file_system->get_storage_filesystem()->has( $file ) ) {
-			$this->logger->info( sprintf( "File not found %s in local storage", $file ) );
+	public function upload_backup_to_storage($file, $storage) {
+		if (!$this->xcloner_file_system->get_storage_filesystem()->has($file)) {
+			$this->logger->info(sprintf("File not found %s in local storage", $file));
 
 			return false;
 		}
 
-		$method = "get_" . $storage . "_filesystem";
+		$method = "get_".$storage."_filesystem";
 
-		if ( ! method_exists( $this, $method ) ) {
+		if (!method_exists($this, $method)) {
 			return false;
 		}
 
-		list( $remote_storage_adapter, $remote_storage_filesystem ) = $this->$method();
+		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 
 		//doing remote storage cleaning here
-		$this->clean_remote_storage( $storage, $remote_storage_filesystem );
+		$this->clean_remote_storage($storage, $remote_storage_filesystem);
 
-		$this->logger->info( sprintf( "Transferring backup %s to remote storage %s", $file, strtoupper( $storage ) ), array( "" ) );
+		$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $file, strtoupper($storage)), array(""));
 
 		/*if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
 		{

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
 
 		if( $action == 'e' && function_exists('openssl_encrypt')) {
 			$output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) );
-		}
-		else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
+		} else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
 			$decrypt = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv );
 			if($decrypt) {
 				//we check if decrypt was succesful

admin/partials/xcloner_manage_backups_page.php

Braces +5 added lines, -2 removed lines

@@ -31,10 +31,13 @@
             <?php if ($storage_selection): ?>
                 <option value=""
                         selected><?php echo __('Change To Local Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php else: ?>
+            <?php else {
+	: ?>
                 <option value=""
                         selected><?php echo __('Change To Remote Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <?php foreach ($available_storages as $storage => $text): ?>
                 <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection)

includes/class-xcloner-requirements.php

Doc Comments +3 added lines

@@ -149,6 +149,9 @@
 		return $this->file_format_size(disk_free_space($this->xcloner_settings->get_xcloner_store_path()));
 	}
 
+	/**
+	 * @param double $bytes
+	 */
 	public function file_format_size($bytes, $decimals = 2) {
 		$unit_list = array('B', 'KB', 'MB', 'GB', 'PB');
 

admin/partials/xcloner_remote_storage_page.php

Braces +4 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_ftp_enable" class="status"
-                                       value="1" <?php if (get_option("xcloner_ftp_enable"))
+                                       value="1" <?php if (get_option("xcloner_ftp_enable")) {
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -340,6 +340,7 @@ 
                                             value=""><?php echo __("Please Select AWS S3 Region or Leave Unselected for Custom Endpoint") ?></option>
 									<?php
 									$aws_regions = $remote_storage->get_aws_regions();
+}
 
 									foreach ($aws_regions as $key => $region) {
 										?>
@@ -423,7 +424,7 @@ 
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_dropbox_enable" class="status"
-                                       value="1" <?php if (get_option("xcloner_dropbox_enable"))
+                                       value="1" <?php if (get_option("xcloner_dropbox_enable")) {
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -957,6 +958,7 @@ 
                                     <div class="center">
 										<?php
 										$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=xcloner-google-drive'), 'install-plugin_xcloner-google-drive');
+}
 										?>
                                         <h6><?php echo __("This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated.") ?></h6>
                                         <h6><?php echo __("PHP 5.5 minimum version is required.") ?></h6>

admin/partials/xcloner_init_page.php

Braces +5 added lines, -2 removed lines

@@ -110,7 +110,8 @@ 
 											echo date($date_format." ".$time_format, $latest_backup['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 											?>
                                         </div>
-									<?php else: ?>
+									<?php else {
+	: ?>
                                         <div class="item">
                                             <div class="title"><?php echo __("No Backup Yet", 'xcloner-backup-and-restore') ?></div>
                                         </div>
@@ -123,7 +124,9 @@ 
                                             <div class="title"><?php echo __("Total Size", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
-											<?php echo size_format($xcloner_file_system->get_storage_usage()); ?>
+											<?php echo size_format($xcloner_file_system->get_storage_usage());
+}
+?>
                                         </div>
                                     </blockquote>
                                     <h5><?php echo __("Next Scheduled Backup", 'xcloner-backup-and-restore') ?></h5>

includes/class-xcloner-deactivator.php

Braces +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		if (is_a($xcloner_plugin, 'Xcloner')) {
 			try {
 				$xcloner_plugin->get_xcloner_filesystem()->cleanup_tmp_directories();
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$xcloner_plugin->trigger_message_notice($e->getMessage());
 			}