ovidiul / XCloner-Wordpress

includes/class-xcloner-database.php

Doc Comments +5 added lines

@@ -469,6 +469,11 @@
 	 * 		handler $fd - file handler where to write the records
 	 * @return
 	 */
+
+	/**
+	 * @param integer $start
+	 * @param integer $limit
+	 */
 	public function export_table($databaseName, $tableName, $start, $limit, $dumpfile)
 	{
 		$this->logger->debug(sprintf(("Exporting table  %s.%s data"), $databaseName, $tableName));

Indentation +4 added lines, -4 removed lines

@@ -284,7 +284,7 @@ 
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
 				}
 			$inc++;
-        }
+		}
 
 		return $tablesList;
 
@@ -507,7 +507,7 @@ 
 					$buffer = "";
 					$this->countRecords++;
 
-	                foreach ($arr as $key => $value) {
+					foreach ($arr as $key => $value) {
 						$value = $this->_real_escape($value);
 						
 						if(method_exists($this, 'remove_placeholder_escape')){
@@ -538,8 +538,8 @@ 
 		$line = ("\n#\n# Table structure for table `$tableName`\n#\n\n");
 		$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 
-        if ($this->dbDropSyntax)
-        {
+		if ($this->dbDropSyntax)
+		{
 			$line = ("\nDROP table IF EXISTS `$tableName`;\n");
 			$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		}

Spacing +93 added lines, -93 removed lines

@@ -21,12 +21,12 @@ 
  */
 
 
-class Xcloner_Database extends wpdb{
+class Xcloner_Database extends wpdb {
 
 
-	public  $debug 						= 0;
-	public  $recordsPerSession			= 10000;
-	public  $dbCompatibility			= "";
+	public  $debug = 0;
+	public  $recordsPerSession = 10000;
+	public  $dbCompatibility = "";
 	public  $dbDropSyntax				= 1;
 	public  $countRecords				= 0;
 
@@ -38,24 +38,24 @@ 
 	private   $TEMP_DBPROCESS_FILE = ".database";
 	private   $TEMP_DUMP_FILE = "database-backup.sql";
 	
-	public function __construct(Xcloner $xcloner_container, $wp_user="", $wp_pass="", $wp_db="", $wp_host="")
+	public function __construct(Xcloner $xcloner_container, $wp_user = "", $wp_pass = "", $wp_db = "", $wp_host = "")
 	{
-		$this->logger 					= $xcloner_container->get_xcloner_logger()->withName("xcloner_database");
-		$this->xcloner_settings 		= $xcloner_container->get_xcloner_settings();
-		$this->fs 						= $xcloner_container->get_xcloner_filesystem();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_database");
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+		$this->fs = $xcloner_container->get_xcloner_filesystem();
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
-			$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
+			$this->recordsPerSession = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
 		
-		if(!$this->recordsPerSession)
+		if (!$this->recordsPerSession)
 			$this->recordsPerSession = 100;
 		
-		if(!$wp_user && !$wp_pass && !$wp_host && !$wp_db )
+		if (!$wp_user && !$wp_pass && !$wp_host && !$wp_db)
 		{
 			$wp_host 	= $this->xcloner_settings->get_db_hostname();
 			$wp_user 	= $this->xcloner_settings->get_db_username();
 			$wp_pass 	= $this->xcloner_settings->get_db_password();
-			$wp_db 		= $this->xcloner_settings->get_db_database();
+			$wp_db = $this->xcloner_settings->get_db_database();
 		}
 		
 		parent::__construct($wp_user, $wp_pass, $wp_db, $wp_host);
@@ -71,7 +71,7 @@ 
 	 */
 	public function init($data, $start = 0)
 	{
-		if($start and $this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)){
+		if ($start and $this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
 				$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
 		}
 		
@@ -90,7 +90,7 @@ 
 				"database_count"=>0,
 		);
 		
-		if(!$this->xcloner_settings->get_enable_mysql_backup())
+		if (!$this->xcloner_settings->get_enable_mysql_backup())
 		{
 			$return['finished'] = 1;
 			return $return;
@@ -100,44 +100,44 @@ 
 		
 		$this->init($params, $init);
 		
-		if($init)
+		if ($init)
 		{
 			$db_count = 0;
 			
-			if(isset($params['#']))
+			if (isset($params['#']))
 			{
-				foreach($params['#'] as $database)
+				foreach ($params['#'] as $database)
 				{
-					if(!isset($params[$database]) or !is_array($params[$database]))
+					if (!isset($params[$database]) or !is_array($params[$database]))
 						$params[$database] = array();
 				}
 				$db_count = -1;
 			}
 			
-			if(isset($params) and is_array($params))
-				foreach($params as $database=>$tables)
+			if (isset($params) and is_array($params))
+				foreach ($params as $database=>$tables)
 				{	
-					if($database != "#")
+					if ($database != "#")
 					{
 						$stats = $this->write_backup_process_list($database, $tables);	
-						$return['stats']['tables_count'] 	+= $stats['tables_count'];
-						$return['stats']['total_records'] 	+= $stats['total_records'];
+						$return['stats']['tables_count'] += $stats['tables_count'];
+						$return['stats']['total_records'] += $stats['total_records'];
 					}
 				}
 
-			if(sizeof($params))
-				$return['stats']['database_count'] = sizeof($params)+$db_count;
+			if (sizeof($params))
+				$return['stats']['database_count'] = sizeof($params) + $db_count;
 			else	
 				$return['stats']['database_count'] = 0;
 				
 			return $return;
 		}
 		
-		if(!isset($extra_params['startAtLine']))
+		if (!isset($extra_params['startAtLine']))
 			$extra_params['startAtLine'] = 0;
-		if(!isset($extra_params['startAtRecord']))
+		if (!isset($extra_params['startAtRecord']))
 			$extra_params['startAtRecord'] = 0;
-		if(!isset($extra_params['dumpfile']))
+		if (!isset($extra_params['dumpfile']))
 			$extra_params['dumpfile'] = "";
 		
 		$return = $this->process_incremental($extra_params['startAtLine'], $extra_params['startAtRecord'], $extra_params['dumpfile']);
@@ -148,13 +148,13 @@ 
 	public function log($message = "")
 	{
 		
-		if($message){
-			$this->logger->info( $message, array(""));
-		}else{	
-			if($this->last_query)
-				$this->logger->debug( $this->last_query, array(""));
-			if($this->last_error)
-				$this->logger->error( $this->last_error, array(""));
+		if ($message) {
+			$this->logger->info($message, array(""));
+		} else {	
+			if ($this->last_query)
+				$this->logger->debug($this->last_query, array(""));
+			if ($this->last_error)
+				$this->logger->error($this->last_error, array(""));
 		}
 		
 		return;
@@ -169,7 +169,7 @@ 
 	*/
 	public function error($message)
 	{
-		$this->logger->error( $message, array(""));
+		$this->logger->error($message, array(""));
 		
 		return;
 	}
@@ -202,7 +202,7 @@ 
 		
 		$query = "show tables in `".$database."`";
 		
-		$res =  $this->get_results($query);
+		$res = $this->get_results($query);
 		$this->log();
 			
 		return count($res);
@@ -225,9 +225,9 @@ 
 		$databases_list[$i]['num_tables'] = $this->get_database_num_tables($this->dbname);
 		$i++;
 		
-		if(is_array($databases))
-		foreach( $databases as $db){
-			if($db->Database != $this->dbname)
+		if (is_array($databases))
+		foreach ($databases as $db) {
+			if ($db->Database != $this->dbname)
 			{
 				$databases_list[$i]['name'] = $db->Database;
 				$databases_list[$i]['num_tables'] = $this->get_database_num_tables($db->Database);
@@ -252,7 +252,7 @@ 
 		$tablesList[0] = array( );
 		$inc = 0;
 
-		if(!$database)
+		if (!$database)
 			$database = $this->dbname;
 		
 		$this->logger->debug(sprintf(("Listing tables in %s database"), $database));
@@ -260,14 +260,14 @@ 
 		$tables = $this->get_results("SHOW TABLES in `".$database."`");
 		$this->log();
 
-		foreach ($tables as $table){
+		foreach ($tables as $table) {
 			
 			$table = array_values((array)$table)[0];
 			
 			$tablesList[$inc]['name'] = $table;
 			$tablesList[$inc]['database'] = $database;
 
-			if($get_num_records)
+			if ($get_num_records)
 			{
 				$records_num_result = $this->get_var("SELECT count(*) FROM `".$database."`.`".$table."`");
 				$this->log();
@@ -277,8 +277,8 @@ 
 			
 			$tablesList[$inc]['excluded'] = 0;
 						
-			if(sizeof($included) and is_array($included))
-				if(!in_array($table, $included) )
+			if (sizeof($included) and is_array($included))
+				if (!in_array($table, $included))
 				{
 					$tablesList[$inc]['excluded'] = 1;
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
@@ -299,7 +299,7 @@ 
 		
 		$tables = $this->list_tables($dbname, $incl_tables, 1);
 		
-		if($this->dbname != $dbname)
+		if ($this->dbname != $dbname)
 			$dumpfile = $dbname."-backup.sql";
 		else
 			$dumpfile = $this->TEMP_DUMP_FILE;
@@ -308,8 +308,8 @@ 
 		$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			
 		// write this to the class and write to $TEMP_DBPROCESS_FILE file as database.table records
-		foreach($tables as $key=>$table) 
-		if($table!= "" and !$tables[$key]['excluded']){
+		foreach ($tables as $key=>$table) 
+		if ($table != "" and !$tables[$key]['excluded']) {
 
 			$line = sprintf("`%s`.`%s`\t%s\t%s\n", $dbname, $tables[$key]['name'], $tables[$key]['records'], $tables[$key]['excluded']);
 			$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
@@ -337,7 +337,7 @@ 
 
 			$result = $this->get_var("SELECT count(*) FROM $table;");
 
-			return intval($result) ;// not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
+			return intval($result); // not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
 
 	}
 
@@ -353,25 +353,25 @@ 
 	 * 		int $dbDropSyntax	- check if the DROP TABLE syntax should be added
 	 * @return array $return
 	 */
-	public function process_incremental($startAtLine= 0, $startAtRecord = 0, $dumpfile = "", $dbCompatibility= ""){
+	public function process_incremental($startAtLine = 0, $startAtRecord = 0, $dumpfile = "", $dbCompatibility = "") {
 
 		$count = 0;
 		$return['finished'] = 0;
 		$lines = array();
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		if ($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
+			$lines = array_filter(explode("\n", $this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
 	
-		foreach ($lines as $buffer){
+		foreach ($lines as $buffer) {
 			
-			if($count == $startAtLine)
+			if ($count == $startAtLine)
 			{
 	
-				$tableInfo =explode("\t", $buffer);
+				$tableInfo = explode("\t", $buffer);
 				
-				if($tableInfo[0] == "###newdump###"){
+				if ($tableInfo[0] == "###newdump###") {
 						// we create a new mysql dump file
-						if($dumpfile != ""){
+						if ($dumpfile != "") {
 								// we finished a previous one and write the footers
 								$return['dumpsize'] = $this->data_footers($dumpfile);
 						}
@@ -385,13 +385,13 @@ 
 						$startAtLine++;
 						$return['new_dump'] = 1;
 						//break;
-				}else{
+				} else {
 						//we export the table
-						if($tableInfo[0] == "###enddump###")
+						if ($tableInfo[0] == "###enddump###")
 							$return['endDump'] = 1;
 	
 						//table is excluded
-						if($tableInfo[2])
+						if ($tableInfo[2])
 							continue;
 							
 						$next = $startAtRecord + $this->recordsPerSession;
@@ -403,28 +403,28 @@ 
 
 						//return something to the browser
 						$return['databaseName'] 	= $databaseName;
-						$return['tableName'] 		= $tableName;
+						$return['tableName'] = $tableName;
 						$return['totalRecords'] 	= $tableInfo[1];
 
 						$processed_records = 0;
 						
-						if(trim($tableName) !=""  and !$tableInfo[2])
+						if (trim($tableName) != "" and !$tableInfo[2])
 							$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
 						
-						$return['processedRecords'] = $startAtRecord+$processed_records;
+						$return['processedRecords'] = $startAtRecord + $processed_records;
 						
-						if($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
+						if ($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
 						{
-								$startAtLine ++;
+								$startAtLine++;
 								$startAtRecord = 0;
-						}else{
+						} else {
 								$startAtRecord = $startAtRecord + $this->recordsPerSession;
 							}
 
 						//$return['dbCompatibility'] 	= self::$dbCompatibility;
 						
-						$return['startAtLine']		= $startAtLine;
-						$return['startAtRecord']	= $startAtRecord;
+						$return['startAtLine'] = $startAtLine;
+						$return['startAtRecord'] = $startAtRecord;
 						$return['dumpfile']			= $dumpfile;
 						$return['dumpsize']			= $this->fs->get_tmp_filesystem_append()->getSize($dumpfile);
 
@@ -442,15 +442,15 @@ 
 		}
 	
 		//while is finished, lets go home...
-		if($dumpfile != ""){
+		if ($dumpfile != "") {
 			// we finished a previous one and write the footers
 			$return['dumpsize'] = $this->data_footers($dumpfile);
 			$return['dumpfile'] = ($dumpfile);
 		}
 		$return['finished'] = 1;
-		$return['startAtLine']	= $startAtLine;
+		$return['startAtLine'] = $startAtLine;
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
+		if ($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
 			$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
 		
 		$this->logger->debug(sprintf(("Database backup finished!")));
@@ -479,7 +479,7 @@ 
 		
 		$records = 0;
 		
-		if($start == 0)
+		if ($start == 0)
 			$this->dump_structure($databaseName, $tableName, $dumpfile);
 
 		$start = intval($start);
@@ -487,20 +487,20 @@ 
 		//exporting the table content now
 
 		$query = "SELECT * from `$databaseName`.`$tableName` Limit $start, $limit ;";
-		if($this->use_mysqli)
+		if ($this->use_mysqli)
 		{
 			$result = mysqli_query($this->dbh, $query);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		
-		}else{
+		} else {
 			$result = mysql_query($query, $this->dbh);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		}
 		//$result = $this->get_results($query, ARRAY_N);
 		//print_r($result); exit;
 		
-		if($result){
-			while($row = $mysql_fetch_function($result, MYSQLI_ASSOC)){
+		if ($result) {
+			while ($row = $mysql_fetch_function($result, MYSQLI_ASSOC)) {
 					
 					$this->fs->get_tmp_filesystem_append()->write($dumpfile, "INSERT INTO `$tableName` VALUES (");
 					$arr = $row;
@@ -510,13 +510,13 @@ 
 	                foreach ($arr as $key => $value) {
 						$value = $this->_real_escape($value);
 						
-						if(method_exists($this, 'remove_placeholder_escape')){
+						if (method_exists($this, 'remove_placeholder_escape')) {
 							$value = $this->remove_placeholder_escape($value);
 						}
 						
 						$buffer .= "'".$value."', ";
 					}
-					$buffer = rtrim($buffer, ', ') . ");\n";
+					$buffer = rtrim($buffer, ', ').");\n";
 					$this->fs->get_tmp_filesystem_append()->write($dumpfile, $buffer);
 					unset($buffer);
 					
@@ -531,7 +531,7 @@ 
 
 	}
 
-	public function dump_structure($databaseName, $tableName ,$dumpfile)
+	public function dump_structure($databaseName, $tableName, $dumpfile)
 	{
 		$this->log(sprintf(__("Dumping the structure for %s.%s table"), $databaseName, $tableName));
 		
@@ -546,14 +546,14 @@ 
 
 		//$result = mysqli_query($this->dbh,"SHOW CREATE table `$databaseName`.`$tableName`;");
 		$result = $this->get_row("SHOW CREATE table `$databaseName`.`$tableName`;", ARRAY_N);
-		if($result){
+		if ($result) {
 			//$row = mysqli_fetch_row( $result);
 			$line = ($result[1].";\n");
 			$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		}
 
-		$line = ( "\n#\n# End Structure for table `$tableName`\n#\n\n");
-		$line .=("#\n# Dumping data for table `$tableName`\n#\n\n");
+		$line = ("\n#\n# End Structure for table `$tableName`\n#\n\n");
+		$line .= ("#\n# Dumping data for table `$tableName`\n#\n\n");
 		$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		
 		return;
@@ -576,7 +576,7 @@ 
 
 	}
 
-	public function resetcountRecords(){
+	public function resetcountRecords() {
 		
 		$this->countRecords = 0;
 
@@ -584,7 +584,7 @@ 
 	
 	}
 
-	public function getcountRecords(){
+	public function getcountRecords() {
 		
 		return $this->countRecords;
 		
@@ -601,14 +601,14 @@ 
 		$return .= "# Powered by XCloner Site Backup\n";
 		$return .= "# http://www.xcloner.com\n";
 		$return .= "#\n";
-		$return .= "# Host: " . get_site_url() . "\n";
-		$return .= "# Generation Time: " . date("M j, Y \a\\t H:i") . "\n";
-		$return .= "# PHP Version: " . phpversion() . "\n";
-		$return .= "# Database Charset: ". $this->charset . "\n";
+		$return .= "# Host: ".get_site_url()."\n";
+		$return .= "# Generation Time: ".date("M j, Y \a\\t H:i")."\n";
+		$return .= "# PHP Version: ".phpversion()."\n";
+		$return .= "# Database Charset: ".$this->charset."\n";
 		
 		$results = $this->get_results("SHOW VARIABLES LIKE \"%version%\";", ARRAY_N);
-		if(isset($results)){
-			foreach($results as $result){
+		if (isset($results)) {
+			foreach ($results as $result) {
 
 					$return .= "# MYSQL ".$result[0].": ".$result[1]."\n";
 
@@ -618,13 +618,13 @@ 
 		$results = $this->get_results("SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
 					FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '".$database."';");
 		
-		if(isset($results[0])){
+		if (isset($results[0])) {
 
 			$return .= "# MYSQL DEFAULT_CHARACTER_SET_NAME: ".$results[0]->DEFAULT_CHARACTER_SET_NAME."\n";
 			$return .= "# MYSQL SCHEMA_NAME: ".$results[0]->DEFAULT_COLLATION_NAME."\n";
 		}
 
-		$return .= "#\n# Database : `" . $database . "`\n# --------------------------------------------------------\n\n";
+		$return .= "#\n# Database : `".$database."`\n# --------------------------------------------------------\n\n";
 		
 		$this->log(sprintf(__("Writing %s database dump headers"), $database));
 		

Braces +75 added lines, -52 removed lines

@@ -44,11 +44,13 @@ 
 		$this->xcloner_settings 		= $xcloner_container->get_xcloner_settings();
 		$this->fs 						= $xcloner_container->get_xcloner_filesystem();
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
-			$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request')) {
+					$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		}
 		
-		if(!$this->recordsPerSession)
-			$this->recordsPerSession = 100;
+		if(!$this->recordsPerSession) {
+					$this->recordsPerSession = 100;
+		}
 		
 		if(!$wp_user && !$wp_pass && !$wp_host && !$wp_db )
 		{
@@ -108,37 +110,43 @@ 
 			{
 				foreach($params['#'] as $database)
 				{
-					if(!isset($params[$database]) or !is_array($params[$database]))
-						$params[$database] = array();
+					if(!isset($params[$database]) or !is_array($params[$database])) {
+											$params[$database] = array();
+					}
 				}
 				$db_count = -1;
 			}
 			
-			if(isset($params) and is_array($params))
-				foreach($params as $database=>$tables)
+			if(isset($params) and is_array($params)) {
+							foreach($params as $database=>$tables)
 				{	
 					if($database != "#")
 					{
-						$stats = $this->write_backup_process_list($database, $tables);	
+						$stats = $this->write_backup_process_list($database, $tables);
+			}
 						$return['stats']['tables_count'] 	+= $stats['tables_count'];
 						$return['stats']['total_records'] 	+= $stats['total_records'];
 					}
 				}
 
-			if(sizeof($params))
-				$return['stats']['database_count'] = sizeof($params)+$db_count;
-			else	
-				$return['stats']['database_count'] = 0;
+			if(sizeof($params)) {
+							$return['stats']['database_count'] = sizeof($params)+$db_count;
+			} else {
+							$return['stats']['database_count'] = 0;
+			}
 				
 			return $return;
 		}
 		
-		if(!isset($extra_params['startAtLine']))
-			$extra_params['startAtLine'] = 0;
-		if(!isset($extra_params['startAtRecord']))
-			$extra_params['startAtRecord'] = 0;
-		if(!isset($extra_params['dumpfile']))
-			$extra_params['dumpfile'] = "";
+		if(!isset($extra_params['startAtLine'])) {
+					$extra_params['startAtLine'] = 0;
+		}
+		if(!isset($extra_params['startAtRecord'])) {
+					$extra_params['startAtRecord'] = 0;
+		}
+		if(!isset($extra_params['dumpfile'])) {
+					$extra_params['dumpfile'] = "";
+		}
 		
 		$return = $this->process_incremental($extra_params['startAtLine'], $extra_params['startAtRecord'], $extra_params['dumpfile']);
 		
@@ -150,11 +158,13 @@ 
 		
 		if($message){
 			$this->logger->info( $message, array(""));
-		}else{	
-			if($this->last_query)
-				$this->logger->debug( $this->last_query, array(""));
-			if($this->last_error)
-				$this->logger->error( $this->last_error, array(""));
+		} else{	
+			if($this->last_query) {
+							$this->logger->debug( $this->last_query, array(""));
+			}
+			if($this->last_error) {
+							$this->logger->error( $this->last_error, array(""));
+			}
 		}
 		
 		return;
@@ -225,11 +235,12 @@ 
 		$databases_list[$i]['num_tables'] = $this->get_database_num_tables($this->dbname);
 		$i++;
 		
-		if(is_array($databases))
-		foreach( $databases as $db){
+		if(is_array($databases)) {
+				foreach( $databases as $db){
 			if($db->Database != $this->dbname)
 			{
 				$databases_list[$i]['name'] = $db->Database;
+		}
 				$databases_list[$i]['num_tables'] = $this->get_database_num_tables($db->Database);
 				$i++;
 			}
@@ -252,8 +263,9 @@ 
 		$tablesList[0] = array( );
 		$inc = 0;
 
-		if(!$database)
-			$database = $this->dbname;
+		if(!$database) {
+					$database = $this->dbname;
+		}
 		
 		$this->logger->debug(sprintf(("Listing tables in %s database"), $database));
 		
@@ -277,10 +289,11 @@ 
 			
 			$tablesList[$inc]['excluded'] = 0;
 						
-			if(sizeof($included) and is_array($included))
-				if(!in_array($table, $included) )
+			if(sizeof($included) and is_array($included)) {
+							if(!in_array($table, $included) )
 				{
 					$tablesList[$inc]['excluded'] = 1;
+			}
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
 				}
 			$inc++;
@@ -299,19 +312,21 @@ 
 		
 		$tables = $this->list_tables($dbname, $incl_tables, 1);
 		
-		if($this->dbname != $dbname)
-			$dumpfile = $dbname."-backup.sql";
-		else
-			$dumpfile = $this->TEMP_DUMP_FILE;
+		if($this->dbname != $dbname) {
+					$dumpfile = $dbname."-backup.sql";
+		} else {
+					$dumpfile = $this->TEMP_DUMP_FILE;
+		}
 		
 		$line = sprintf("###newdump###\t%s\t%s\n", $dbname, $dumpfile);
 		$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			
 		// write this to the class and write to $TEMP_DBPROCESS_FILE file as database.table records
-		foreach($tables as $key=>$table) 
-		if($table!= "" and !$tables[$key]['excluded']){
+		foreach($tables as $key=>$table) {
+				if($table!= "" and !$tables[$key]['excluded']){
 
 			$line = sprintf("`%s`.`%s`\t%s\t%s\n", $dbname, $tables[$key]['name'], $tables[$key]['records'], $tables[$key]['excluded']);
+		}
 			$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			$return['tables_count']++;
 			$return['total_records'] += $tables[$key]['records'];
@@ -359,8 +374,9 @@ 
 		$return['finished'] = 0;
 		$lines = array();
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		}
 	
 		foreach ($lines as $buffer){
 			
@@ -385,14 +401,16 @@ 
 						$startAtLine++;
 						$return['new_dump'] = 1;
 						//break;
-				}else{
+				} else{
 						//we export the table
-						if($tableInfo[0] == "###enddump###")
-							$return['endDump'] = 1;
+						if($tableInfo[0] == "###enddump###") {
+													$return['endDump'] = 1;
+						}
 	
 						//table is excluded
-						if($tableInfo[2])
-							continue;
+						if($tableInfo[2]) {
+													continue;
+						}
 							
 						$next = $startAtRecord + $this->recordsPerSession;
 						
@@ -408,16 +426,19 @@ 
 
 						$processed_records = 0;
 						
-						if(trim($tableName) !=""  and !$tableInfo[2])
-							$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						if(trim($tableName) !=""  and !$tableInfo[2]) {
+													$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						}
 						
 						$return['processedRecords'] = $startAtRecord+$processed_records;
 						
-						if($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
+						if($next >= $tableInfo[1]) {
+							//we finished loading the records for next sessions, will go to the new record
 						{
 								$startAtLine ++;
+						}
 								$startAtRecord = 0;
-						}else{
+						} else{
 								$startAtRecord = $startAtRecord + $this->recordsPerSession;
 							}
 
@@ -450,8 +471,9 @@ 
 		$return['finished'] = 1;
 		$return['startAtLine']	= $startAtLine;
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		}
 		
 		$this->logger->debug(sprintf(("Database backup finished!")));
 		
@@ -479,8 +501,9 @@ 
 		
 		$records = 0;
 		
-		if($start == 0)
-			$this->dump_structure($databaseName, $tableName, $dumpfile);
+		if($start == 0) {
+					$this->dump_structure($databaseName, $tableName, $dumpfile);
+		}
 
 		$start = intval($start);
 		$limit = intval($limit);
@@ -492,7 +515,7 @@ 
 			$result = mysqli_query($this->dbh, $query);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		
-		}else{
+		} else{
 			$result = mysql_query($query, $this->dbh);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		}

uninstall.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }

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;
 

Indentation +32 added lines, -32 removed lines

@@ -158,15 +158,15 @@ 
 	}
 	
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 	
 	public function get_logger_filename()
@@ -887,19 +887,19 @@ 
 	}
 	
 	private function return_bytes($val) {
-	    $val = trim($val);
-	    $last = strtolower($val[strlen($val)-1]);
-	    switch($last) {
-	        // The 'G' modifier is available since PHP 5.1.0
-	        case 'g':
-	            $val *= 1024;
-	        case 'm':
-	            $val *= 1024;
-	        case 'k':
-	            $val *= 1024;
-	    }
+		$val = trim($val);
+		$last = strtolower($val[strlen($val)-1]);
+		switch($last) {
+			// The 'G' modifier is available since PHP 5.1.0
+			case 'g':
+				$val *= 1024;
+			case 'm':
+				$val *= 1024;
+			case 'k':
+				$val *= 1024;
+		}
 	
-	    return $val;
+		return $val;
 	}
 	
 	public function is_multipart($backup_name)
@@ -947,7 +947,7 @@ 
 	{
 		$direction = strtolower($direction);
 		
-	    usort($array, create_function('$a, $b', '
+		usort($array, create_function('$a, $b', '
 	        $a = $a["' . $field . '"];
 	        $b = $b["' . $field . '"];
 	
@@ -959,7 +959,7 @@ 
 	        return ($a ' . ($direction == 'desc' ? '>' : '<') .' $b) ? -1 : 1;
 	    '));
 	
-	    return true;
+		return true;
 	}
 		
 	public static function send_response($status = 200, $response)
@@ -999,10 +999,10 @@ 
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
-	              //return $this->unescape_quotes($data);
+				  //return $this->unescape_quotes($data);
 	              
-	              return $data;
-	            }, $query);
+				  return $data;
+				}, $query);
 	}
 	
 	private function unescape_quotes($value) {
@@ -1019,14 +1019,14 @@ 
 	private function has_serialized($s)
 	{
 		if(
-		    stristr($s, '{' ) != false &&
-		    stristr($s, '}' ) != false &&
-		    stristr($s, ';' ) != false &&
-		    stristr($s, ':' ) != false
-		    ){
-		    return true;
+			stristr($s, '{' ) != false &&
+			stristr($s, '}' ) != false &&
+			stristr($s, ';' ) != false &&
+			stristr($s, ':' ) != false
+			){
+			return true;
 		}else{
-		    return false;
+			return false;
 		}
 
 	}

Braces +113 added lines, -87 removed lines

@@ -45,11 +45,10 @@ 
 {
 	
 	require_once($file);
-}
-elseif(file_exists("vendor.phar") and extension_loaded('phar'))
+} elseif(file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
-}else{	
+} else{	
 	
 	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
 	
@@ -87,7 +86,7 @@ 
 try{
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch(Exception $e){
+} catch(Exception $e){
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -191,7 +190,7 @@ 
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
+			} else{
 				throw new Exception($method ." does not exists");
 				}
 		}
@@ -205,13 +204,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']);
 			
@@ -221,18 +222,20 @@ 
 				
 				$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");
+				}
 				
 				@unlink($_FILES['blob']['tmp_name']);
-			}elseif(isset($_POST['blob'])){
+			} elseif(isset($_POST['blob'])){
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
-			}else{
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
+			} else{
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -256,10 +259,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;	
 	}
@@ -284,8 +288,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)
@@ -317,16 +322,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;
 				}
@@ -385,7 +392,7 @@ 
 		if(!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else{
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -437,7 +444,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();
@@ -465,15 +472,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -590,19 +598,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;
 	}
@@ -629,8 +640,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);
 		
@@ -671,10 +683,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'] = "";
+							}
 						}
 					}
 				}
@@ -689,13 +702,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;
 	}
@@ -715,10 +730,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;
@@ -728,20 +744,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']));
 					
@@ -782,8 +800,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']];	
@@ -803,12 +822,13 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
-		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
+		if(isset($data['start'])) {
+				//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
+		}
 			$return['start'] = $data['start'];
-		}else{
+		} else{
 			
 			$return['processed'] += $start;
 			
@@ -818,14 +838,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;
 		
@@ -854,8 +876,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;
 		}	
@@ -869,11 +890,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')));
@@ -904,8 +927,9 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -916,8 +940,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;
@@ -974,7 +999,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;
@@ -995,8 +1020,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);
@@ -1025,7 +1051,7 @@ 
 		    stristr($s, ':' ) != false
 		    ){
 		    return true;
-		}else{
+		} else{
 		    return false;
 		}
 

Doc Comments +12 added lines

@@ -580,6 +580,9 @@ 
 		
 	}
 	
+	/**
+	 * @param mysqli $mysqli
+	 */
 	private function update_wp_url($wp_path, $url, $mysqli)
 	{
 		$wp_config = $wp_path.DS."wp-config.php";
@@ -886,6 +889,9 @@ 
 		$this->send_response(200, $return);
 	}
 	
+	/**
+	 * @param string $val
+	 */
 	private function return_bytes($val) {
 	    $val = trim($val);
 	    $last = strtolower($val[strlen($val)-1]);
@@ -943,6 +949,9 @@ 
 		return $files;
 	}
 	
+	/**
+	 * @param string $field
+	 */
 	private function sort_by( &$array, $field, $direction = 'asc')
 	{
 		$direction = strtolower($direction);
@@ -988,6 +997,9 @@ 
 	 * Serialize fix methods below for mysql query lines
 	 */ 
 	 
+	/**
+	 * @return string
+	 */
 	function do_serialized_fix($query)
 	{
 		$query = str_replace(array("\\n","\\r","\\'"), array("","","\""), ($query));

Spacing +190 added lines, -190 removed lines

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

includes/class-xcloner.php

Braces +2 added lines, -2 removed lines

@@ -350,7 +350,7 @@ 
 			
 			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else{
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
@@ -452,7 +452,7 @@ 
 		
 		try{
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 	

Indentation +21 added lines, -21 removed lines

@@ -321,7 +321,7 @@ 
 		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
-        //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
+		//   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
 
 	}
 
@@ -357,8 +357,8 @@ 
 
 	private function define_plugin_settings(){
 		/**
-		* register wporg_settings_init to the admin_init action hook
-		*/
+		 * register wporg_settings_init to the admin_init action hook
+		 */
 
 		$this->xcloner_settings = new XCloner_Settings($this);
 
@@ -513,15 +513,15 @@ 
 	}
 
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 
 	private function define_ajax_hooks()
@@ -563,24 +563,24 @@ 
 			add_action( 'wp_ajax_restore_backup', 				array($xcloner_api,'restore_backup')  );
 			add_action( 'admin_notices', 						array($this, 'xcloner_error_admin_notices' ));
 
-        }
+		}
 
-        //Do a pre-update backup of targeted files
-        if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
-        {
+		//Do a pre-update backup of targeted files
+		if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
+		{
 			add_action("pre_auto_update", array($this, "pre_auto_update"), 1, 3);
 		}
 	}
 
 	function add_plugin_action_links($links, $file) {
-        if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+		if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
 		{
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';
 		}
 
-        return $links;
-    }
+		return $links;
+	}
 
 	public function xcloner_error_admin_notices() {
 			settings_errors( 'xcloner_error_message' );
@@ -664,9 +664,9 @@ 
 	function xcloner_display()
 	{
 		// check user capabilities
-	    if (!current_user_can('manage_options')) {
-	        return;
-	    }
+		if (!current_user_can('manage_options')) {
+			return;
+		}
 
 		$page = sanitize_key($_GET['page']);
 

Spacing +88 added lines, -88 removed lines

@@ -162,15 +162,15 @@ 
 		return $this->xcloner_file_transfer;
 	}
 
-	public function check_dependencies(){
+	public function check_dependencies() {
 
 		$backup_storage_path = realpath(__DIR__.DS."..".DS."..".DS."..").DS."backups".DS;
 
 		define("XCLONER_STORAGE_PATH", realpath($backup_storage_path));
 
-		if(!is_dir($backup_storage_path))
+		if (!is_dir($backup_storage_path))
 		{
-			if(!@mkdir($backup_storage_path))
+			if (!@mkdir($backup_storage_path))
 			{
 				$status = "error";
 				$message = sprintf(__("Unable to create the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -178,7 +178,7 @@ 
 				return;
 			}
 		}
-		if(!is_writable($backup_storage_path))
+		if (!is_writable($backup_storage_path))
 		{
 			$status = "error";
 			$message = sprintf(__("Unable to write to the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -192,15 +192,15 @@ 
 	public function trigger_message($message, $status = "error", $message_param1 = "", $message_param2 = "", $message_param3 = "")
 	{
 			$message = sprintf(__($message), $message_param1, $message_param2, $message_param3);
-			add_action( 'xcloner_admin_notices', array($this,"trigger_message_notice"), 10, 2);
-			do_action( 'xcloner_admin_notices', $message, $status);
+			add_action('xcloner_admin_notices', array($this, "trigger_message_notice"), 10, 2);
+			do_action('xcloner_admin_notices', $message, $status);
 	}
 
 	public function trigger_message_notice($message, $status = "success")
 	{
 		?>
 		<div class="notice notice-<?php echo $status?> is-dismissible">
-	        <p><?php _e( $message, 'xcloner-backup-and-restore' ); ?></p>
+	        <p><?php _e($message, 'xcloner-backup-and-restore'); ?></p>
 	    </div>
 		<?php
 	}
@@ -227,79 +227,79 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-i18n.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-xcloner-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-xcloner-admin.php';
 
 		/**
 		 * The class responsible for debugging XCloner.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-logger.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-logger.php';
 
 		/**
 		 * The class responsible for defining the admin settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-settings.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-settings.php';
 
 		/**
 		 * The class responsible for defining the Remote Storage settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-remote-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-remote-storage.php';
 
 		/**
 		 * The class responsible for implementing the database backup methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-database.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-database.php';
 
 		/**
 		 * The class responsible for sanitization of users input.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-sanitization.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-sanitization.php';
 
 		/**
 		 * The class responsible for XCloner system requirements validation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-requirements.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-requirements.php';
 
 		/**
 		 * The class responsible for XCloner backup archive creation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-archive.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-archive.php';
 
 		/**
 		 * The class responsible for XCloner API requests.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-api.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-api.php';
 
 		/**
 		 * The class responsible for the XCloner File System methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-system.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-system.php';
 
 		/**
 		 * The class responsible for the XCloner File Transfer methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-transfer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-transfer.php';
 
 		/**
 		 * The class responsible for the XCloner Scheduler methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-scheduler.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-scheduler.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-xcloner-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-xcloner-public.php';
 
 		$this->loader = new Xcloner_Loader($this);
 
@@ -318,7 +318,7 @@ 
 
 		$plugin_i18n = new Xcloner_i18n();
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
         //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
@@ -334,13 +334,13 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new Xcloner_Admin( $this );
+		$plugin_admin = new Xcloner_Admin($this);
 		$this->plugin_admin = $plugin_admin;
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
-		add_action( 'backup_archive_finished', array($this, 'do_action_after_backup_finished'), 10, 2);
+		add_action('backup_archive_finished', array($this, 'do_action_after_backup_finished'), 10, 2);
 	}
 
 	/**
@@ -349,31 +349,31 @@ 
 	 * @access    private
 	 *
 	 */
-	private function define_admin_menu(){
+	private function define_admin_menu() {
 
 		add_action('admin_menu', array($this->loader, 'xcloner_backup_add_admin_menu'));
 
 	}
 
-	private function define_plugin_settings(){
+	private function define_plugin_settings() {
 		/**
 		* register wporg_settings_init to the admin_init action hook
 		*/
 
 		$this->xcloner_settings = new XCloner_Settings($this);
 
-		if(defined('DOING_CRON') || isset($_POST['hash'])){
+		if (defined('DOING_CRON') || isset($_POST['hash'])) {
 
-			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
+			if (defined('DOING_CRON') || $_POST['hash'] == "generate_hash") {
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else {
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
 
-		if(defined('DOING_CRON') || !isset($_POST['hash']))
+		if (defined('DOING_CRON') || !isset($_POST['hash']))
 		{
-			add_action( 'shutdown', function(){
+			add_action('shutdown', function() {
 				$this->xcloner_file_system = new Xcloner_File_System($this);
 				$this->xcloner_file_system->remove_tmp_filesystem();
 			});
@@ -396,7 +396,7 @@ 
 	 */
 	public function pre_auto_update($type, $item, $context)
 	{
-		if(!$type)
+		if (!$type)
 		{
 			return false;
 		}
@@ -405,10 +405,10 @@ 
 
 		$content_dir = str_replace(ABSPATH, "", WP_CONTENT_DIR);
 		$plugins_dir 	= str_replace(ABSPATH, "", WP_PLUGIN_DIR);
-		$langs_dir 		= $content_dir . DS . "languages";
-		$themes_dir 		= $content_dir . DS . "themes";
+		$langs_dir 		= $content_dir.DS."languages";
+		$themes_dir 		= $content_dir.DS."themes";
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'core':
 				$exclude_files = array(
 									"^(?!(wp-admin|wp-includes|(?!.*\/.*.php)))(.*)$",
@@ -418,7 +418,7 @@ 
 
 				$dir_array = explode(DS, $plugins_dir);
 
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -434,7 +434,7 @@ 
 
 				$dir_array = explode(DS, $themes_dir);
 
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -450,7 +450,7 @@ 
 
 				$dir_array = explode(DS, $langs_dir);
 
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -476,9 +476,9 @@ 
 		$schedule['backup_params']->email_notification = get_option('admin_email');
 		$schedule['backup_params']->backup_name = "backup_pre_auto_update_".$type."_[domain]-[time]-sql";
 
-		try{
+		try {
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 
@@ -493,10 +493,10 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Xcloner_Public( $this );
+		$plugin_public = new Xcloner_Public($this);
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 	}
 
@@ -505,20 +505,20 @@ 
 		$logger = new XCloner_Logger($this, "php_system");
 		$error = error_get_last();
 
-		if($error['type'] and $logger)
+		if ($error['type'] and $logger)
 		{
-			$logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 
 	}
 
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
+	    static $levels = null;
+	    if ($levels === null) {
+	        $levels = [];
 	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+	            if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 	        }
 	    }
 	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -528,52 +528,52 @@ 
 	{
 		//adding the pre-update hook
 
-		if(is_admin() || defined('DOING_CRON'))
+		if (is_admin() || defined('DOING_CRON'))
 		{
-			$this->xcloner_logger 			= new XCloner_Logger($this, "xcloner_api");
-			$this->xcloner_filesystem 		= new Xcloner_File_System($this);
+			$this->xcloner_logger = new XCloner_Logger($this, "xcloner_api");
+			$this->xcloner_filesystem = new Xcloner_File_System($this);
 
 			//$this->xcloner_filesystem->set_diff_timestamp_start (strtotime("-15 days"));
 
-			$this->archive_system 			= new Xcloner_Archive($this);
-			$this->xcloner_database 		= new Xcloner_Database($this);
-			$this->xcloner_scheduler 		= new Xcloner_Scheduler($this);
-			$this->xcloner_remote_storage 	= new Xcloner_Remote_Storage($this);
-			$this->xcloner_file_transfer 	= new Xcloner_File_Transfer($this);
-
-			$xcloner_api 					= new Xcloner_Api($this);
-
-			add_action( 'wp_ajax_get_database_tables_action', 	array($xcloner_api,'get_database_tables_action')  );
-			add_action( 'wp_ajax_get_file_system_action', 		array($xcloner_api,'get_file_system_action')  );
-			add_action( 'wp_ajax_scan_filesystem', 				array($xcloner_api,'scan_filesystem')  );
-			add_action( 'wp_ajax_backup_database', 				array($xcloner_api,'backup_database')  );
-			add_action( 'wp_ajax_backup_files'	, 				array($xcloner_api,'backup_files')  );
-			add_action( 'wp_ajax_save_schedule'	, 				array($xcloner_api,'save_schedule')  );
-			add_action( 'wp_ajax_get_schedule_by_id',	 		array($xcloner_api,'get_schedule_by_id')  );
-			add_action( 'wp_ajax_get_scheduler_list',	 		array($xcloner_api,'get_scheduler_list')  );
-			add_action( 'wp_ajax_delete_schedule_by_id'	, 		array($xcloner_api,'delete_schedule_by_id')  );
-			add_action( 'wp_ajax_delete_backup_by_name'	, 		array($xcloner_api,'delete_backup_by_name')  );
-			add_action( 'wp_ajax_download_backup_by_name', 		array($xcloner_api,'download_backup_by_name')  );
-			add_action( 'wp_ajax_remote_storage_save_status', 	array($xcloner_api,'remote_storage_save_status')  );
-			add_action( 'wp_ajax_upload_backup_to_remote', 		array($xcloner_api,'upload_backup_to_remote')  );
-			add_action( 'wp_ajax_list_backup_files'	,			array($xcloner_api,'list_backup_files')  );
-			add_action( 'wp_ajax_restore_upload_backup'	, 		array($xcloner_api,'restore_upload_backup')  );
-			add_action( 'wp_ajax_download_restore_script', 		array($xcloner_api,'download_restore_script')  );
-			add_action( 'wp_ajax_copy_backup_remote_to_local', 	array($xcloner_api,'copy_backup_remote_to_local')  );
-			add_action( 'wp_ajax_restore_backup', 				array($xcloner_api,'restore_backup')  );
-			add_action( 'admin_notices', 						array($this, 'xcloner_error_admin_notices' ));
+			$this->archive_system = new Xcloner_Archive($this);
+			$this->xcloner_database = new Xcloner_Database($this);
+			$this->xcloner_scheduler = new Xcloner_Scheduler($this);
+			$this->xcloner_remote_storage = new Xcloner_Remote_Storage($this);
+			$this->xcloner_file_transfer = new Xcloner_File_Transfer($this);
+
+			$xcloner_api = new Xcloner_Api($this);
+
+			add_action('wp_ajax_get_database_tables_action', array($xcloner_api, 'get_database_tables_action'));
+			add_action('wp_ajax_get_file_system_action', array($xcloner_api, 'get_file_system_action'));
+			add_action('wp_ajax_scan_filesystem', array($xcloner_api, 'scan_filesystem'));
+			add_action('wp_ajax_backup_database', array($xcloner_api, 'backup_database'));
+			add_action('wp_ajax_backup_files', array($xcloner_api, 'backup_files'));
+			add_action('wp_ajax_save_schedule', array($xcloner_api, 'save_schedule'));
+			add_action('wp_ajax_get_schedule_by_id', array($xcloner_api, 'get_schedule_by_id'));
+			add_action('wp_ajax_get_scheduler_list', array($xcloner_api, 'get_scheduler_list'));
+			add_action('wp_ajax_delete_schedule_by_id', array($xcloner_api, 'delete_schedule_by_id'));
+			add_action('wp_ajax_delete_backup_by_name', array($xcloner_api, 'delete_backup_by_name'));
+			add_action('wp_ajax_download_backup_by_name', array($xcloner_api, 'download_backup_by_name'));
+			add_action('wp_ajax_remote_storage_save_status', array($xcloner_api, 'remote_storage_save_status'));
+			add_action('wp_ajax_upload_backup_to_remote', array($xcloner_api, 'upload_backup_to_remote'));
+			add_action('wp_ajax_list_backup_files', array($xcloner_api, 'list_backup_files'));
+			add_action('wp_ajax_restore_upload_backup', array($xcloner_api, 'restore_upload_backup'));
+			add_action('wp_ajax_download_restore_script', array($xcloner_api, 'download_restore_script'));
+			add_action('wp_ajax_copy_backup_remote_to_local', array($xcloner_api, 'copy_backup_remote_to_local'));
+			add_action('wp_ajax_restore_backup', array($xcloner_api, 'restore_backup'));
+			add_action('admin_notices', array($this, 'xcloner_error_admin_notices'));
 
         }
 
         //Do a pre-update backup of targeted files
-        if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
+        if ($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
         {
 			add_action("pre_auto_update", array($this, "pre_auto_update"), 1, 3);
 		}
 	}
 
 	function add_plugin_action_links($links, $file) {
-        if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+        if ($file == plugin_basename(dirname(dirname(__FILE__)).'/xcloner.php'))
 		{
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';
@@ -583,13 +583,13 @@ 
     }
 
 	public function xcloner_error_admin_notices() {
-			settings_errors( 'xcloner_error_message' );
+			settings_errors('xcloner_error_message');
 		}
 
 	public function define_cron_hooks()
 	{
 		//registering new schedule intervals
-		add_filter( 'cron_schedules', array($this, 'add_new_intervals'));
+		add_filter('cron_schedules', array($this, 'add_new_intervals'));
 
 
 		$xcloner_scheduler = $this->get_xcloner_scheduler();
@@ -670,7 +670,7 @@ 
 
 		$page = sanitize_key($_GET['page']);
 
-		if($page)
+		if ($page)
 		{
 			$this->display($page);
 		}

admin/class-xcloner-admin.php

Doc Comments -2 removed lines

@@ -47,8 +47,6 @@
 	 *
 	 * @since    1.0.0
 	 *
-	 * @param      string $plugin_name The name of this plugin.
-	 * @param      string $version The version of this plugin.
 	 */
 	public function __construct( Xcloner $xcloner_container ) {
 

Spacing +68 added lines, -68 removed lines

@@ -50,7 +50,7 @@ 
 	 * @param      string $plugin_name The name of this plugin.
 	 * @param      string $version The version of this plugin.
 	 */
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 
 		$this->plugin_name       = $xcloner_container->get_plugin_name();
 		$this->version           = $xcloner_container->get_version();
@@ -66,9 +66,9 @@ 
 	 *
 	 * @since    1.0.0
 	 */
-	public function enqueue_styles( $hook ) {
+	public function enqueue_styles($hook) {
 
-		if ( ! stristr( $hook, "page_" . $this->plugin_name ) || ( isset( $_GET['option'] ) and $_GET['option'] == "com_cloner" ) ) {
+		if (!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option'] == "com_cloner")) {
 			return;
 		}
 
@@ -84,13 +84,13 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name . "_materialize", plugin_dir_url( __FILE__ ) . 'css/materialize.min.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name . "_materialize.clockpicker", plugin_dir_url( __FILE__ ) . 'css/materialize.clockpicker.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name . "_materialize.icons", '//fonts.googleapis.com/icon?family=Material+Icons', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name . "_jquery.datatables", plugin_dir_url( __FILE__ ) . 'css/jquery.dataTables.min.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name . "_jquery.datatables.responsive", plugin_dir_url( __FILE__ ) . 'css/responsive.dataTables.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name . "_jstree", dirname( plugin_dir_url( __FILE__ ) ) . '/vendor/vakata/jstree/dist/themes/default/style.min.css', array(), '3.3', 'all' );
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/xcloner-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name."_materialize", plugin_dir_url(__FILE__).'css/materialize.min.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_materialize.clockpicker", plugin_dir_url(__FILE__).'css/materialize.clockpicker.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_materialize.icons", '//fonts.googleapis.com/icon?family=Material+Icons', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jquery.datatables", plugin_dir_url(__FILE__).'css/jquery.dataTables.min.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jquery.datatables.responsive", plugin_dir_url(__FILE__).'css/responsive.dataTables.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jstree", dirname(plugin_dir_url(__FILE__)).'/vendor/vakata/jstree/dist/themes/default/style.min.css', array(), '3.3', 'all');
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/xcloner-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -99,9 +99,9 @@ 
 	 *
 	 * @since    1.0.0
 	 */
-	public function enqueue_scripts( $hook ) {
+	public function enqueue_scripts($hook) {
 
-		if ( ! stristr( $hook, "page_" . $this->plugin_name ) ) {
+		if (!stristr($hook, "page_".$this->plugin_name)) {
 			return;
 		}
 
@@ -118,25 +118,25 @@ 
 		 */
 
 		add_thickbox();
-		wp_enqueue_script( 'plugin-install' );
-		wp_enqueue_script( 'updates' );
-		wp_enqueue_script( $this->plugin_name . "_materialize", plugin_dir_url( __FILE__ ) . 'js/materialize.min.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_materialize.clockpicker", plugin_dir_url( __FILE__ ) . 'js/materialize.clockpicker.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_jquery.datatables", plugin_dir_url( __FILE__ ) . 'js/jquery.dataTables.min.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_jquery.datatables.respnsive", plugin_dir_url( __FILE__ ) . 'js/dataTables.responsive.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_vakata", dirname( plugin_dir_url( __FILE__ ) ) . '/vendor/vakata/jstree/dist/jstree.min.js', array( 'jquery' ), '3.3', false );
-		wp_enqueue_script( $this->plugin_name . "_xcloner-backup-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-backup-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_xcloner-scheduler-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-scheduler-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_xcloner-restore-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-restore-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_xcloner-manage-backups-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-manage-backups-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name . "_xcloner-remote-storage-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-remote-storage-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/xcloner-admin.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script('plugin-install');
+		wp_enqueue_script('updates');
+		wp_enqueue_script($this->plugin_name."_materialize", plugin_dir_url(__FILE__).'js/materialize.min.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_materialize.clockpicker", plugin_dir_url(__FILE__).'js/materialize.clockpicker.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_jquery.datatables", plugin_dir_url(__FILE__).'js/jquery.dataTables.min.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_jquery.datatables.respnsive", plugin_dir_url(__FILE__).'js/dataTables.responsive.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_vakata", dirname(plugin_dir_url(__FILE__)).'/vendor/vakata/jstree/dist/jstree.min.js', array('jquery'), '3.3', false);
+		wp_enqueue_script($this->plugin_name."_xcloner-backup-class", plugin_dir_url(__FILE__).'js/xcloner-backup-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-scheduler-class", plugin_dir_url(__FILE__).'js/xcloner-scheduler-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-restore-class", plugin_dir_url(__FILE__).'js/xcloner-restore-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-manage-backups-class", plugin_dir_url(__FILE__).'js/xcloner-manage-backups-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-remote-storage-class", plugin_dir_url(__FILE__).'js/xcloner-remote-storage-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/xcloner-admin.js', array('jquery'), $this->version, false);
 
 
 	}
 
 	public function xcloner_init_page() {
-		require_once( "partials/xcloner_init_page.php" );
+		require_once("partials/xcloner_init_page.php");
 
 	}
 
@@ -145,70 +145,70 @@ 
 		$remote_storage       = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
 
-		if ( isset( $_POST['action'] ) ) {
-			$_POST['action'] = $xcloner_sanitization->sanitize_input_as_string( $_POST['action'] );
-			$remote_storage->save( $_POST['action'] );
+		if (isset($_POST['action'])) {
+			$_POST['action'] = $xcloner_sanitization->sanitize_input_as_string($_POST['action']);
+			$remote_storage->save($_POST['action']);
 		}
 
-		if ( isset( $_POST['authentification_code'] ) && $_POST['authentification_code'] != "" ) {
-			$_POST['authentification_code'] = $xcloner_sanitization->sanitize_input_as_string( $_POST['authentification_code'] );
+		if (isset($_POST['authentification_code']) && $_POST['authentification_code'] != "") {
+			$_POST['authentification_code'] = $xcloner_sanitization->sanitize_input_as_string($_POST['authentification_code']);
 
-			$remote_storage->set_access_token( $_POST['authentification_code'] );
+			$remote_storage->set_access_token($_POST['authentification_code']);
 		}
 
-		if ( isset( $_POST['connection_check'] ) && $_POST['connection_check'] ) {
-			$remote_storage->check( $_POST['action'] );
+		if (isset($_POST['connection_check']) && $_POST['connection_check']) {
+			$remote_storage->check($_POST['action']);
 		}
 
-		require_once( "partials/xcloner_remote_storage_page.php" );
+		require_once("partials/xcloner_remote_storage_page.php");
 
 	}
 
 	public function xcloner_scheduled_backups_page() {
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 
-		if ( ! $requirements->check_backup_ready_status() ) {
-			require_once( "partials/xcloner_init_page.php" );
+		if (!$requirements->check_backup_ready_status()) {
+			require_once("partials/xcloner_init_page.php");
 
 			return false;
 		}
 
-		require_once( "partials/xcloner_scheduled_backups_page.php" );
+		require_once("partials/xcloner_scheduled_backups_page.php");
 
 	}
 
 	public function xcloner_manage_backups_page() {
-		require_once( "partials/xcloner_manage_backups_page.php" );
+		require_once("partials/xcloner_manage_backups_page.php");
 
 	}
 
 	public function xcloner_debugger_page() {
-		require_once( "partials/xcloner_console_page.php" );
+		require_once("partials/xcloner_console_page.php");
 
 	}
 
 	public function xcloner_restore_page() {
-		require_once( "partials/xcloner_restore_page.php" );
+		require_once("partials/xcloner_restore_page.php");
 
 	}
 
 	public function xcloner_generate_backups_page() {
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 
-		if ( ! $requirements->check_backup_ready_status() ) {
-			require_once( "partials/xcloner_init_page.php" );
+		if (!$requirements->check_backup_ready_status()) {
+			require_once("partials/xcloner_init_page.php");
 
 			return false;
 		}
 
-		require_once( "partials/xcloner_generate_backups_page.php" );
+		require_once("partials/xcloner_generate_backups_page.php");
 
 		return;
 	}
 
 	public function xcloner_settings_page() {
 		// check user capabilities
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if (!current_user_can('manage_options')) {
 			return;
 		}
 
@@ -216,40 +216,40 @@ 
 
 		// check if the user have submitted the settings
 		// wordpress will add the "settings-updated" $_GET parameter to the url
-		if ( isset( $_GET['settings-updated'] ) ) {
+		if (isset($_GET['settings-updated'])) {
 			// add settings saved message with the class of "updated"
-			add_settings_error( 'wporg_messages', 'wporg_message', __( 'Settings Saved', 'wporg' ), 'updated' );
+			add_settings_error('wporg_messages', 'wporg_message', __('Settings Saved', 'wporg'), 'updated');
 		}
 
 		// show error/update messages
-		settings_errors( 'wporg_messages' );
+		settings_errors('wporg_messages');
 		?>
 
 		<?php
 		$xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 
-		if ( isset( $_GET['tab'] ) ) {
-			$active_tab = $xcloner_sanitization->sanitize_input_as_string( $_GET['tab'] );
+		if (isset($_GET['tab'])) {
+			$active_tab = $xcloner_sanitization->sanitize_input_as_string($_GET['tab']);
 		} // end if
 		else {
 			$active_tab = "general_options";
 		}
 
 		?>
-        <h1><?= esc_html( get_admin_page_title() ); ?></h1>
+        <h1><?= esc_html(get_admin_page_title()); ?></h1>
 
         <ul class="nav-tab-wrapper row">
             <li><a href="?page=xcloner_settings_page&tab=general_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'general_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'General Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'general_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('General Options', 'xcloner-backup-and-restore') ?></a>
             </li>
             <li><a href="?page=xcloner_settings_page&tab=mysql_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'mysql_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'Mysql Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'mysql_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('Mysql Options', 'xcloner-backup-and-restore') ?></a>
             </li>
             <li><a href="?page=xcloner_settings_page&tab=system_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'system_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'System Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'system_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('System Options', 'xcloner-backup-and-restore') ?></a>
             </li>
             <li><a href="?page=xcloner_settings_page&tab=cleanup_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'cleanup_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'Cleanup Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'cleanup_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('Cleanup Options', 'xcloner-backup-and-restore') ?></a>
             </li>
         </ul>
 
@@ -258,27 +258,27 @@ 
             <form action="options.php" method="post">
 				<?php
 
-				if ( $active_tab == 'general_options' ) {
+				if ($active_tab == 'general_options') {
 
-					settings_fields( 'xcloner_general_settings_group' );
-					do_settings_sections( 'xcloner_settings_page' );
+					settings_fields('xcloner_general_settings_group');
+					do_settings_sections('xcloner_settings_page');
 
-				} elseif ( $active_tab == 'mysql_options' ) {
+				} elseif ($active_tab == 'mysql_options') {
 
-					settings_fields( 'xcloner_mysql_settings_group' );
-					do_settings_sections( 'xcloner_mysql_settings_page' );
-				} elseif ( $active_tab == 'system_options' ) {
+					settings_fields('xcloner_mysql_settings_group');
+					do_settings_sections('xcloner_mysql_settings_page');
+				} elseif ($active_tab == 'system_options') {
 
-					settings_fields( 'xcloner_system_settings_group' );
-					do_settings_sections( 'xcloner_system_settings_page' );
-				} elseif ( $active_tab == 'cleanup_options' ) {
+					settings_fields('xcloner_system_settings_group');
+					do_settings_sections('xcloner_system_settings_page');
+				} elseif ($active_tab == 'cleanup_options') {
 
-					settings_fields( 'xcloner_cleanup_settings_group' );
-					do_settings_sections( 'xcloner_cleanup_settings_page' );
+					settings_fields('xcloner_cleanup_settings_group');
+					do_settings_sections('xcloner_cleanup_settings_page');
 				}
 
 				// output save settings button
-				submit_button( 'Save Settings' );
+				submit_button('Save Settings');
 				?>
             </form>
 

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;
 
 
 /**

Indentation +889 added lines, -889 removed lines

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

Spacing +53 added lines, -53 removed lines

@@ -85,7 +85,7 @@ 
         $this->xcloner_scheduler = $xcloner_container->get_xcloner_scheduler();
 
         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));
         }
 
@@ -127,13 +127,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());
@@ -218,8 +218,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'] = "";
@@ -244,7 +244,7 @@ 
 
         if (!isset($_POST['id'])) {
             $wpdb->insert(
-                $wpdb->prefix . 'xcloner_scheduler',
+                $wpdb->prefix.'xcloner_scheduler',
                 $schedule,
                 array(
                     '%s',
@@ -253,7 +253,7 @@ 
             );
         } else {
             $wpdb->update(
-                $wpdb->prefix . 'xcloner_scheduler',
+                $wpdb->prefix.'xcloner_scheduler',
                 $schedule,
                 array('id' => $_POST['id']),
                 array(
@@ -304,7 +304,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;
@@ -331,7 +331,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());
                 }
             }
@@ -425,7 +425,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'
                 ));
@@ -437,7 +437,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'
                 ));
@@ -456,7 +456,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'
                     ));
@@ -504,13 +504,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());
@@ -531,7 +531,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)) {
@@ -547,8 +547,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"
             );
         }
 
@@ -574,7 +574,7 @@ 
         if ($database == "#") {
             try {
                 $return = $this->xcloner_database->get_all_databases();
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
 
@@ -595,10 +595,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"
                 );
             }
 
@@ -606,7 +606,7 @@ 
 
             try {
                 $return = $this->xcloner_database->list_tables($database, "", 1);
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
 
@@ -623,12 +623,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"
                 );
             }
         }
@@ -672,17 +672,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;
 
@@ -691,16 +691,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)";
             }
 
@@ -712,11 +712,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();
@@ -728,7 +728,7 @@ 
             $return['data'][] = array(
                 $res->id,
                 $res->name,
-                $res->recurrence,/*$res->start_at,*/
+                $res->recurrence, /*$res->start_at,*/
                 $next_run,
                 $remote_storage,
                 $backup_text,
@@ -792,10 +792,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);
@@ -803,14 +803,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++;
@@ -858,7 +858,7 @@ 
                     "copy_backup_remote_to_local"
                 ), array($backup_file, $storage_type));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return['error'] = 1;
             $return['message'] = $e->getMessage();
@@ -897,7 +897,7 @@ 
                     "upload_backup_to_storage"
                 ), array($backup_file, $storage_type));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return['error'] = 1;
             $return['message'] = $e->getMessage();
@@ -957,21 +957,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);
 
@@ -980,11 +980,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);
 
         }
@@ -1016,9 +1016,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();
 
@@ -1078,12 +1078,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);
 
         }
@@ -1107,7 +1107,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;
     }

includes/class-xcloner-archive.php

Doc Comments +21 added lines

@@ -213,6 +213,10 @@ 
      *
      * @return bool
      */
+
+    /**
+     * @param string $error_message
+     */
     public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
     {
 
@@ -251,6 +255,11 @@ 
      *
      * @return bool
      */
+
+    /**
+     * @param string $from
+     * @param string $subject
+     */
     public function send_notification(
         $to,
         $from,
@@ -339,6 +348,10 @@ 
      * Incremental Backup method
      *
      */
+
+    /**
+     * @param integer $init
+     */
     public function start_incremental_backup($backup_params, $extra_params, $init)
     {
         $return = array();
@@ -576,6 +589,10 @@ 
      * Write multipart file components
      *
      */
+
+    /**
+     * @param string $path
+     */
     private function write_multipart_file($path)
     {
         $path = $this->get_archive_name_with_extension();
@@ -636,6 +653,10 @@ 
      * Add file to archive
      *
      */
+
+    /**
+     * @param integer $append
+     */
     public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
     {
 

Indentation +513 added lines, -513 removed lines

@@ -36,171 +36,171 @@ 
  */
 class Xcloner_Archive extends Tar
 {
-    /**
-     * Process file size per API request
-     * @var float|int
-     */
-    private $file_size_per_request_limit = 52428800; //50MB = 52428800; 1MB = 1048576
-    /**
-     * Files count to process per API request
-     * @var int
-     */
-    private $files_to_process_per_request = 250; //block of 512 bytes
-    /**
-     * Compression level, 0-uncompressed, 9-maximum compression
-     * @var int
-     */
-    private $compression_level = 0; //0-9 , 0 uncompressed
-    /**
-     * Split backup size limit
-     * Create a new backup archive file once the set size is reached
-     * @var float|int
-     */
-    private $xcloner_split_backup_limit = 2048; //2048MB
-    /**
-     * Number of processed bytes
-     * @var int
-     */
-    private $processed_size_bytes = 0;
-
-    /**
-     * Archive name
-     * @var string
-     */
-    private $archive_name;
-    /**
-     * @var Tar
-     */
-    private $backup_archive;
-    /**
-     * @var Xcloner_File_System
-     */
-    private $filesystem;
-    /**
-     * @var Xcloner_Logger
-     */
-    private $logger;
-    /**
-     * @var Xcloner_Settings
-     */
-    private $xcloner_settings;
-
-    /**
-     * [__construct description]
-     * @param Xcloner $xcloner_container XCloner Container
-     * @param string $archive_name Achive Name
-     */
-    public function __construct(Xcloner $xcloner_container, $archive_name = "")
-    {
-        $this->filesystem = $xcloner_container->get_xcloner_filesystem();
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
-        $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-
-        if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request')) {
-            $this->file_size_per_request_limit = $value * 1024 * 1024;
-        } //MB
-
-        if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request')) {
-            $this->files_to_process_per_request = $value;
-        }
+	/**
+	 * Process file size per API request
+	 * @var float|int
+	 */
+	private $file_size_per_request_limit = 52428800; //50MB = 52428800; 1MB = 1048576
+	/**
+	 * Files count to process per API request
+	 * @var int
+	 */
+	private $files_to_process_per_request = 250; //block of 512 bytes
+	/**
+	 * Compression level, 0-uncompressed, 9-maximum compression
+	 * @var int
+	 */
+	private $compression_level = 0; //0-9 , 0 uncompressed
+	/**
+	 * Split backup size limit
+	 * Create a new backup archive file once the set size is reached
+	 * @var float|int
+	 */
+	private $xcloner_split_backup_limit = 2048; //2048MB
+	/**
+	 * Number of processed bytes
+	 * @var int
+	 */
+	private $processed_size_bytes = 0;
+
+	/**
+	 * Archive name
+	 * @var string
+	 */
+	private $archive_name;
+	/**
+	 * @var Tar
+	 */
+	private $backup_archive;
+	/**
+	 * @var Xcloner_File_System
+	 */
+	private $filesystem;
+	/**
+	 * @var Xcloner_Logger
+	 */
+	private $logger;
+	/**
+	 * @var Xcloner_Settings
+	 */
+	private $xcloner_settings;
+
+	/**
+	 * [__construct description]
+	 * @param Xcloner $xcloner_container XCloner Container
+	 * @param string $archive_name Achive Name
+	 */
+	public function __construct(Xcloner $xcloner_container, $archive_name = "")
+	{
+		$this->filesystem = $xcloner_container->get_xcloner_filesystem();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request')) {
+			$this->file_size_per_request_limit = $value * 1024 * 1024;
+		} //MB
+
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request')) {
+			$this->files_to_process_per_request = $value;
+		}
 
-        if ($value = get_option('xcloner_backup_compression_level')) {
-            $this->compression_level = $value;
-        }
+		if ($value = get_option('xcloner_backup_compression_level')) {
+			$this->compression_level = $value;
+		}
 
-        if ($value = get_option('xcloner_split_backup_limit')) {
-            $this->xcloner_split_backup_limit = $value;
-        }
+		if ($value = get_option('xcloner_split_backup_limit')) {
+			$this->xcloner_split_backup_limit = $value;
+		}
 
-        $this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
+		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
 
-        if (isset($archive_name) && $archive_name) {
-            $this->set_archive_name($archive_name);
-        }
-    }
+		if (isset($archive_name) && $archive_name) {
+			$this->set_archive_name($archive_name);
+		}
+	}
 
-    /*
+	/*
      * Rename backup archive
      *
      * @param string $old_name
      * @param string $new_name
      *
      */
-    public function rename_archive($old_name, $new_name)
-    {
-        $this->logger->info(sprintf("Renaming backup archive %s to %s", $old_name, $new_name));
-        $storage_filesystem = $this->filesystem->get_storage_filesystem();
-        $storage_filesystem->rename($old_name, $new_name);
-    }
-
-    /*
+	public function rename_archive($old_name, $new_name)
+	{
+		$this->logger->info(sprintf("Renaming backup archive %s to %s", $old_name, $new_name));
+		$storage_filesystem = $this->filesystem->get_storage_filesystem();
+		$storage_filesystem->rename($old_name, $new_name);
+	}
+
+	/*
      *
      * Set the backup archive name
      *
      */
-    public function set_archive_name($name = "", $part = 0)
-    {
+	public function set_archive_name($name = "", $part = 0)
+	{
 
-        $this->archive_name = $this->filesystem->process_backup_name($name);
+		$this->archive_name = $this->filesystem->process_backup_name($name);
 
-        if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start()) {
-            //$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
-            $new_name = $this->archive_name;
+		if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start()) {
+			//$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
+			$new_name = $this->archive_name;
 
-            if (!stristr($new_name, "-diff")) {
-                $new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
-            }
+			if (!stristr($new_name, "-diff")) {
+				$new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+			}
 
-            $this->archive_name = $new_name;
+			$this->archive_name = $new_name;
 
-        }
+		}
 
-        if (isset($part) and $part) {
-            $new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
-            if (!stristr($new_name, "-part")) {
-                $new_name = $this->archive_name . "-part" . $part;
-            }
+		if (isset($part) and $part) {
+			$new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+			if (!stristr($new_name, "-part")) {
+				$new_name = $this->archive_name . "-part" . $part;
+			}
 
-            $this->archive_name = $new_name;
-        }
+			$this->archive_name = $new_name;
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /*
+	/*
      *
      * Returns the backup archive name
      *
      * @return string archive name
      */
-    public function get_archive_name()
-    {
-        return $this->archive_name;
-    }
+	public function get_archive_name()
+	{
+		return $this->archive_name;
+	}
 
-    /*
+	/*
      *
      * Returns the multipart naming for the backup archive
      *
      * @return string multi-part backup name
      */
-    public function get_archive_name_multipart()
-    {
-        $new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-        return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
-    }
+	public function get_archive_name_multipart()
+	{
+		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
+		return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+	}
 
-    /*
+	/*
      *
      * Returns the full backup name including extension
      *
      */
-    public function get_archive_name_with_extension()
-    {
-        return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
-    }
+	public function get_archive_name_with_extension()
+	{
+		return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+	}
 
-    /*
+	/*
      *
      * Send notification error by E-Mail
      *
@@ -213,31 +213,31 @@ 
      *
      * @return bool
      */
-    public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
-    {
+	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
+	{
 
-        $body = "";
-        $body .= sprintf(__("Backup Site Url: %s"), get_site_url());
-        $body .= "<br /><>";
+		$body = "";
+		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
+		$body .= "<br /><>";
 
-        $body .= sprintf(__("Error Message: %s"), $error_message);
+		$body .= sprintf(__("Error Message: %s"), $error_message);
 
-        $this->logger->info(sprintf("Sending backup error notification to %s", $to));
+		$this->logger->info(sprintf("Sending backup error notification to %s", $to));
 
-        $admin_email = get_option("admin_email");
+		$admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8');
+		$headers = array('Content-Type: text/html; charset=UTF-8');
 
-        if ($admin_email and $from) {
-            $headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
-        }
+		if ($admin_email and $from) {
+			$headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+		}
 
-        $return = wp_mail($to, $subject, $body, $headers);
+		$return = wp_mail($to, $subject, $body, $headers);
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Send backup archive notfication by E-Mail
      *
@@ -251,480 +251,480 @@ 
      *
      * @return bool
      */
-    public function send_notification(
-        $to,
-        $from,
-        $subject,
-        $backup_name,
-        $params,
-        $error_message = "",
-        $additional = array()
-    ) {
-        if (!$from) {
-            $from = "XCloner Backup";
-        }
+	public function send_notification(
+		$to,
+		$from,
+		$subject,
+		$backup_name,
+		$params,
+		$error_message = "",
+		$additional = array()
+	) {
+		if (!$from) {
+			$from = "XCloner Backup";
+		}
 
-        if (($error_message)) {
-            return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
-        }
+		if (($error_message)) {
+			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
+		}
 
-        $params = (array)$params;
+		$params = (array)$params;
 
-        if (!$subject) {
-            $subject = sprintf(__("New backup generated %s"), $backup_name);
-        }
+		if (!$subject) {
+			$subject = sprintf(__("New backup generated %s"), $backup_name);
+		}
 
-        $body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
-        $body .= "<br /><br />";
+		$body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
+		$body .= "<br /><br />";
 
-        if (isset($additional['lines_total'])) {
-            $body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
-            $body .= "<br /><br />";
-        }
+		if (isset($additional['lines_total'])) {
+			$body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
+			$body .= "<br /><br />";
+		}
 
-        $backup_parts = $this->filesystem->get_multipart_files($backup_name);
+		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 
-        if (!$backups_counter = sizeof($backup_parts)) {
-            $backups_counter = 1;
-        }
+		if (!$backups_counter = sizeof($backup_parts)) {
+			$backups_counter = 1;
+		}
 
-        $body .= sprintf(__("Backup Parts: %s"), $backups_counter);
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
+		$body .= "<br />";
 
-        if (sizeof($backup_parts)) {
-            $body .= implode("<br />", $backup_parts);
-            $body .= "<br />";
-        }
+		if (sizeof($backup_parts)) {
+			$body .= implode("<br />", $backup_parts);
+			$body .= "<br />";
+		}
 
-        $body .= "<br />";
+		$body .= "<br />";
 
-        $body .= sprintf(__("Backup Site Url: %s"), get_site_url());
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
+		$body .= "<br />";
 
-        if (isset($params['backup_params']->backup_comments)) {
-            $body .= __("Backup Comments: ") . $params['backup_params']->backup_comments;
-            $body .= "<br /><br />";
-        }
+		if (isset($params['backup_params']->backup_comments)) {
+			$body .= __("Backup Comments: ") . $params['backup_params']->backup_comments;
+			$body .= "<br /><br />";
+		}
 
-        if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $body .= __("Latest 50 Log Lines: ") . "<br />" . implode("<br />\n",
-                                                                        $this->logger->getLastDebugLines(50));
-        }
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+			$body .= __("Latest 50 Log Lines: ") . "<br />" . implode("<br />\n",
+																		$this->logger->getLastDebugLines(50));
+		}
 
-        $attachments = $this->filesystem->get_backup_attachments();
+		$attachments = $this->filesystem->get_backup_attachments();
 
-        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "info.tgz";
+		$attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "info.tgz";
 
-        $tar = new Tar();
-        $tar->create($attachments_archive);
+		$tar = new Tar();
+		$tar->create($attachments_archive);
 
-        foreach ($attachments as $key => $file) {
-            $tar->addFile($file, basename($file));
-        }
-        $tar->close();
+		foreach ($attachments as $key => $file) {
+			$tar->addFile($file, basename($file));
+		}
+		$tar->close();
 
-        $this->logger->info(sprintf("Sending backup notification to %s", $to));
+		$this->logger->info(sprintf("Sending backup notification to %s", $to));
 
-        $admin_email = get_option("admin_email");
+		$admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: ' . $from . ' <' . $admin_email . '>');
+		$headers = array('Content-Type: text/html; charset=UTF-8', 'From: ' . $from . ' <' . $admin_email . '>');
 
-        $return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
+		$return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Incremental Backup method
      *
      */
-    public function start_incremental_backup($backup_params, $extra_params, $init)
-    {
-        $return = array();
+	public function start_incremental_backup($backup_params, $extra_params, $init)
+	{
+		$return = array();
 
-        if (!isset($extra_params['backup_part'])) {
-            $extra_params['backup_part'] = 0;
-        }
+		if (!isset($extra_params['backup_part'])) {
+			$extra_params['backup_part'] = 0;
+		}
 
-        $return['extra']['backup_part'] = $extra_params['backup_part'];
+		$return['extra']['backup_part'] = $extra_params['backup_part'];
 
-        if (isset($extra_params['backup_archive_name'])) {
-            $this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
-        } else {
-            $this->set_archive_name($backup_params['backup_name']);
-        }
+		if (isset($extra_params['backup_archive_name'])) {
+			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
+		} else {
+			$this->set_archive_name($backup_params['backup_name']);
+		}
 
-        if (!$this->get_archive_name()) {
-            $this->set_archive_name();
-        }
+		if (!$this->get_archive_name()) {
+			$this->set_archive_name();
+		}
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
 
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-        if ($init) {
-            $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
+		if ($init) {
+			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+			$this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
 
-            $return['extra']['backup_init'] = 1;
+			$return['extra']['backup_init'] = 1;
 
-        } else {
-            $this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
+		} else {
+			$this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
+			$this->backup_archive->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
 
-            $return['extra']['backup_init'] = 0;
+			$return['extra']['backup_init'] = 0;
 
-        }
+		}
 
-        $return['extra']['backup_archive_name'] = $this->get_archive_name();
-        $return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
+		$return['extra']['backup_archive_name'] = $this->get_archive_name();
+		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 
-        if (!isset($extra_params['start_at_line'])) {
-            $extra_params['start_at_line'] = 0;
-        }
+		if (!isset($extra_params['start_at_line'])) {
+			$extra_params['start_at_line'] = 0;
+		}
 
-        if (!isset($extra_params['start_at_byte'])) {
-            $extra_params['start_at_byte'] = 0;
-        }
+		if (!isset($extra_params['start_at_byte'])) {
+			$extra_params['start_at_byte'] = 0;
+		}
 
-        if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
-            $this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
-                $this->filesystem->get_included_files_handler()));
+		if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
+			$this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
+				$this->filesystem->get_included_files_handler()));
 
-            $return['finished'] = 1;
-            return $return;
-        }
+			$return['finished'] = 1;
+			return $return;
+		}
 
-        $included_files_handler = $this->filesystem->get_included_files_handler(1);
+		$included_files_handler = $this->filesystem->get_included_files_handler(1);
 
-        $file = new SplFileObject($included_files_handler);
+		$file = new SplFileObject($included_files_handler);
 
-        $file->seek(PHP_INT_MAX);
+		$file->seek(PHP_INT_MAX);
 
-        $return['extra']['lines_total'] = ($file->key() - 1);
+		$return['extra']['lines_total'] = ($file->key() - 1);
 
-        //we skip the first CSV line with headers
-        if (!$extra_params['start_at_line']) {
-            $file->seek(1);
-        } else {
-            $file->seek($extra_params['start_at_line'] + 1);
-        }
+		//we skip the first CSV line with headers
+		if (!$extra_params['start_at_line']) {
+			$file->seek(1);
+		} else {
+			$file->seek($extra_params['start_at_line'] + 1);
+		}
 
-        $this->processed_size_bytes = 0;
+		$this->processed_size_bytes = 0;
 
-        $counter = 0;
+		$counter = 0;
 
-        $start_byte = $extra_params['start_at_byte'];
+		$start_byte = $extra_params['start_at_byte'];
 
-        $byte_limit = 0;
+		$byte_limit = 0;
 
-        while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
-            $current_line_str = $file->current();
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
+			$current_line_str = $file->current();
 
-            $line = str_getcsv($current_line_str);
+			$line = str_getcsv($current_line_str);
 
-            $relative_path = stripslashes($line[0]);
+			$relative_path = stripslashes($line[0]);
 
-            $start_filesystem = "start_filesystem";
+			$start_filesystem = "start_filesystem";
 
-            if (isset($line[4])) {
-                $start_filesystem = $line[4];
-            }
+			if (isset($line[4])) {
+				$start_filesystem = $line[4];
+			}
 
-            //$adapter = $this->filesystem->get_adapter($start_filesystem);
+			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 
-            if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
-                if ($relative_path != "") {
-                    $this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
-                        $relative_path));
-                }
+			if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
+				if ($relative_path != "") {
+					$this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
+						$relative_path));
+				}
 
-                $extra_params['start_at_line']++;
-                $file->next();
-                continue;
-            }
+				$extra_params['start_at_line']++;
+				$file->next();
+				continue;
+			}
 
-            $file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
+			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 
-            if (!isset($file_info['size'])) {
-                $file_info['size'] = 0;
-            }
+			if (!isset($file_info['size'])) {
+				$file_info['size'] = 0;
+			}
 
-            if ($start_filesystem == "tmp_filesystem") {
-                $file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
-            }
+			if ($start_filesystem == "tmp_filesystem") {
+				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
+			}
 
-            $byte_limit = (int)$this->file_size_per_request_limit / 512;
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 
-            $append = 0;
+			$append = 0;
 
-            if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
-                $append = 1;
-            }
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
+				$append = 1;
+			}
 
-            if (!isset($return['extra']['backup_size'])) {
-                $return['extra']['backup_size'] = 0;
-            }
+			if (!isset($return['extra']['backup_size'])) {
+				$return['extra']['backup_size'] = 0;
+			}
 
-            $return['extra']['backup_size'] = $archive_info->getSize();
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            $estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
+			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 
-            //we create a new backup part if we reach the Split Achive Limit
-            if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
-                $this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
-                    $this->xcloner_split_backup_limit, $estimated_new_size));
-                list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
+			//we create a new backup part if we reach the Split Achive Limit
+			if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
+				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
+					$this->xcloner_split_backup_limit, $estimated_new_size));
+				list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
 
-                if ($file_info['size'] > $this->xcloner_split_backup_limit) {
-                    $this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
-                        $file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
-                    $extra_params['start_at_line']++;
-                }
+				if ($file_info['size'] > $this->xcloner_split_backup_limit) {
+					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
+						$file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
+					$extra_params['start_at_line']++;
+				}
 
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = 0;
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = 0;
 
-                $return['finished'] = 0;
+				$return['finished'] = 0;
 
-                return $return;
-            }
+				return $return;
+			}
 
-            list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
-                $append, $start_filesystem);
-            $this->processed_size_bytes += $bytes_wrote;
+			list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
+				$append, $start_filesystem);
+			$this->processed_size_bytes += $bytes_wrote;
 
-            //echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-            $return['extra']['backup_size'] = $archive_info->getSize();
+			//echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            if ($last_position > 0) {
-                $start_byte = $last_position;
-            } else {
-                $extra_params['start_at_line']++;
-                $file->next();
-                $start_byte = 0;
-                $counter++;
-            }
+			if ($last_position > 0) {
+				$start_byte = $last_position;
+			} else {
+				$extra_params['start_at_line']++;
+				$file->next();
+				$start_byte = 0;
+				$counter++;
+			}
 
-            if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
-                clearstatcache();
-                $return['extra']['backup_size'] = $archive_info->getSize();
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
+				clearstatcache();
+				$return['extra']['backup_size'] = $archive_info->getSize();
 
-                $return['finished'] = 0;
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = $last_position;
-                $this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
-                    $this->file_size_per_request_limit));
-                return $return;
-            }
-        }
+				$return['finished'] = 0;
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = $last_position;
+				$this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
+					$this->file_size_per_request_limit));
+				return $return;
+			}
+		}
 
-        if (!$file->eof()) {
-            clearstatcache();
-            $return['extra']['backup_size'] = $archive_info->getSize();
+		if (!$file->eof()) {
+			clearstatcache();
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            $return['finished'] = 0;
-            $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-            $return['extra']['start_at_byte'] = $last_position;
-            $this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
-                $this->files_to_process_per_request));
+			$return['finished'] = 0;
+			$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+			$return['extra']['start_at_byte'] = $last_position;
+			$this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
+				$this->files_to_process_per_request));
 
-            return $return;
-        }
+			return $return;
+		}
 
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
 
-        /**
-         * XCloner HOOK backup_archive_finished.
-         *
-         * This will get triggered when a backup archive is finished writing.
-         */
-        //do_action('backup_archive_finished', $this->backup_archive, $this);
+		/**
+		 * XCloner HOOK backup_archive_finished.
+		 *
+		 * This will get triggered when a backup archive is finished writing.
+		 */
+		//do_action('backup_archive_finished', $this->backup_archive, $this);
 
-        //updating archive_info
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		//updating archive_info
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-        if ($return['extra']['backup_part']) {
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+		if ($return['extra']['backup_part']) {
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
+		$return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
 
-        if (isset($file_info)) {
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-        }
+		if (isset($file_info)) {
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+		}
 
-        clearstatcache();
-        $return['extra']['backup_size'] = $archive_info->getSize();
+		clearstatcache();
+		$return['extra']['backup_size'] = $archive_info->getSize();
 
-        $return['finished'] = 1;
-        return $return;
-    }
+		$return['finished'] = 1;
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Write multipart file components
      *
      */
-    private function write_multipart_file($path)
-    {
-        $path = $this->get_archive_name_with_extension();
+	private function write_multipart_file($path)
+	{
+		$path = $this->get_archive_name_with_extension();
 
-        $file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
-        //print_r($file_info);
-        $line = '"' . $file['path'] . '","' . $file['timestamp'] . '","' . $file['size'] . '"' . PHP_EOL;
+		$file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
+		//print_r($file_info);
+		$line = '"' . $file['path'] . '","' . $file['timestamp'] . '","' . $file['size'] . '"' . PHP_EOL;
 
 
-        $this->filesystem->get_filesystem("storage_filesystem_append")
-            ->write($this->get_archive_name_multipart(), $line);
-    }
+		$this->filesystem->get_filesystem("storage_filesystem_append")
+			->write($this->get_archive_name_multipart(), $line);
+	}
 
-    /*
+	/*
      *
      * Create a new backup part
      *
      */
-    private function create_new_backup_part($part = 0)
-    {
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
-
-        if (!$part) {
-            $old_name = $this->get_archive_name_with_extension();
-            $this->set_archive_name($this->get_archive_name(), ++$part);
-            $this->rename_archive($old_name, $this->get_archive_name_with_extension());
-
-            if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
-                $this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
-            }
-
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-
-        } else {
-            $this->logger->info(sprintf("Creating new multipart info file %s",
-                $this->get_archive_name_with_extension()));
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+	private function create_new_backup_part($part = 0)
+	{
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
+
+		if (!$part) {
+			$old_name = $this->get_archive_name_with_extension();
+			$this->set_archive_name($this->get_archive_name(), ++$part);
+			$this->rename_archive($old_name, $this->get_archive_name_with_extension());
+
+			if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
+				$this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
+			}
+
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+
+		} else {
+			$this->logger->info(sprintf("Creating new multipart info file %s",
+				$this->get_archive_name_with_extension()));
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $this->set_archive_name($this->get_archive_name(), ++$part);
+		$this->set_archive_name($this->get_archive_name(), ++$part);
 
-        $this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
+		$this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
-        $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		$this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
 
-        return array($archive_info, $part);
+		return array($archive_info, $part);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Add file to archive
      *
      */
-    public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
-    {
-
-        $start_adapter = $this->filesystem->get_adapter($filesystem);
-        $start_filesystem = $this->filesystem->get_adapter($filesystem);
-
-        if (!$file_info['path']) {
-            return;
-        }
-
-        if (isset($file_info['archive_prefix_path'])) {
-            $file_info['target_path'] = $file_info['archive_prefix_path'] . "/" . $file_info['path'];
-        } else {
-            $file_info['target_path'] = $file_info['path'];
-        }
-
-        $last_position = $start_at_byte;
-
-        //$start_adapter = $this->filesystem->get_start_adapter();
-
-        if (!$append) {
-            $bytes_wrote = $file_info['size'];
-            $this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
-                $file_info['target_path'], $this->get_archive_name_with_extension()));
-            $this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
-                $file_info['target_path']);
-        } else {
-            $tmp_file = md5($file_info['path']);
-
-            //we isolate file to tmp if we are at byte 0, the starting point of file reading
-            if (!$start_at_byte) {
-                $this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
-                    $file_info['path'], $tmp_file));
-                $file_stream = $start_filesystem->readStream($file_info['path']);
-
-                if (is_resource($file_stream['stream'])) {
-                    $this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
-                }
-            }
-
-            if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
-                $is_tmp = 1;
-                $last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
-                                                        ->applyPathPrefix($tmp_file),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            } else {
-                $is_tmp = 0;
-                $last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            }
-
-
-            if ($last_position == -1) {
-                $bytes_wrote = $file_info['size'] - $start_at_byte;
-            } else {
-                $bytes_wrote = $last_position - $start_at_byte;
-            }
+	public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
+	{
 
+		$start_adapter = $this->filesystem->get_adapter($filesystem);
+		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 
-            if ($is_tmp) {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
-                    $bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
-            } else {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
-                    $bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
-            }
+		if (!$file_info['path']) {
+			return;
+		}
 
-            //we delete here the isolated tmp file
-            if ($last_position == -1) {
-                if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
-                    $this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
-                    $this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
-                }
-            }
+		if (isset($file_info['archive_prefix_path'])) {
+			$file_info['target_path'] = $file_info['archive_prefix_path'] . "/" . $file_info['path'];
+		} else {
+			$file_info['target_path'] = $file_info['path'];
+		}
 
-        }
+		$last_position = $start_at_byte;
+
+		//$start_adapter = $this->filesystem->get_start_adapter();
+
+		if (!$append) {
+			$bytes_wrote = $file_info['size'];
+			$this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
+				$file_info['target_path'], $this->get_archive_name_with_extension()));
+			$this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
+				$file_info['target_path']);
+		} else {
+			$tmp_file = md5($file_info['path']);
+
+			//we isolate file to tmp if we are at byte 0, the starting point of file reading
+			if (!$start_at_byte) {
+				$this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
+					$file_info['path'], $tmp_file));
+				$file_stream = $start_filesystem->readStream($file_info['path']);
+
+				if (is_resource($file_stream['stream'])) {
+					$this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
+				}
+			}
+
+			if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
+				$is_tmp = 1;
+				$last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
+														->applyPathPrefix($tmp_file),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			} else {
+				$is_tmp = 0;
+				$last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			}
+
+
+			if ($last_position == -1) {
+				$bytes_wrote = $file_info['size'] - $start_at_byte;
+			} else {
+				$bytes_wrote = $last_position - $start_at_byte;
+			}
+
+
+			if ($is_tmp) {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
+					$bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
+			} else {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
+					$bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
+			}
+
+			//we delete here the isolated tmp file
+			if ($last_position == -1) {
+				if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
+					$this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
+					$this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
+				}
+			}
 
-        return array($bytes_wrote, $last_position);
-    }
+		}
 
-    /**
-     * Open a TAR archive and put the file cursor at the end for data appending
-     *
-     * If $file is empty, the tar file will be created in memory
-     *
-     * @param string $file
-     * @throws ArchiveIOException
-     */
-    /*
+		return array($bytes_wrote, $last_position);
+	}
+
+	/**
+	 * Open a TAR archive and put the file cursor at the end for data appending
+	 *
+	 * If $file is empty, the tar file will be created in memory
+	 *
+	 * @param string $file
+	 * @throws ArchiveIOException
+	 */
+	/*
     public function openForAppend($file = '')
     {
         $this->file   = $file;
@@ -754,17 +754,17 @@ 
     }
     */
 
-    /**
-     * Append data to a file to the current TAR archive using an existing file in the filesystem
-     *
-     * @param string $file path to the original file
-     * @param int $start starting reading position in file
-     * @param int $end end position in reading multiple with 512
-     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with
-     * all meta data, empty to take from original
-     * @throws ArchiveIOException
-     */
-    /*
+	/**
+	 * Append data to a file to the current TAR archive using an existing file in the filesystem
+	 *
+	 * @param string $file path to the original file
+	 * @param int $start starting reading position in file
+	 * @param int $end end position in reading multiple with 512
+	 * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with
+	 * all meta data, empty to take from original
+	 * @throws ArchiveIOException
+	 */
+	/*
      * public function appendFileData($file, $fileinfo = '', $start = 0, $limit = 0)
     {
 		$end = $start+($limit*512);
@@ -820,15 +820,15 @@ 
         return $last_position;
     }*/
 
-    /**
-     * Adds a file to a TAR archive by appending it's data
-     *
-     * @param string $archive name of the archive file
-     * @param string $file name of the file to read data from
-     * @param string $start start position from where to start reading data
-     * @throws ArchiveIOException
-     */
-    /*public function addFileToArchive($archive, $file, $start = 0)
+	/**
+	 * Adds a file to a TAR archive by appending it's data
+	 *
+	 * @param string $archive name of the archive file
+	 * @param string $file name of the file to read data from
+	 * @param string $start start position from where to start reading data
+	 * @throws ArchiveIOException
+	 */
+	/*public function addFileToArchive($archive, $file, $start = 0)
     {
         $this->openForAppend($archive);
         return $start = $this->appendFileData($file, $start, $this->file_size_per_request_limit);

Spacing +15 added lines, -15 removed lines

@@ -148,7 +148,7 @@ 
             $new_name = $this->archive_name;
 
             if (!stristr($new_name, "-diff")) {
-                $new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+                $new_name = $this->archive_name."-diff".date("Y-m-d_H-i", $diff_timestamp_start);
             }
 
             $this->archive_name = $new_name;
@@ -156,9 +156,9 @@ 
         }
 
         if (isset($part) and $part) {
-            $new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+            $new_name = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
             if (!stristr($new_name, "-part")) {
-                $new_name = $this->archive_name . "-part" . $part;
+                $new_name = $this->archive_name."-part".$part;
             }
 
             $this->archive_name = $new_name;
@@ -187,7 +187,7 @@ 
     public function get_archive_name_multipart()
     {
         $new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-        return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+        return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
     }
 
     /*
@@ -197,7 +197,7 @@ 
      */
     public function get_archive_name_with_extension()
     {
-        return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+        return $this->archive_name.$this->xcloner_settings->get_backup_extension_name();
     }
 
     /*
@@ -229,7 +229,7 @@ 
         $headers = array('Content-Type: text/html; charset=UTF-8');
 
         if ($admin_email and $from) {
-            $headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+            $headers[] = 'From: '.$from.' <'.$admin_email.'>';
         }
 
         $return = wp_mail($to, $subject, $body, $headers);
@@ -302,18 +302,18 @@ 
         $body .= "<br />";
 
         if (isset($params['backup_params']->backup_comments)) {
-            $body .= __("Backup Comments: ") . $params['backup_params']->backup_comments;
+            $body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
             $body .= "<br /><br />";
         }
 
         if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $body .= __("Latest 50 Log Lines: ") . "<br />" . implode("<br />\n",
+            $body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n",
                                                                         $this->logger->getLastDebugLines(50));
         }
 
         $attachments = $this->filesystem->get_backup_attachments();
 
-        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "info.tgz";
+        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path().DS."info.tgz";
 
         $tar = new Tar();
         $tar->create($attachments_archive);
@@ -327,7 +327,7 @@ 
 
         $admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: ' . $from . ' <' . $admin_email . '>');
+        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
 
         $return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 
@@ -367,14 +367,14 @@ 
         if ($init) {
             $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+            $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
             $return['extra']['backup_init'] = 1;
 
         } else {
             $this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
+            $this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
 
             $return['extra']['backup_init'] = 0;
 
@@ -582,7 +582,7 @@ 
 
         $file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
         //print_r($file_info);
-        $line = '"' . $file['path'] . '","' . $file['timestamp'] . '","' . $file['size'] . '"' . PHP_EOL;
+        $line = '"'.$file['path'].'","'.$file['timestamp'].'","'.$file['size'].'"'.PHP_EOL;
 
 
         $this->filesystem->get_filesystem("storage_filesystem_append")
@@ -625,7 +625,7 @@ 
         $this->backup_archive = new Tar();
         $this->backup_archive->setCompression($this->compression_level);
         $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
-        $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+        $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
         return array($archive_info, $part);
 
@@ -647,7 +647,7 @@ 
         }
 
         if (isset($file_info['archive_prefix_path'])) {
-            $file_info['target_path'] = $file_info['archive_prefix_path'] . "/" . $file_info['path'];
+            $file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
         } else {
             $file_info['target_path'] = $file_info['path'];
         }

includes/class-xcloner-file-system.php

Doc Comments +12 added lines

@@ -207,6 +207,9 @@ 
         return $this->start_filesystem->normalizeFileInfo($info);
     }
 
+    /**
+     * @param string $file
+     */
     public function get_storage_path_file_info($file)
     {
         return $this->getMetadataFull('storage_adapter', $file);
@@ -284,6 +287,9 @@ 
         return $total;
     }
 
+    /**
+     * @param string $backup_name
+     */
     public function is_part($backup_name)
     {
         if (stristr($backup_name, "-part")) {
@@ -741,6 +747,9 @@ 
 
     }
 
+    /**
+     * @param string $tmp_file
+     */
     public function estimate_reading_time($tmp_file)
     {
         $this->logger->debug(sprintf(("Estimating file system reading time")));
@@ -781,6 +790,9 @@ 
         return $name;
     }
 
+    /**
+     * @param string $field
+     */
     public function sort_by(&$array, $field, $direction = 'asc')
     {
         if (strtolower($direction) == "desc" || $direction == SORT_DESC) {

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 +957 added lines, -957 removed lines

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

Spacing +29 added lines, -29 removed lines

@@ -102,8 +102,8 @@ 
             $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());
+        }catch (Exception $e) {
+            $this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
         }
 
 
@@ -161,7 +161,7 @@ 
     {
         if ($remote_storage_selection != "") {
             $remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
-            $method = "get_" . $remote_storage_selection . "_filesystem";
+            $method = "get_".$remote_storage_selection."_filesystem";
 
             if (!method_exists($remote_storage, $method)) {
                 return false;
@@ -431,7 +431,7 @@ 
                     $this->build_files_list($file);
                     $counter++;
                 } else {
-                    $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
+                    $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
                 }
             }
         } else {
@@ -472,15 +472,15 @@ 
     {
         $return = array();
 
-        $files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
+        $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);
+            $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();
+                $log_file = $this->xcloner_settings->get_xcloner_store_path().DS.$this->xcloner_settings->get_logger_filename();
             }
 
             if (file_exists($log_file)) {
@@ -614,7 +614,7 @@ 
 
             $files = $this->start_filesystem->listContents($folder);
             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",
@@ -642,7 +642,7 @@ 
                 }
             }
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -652,7 +652,7 @@ 
 
     public function estimate_read_write_time()
     {
-        $tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
+        $tmp_file = ".xcloner".substr(md5(time()), 0, 5);
 
         $start_time = microtime(true);
 
@@ -669,7 +669,7 @@ 
 
             $this->tmp_filesystem->delete($tmp_file);
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -686,7 +686,7 @@ 
         $_backup_files_list = array();
 
         //rule date limit
-        $current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
+        $current_timestamp = strtotime("-".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')." days");
 
         $files = $this->storage_filesystem->listContents();
 
@@ -711,18 +711,18 @@ 
             {
                 $this->storage_filesystem->delete($file['path']);
                 $_storage_size -= $file['size'];
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+                $this->logger->info("Deleting backup ".$file['path']." matching rule", array(
                     "STORAGE SIZE LIMIT",
-                    $_storage_size . " >= " . $set_storage_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(
+                $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')
+                    $file['timestamp']." =< ".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
                 ));
             }
 
@@ -730,9 +730,9 @@ 
             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(
+                $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')
+                    $_backups_counter." >= ".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
                 ));
             }
 
@@ -829,7 +829,7 @@ 
             }
 
             if ($timestamp <= $this->get_diff_timestamp_start()) {
-                return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
+                return " file DIFF timestamp ".$timestamp." < ".$this->diff_timestamp_start;
             }
         }
 
@@ -842,7 +842,7 @@ 
 
         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";
+                return "> ".$xcloner_exclude_files_larger_than_mb."MB";
             }
         }
 
@@ -855,10 +855,10 @@ 
                 if ($excluded_file_pattern == "/") {
                     $needle = "$";
                 } else {
-                    $needle = "$" . $excluded_file_pattern;
+                    $needle = "$".$excluded_file_pattern;
                 }
 
-                if (strstr("$" . $file['path'], $needle)) {
+                if (strstr("$".$file['path'], $needle)) {
                     return $excluded_file_pattern;
                 }
             }
@@ -937,11 +937,11 @@ 
                 if ($file['path'] == "/") {
                     $needle = "/";
                 } else {
-                    $needle = "/" . $file['path'];
+                    $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;
                 }
             }
@@ -963,14 +963,14 @@ 
 
         $csv_filename = str_replace('"', '""', $file['path']);
 
-        $line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
+        $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->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
         }
@@ -990,13 +990,13 @@ 
         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;
+                $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) {
+        }catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
         }

Braces +3 added lines, -1 removed lines

@@ -707,9 +707,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",

includes/class-xcloner-file-transfer.php

Doc Comments +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function get_target()
     {
@@ -141,7 +141,7 @@ 
     }
 
     /**
-     * @param $filename
+     * @param string $filename
      * @param string $mimetype
      * @param string $postname
      *

Indentation +99 added lines, -99 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 
         $binary_data = fread($fp, $this->transfer_limit);
 
-        $tmp_filename = "xcloner_upload_" . substr(md5(time()), 0, 5);
+        $tmp_filename = "xcloner_upload_".substr(md5(time()), 0, 5);
 
         $this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
 
@@ -122,7 +122,7 @@ 
         $result = json_decode($original_result);
 
         if (!$result) {
-            throw new Exception("We have received no valid response from the remote host, original message: " . $original_result);
+            throw new Exception("We have received no valid response from the remote host, original message: ".$original_result);
         }
 
         if ($result->status != 200) {