ovidiul / XCloner-Wordpress

includes/class-xcloner-file-system.php

Spacing +135 added lines, -135 removed lines

@@ -4,12 +4,12 @@ 
 use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
 
-class Xcloner_File_System{
+class Xcloner_File_System {
 	
-	private $excluded_files 			= "";
-	private $excluded_files_by_default	= array("administrator/backups", "wp-content/backups");
-	private $included_files_handler 	= "backup_files.csv";
-	private $temp_dir_handler 			= ".dir";
+	private $excluded_files = "";
+	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;
@@ -37,39 +37,39 @@ 
 		$this->logger = new XCloner_Logger('xcloner_file_system', $hash);
 		$this->xcloner_requirements = new Xcloner_Requirements();
 
-		$this->xcloner_settings 		= new Xcloner_Settings($hash);
+		$this->xcloner_settings = new Xcloner_Settings($hash);
 
-		try{
+		try {
 			
-			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(),LOCK_EX, 'SKIP_LINKS');
+			$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_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');
+			$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');
+			$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_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){
+		}catch (Exception $e) {
 			return false;
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
+		if ($value = get_option('xcloner_directories_to_scan_per_request'))
 			$this->folders_to_process_per_session = $value;
 
 	}
@@ -130,10 +130,10 @@ 
 		return $this->getMetadataFull('storage_adapter', $file);
 	}
 	
-	public function get_included_files_handler($metadata  = 0)
+	public function get_included_files_handler($metadata = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
+		if (!$metadata)
 			return $path;
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
@@ -150,16 +150,16 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 		
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
-		if(isset($new_list[0]))
+		if (isset($new_list[0]))
 			return $new_list[0];
 	}
 	
@@ -167,13 +167,13 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
 		return $new_list;
@@ -184,8 +184,8 @@ 
 		$files = $this->get_backup_archives_list();
 		$total = 0;
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 				$total += $file['size'];
 				
 		return $total;		
@@ -193,7 +193,7 @@ 
 	
 	public function is_part($backup_name)
 	{
-		if(stristr($backup_name, "-part"))
+		if (stristr($backup_name, "-part"))
 			return true;
 		
 		return false;	
@@ -201,7 +201,7 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -210,10 +210,10 @@ 
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->get_storage_filesystem()->getSize($backup_name);
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
+			foreach ($backup_parts as $part_file)
 				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
 		}
 		
@@ -224,12 +224,12 @@ 
 	{
 		$files = array();
 		
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$files[] = $data[0];
@@ -242,12 +242,12 @@ 
 	
 	public function delete_backup_by_name($backup_name)
 	{
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$this->get_storage_filesystem()->delete($data[0]);
@@ -255,7 +255,7 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem()->delete($backup_name))
+		if ($this->get_storage_filesystem()->delete($backup_name))
 			$return = true;
 		else
 			$return = false;
@@ -263,7 +263,7 @@ 
 		return $return;	
 	}
 	
-	public function getMetadataFull($adapter = "storage_adapter" , $path)
+	public function getMetadataFull($adapter = "storage_adapter", $path)
     {
         $location = $this->$adapter->applyPathPrefix($path);
         $spl_info = new SplFileInfo($location);
@@ -276,25 +276,25 @@ 
 	{
 		$list = array();
 		
-		if(method_exists($this->get_storage_filesystem(), "listContents"))
+		if (method_exists($this->get_storage_filesystem(), "listContents"))
 			$list = $this->get_storage_filesystem()->listContents();
 
 		
 		$backup_files = array();
 		$parents = array();
 		
-		foreach($list as $file_info)
+		foreach ($list as $file_info)
 		{
-			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$data = array();
 				
 				$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach ($lines as $line)
+					if ($line)
 					{
 						$data = str_getcsv($line);
-						if(is_array($data)){
+						if (is_array($data)) {
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
 							$file_info['size'] += $data[2];
@@ -303,13 +303,13 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
 				$backup_files[$file_info['path']] = $file_info;
 		}
 		
-		foreach($backup_files as $key=>$file_info)
+		foreach ($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
+			if (isset($parents[$file_info['path']]))
 				$backup_files[$key]['parent'] = $parents[$file_info['path']];
 		}
 		
@@ -318,40 +318,40 @@ 
 	
 	public function start_file_recursion($init = 0)
 	{
-		if($init)
+		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())){
+		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)
+			foreach ($files as $file)
 			{
-				if($counter < $this->folders_to_process_per_session){
+				if ($counter < $this->folders_to_process_per_session) {
 					$this->build_files_list($file);
 					$counter++;
-				}else{
+				} else {
 					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
 				}
 			}
-		}else{
+		} else {
 			$this->build_files_list();
 		}
 		
-		if($this->scan_finished())
+		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()))
+			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');
@@ -359,13 +359,13 @@ 
 			}
 		
 			//adding a default index.html to the temp xcloner folder
-			if(!$this->get_tmp_filesystem()->has("index.html"))
+			if (!$this->get_tmp_filesystem()->has("index.html"))
 			{
-				$this->get_tmp_filesystem()->write("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)))
+			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');
@@ -382,7 +382,7 @@ 
 	{
 		$return = array();
 		$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 			$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
 		
 		return $return;
@@ -395,8 +395,8 @@ 
 		
 		$contents = $this->get_tmp_filesystem()->listContents();
 	
-		if(is_array($contents))
-		foreach($contents as $file_info)
+		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());
@@ -408,16 +408,16 @@ 
 	{
 		$this->files_counter = 0;
 		
-		if(!$this->storage_filesystem->has("index.html"))	
-			$this->storage_filesystem->write("index.html","");
+		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("index.html"))	
+			$this->tmp_filesystem->write("index.html", "");
 			
-		if($this->tmp_filesystem->has($this->get_included_files_handler()))
+		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()))	
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 	}
 	
@@ -438,7 +438,7 @@ 
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
+		if (!is_array($excluded_files))
 			$excluded_files = array();
 			
 		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
@@ -461,33 +461,33 @@ 
 		$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 (!$folder) {
 			
 		}
 			
-		try{
+		try {
 			
 			$files = $this->start_filesystem->listContents($folder);
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path']))
+				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"));
+					$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"));
+				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']);
 					$this->store_file($file);
 					$this->files_counter++;
-					if(isset($file['size']))
+					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"));
+				} 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());
 		
@@ -501,9 +501,9 @@ 
 				
 		$start_time = microtime();
 		
-		$data = str_repeat(rand(0,9), 1024*1024); //write 1MB data
+		$data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
 		
-		try{
+		try {
 			$this->tmp_filesystem->write($tmp_file, $data);
 			
 			$end_time = microtime() - $start_time;
@@ -514,7 +514,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
 			$this->logger->error($e->getMessage());
 			
@@ -535,10 +535,10 @@ 
 		
 		$files = $this->storage_filesystem->listContents();
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 			{
-				if(isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
+				if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
 				{
 					$_storage_size += $file['size']; //bytes
 					$_backup_files_list[] = $file;
@@ -546,15 +546,15 @@ 
 			}
 		
 		
-		$this->sort_by($_backup_files_list, "timestamp","asc");
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
 		
 		$_backups_counter = sizeof($_backup_files_list);
 				
-		foreach($_backup_files_list as $file)
+		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	
+			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'];
@@ -562,14 +562,14 @@ 
 			}
 			
 			//processing rule days limit
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp'])
+			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'))
+			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--;
@@ -595,33 +595,33 @@ 
 	
 	}
 	
-	public function process_backup_name($name = "", $max_length=100)
+	public function process_backup_name($name = "", $max_length = 100)
 	{
-		if(!$name)
+		if (!$name)
 			$name = $this->xcloner_settings->get_default_backup_name();
 		
-		foreach($this->backup_name_tags as $tag)
+		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]')
+			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);	
+				$name = str_replace($tag, $domain, $name);	
 			}
 		}
 		
-		if($max_length)
+		if ($max_length)
 			$name = substr($name, 0, $max_length);
 			
 		return $name;	
 	}
 	
-	public function sort_by( &$array, $field, $direction = 'asc')
+	public function sort_by(&$array, $field, $direction = 'asc')
 	{
-		if(strtolower($direction) == "desc" || $direction == SORT_DESC)
+		if (strtolower($direction) == "desc" || $direction == SORT_DESC)
 			$direction = SORT_DESC;
 		else
 			$direction = SORT_ASC;
@@ -641,7 +641,7 @@ 
 	            $tmp = array();
 	            foreach ($data as $key => $row)
 	            {
-					if(is_array($row))
+					if (is_array($row))
 						$tmp[$key] = $row[$field];
 					else
 						$tmp[$key] = $row->$field;
@@ -660,29 +660,29 @@ 
 	{
 		$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 ($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))
+			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(!sizeof($this->excluded_files))
+		if (!sizeof($this->excluded_files))
 			$this->set_excluded_files();
 				
-		if(is_array($this->excluded_files))
-		foreach($this->excluded_files as $excluded_file_pattern)
+		if (is_array($this->excluded_files))
+		foreach ($this->excluded_files as $excluded_file_pattern)
 		{
-			if($excluded_file_pattern == "/")
+			if ($excluded_file_pattern == "/")
 				$needle = "$";
 			else
 				$needle = "$".$excluded_file_pattern;
 				
-			if(strstr("$".$file['path'], $needle)){
+			if (strstr("$".$file['path'], $needle)) {
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
+		if ($regex = $this->is_excluded_regex($file))
 			return $regex;
 		
 		return false;
@@ -728,25 +728,25 @@ 
 		
 		//print_r($regex_patterns);exit;
 		
-		if(is_array($regex_patterns))
+		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)
+			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 (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'] == "/")
+				if ($file['path'] == "/")
 					$needle = "/";
 				else
 					$needle = "/".$file['path'];
 				//echo $needle."---".$excluded_file_pattern."---\n";
 				
-				if(@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)){
+				if (@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)) {
 					return $excluded_file_pattern;
 				}
 			}
@@ -759,27 +759,27 @@ 
 	{
 		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
 		
-		if(!isset($file['size']))
+		if (!isset($file['size']))
 			$file['size'] = 0;
-		if(!isset($file['visibility']))	
+		if (!isset($file['visibility']))	
 			$file['visibility'] = "private";
 		
 		$line = '"'.addslashes($file['path']).'","'.$file['timestamp'].'","'.$file['size'].'","'.$file['visibility'].'","'.$storage.'"'.PHP_EOL;
 		
 		$this->last_logged_file = $file['path'];
 		
-		try{
+		try {
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 		
 			$this->logger->error($e->getMessage());	
 		}
 		
-		if($file['type'] == "dir"){
-			try{
+		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());	
 			}
 		}
@@ -792,13 +792,13 @@ 
 	
 	public function get_filesystem($system = "")
 	{
-		if($system == "storage_filesystem_append")
+		if ($system == "storage_filesystem_append")
 			return $this->storage_filesystem_append;
-		elseif($system == "tmp_filesystem_append")
+		elseif ($system == "tmp_filesystem_append")
 			return $this->tmp_filesystem_append;
-		elseif($system == "tmp_filesystem")
+		elseif ($system == "tmp_filesystem")
 			return $this->tmp_filesystem;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_filesystem;
 		else
 			return $this->start_filesystem;	
@@ -806,9 +806,9 @@ 
 	
 	public function get_adapter($system)
 	{
-		if($system == "tmp_filesystem")
+		if ($system == "tmp_filesystem")
 			return $this->tmp_adapter;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_adapter;
 		else
 			return $this->start_adapter;	
@@ -816,10 +816,10 @@ 
 	
 	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()))
+		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()))
+		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")));
@@ -829,7 +829,7 @@ 
 	
 	private function calc_to_bytes($mb_size)
 	{
-		return $mb_size*(1024*1024);
+		return $mb_size * (1024 * 1024);
 	}
 	
 }

Braces +164 added lines, -121 removed lines

@@ -64,13 +64,14 @@ 
 			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			return false;
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
-			$this->folders_to_process_per_session = $value;
+		if($value = get_option('xcloner_directories_to_scan_per_request')) {
+					$this->folders_to_process_per_session = $value;
+		}
 
 	}
 	
@@ -133,8 +134,9 @@ 
 	public function get_included_files_handler($metadata  = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
-			return $path;
+		if(!$metadata) {
+					return $path;
+		}
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
 		return $spl_info;
@@ -150,31 +152,36 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 		
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if(is_array($files)) {
+					$this->sort_by($files, "timestamp","desc");
+		}
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach($files as $key=>$file) {
+					if(!isset($file['parent']))
 				$new_list[] = ($files[$key]);
+		}
 
-		if(isset($new_list[0]))
-			return $new_list[0];
+		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");
+		if(is_array($files)) {
+					$this->sort_by($files, "timestamp","desc");
+		}
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach($files as $key=>$file) {
+					if(!isset($file['parent']))
 				$new_list[] = ($files[$key]);
+		}
 
 		return $new_list;
 	}
@@ -184,25 +191,28 @@ 
 		$files = $this->get_backup_archives_list();
 		$total = 0;
 		
-		if(is_array($files))
-			foreach($files as $file)
+		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;
+		if(stristr($backup_name, "-part")) {
+					return true;
+		}
 		
 		return false;	
 	}
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -213,8 +223,9 @@ 
 		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);
+			foreach($backup_parts as $part_file) {
+							$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -255,10 +266,11 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem()->delete($backup_name))
-			$return = true;
-		else
-			$return = false;
+		if($this->get_storage_filesystem()->delete($backup_name)) {
+					$return = true;
+		} else {
+					$return = false;
+		}
 			
 		return $return;	
 	}
@@ -276,8 +288,9 @@ 
 	{
 		$list = array();
 		
-		if(method_exists($this->get_storage_filesystem(), "listContents"))
-			$list = $this->get_storage_filesystem()->listContents();
+		if(method_exists($this->get_storage_filesystem(), "listContents")) {
+					$list = $this->get_storage_filesystem()->listContents();
+		}
 
 		
 		$backup_files = array();
@@ -290,10 +303,11 @@ 
 				$data = array();
 				
 				$lines = explode(PHP_EOL, $this->get_storage_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;
@@ -303,14 +317,16 @@ 
 						
 			}
 			
-			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;
+			}
 		}
 		
 		foreach($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			if(isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			}
 		}
 		
 		return $backup_files;
@@ -336,11 +352,11 @@ 
 				if($counter < $this->folders_to_process_per_session){
 					$this->build_files_list($file);
 					$counter++;
-				}else{
+				} else{
 					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
 				}
 			}
-		}else{
+		} else{
 			$this->build_files_list();
 		}
 		
@@ -382,8 +398,9 @@ 
 	{
 		$return = array();
 		$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
-			$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+					$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		}
 		
 		return $return;
 	}
@@ -395,9 +412,10 @@ 
 		
 		$contents = $this->get_tmp_filesystem()->listContents();
 	
-		if(is_array($contents))
-		foreach($contents as $file_info)
+		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());
 		
@@ -408,17 +426,21 @@ 
 	{
 		$this->files_counter = 0;
 		
-		if(!$this->storage_filesystem->has("index.html"))	
-			$this->storage_filesystem->write("index.html","");
+		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("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_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());
+		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()
@@ -438,8 +460,9 @@ 
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
-			$excluded_files = array();
+		if(!is_array($excluded_files)) {
+					$excluded_files = array();
+		}
 			
 		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
 		
@@ -473,21 +496,21 @@ 
 				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) ){
+				} 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']);
 					$this->store_file($file);
 					$this->files_counter++;
-					if(isset($file['size']))
-						$this->files_size += $file['size'];
+					if(isset($file['size'])) {
+											$this->files_size += $file['size'];
+					}
 					
-				}else{
+				} 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());
 		
@@ -514,7 +537,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			$this->logger->error($e->getMessage());
 			
@@ -535,12 +558,14 @@ 
 		
 		$files = $this->storage_filesystem->listContents();
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if(is_array($files)) {
+					foreach($files as $file)
 			{
 				if(isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
 				{
-					$_storage_size += $file['size']; //bytes
+					$_storage_size += $file['size'];
+		}
+		//bytes
 					$_backup_files_list[] = $file;
 				}
 			}
@@ -554,9 +579,11 @@ 
 		{
 			//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", $_storage_size." >= ".$set_storage_limit));
 			}
@@ -597,34 +624,37 @@ 
 	
 	public function process_backup_name($name = "", $max_length=100)
 	{
-		if(!$name)
-			$name = $this->xcloner_settings->get_default_backup_name();
+		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]')
+			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);
+		if($max_length) {
+					$name = substr($name, 0, $max_length);
+		}
 			
 		return $name;	
 	}
 	
 	public function sort_by( &$array, $field, $direction = 'asc')
 	{
-		if(strtolower($direction) == "desc" || $direction == SORT_DESC)
-			$direction = SORT_DESC;
-		else
-			$direction = SORT_ASC;
+		if(strtolower($direction) == "desc" || $direction == SORT_DESC) {
+					$direction = SORT_DESC;
+		} else {
+					$direction = SORT_ASC;
+		}
 					
 	   $array = $this->array_orderby($array, $field, $direction);
 	    
@@ -641,10 +671,11 @@ 
 	            $tmp = array();
 	            foreach ($data as $key => $row)
 	            {
-					if(is_array($row))
-						$tmp[$key] = $row[$field];
-					else
-						$tmp[$key] = $row->$field;
+					if(is_array($row)) {
+											$tmp[$key] = $row[$field];
+					} else {
+											$tmp[$key] = $row->$field;
+					}
 				}
 	            $args[$n] = $tmp;
 	            }
@@ -662,28 +693,32 @@ 
 		
 		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(isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
+							return "> ".$xcloner_exclude_files_larger_than_mb."MB";
+			}
 		}
 		
-		if(!sizeof($this->excluded_files))
-			$this->set_excluded_files();
+		if(!sizeof($this->excluded_files)) {
+					$this->set_excluded_files();
+		}
 				
-		if(is_array($this->excluded_files))
-		foreach($this->excluded_files as $excluded_file_pattern)
+		if(is_array($this->excluded_files)) {
+				foreach($this->excluded_files as $excluded_file_pattern)
 		{
 			if($excluded_file_pattern == "/")
 				$needle = "$";
-			else
-				$needle = "$".$excluded_file_pattern;
+		} else {
+							$needle = "$".$excluded_file_pattern;
+			}
 				
 			if(strstr("$".$file['path'], $needle)){
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
-			return $regex;
+		if( $regex = $this->is_excluded_regex($file)) {
+					return $regex;
+		}
 		
 		return false;
 	}
@@ -737,13 +772,15 @@ 
 			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( 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'];
+				if($file['path'] == "/") {
+									$needle = "/";
+				} else {
+									$needle = "/".$file['path'];
+				}
 				//echo $needle."---".$excluded_file_pattern."---\n";
 				
 				if(@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)){
@@ -759,10 +796,12 @@ 
 	{
 		$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";
+		if(!isset($file['size'])) {
+					$file['size'] = 0;
+		}
+		if(!isset($file['visibility'])) {
+					$file['visibility'] = "private";
+		}
 		
 		$line = '"'.addslashes($file['path']).'","'.$file['timestamp'].'","'.$file['size'].'","'.$file['visibility'].'","'.$storage.'"'.PHP_EOL;
 		
@@ -771,7 +810,7 @@ 
 		try{
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$this->logger->error($e->getMessage());	
 		}
@@ -779,7 +818,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());	
 			}
 		}
@@ -792,35 +831,39 @@ 
 	
 	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;	
+		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;	
+		if($system == "tmp_filesystem") {
+					return $this->tmp_adapter;
+		} elseif($system == "storage_filesystem") {
+					return $this->storage_adapter;
+		} else {
+					return $this->start_adapter;
+		}
 	}
 	
 	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_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());
+		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")));