ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

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)
 	{
 		//return preg_replace('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!e', "'s:'.strlen(unescape_mysql('$3')).':\"'.unescape_quotes('$3').'\";'", $query);

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;
 		}
 
 	}

Spacing +189 added lines, -189 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 = get_option("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;
@@ -992,10 +992,10 @@ 
 	{
 		//return preg_replace('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!e', "'s:'.strlen(unescape_mysql('$3')).':\"'.unescape_quotes('$3').'\";'", $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;
 		}
 

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;
 		}
 

includes/class-xcloner-archive.php

Spacing +89 added lines, -89 removed lines

@@ -8,11 +8,11 @@ 
 	/*
 	 * bytes
 	 */ 
-	private $file_size_per_request_limit	= 52428800 ; //50MB = 52428800; 1MB = 1048576
-	private $files_to_process_per_request 	= 250; //block of 512 bytes
-	private $compression_level 				= 0; //0-9 , 0 uncompressed
+	private $file_size_per_request_limit	= 52428800; //50MB = 52428800; 1MB = 1048576
+	private $files_to_process_per_request = 250; //block of 512 bytes
+	private $compression_level = 0; //0-9 , 0 uncompressed
 	private $xcloner_split_backup_limit		= 2048; //2048MB
-	private $processed_size_bytes			= 0 ;
+	private $processed_size_bytes = 0;
 	
 	private $archive_name;
 	private $backup_archive;
@@ -22,25 +22,25 @@ 
 	
 	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->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_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'))
+		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'))
+		if ($value = get_option('xcloner_backup_compression_level'))
 			$this->compression_level = $value;
 		
-		if($value = get_option('xcloner_split_backup_limit'))
+		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)
+		if (isset($archive_name) && $archive_name)
 		{
 			$this->set_archive_name($archive_name);
 		}
@@ -68,23 +68,23 @@ 
 		
 		$this->archive_name = $this->filesystem->process_backup_name($name);
 		
-		if($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start())
+		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;
 			
 		}
 		
-		if(isset($part) and $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;
+			$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;	
 		}
@@ -109,7 +109,7 @@ 
 	 */ 
 	public function get_archive_name_multipart()
 	{
-		$new_name =  preg_replace('/-part(\d*)/', "", $this->archive_name);
+		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
 		return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
 	}
 	
@@ -131,7 +131,7 @@ 
 	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
 	{
 		
-		$body  = $error_message; 
+		$body = $error_message; 
 		
 		$this->logger->info(sprintf("Sending backup error notification to %s", $to));
 		
@@ -139,10 +139,10 @@ 
 		
 		$headers = array('Content-Type: text/html; charset=UTF-8');
 		
-		if($admin_email and $from )
+		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;
 	}
@@ -152,29 +152,29 @@ 
 	 * Send backup archive notfication by E-Mail
 	 * 
 	 */ 
-	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message="", $additional = array())
+	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message = "", $additional = array())
 	{
-		if(!$from)
+		if (!$from)
 		{
 			$from = "XCloner Backup";
 		}
 			
-		if(($error_message))
+		if (($error_message))
 		{
 			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
 		}
 		
 		$params = (array)$params;
 		
-		if(!$subject)
+		if (!$subject)
 		{
-			$subject = sprintf(__("New backup generated %s") ,$backup_name);
+			$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 />";
 		
-		if(isset($additional['lines_total']))
+		if (isset($additional['lines_total']))
 		{
 			$body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
 			$body .= "<br /><br />";
@@ -182,27 +182,27 @@ 
 		
 		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 		
-		if(!$backups_counter = sizeof($backup_parts))
+		if (!$backups_counter = sizeof($backup_parts))
 			$backups_counter = 1;
 		
 		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
 		$body .= "<br />";
 		
-		if(sizeof($backup_parts))
+		if (sizeof($backup_parts))
 		{
-			$body .= implode("<br />",$backup_parts);
+			$body .= implode("<br />", $backup_parts);
 			$body .= "<br />";
 		}
 		
-		$body.= "<br />";
+		$body .= "<br />";
 		
-		if(isset($params['backup_params']->backup_comments))
+		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'))
+		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();
@@ -212,7 +212,7 @@ 
 		$tar = new Tar();
 		$tar->create($attachments_archive);
 			
-		foreach($attachments as $key => $file)
+		foreach ($attachments as $key => $file)
 		{
 			$tar->addFile($file, basename($file));
 		}
@@ -224,7 +224,7 @@ 
 		
 		$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;
 	}
@@ -238,17 +238,17 @@ 
 	{
 		$return = array();
 		
-		if(!isset($extra_params['backup_part']))
+		if (!isset($extra_params['backup_part']))
 			$extra_params['backup_part'] = 0;
 		
 		$return['extra']['backup_part'] = $extra_params['backup_part'];
 					
-		if(isset( $extra_params['backup_archive_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())
+		if (!$this->get_archive_name())
 			$this->set_archive_name();
 		
 		$this->backup_archive = new Tar();
@@ -256,7 +256,7 @@ 
 		
 		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 		
-		if($init)
+		if ($init)
 		{
 			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 		
@@ -264,7 +264,7 @@ 
 			
 			$return['extra']['backup_init'] = 1;
 			
-		}else{
+		} 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());
@@ -276,13 +276,13 @@ 
 		$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']))
+		if (!isset($extra_params['start_at_line']))
 			$extra_params['start_at_line'] = 0;
 		
-		if(!isset($extra_params['start_at_byte']))
+		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()))
+		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()));
 			
@@ -296,14 +296,14 @@ 
 		
 		$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'])
+		if (!$extra_params['start_at_line'])
 		{
 			$file->seek(1);
-		}else{
-			$file->seek($extra_params['start_at_line']+1);
+		} else {
+			$file->seek($extra_params['start_at_line'] + 1);
 		}
 		
 		$this->processed_size_bytes = 0;
@@ -314,7 +314,7 @@ 
 		
 		$byte_limit = 0;
 		
-		while(!$file->eof() and $counter<=$this->files_to_process_per_request)
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request)
 		{
 			$current_line_str = $file->current();
 			
@@ -324,15 +324,15 @@ 
 			
 			$start_filesystem = "start_filesystem";
 			
-			if(isset($line[4])){
+			if (isset($line[4])) {
 				$start_filesystem = $line[4];
 			}
 			
 			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 			
-			if(!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
+			if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
 			{
-				if($relative_path != "")
+				if ($relative_path != "")
 				{
 					$this->logger->error(sprintf("Could not add file %b to backup archive, file not found", $relative_path));
 				}
@@ -344,37 +344,37 @@ 
 			
 			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 			
-			if(!isset($file_info['size']))
+			if (!isset($file_info['size']))
 				$file_info['size'] = 0;
 			
-			if($start_filesystem == "tmp_filesystem")
+			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;
 			
-			if($file_info['size'] > $byte_limit*512 or $start_byte)
+			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();
 			
 			$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))
+			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));
+				$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)
+				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));
+					$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']++;
 				}
 				
@@ -386,7 +386,7 @@ 
 				return $return;
 			}
 			
-			list($bytes_wrote, $last_position) = $this->add_file_to_archive( $file_info, $start_byte, $byte_limit, $append, $start_filesystem);
+			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";
@@ -394,17 +394,17 @@ 
 			$return['extra']['processed_file_size'] = $file_info['size'];
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
-			if($last_position>0){	
+			if ($last_position > 0) {	
 				$start_byte = $last_position;
 			}
-			else{	
+			else {	
 				$extra_params['start_at_line']++;
 				$file->next();
 				$start_byte = 0;
 				$counter++;
 			}
 			
-			if($this->processed_size_bytes >= $this->file_size_per_request_limit)
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit)
 			{
 				clearstatcache();
 				$return['extra']['backup_size'] = $archive_info->getSize();
@@ -417,7 +417,7 @@ 
 			}
 		}
 		
-		if(!$file->eof())
+		if (!$file->eof())
 		{
 			clearstatcache();
 			$return['extra']['backup_size'] = $archive_info->getSize();
@@ -434,12 +434,12 @@ 
 		$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($return['extra']['backup_part'])
+		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))
+		if (isset($file_info))
 		{
 			$return['extra']['processed_file'] = $file_info['path'];
 			$return['extra']['processed_file_size'] = $file_info['size'];
@@ -481,20 +481,20 @@ 
 		$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)
+		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()))
+			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
+		} else
 		{
-			$this->logger->info(sprintf("Creating new multipart info file %s",$this->get_archive_name_with_extension()));
+			$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());
 		}
 				
@@ -522,10 +522,10 @@ 
 		$start_adapter = $this->filesystem->get_adapter($filesystem);
 		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 		
-		if(!$file_info['path'])
+		if (!$file_info['path'])
 			return;
 		
-		if(isset($file_info['archive_prefix_path']))	
+		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'];
@@ -534,36 +534,36 @@ 
 		
 		//$start_adapter = $this->filesystem->get_start_adapter();
 
-		if(!$append){
+		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{	
+		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)
+			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']))
+				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))
+			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{
+			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)
+			if ($last_position == -1)
 			{
 				$bytes_wrote = $file_info['size'] - $start_at_byte;
 			}
@@ -573,18 +573,18 @@ 
 			}
 			
 			
-			if($is_tmp)
+			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{
+			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 ($last_position == -1)
 			{
-				if($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file))
+				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);

Braces +79 added lines, -61 removed lines

@@ -26,17 +26,22 @@ 
 		$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_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 = $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
 			
@@ -73,8 +78,9 @@ 
 			//$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;
 			
@@ -83,8 +89,9 @@ 
 		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(!stristr($new_name, "-part")) {
+							$new_name = $this->archive_name . "-part".$part;
+			}
 			
 			$this->archive_name = $new_name;	
 		}
@@ -139,8 +146,9 @@ 
 		
 		$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 );
 		
@@ -182,8 +190,9 @@ 
 		
 		$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 />";
@@ -202,8 +211,9 @@ 
 			$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();
 		
@@ -238,18 +248,21 @@ 
 	{
 		$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'];
 					
-		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);
@@ -264,7 +277,7 @@ 
 			
 			$return['extra']['backup_init'] = 1;
 			
-		}else{
+		} 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());
@@ -276,11 +289,13 @@ 
 		$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()))
 		{
@@ -302,7 +317,7 @@ 
 		if(!$extra_params['start_at_line'])
 		{
 			$file->seek(1);
-		}else{
+		} else{
 			$file->seek($extra_params['start_at_line']+1);
 		}
 		
@@ -344,8 +359,9 @@ 
 			
 			$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")
 			{	
@@ -356,11 +372,13 @@ 
 			
 			$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();
 			
@@ -396,8 +414,7 @@ 
 			
 			if($last_position>0){	
 				$start_byte = $last_position;
-			}
-			else{	
+			} else{	
 				$extra_params['start_at_line']++;
 				$file->next();
 				$start_byte = 0;
@@ -434,8 +451,9 @@ 
 		$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($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;
 		
@@ -487,12 +505,13 @@ 
 			$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());
+			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
+		} 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());
@@ -522,13 +541,15 @@ 
 		$start_adapter = $this->filesystem->get_adapter($filesystem);
 		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 		
-		if(!$file_info['path'])
-			return;
+		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'];
+		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;
 		
@@ -538,8 +559,7 @@ 
 			$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{	
+		} else{	
 			$tmp_file = md5($file_info['path']);
 			
 			//we isolate file to tmp if we are at byte 0, the starting point of file reading
@@ -548,16 +568,16 @@ 
 				$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(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{
+			} 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);
 			}
@@ -566,8 +586,7 @@ 
 			if($last_position == -1)
 			{
 				$bytes_wrote = $file_info['size'] - $start_at_byte;
-			}
-			else
+			} else
 			{
 				$bytes_wrote = $last_position - $start_at_byte;
 			}
@@ -576,8 +595,7 @@ 
 			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{
+			} 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()));
 			}
 			

includes/class-xcloner-settings.php

Indentation +250 added lines, -250 removed lines

@@ -209,262 +209,262 @@ 
 	
 	public function settings_init()
 	{
-	    global $wpdb;
-	    $this->xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
+		global $wpdb;
+		$this->xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 	    
-	    //ADDING MISSING OPTIONS
-	    if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
+		//ADDING MISSING OPTIONS
+		if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
 			add_option( 'xcloner_mysql_settings_page' );
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cron_settings_page' ) ) {  
+		if( false == get_option( 'xcloner_cron_settings_page' ) ) {  
 			add_option( 'xcloner_cron_settings_page' );
 		} // end if
 	    
-	    if( false == get_option( 'xcloner_system_settings_page' ) ) {  
+		if( false == get_option( 'xcloner_system_settings_page' ) ) {  
 			add_option( 'xcloner_system_settings_page' );
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
+		if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
 			add_option( 'xcloner_cleanup_settings_page' );
 		} // end if
 	 
 	    
-	    //ADDING SETTING SECTIONS
-	    //GENERAL section
-	    add_settings_section(
-	        'xcloner_general_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_settings_page'
-	    );
-	    //MYSQL section
-	    add_settings_section(
-	        'xcloner_mysql_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_mysql_settings_page'
-	    );
+		//ADDING SETTING SECTIONS
+		//GENERAL section
+		add_settings_section(
+			'xcloner_general_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_settings_page'
+		);
+		//MYSQL section
+		add_settings_section(
+			'xcloner_mysql_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_mysql_settings_page'
+		);
 	    
-	    //SYSTEM section
-	    add_settings_section(
-	        'xcloner_system_settings_group',
-	        __('These are advanced options recommended for developers!','xcloner-backup-and-restore'),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_system_settings_page'
-	    );
+		//SYSTEM section
+		add_settings_section(
+			'xcloner_system_settings_group',
+			__('These are advanced options recommended for developers!','xcloner-backup-and-restore'),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_system_settings_page'
+		);
 	    
-	    //CLEANUP section
-	    add_settings_section(
-	        'xcloner_cleanup_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_cleanup_settings_page'
-	    );
+		//CLEANUP section
+		add_settings_section(
+			'xcloner_cleanup_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_cleanup_settings_page'
+		);
 	    
 		
 		//CRON section
-	    add_settings_section(
-	        'xcloner_cron_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_cron_settings_page'
-	    );
+		add_settings_section(
+			'xcloner_cron_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_cron_settings_page'
+		);
 	    
 	    
 	    
 		//REGISTERING THE 'GENERAL SECTION' FIELDS
 		register_setting('xcloner_general_settings_group', 'xcloner_backup_compression_level', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_backup_compression_level',
-	       __('Backup Compression Level','xcloner-backup-and-restore'),
-	        array($this, 'do_form_range_field'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_backup_compression_level',
-	         __('Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load','xcloner-backup-and-restore'), 
-	         0,
-	         9
-	         )
-	    );
+		add_settings_field(
+			'xcloner_backup_compression_level',
+		   __('Backup Compression Level','xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_backup_compression_level',
+			 __('Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load','xcloner-backup-and-restore'), 
+			 0,
+			 9
+			 )
+		);
 	    
-	    register_setting('xcloner_general_settings_group', 'xcloner_start_path', array($this->xcloner_sanitization, "sanitize_input_as_absolute_path"));
-	    add_settings_field(
-	        'xcloner_start_path',
-	        __('Backup Start Location','xcloner-backup-and-restore'),
-	        array($this, 'do_form_text_field'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_start_path',
+		register_setting('xcloner_general_settings_group', 'xcloner_start_path', array($this->xcloner_sanitization, "sanitize_input_as_absolute_path"));
+		add_settings_field(
+			'xcloner_start_path',
+			__('Backup Start Location','xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_start_path',
 				__('Base path location from where XCloner can start the Backup.','xcloner-backup-and-restore'),
 				$this->get_xcloner_start_path(),
 				//'disabled'
 				)
-	    );
+		);
 	    
-	    register_setting('xcloner_general_settings_group', 'xcloner_store_path', array($this->xcloner_sanitization, "sanitize_input_as_absolute_path"));
-	    add_settings_field(
-	        'xcloner_store_path',
-	        __('Backup Storage Location','xcloner-backup-and-restore'),
-	        array($this, 'do_form_text_field'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_store_path',
+		register_setting('xcloner_general_settings_group', 'xcloner_store_path', array($this->xcloner_sanitization, "sanitize_input_as_absolute_path"));
+		add_settings_field(
+			'xcloner_store_path',
+			__('Backup Storage Location','xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_store_path',
 				__('Location where XCloner will store the Backup archives.','xcloner-backup-and-restore'),
 				$this->get_xcloner_store_path(), 
 				//'disabled'
 				)
-	    );
+		);
 	    
-	    register_setting('xcloner_general_settings_group', 'xcloner_enable_log', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_enable_log',
-	        __('Enable XCloner Backup Log','xcloner-backup-and-restore'),
-	        array($this, 'do_form_switch_field'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_enable_log',
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_log', array($this->xcloner_sanitization, "sanitize_input_as_int"));
+		add_settings_field(
+			'xcloner_enable_log',
+			__('Enable XCloner Backup Log','xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_enable_log',
 				sprintf(__('Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s','xcloner-backup-and-restore'), $this->get_logger_filename())
 				)
 		);	
 		
 		register_setting('xcloner_general_settings_group', 'xcloner_regex_exclude', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
-	    add_settings_field(
-	        'xcloner_regex_exclude',
-	        __('Regex Exclude Files','xcloner-backup-and-restore'),
-	        array($this, 'do_form_textarea_field'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_regex_exclude',
+		add_settings_field(
+			'xcloner_regex_exclude',
+			__('Regex Exclude Files','xcloner-backup-and-restore'),
+			array($this, 'do_form_textarea_field'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_regex_exclude',
 				__('Regular expression match to exclude files and folders, example patterns provided below, one pattern per line','xcloner-backup-and-restore'),
 				//$this->get_xcloner_store_path(), 
 				//'disabled'
 				)
-	    );
+		);
 	 
 		//REGISTERING THE 'MYSQL SECTION' FIELDS
 		register_setting('xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_enable_mysql_backup',
-	        __('Enable Mysql Backup','xcloner-backup-and-restore'),
-	        array($this, 'do_form_switch_field'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_enable_mysql_backup',
+		add_settings_field(
+			'xcloner_enable_mysql_backup',
+			__('Enable Mysql Backup','xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_enable_mysql_backup',
 				__('Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.','xcloner-backup-and-restore')
 				)
-	    );
+		);
 	    
-	    register_setting('xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables');
-	    add_settings_field(
-	        'xcloner_backup_only_wp_tables',
-	        __('Backup only WP tables','xcloner-backup-and-restore'),
-	        array($this, 'do_form_switch_field'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_backup_only_wp_tables',
+		register_setting('xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables');
+		add_settings_field(
+			'xcloner_backup_only_wp_tables',
+			__('Backup only WP tables','xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_backup_only_wp_tables',
 				sprintf(__('Enable this if you only want to Backup only tables starting with \'%s\' prefix','xcloner-backup-and-restore'), $this->get_table_prefix())
 				)
-	    );
+		);
 	    
-	    register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
-	    add_settings_field(
-	        'xcloner_mysql_hostname',
-	        __('Mysql Hostname','xcloner-backup-and-restore'),
-	        array($this, 'do_form_text_field'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_hostname',
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
+		add_settings_field(
+			'xcloner_mysql_hostname',
+			__('Mysql Hostname','xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_hostname',
 				__('Wordpress mysql hostname','xcloner-backup-and-restore'),
 				$this->get_db_hostname(),
 				'disabled'
 				)
-	    );
+		);
 
-	    register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_username', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
-	    add_settings_field(
-	        'xcloner_mysql_username',
-	        __('Mysql Username','xcloner-backup-and-restore'),
-	        array($this, 'do_form_text_field'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_username',
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_username', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
+		add_settings_field(
+			'xcloner_mysql_username',
+			__('Mysql Username','xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_username',
 				__('Wordpress mysql username','xcloner-backup-and-restore'),
 				$this->get_db_username(),
 				'disabled'
 				)
-	    );
+		);
 	    
-	    register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_database', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
-	    add_settings_field(
-	        'xcloner_mysql_database',
-	        __('Mysql Database','xcloner-backup-and-restore'),
-	        array($this, 'do_form_text_field'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_database',
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_database', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
+		add_settings_field(
+			'xcloner_mysql_database',
+			__('Mysql Database','xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_database',
 				__('Wordpress mysql database','xcloner-backup-and-restore'),
 				$this->get_db_database(),
 				'disabled'
 				)
-	    );
+		);
 	    
-	    //REGISTERING THE 'SYSTEM SECTION' FIELDS
-	    register_setting('xcloner_system_settings_group', 'xcloner_size_limit_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_size_limit_per_request',
-	       __('Data Size Limit Per Request','xcloner-backup-and-restore'),
-	        array($this, 'do_form_range_field'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('xcloner_size_limit_per_request',
-	         __('Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB','xcloner-backup-and-restore'), 
-	         0,
-	         1024
-	         )
-	    );
+		//REGISTERING THE 'SYSTEM SECTION' FIELDS
+		register_setting('xcloner_system_settings_group', 'xcloner_size_limit_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
+		add_settings_field(
+			'xcloner_size_limit_per_request',
+		   __('Data Size Limit Per Request','xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array('xcloner_size_limit_per_request',
+			 __('Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB','xcloner-backup-and-restore'), 
+			 0,
+			 1024
+			 )
+		);
 	    
 		register_setting('xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_files_to_process_per_request',
-	       __('Files To Process Per Request','xcloner-backup-and-restore'),
-	        array($this, 'do_form_range_field'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('xcloner_files_to_process_per_request',
-	         __('Use this option to set how many files XCloner should process at one time before doing another AJAX call','xcloner-backup-and-restore'), 
-	         0,
-	         1000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_files_to_process_per_request',
+		   __('Files To Process Per Request','xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array('xcloner_files_to_process_per_request',
+			 __('Use this option to set how many files XCloner should process at one time before doing another AJAX call','xcloner-backup-and-restore'), 
+			 0,
+			 1000
+			 )
+		);
 	    
 		register_setting('xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_directories_to_scan_per_request',
-	       __('Directories To Scan Per Request','xcloner-backup-and-restore'),
-	        array($this, 'do_form_range_field'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('xcloner_directories_to_scan_per_request',
-	         __('Use this option to set how many directories XCloner should scan at one time before doing another AJAX call','xcloner-backup-and-restore'), 
-	         0,
-	         1000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_directories_to_scan_per_request',
+		   __('Directories To Scan Per Request','xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array('xcloner_directories_to_scan_per_request',
+			 __('Use this option to set how many directories XCloner should scan at one time before doing another AJAX call','xcloner-backup-and-restore'), 
+			 0,
+			 1000
+			 )
+		);
 	    
 		register_setting('xcloner_system_settings_group', 'xcloner_database_records_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_database_records_per_request',
-	       __('Database Records Per Request','xcloner-backup-and-restore'),
-	        array($this, 'do_form_range_field'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('xcloner_database_records_per_request',
-	         __('Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records','xcloner-backup-and-restore'), 
-	         0,
-	         100000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_database_records_per_request',
+		   __('Database Records Per Request','xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array('xcloner_database_records_per_request',
+			 __('Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records','xcloner-backup-and-restore'), 
+			 0,
+			 100000
+			 )
+		);
 	    
 		/*register_setting('xcloner_system_settings_group', 'xcloner_diff_backup_recreate_period', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
@@ -479,90 +479,90 @@ 
 	    );*/
 	    
 		register_setting('xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_exclude_files_larger_than_mb',
-	       __('Exclude files larger than (MB)','xcloner-backup-and-restore'),
-	        array($this, 'do_form_number_field'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('xcloner_exclude_files_larger_than_mb',
-	         __('Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB','xcloner-backup-and-restore'), 
-	         )
-	    );
+		add_settings_field(
+			'xcloner_exclude_files_larger_than_mb',
+		   __('Exclude files larger than (MB)','xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array('xcloner_exclude_files_larger_than_mb',
+			 __('Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB','xcloner-backup-and-restore'), 
+			 )
+		);
 	    
 		register_setting('xcloner_system_settings_group', 'xcloner_split_backup_limit', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_split_backup_limit',
-	       __('Split Backup Archive Limit (MB)','xcloner-backup-and-restore'),
-	        array($this, 'do_form_number_field'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('xcloner_split_backup_limit',
-	         __('Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB','xcloner-backup-and-restore'), 
-	         )
-	    );
+		add_settings_field(
+			'xcloner_split_backup_limit',
+		   __('Split Backup Archive Limit (MB)','xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array('xcloner_split_backup_limit',
+			 __('Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB','xcloner-backup-and-restore'), 
+			 )
+		);
 	    
-	    register_setting('xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root');
-	    add_settings_field(
-	        'xcloner_force_tmp_path_site_root',
-	        __('Force Temporary Path Within XCloner Storage','xcloner-backup-and-restore'),
-	        array($this, 'do_form_switch_field'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('xcloner_force_tmp_path_site_root',
+		register_setting('xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root');
+		add_settings_field(
+			'xcloner_force_tmp_path_site_root',
+			__('Force Temporary Path Within XCloner Storage','xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
+			'xcloner_system_settings_page',
+			'xcloner_system_settings_group',
+			array('xcloner_force_tmp_path_site_root',
 				sprintf(__('Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location','xcloner-backup-and-restore'), $this->get_table_prefix())
 				)
-	    );
+		);
 		
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
 		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_cleanup_retention_limit_days',
-	        __('Cleanup by Date(days)','xcloner-backup-and-restore'),
-	        array($this, 'do_form_number_field'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_retention_limit_days',
+		add_settings_field(
+			'xcloner_cleanup_retention_limit_days',
+			__('Cleanup by Date(days)','xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
+			'xcloner_cleanup_settings_page',
+			'xcloner_cleanup_settings_group',
+			array('xcloner_cleanup_retention_limit_days',
 				__('Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option','xcloner-backup-and-restore')
 			)
-	    );
+		);
 	    
 		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_cleanup_retention_limit_archives',
-	        __('Cleanup by Quantity','xcloner-backup-and-restore'),
-	        array($this, 'do_form_number_field'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_retention_limit_archives',
+		add_settings_field(
+			'xcloner_cleanup_retention_limit_archives',
+			__('Cleanup by Quantity','xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
+			'xcloner_cleanup_settings_page',
+			'xcloner_cleanup_settings_group',
+			array('xcloner_cleanup_retention_limit_archives',
 				__('Specify the maximum number of backup archives to keep on the server. 0 disables this option','xcloner-backup-and-restore')
 			)
-	    );
+		);
 	    
 		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_cleanup_capacity_limit',
-	        __('Cleanup by Capacity(MB)','xcloner-backup-and-restore'),
-	        array($this, 'do_form_number_field'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_capacity_limit',
+		add_settings_field(
+			'xcloner_cleanup_capacity_limit',
+			__('Cleanup by Capacity(MB)','xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
+			'xcloner_cleanup_settings_page',
+			'xcloner_cleanup_settings_group',
+			array('xcloner_cleanup_capacity_limit',
 				__('Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option','xcloner-backup-and-restore')
 			)
-	    );
+		);
 		
 		//REGISTERING THE 'CRON SECTION' FIELDS
 		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
-	    add_settings_field(
-	        'xcloner_cron_frequency',
-	        __('Cron frequency','xcloner-backup-and-restore'),
-	        array($this, 'do_form_text_field'),
-	        'xcloner_cron_settings_page',
-	        'xcloner_cron_settings_group',
-	        array('xcloner_cron_frequency',
+		add_settings_field(
+			'xcloner_cron_frequency',
+			__('Cron frequency','xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
+			'xcloner_cron_settings_page',
+			'xcloner_cron_settings_group',
+			array('xcloner_cron_frequency',
 				__('Cron frequency')
 			)
-	    );
+		);
 	}
 	 
 	
@@ -575,7 +575,7 @@ 
 	// section content cb
 	public function xcloner_settings_section_cb()
 	{
-	    //echo '<p>WPOrg Section Introduction.</p>';
+		//echo '<p>WPOrg Section Introduction.</p>';
 	}
 	 
 	// text field content cb
@@ -590,8 +590,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// output the field
+		?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
 	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
@@ -617,8 +617,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// output the field
+		?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
 	          <textarea class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
@@ -661,8 +661,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// output the field
+		?>
 	    <div class="row">
 	        <div class="input-field col s10 m5 l3">
 	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">

Spacing +87 added lines, -87 removed lines

@@ -4,14 +4,14 @@ 
 {
 	private $logger_file = "xcloner_main_%s.log";
 	private $logger_file_hash = "xcloner%s.log";
-	private $hash ;
+	private $hash;
 	private $xcloner_sanitization;
 	private $xcloner_container;
 	
 	public function __construct(Xcloner $xcloner_container, $hash = "")
 	{
 		$this->xcloner_container = $xcloner_container;
-		if(isset($hash))
+		if (isset($hash))
 			$this->set_hash($hash);
 	}
 	
@@ -22,7 +22,7 @@ 
 	
 	public function get_logger_filename($include_hash = 0)
 	{
-		if($include_hash)
+		if ($include_hash)
 			$filename = sprintf($this->logger_file_hash, $this->get_hash()); 
 		else
 			$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
@@ -32,7 +32,7 @@ 
 	
 	public function get_xcloner_start_path()
 	{
-		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
+		if (!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
 			$path = realpath(ABSPATH);
 		else
 			$path = get_option('xcloner_start_path');
@@ -49,7 +49,7 @@ 
 	
 	public function get_xcloner_store_path()
 	{
-		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path')))
+		if (!get_option('xcloner_store_path') or !is_dir(get_option('xcloner_store_path')))
 			$path = realpath(XCLONER_STORAGE_PATH);
 		else
 			$path = get_option('xcloner_store_path');
@@ -66,18 +66,18 @@ 
 	public function get_xcloner_tmp_path($suffix = true)
 	{
 		$path = sys_get_temp_dir();
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			@mkdir($path);
 			@chmod($path, 0777);
 		}
 		
-		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
+		if (!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
 		{
 			$path = $this->get_xcloner_store_path();
 		}
 		
-		if($suffix)
+		if ($suffix)
 		{
 			$path = $path.DS.".".$this->get_xcloner_tmp_path_suffix();
 		}
@@ -87,7 +87,7 @@ 
 	
 	public function get_enable_mysql_backup()
 	{
-		if(get_option('xcloner_enable_mysql_backup'))
+		if (get_option('xcloner_enable_mysql_backup'))
 			return true;
 		
 		return false;	
@@ -95,9 +95,9 @@ 
 	
 	public function get_backup_extension_name($ext = "")
 	{
-		if(!$ext)
+		if (!$ext)
 		{
-			if(get_option('xcloner_backup_compression_level'))
+			if (get_option('xcloner_backup_compression_level'))
 				$ext = ".tgz";
 			else
 				$ext = ".tar";
@@ -107,7 +107,7 @@ 
 	
 	public function get_hash()
 	{
-		if(!$this->hash){
+		if (!$this->hash) {
 			$this->set_hash("-".$this->get_server_unique_hash(5));
 		}
 		
@@ -119,17 +119,17 @@ 
 	{
 		$hash = "-".md5(rand());
 		
-		$this->set_hash(substr( $hash, 0, 6));
+		$this->set_hash(substr($hash, 0, 6));
 		
 		return $hash;
 	}
 	
 	public function set_hash($hash = "")
 	{
-		if(substr($hash, 0, 1) != "-" and strlen($hash))
+		if (substr($hash, 0, 1) != "-" and strlen($hash))
 			$hash = "-".$hash;
 			
-		$this->hash = substr( $hash, 0, 6);
+		$this->hash = substr($hash, 0, 6);
 		
 		return $this;
 	}
@@ -138,7 +138,7 @@ 
 	{
 		$data = parse_url(get_site_url());
 			
-		$backup_name = "backup_[domain]".(isset($data['port'])?"_".$data['port']:"")."-[time]-".($this->get_enable_mysql_backup()?"sql":"nosql");
+		$backup_name = "backup_[domain]".(isset($data['port']) ? "_".$data['port'] : "")."-[time]-".($this->get_enable_mysql_backup() ? "sql" : "nosql");
 		
 		return $backup_name;
 	}
@@ -147,7 +147,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
+		if (!$data = get_option('xcloner_mysql_hostname'))
 			$data = $wpdb->dbhost;
 		
 		return $data;
@@ -157,7 +157,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
+		if (!$data = get_option('xcloner_mysql_username'))
 			$data = $wpdb->dbuser;
 		
 		return $data;
@@ -167,7 +167,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
+		if (!$data = get_option('xcloner_mysql_password'))
 			$data = $wpdb->dbpassword;
 		
 		return $data;
@@ -177,7 +177,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
+		if (!$data = get_option('xcloner_mysql_database'))
 			$data = $wpdb->dbname;
 		
 		return $data;
@@ -201,7 +201,7 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
+		if ($strlen)
 			$hash = substr($hash, 0, $strlen);
 			
 		return $hash;
@@ -213,20 +213,20 @@ 
 	    $this->xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 	    
 	    //ADDING MISSING OPTIONS
-	    if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
-			add_option( 'xcloner_mysql_settings_page' );
+	    if (false == get_option('xcloner_mysql_settings_page')) {  
+			add_option('xcloner_mysql_settings_page');
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cron_settings_page' ) ) {  
-			add_option( 'xcloner_cron_settings_page' );
+	    if (false == get_option('xcloner_cron_settings_page')) {  
+			add_option('xcloner_cron_settings_page');
 		} // end if
 	    
-	    if( false == get_option( 'xcloner_system_settings_page' ) ) {  
-			add_option( 'xcloner_system_settings_page' );
+	    if (false == get_option('xcloner_system_settings_page')) {  
+			add_option('xcloner_system_settings_page');
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
-			add_option( 'xcloner_cleanup_settings_page' );
+	    if (false == get_option('xcloner_cleanup_settings_page')) {  
+			add_option('xcloner_cleanup_settings_page');
 		} // end if
 	 
 	    
@@ -249,7 +249,7 @@ 
 	    //SYSTEM section
 	    add_settings_section(
 	        'xcloner_system_settings_group',
-	        __('These are advanced options recommended for developers!','xcloner-backup-and-restore'),
+	        __('These are advanced options recommended for developers!', 'xcloner-backup-and-restore'),
 	        array($this, 'xcloner_settings_section_cb'),
 	        'xcloner_system_settings_page'
 	    );
@@ -277,12 +277,12 @@ 
 		register_setting('xcloner_general_settings_group', 'xcloner_backup_compression_level', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_backup_compression_level',
-	       __('Backup Compression Level','xcloner-backup-and-restore'),
+	       __('Backup Compression Level', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_range_field'),
 	        'xcloner_settings_page',
 	        'xcloner_general_settings_group',
 	        array('xcloner_backup_compression_level',
-	         __('Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load','xcloner-backup-and-restore'), 
+	         __('Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load', 'xcloner-backup-and-restore'), 
 	         0,
 	         9
 	         )
@@ -291,12 +291,12 @@ 
 	    register_setting('xcloner_general_settings_group', 'xcloner_start_path', array($this->xcloner_sanitization, "sanitize_input_as_absolute_path"));
 	    add_settings_field(
 	        'xcloner_start_path',
-	        __('Backup Start Location','xcloner-backup-and-restore'),
+	        __('Backup Start Location', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_settings_page',
 	        'xcloner_general_settings_group',
 	        array('xcloner_start_path',
-				__('Base path location from where XCloner can start the Backup.','xcloner-backup-and-restore'),
+				__('Base path location from where XCloner can start the Backup.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_start_path(),
 				//'disabled'
 				)
@@ -305,12 +305,12 @@ 
 	    register_setting('xcloner_general_settings_group', 'xcloner_store_path', array($this->xcloner_sanitization, "sanitize_input_as_absolute_path"));
 	    add_settings_field(
 	        'xcloner_store_path',
-	        __('Backup Storage Location','xcloner-backup-and-restore'),
+	        __('Backup Storage Location', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_settings_page',
 	        'xcloner_general_settings_group',
 	        array('xcloner_store_path',
-				__('Location where XCloner will store the Backup archives.','xcloner-backup-and-restore'),
+				__('Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_store_path(), 
 				//'disabled'
 				)
@@ -319,24 +319,24 @@ 
 	    register_setting('xcloner_general_settings_group', 'xcloner_enable_log', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_enable_log',
-	        __('Enable XCloner Backup Log','xcloner-backup-and-restore'),
+	        __('Enable XCloner Backup Log', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_switch_field'),
 	        'xcloner_settings_page',
 	        'xcloner_general_settings_group',
 	        array('xcloner_enable_log',
-				sprintf(__('Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s','xcloner-backup-and-restore'), $this->get_logger_filename())
+				sprintf(__('Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 				)
 		);	
 		
 		register_setting('xcloner_general_settings_group', 'xcloner_regex_exclude', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_regex_exclude',
-	        __('Regex Exclude Files','xcloner-backup-and-restore'),
+	        __('Regex Exclude Files', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_textarea_field'),
 	        'xcloner_settings_page',
 	        'xcloner_general_settings_group',
 	        array('xcloner_regex_exclude',
-				__('Regular expression match to exclude files and folders, example patterns provided below, one pattern per line','xcloner-backup-and-restore'),
+				__('Regular expression match to exclude files and folders, example patterns provided below, one pattern per line', 'xcloner-backup-and-restore'),
 				//$this->get_xcloner_store_path(), 
 				//'disabled'
 				)
@@ -346,36 +346,36 @@ 
 		register_setting('xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_enable_mysql_backup',
-	        __('Enable Mysql Backup','xcloner-backup-and-restore'),
+	        __('Enable Mysql Backup', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_switch_field'),
 	        'xcloner_mysql_settings_page',
 	        'xcloner_mysql_settings_group',
 	        array('xcloner_enable_mysql_backup',
-				__('Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.','xcloner-backup-and-restore')
+				__('Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.', 'xcloner-backup-and-restore')
 				)
 	    );
 	    
 	    register_setting('xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables');
 	    add_settings_field(
 	        'xcloner_backup_only_wp_tables',
-	        __('Backup only WP tables','xcloner-backup-and-restore'),
+	        __('Backup only WP tables', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_switch_field'),
 	        'xcloner_mysql_settings_page',
 	        'xcloner_mysql_settings_group',
 	        array('xcloner_backup_only_wp_tables',
-				sprintf(__('Enable this if you only want to Backup only tables starting with \'%s\' prefix','xcloner-backup-and-restore'), $this->get_table_prefix())
+				sprintf(__('Enable this if you only want to Backup only tables starting with \'%s\' prefix', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 				)
 	    );
 	    
 	    register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_mysql_hostname',
-	        __('Mysql Hostname','xcloner-backup-and-restore'),
+	        __('Mysql Hostname', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_mysql_settings_page',
 	        'xcloner_mysql_settings_group',
 	        array('xcloner_mysql_hostname',
-				__('Wordpress mysql hostname','xcloner-backup-and-restore'),
+				__('Wordpress mysql hostname', 'xcloner-backup-and-restore'),
 				$this->get_db_hostname(),
 				'disabled'
 				)
@@ -384,12 +384,12 @@ 
 	    register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_username', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_mysql_username',
-	        __('Mysql Username','xcloner-backup-and-restore'),
+	        __('Mysql Username', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_mysql_settings_page',
 	        'xcloner_mysql_settings_group',
 	        array('xcloner_mysql_username',
-				__('Wordpress mysql username','xcloner-backup-and-restore'),
+				__('Wordpress mysql username', 'xcloner-backup-and-restore'),
 				$this->get_db_username(),
 				'disabled'
 				)
@@ -398,12 +398,12 @@ 
 	    register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_database', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_mysql_database',
-	        __('Mysql Database','xcloner-backup-and-restore'),
+	        __('Mysql Database', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_mysql_settings_page',
 	        'xcloner_mysql_settings_group',
 	        array('xcloner_mysql_database',
-				__('Wordpress mysql database','xcloner-backup-and-restore'),
+				__('Wordpress mysql database', 'xcloner-backup-and-restore'),
 				$this->get_db_database(),
 				'disabled'
 				)
@@ -413,12 +413,12 @@ 
 	    register_setting('xcloner_system_settings_group', 'xcloner_size_limit_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_size_limit_per_request',
-	       __('Data Size Limit Per Request','xcloner-backup-and-restore'),
+	       __('Data Size Limit Per Request', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_range_field'),
 	        'xcloner_system_settings_page',
 	        'xcloner_system_settings_group',
 	        array('xcloner_size_limit_per_request',
-	         __('Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB','xcloner-backup-and-restore'), 
+	         __('Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB', 'xcloner-backup-and-restore'), 
 	         0,
 	         1024
 	         )
@@ -427,12 +427,12 @@ 
 		register_setting('xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_files_to_process_per_request',
-	       __('Files To Process Per Request','xcloner-backup-and-restore'),
+	       __('Files To Process Per Request', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_range_field'),
 	        'xcloner_system_settings_page',
 	        'xcloner_system_settings_group',
 	        array('xcloner_files_to_process_per_request',
-	         __('Use this option to set how many files XCloner should process at one time before doing another AJAX call','xcloner-backup-and-restore'), 
+	         __('Use this option to set how many files XCloner should process at one time before doing another AJAX call', 'xcloner-backup-and-restore'), 
 	         0,
 	         1000
 	         )
@@ -441,12 +441,12 @@ 
 		register_setting('xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_directories_to_scan_per_request',
-	       __('Directories To Scan Per Request','xcloner-backup-and-restore'),
+	       __('Directories To Scan Per Request', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_range_field'),
 	        'xcloner_system_settings_page',
 	        'xcloner_system_settings_group',
 	        array('xcloner_directories_to_scan_per_request',
-	         __('Use this option to set how many directories XCloner should scan at one time before doing another AJAX call','xcloner-backup-and-restore'), 
+	         __('Use this option to set how many directories XCloner should scan at one time before doing another AJAX call', 'xcloner-backup-and-restore'), 
 	         0,
 	         1000
 	         )
@@ -455,12 +455,12 @@ 
 		register_setting('xcloner_system_settings_group', 'xcloner_database_records_per_request', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_database_records_per_request',
-	       __('Database Records Per Request','xcloner-backup-and-restore'),
+	       __('Database Records Per Request', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_range_field'),
 	        'xcloner_system_settings_page',
 	        'xcloner_system_settings_group',
 	        array('xcloner_database_records_per_request',
-	         __('Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records','xcloner-backup-and-restore'), 
+	         __('Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records', 'xcloner-backup-and-restore'), 
 	         0,
 	         100000
 	         )
@@ -481,36 +481,36 @@ 
 		register_setting('xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_exclude_files_larger_than_mb',
-	       __('Exclude files larger than (MB)','xcloner-backup-and-restore'),
+	       __('Exclude files larger than (MB)', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_number_field'),
 	        'xcloner_system_settings_page',
 	        'xcloner_system_settings_group',
 	        array('xcloner_exclude_files_larger_than_mb',
-	         __('Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB','xcloner-backup-and-restore'), 
+	         __('Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore'), 
 	         )
 	    );
 	    
 		register_setting('xcloner_system_settings_group', 'xcloner_split_backup_limit', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_split_backup_limit',
-	       __('Split Backup Archive Limit (MB)','xcloner-backup-and-restore'),
+	       __('Split Backup Archive Limit (MB)', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_number_field'),
 	        'xcloner_system_settings_page',
 	        'xcloner_system_settings_group',
 	        array('xcloner_split_backup_limit',
-	         __('Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB','xcloner-backup-and-restore'), 
+	         __('Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB', 'xcloner-backup-and-restore'), 
 	         )
 	    );
 	    
 	    register_setting('xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root');
 	    add_settings_field(
 	        'xcloner_force_tmp_path_site_root',
-	        __('Force Temporary Path Within XCloner Storage','xcloner-backup-and-restore'),
+	        __('Force Temporary Path Within XCloner Storage', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_switch_field'),
 	        'xcloner_system_settings_page',
 	        'xcloner_system_settings_group',
 	        array('xcloner_force_tmp_path_site_root',
-				sprintf(__('Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location','xcloner-backup-and-restore'), $this->get_table_prefix())
+				sprintf(__('Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 				)
 	    );
 		
@@ -518,36 +518,36 @@ 
 		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_retention_limit_days',
-	        __('Cleanup by Date(days)','xcloner-backup-and-restore'),
+	        __('Cleanup by Date(days)', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_number_field'),
 	        'xcloner_cleanup_settings_page',
 	        'xcloner_cleanup_settings_group',
 	        array('xcloner_cleanup_retention_limit_days',
-				__('Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option','xcloner-backup-and-restore')
+				__('Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 	    );
 	    
 		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_retention_limit_archives',
-	        __('Cleanup by Quantity','xcloner-backup-and-restore'),
+	        __('Cleanup by Quantity', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_number_field'),
 	        'xcloner_cleanup_settings_page',
 	        'xcloner_cleanup_settings_group',
 	        array('xcloner_cleanup_retention_limit_archives',
-				__('Specify the maximum number of backup archives to keep on the server. 0 disables this option','xcloner-backup-and-restore')
+				__('Specify the maximum number of backup archives to keep on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 	    );
 	    
 		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_capacity_limit',
-	        __('Cleanup by Capacity(MB)','xcloner-backup-and-restore'),
+	        __('Cleanup by Capacity(MB)', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_number_field'),
 	        'xcloner_cleanup_settings_page',
 	        'xcloner_cleanup_settings_group',
 	        array('xcloner_cleanup_capacity_limit',
-				__('Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option','xcloner-backup-and-restore')
+				__('Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 	    );
 		
@@ -555,7 +555,7 @@ 
 		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
 	    add_settings_field(
 	        'xcloner_cron_frequency',
-	        __('Cron frequency','xcloner-backup-and-restore'),
+	        __('Cron frequency', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_cron_settings_page',
 	        'xcloner_cron_settings_group',
@@ -581,20 +581,20 @@ 
 	// text field content cb
 	public function do_form_text_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		if (!$value)
 			$value = get_option($fieldname);
 	    // output the field
 	    ?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
-	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
+	          <input class="validate" <?php echo ($disabled) ? "disabled" : ""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="left" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -608,20 +608,20 @@ 
 	// textarea field content cb
 	public function do_form_textarea_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		if (!$value)
 			$value = get_option($fieldname);
 	    // output the field
 	    ?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
-	          <textarea class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
+	          <textarea class="validate" <?php echo ($disabled) ? "disabled" : ""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="center" data-html="true" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -652,20 +652,20 @@ 
 	// number field content cb
 	public function do_form_number_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		if (!$value)
 			$value = get_option($fieldname);
 	    // output the field
 	    ?>
 	    <div class="row">
 	        <div class="input-field col s10 m5 l3">
-	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
+	          <input class="validate" <?php echo ($disabled) ? "disabled" : ""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-html="true"  data-position="center" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -678,7 +678,7 @@ 
 	
 	public function do_form_range_field($params)
 	{
-		if(!isset($params['4']))
+		if (!isset($params['4']))
 			$params[4] = 0;
 			
 		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
@@ -687,7 +687,7 @@ 
 		<div class="row">
 	        <div class="input-field col s10 m10 l8">
 				<p class="range-field">
-			      <input <?php echo ($disabled)?"disabled":""?> type="range" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" min="<?php echo $range_start?>" max="<?php echo $range_end?>" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>" />
+			      <input <?php echo ($disabled) ? "disabled" : ""?> type="range" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" min="<?php echo $range_start?>" max="<?php echo $range_end?>" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>" />
 			    </p>
 			</div>
 			<div class="col s2 m2 ">
@@ -700,7 +700,7 @@ 
 	
 	public function do_form_switch_field($params)
 	{
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;
 		list($fieldname, $label, $disabled) = $params;
 		$value = get_option($fieldname);
@@ -710,7 +710,7 @@ 
 			<div class="switch">
 				<label>
 				  Off
-				  <input <?php echo ($disabled)?"disabled":""?> type="checkbox" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>">
+				  <input <?php echo ($disabled) ? "disabled" : ""?> type="checkbox" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>">
 				  <span class="lever"></span>
 				  On
 				</label>

Braces +77 added lines, -54 removed lines

@@ -11,8 +11,9 @@ 
 	public function __construct(Xcloner $xcloner_container, $hash = "")
 	{
 		$this->xcloner_container = $xcloner_container;
-		if(isset($hash))
-			$this->set_hash($hash);
+		if(isset($hash)) {
+					$this->set_hash($hash);
+		}
 	}
 	
 	private function get_xcloner_container()
@@ -22,20 +23,22 @@ 
 	
 	public function get_logger_filename($include_hash = 0)
 	{
-		if($include_hash)
-			$filename = sprintf($this->logger_file_hash, $this->get_hash()); 
-		else
-			$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
+		if($include_hash) {
+					$filename = sprintf($this->logger_file_hash, $this->get_hash());
+		} else {
+					$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
+		}
 		
 		return $filename;
 	}
 	
 	public function get_xcloner_start_path()
 	{
-		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
-			$path = realpath(ABSPATH);
-		else
-			$path = get_option('xcloner_start_path');
+		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path'))) {
+					$path = realpath(ABSPATH);
+		} else {
+					$path = get_option('xcloner_start_path');
+		}
 		
 		return $path;
 	}
@@ -49,10 +52,11 @@ 
 	
 	public function get_xcloner_store_path()
 	{
-		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path')))
-			$path = realpath(XCLONER_STORAGE_PATH);
-		else
-			$path = get_option('xcloner_store_path');
+		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path'))) {
+					$path = realpath(XCLONER_STORAGE_PATH);
+		} else {
+					$path = get_option('xcloner_store_path');
+		}
 		
 		return $path;
 	}
@@ -87,8 +91,9 @@ 
 	
 	public function get_enable_mysql_backup()
 	{
-		if(get_option('xcloner_enable_mysql_backup'))
-			return true;
+		if(get_option('xcloner_enable_mysql_backup')) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -97,10 +102,11 @@ 
 	{
 		if(!$ext)
 		{
-			if(get_option('xcloner_backup_compression_level'))
-				$ext = ".tgz";
-			else
-				$ext = ".tar";
+			if(get_option('xcloner_backup_compression_level')) {
+							$ext = ".tgz";
+			} else {
+							$ext = ".tar";
+			}
 		}	
 		return ($this->get_hash()).$ext;	
 	}
@@ -126,8 +132,9 @@ 
 	
 	public function set_hash($hash = "")
 	{
-		if(substr($hash, 0, 1) != "-" and strlen($hash))
-			$hash = "-".$hash;
+		if(substr($hash, 0, 1) != "-" and strlen($hash)) {
+					$hash = "-".$hash;
+		}
 			
 		$this->hash = substr( $hash, 0, 6);
 		
@@ -147,8 +154,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
-			$data = $wpdb->dbhost;
+		if(!$data = get_option('xcloner_mysql_hostname')) {
+					$data = $wpdb->dbhost;
+		}
 		
 		return $data;
 	}
@@ -157,8 +165,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
-			$data = $wpdb->dbuser;
+		if(!$data = get_option('xcloner_mysql_username')) {
+					$data = $wpdb->dbuser;
+		}
 		
 		return $data;
 	}
@@ -167,8 +176,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
-			$data = $wpdb->dbpassword;
+		if(!$data = get_option('xcloner_mysql_password')) {
+					$data = $wpdb->dbpassword;
+		}
 		
 		return $data;
 	}
@@ -177,8 +187,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
-			$data = $wpdb->dbname;
+		if(!$data = get_option('xcloner_mysql_database')) {
+					$data = $wpdb->dbname;
+		}
 		
 		return $data;
 	}
@@ -201,8 +212,9 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
-			$hash = substr($hash, 0, $strlen);
+		if($strlen) {
+					$hash = substr($hash, 0, $strlen);
+		}
 			
 		return $hash;
 	}
@@ -581,15 +593,18 @@ 
 	// text field content cb
 	public function do_form_text_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -608,15 +623,18 @@ 
 	// textarea field content cb
 	public function do_form_textarea_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -652,15 +670,18 @@ 
 	// number field content cb
 	public function do_form_number_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -678,8 +699,9 @@ 
 	
 	public function do_form_range_field($params)
 	{
-		if(!isset($params['4']))
-			$params[4] = 0;
+		if(!isset($params['4'])) {
+					$params[4] = 0;
+		}
 			
 		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
 		$value = get_option($fieldname);
@@ -700,8 +722,9 @@ 
 	
 	public function do_form_switch_field($params)
 	{
-		if(!isset($params['2']))
-			$params[2] = 0;
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 		list($fieldname, $label, $disabled) = $params;
 		$value = get_option($fieldname);
 	?>

includes/class-xcloner-api.php

Indentation +28 added lines, -28 removed lines

@@ -220,12 +220,12 @@ 
 		}
 			
 		if( $wpdb->last_error ) {
-            $response['error'] = 1;
-            $response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/;
+			$response['error'] = 1;
+			$response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/;
             
-        }
+		}
         
-        $scheduler->update_wp_cron_hooks();
+		$scheduler->update_wp_cron_hooks();
 		$response['finished'] = 1;
 		
 		$this->send_response($response);
@@ -916,14 +916,14 @@ 
 		$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);
+			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);
 		    
 		}
 		
@@ -950,24 +950,24 @@ 
 		
 		
 		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('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;
     
 	}
 	

Spacing +144 added lines, -144 removed lines

@@ -11,7 +11,7 @@ 
 use splitbrain\PHPArchive\FileInfo;
 
 
-class Xcloner_Api{
+class Xcloner_Api {
 
 	private $xcloner_database;
 	private $xcloner_settings;
@@ -27,30 +27,30 @@ 
 	{
 		global $wpdb;
 		
-		if(WP_DEBUG)
+		if (WP_DEBUG)
 		{
 			error_reporting(0);
 		}
 		
-		if( ob_get_length() )
+		if (ob_get_length())
 			ob_end_clean();
 		ob_start();
 		
-		$wpdb->show_errors			= false;
+		$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->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_api");
 		$this->xcloner_file_system 	= $xcloner_container->get_xcloner_filesystem();
 		$this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
 		$this->xcloner_requirements = $xcloner_container->get_xcloner_requirements();
-		$this->archive_system 		=  $xcloner_container->get_archive_system();
-		$this->xcloner_database 	=  $xcloner_container->get_xcloner_database();
-		$this->xcloner_scheduler 	=  $xcloner_container->get_xcloner_scheduler();
+		$this->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));
+		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));
 		}
 		
 	}
@@ -78,15 +78,15 @@ 
 		$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";
+		$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){
+		}catch (Exception $e) {
 			
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -113,19 +113,19 @@ 
 		$schedule = array();
 		$response = array();
 		
-		if(isset($_POST['data']))
+		if (isset($_POST['data']))
 			$params = json_decode(stripslashes($_POST['data']));
 		
 		$this->process_params($params);
 		
-		if(isset($_POST['id']))
+		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']){
+			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{
+			} 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']);
@@ -140,11 +140,11 @@ 
 			$tables = explode(PHP_EOL, $this->form_params['database']);
 			$return = array();
 			
-			foreach($tables as $table)
+			foreach ($tables as $table)
 			{
-					$table = str_replace("\r","", $table);
+					$table = str_replace("\r", "", $table);
 					$data = explode(".", $table);
-					if(isset($data[1]))
+					if (isset($data[1]))
 						$return[$data[0]][] = $data[1];
 			}
 			
@@ -153,10 +153,10 @@ 
 			$excluded_files = explode(PHP_EOL, $this->form_params['excluded_files']);
 			$return = array();
 			
-			foreach($excluded_files as $file)
+			foreach ($excluded_files as $file)
 			{
-				$file = str_replace("\r","", $file);
-				if($file)
+				$file = str_replace("\r", "", $file);
+				if ($file)
 					$return[] = $file;
 			}
 			
@@ -164,27 +164,27 @@ 
 			
 			$schedule['start_at'] = $this->form_params['backup_params']['start_at'];
 			
-			if(!isset($_POST['status']))
+			if (!isset($_POST['status']))
 				$schedule['status'] = 0;
 			else	
 				$schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
-		}else{
+		} else {
 		
 			$schedule['status'] = 1;
-			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
+			$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())
+			if ($schedule['start_at'] <= time())
 			{
 				$schedule['start_at'] = "";
 			}
 		}
 		
-		if(!$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) );	
+		} 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'];
@@ -193,7 +193,7 @@ 
 		//$schedule['backup_type'] = $this->form_params['backup_params']['backup_type'];
 		$schedule['params'] = json_encode($this->form_params);
 
-		if(!isset($_POST['id']))
+		if (!isset($_POST['id']))
 		{
 			$wpdb->insert( 
 				$wpdb->prefix.'xcloner_scheduler', 
@@ -203,23 +203,23 @@ 
 					'%s' 
 				) 
 			);
-		}else		{
+		} else {
 			$wpdb->update( 
 				$wpdb->prefix.'xcloner_scheduler', 
 				$schedule, 
-				array( 'id' => $_POST['id'] ), 
+				array('id' => $_POST['id']), 
 				array( 
 					'%s', 
 					'%s' 
 				) 
 			);
 		}
-		if(isset($_POST['id']))
+		if (isset($_POST['id']))
 		{
 			$scheduler->update_cron_hook($_POST['id']);
 		}
 			
-		if( $wpdb->last_error ) {
+		if ($wpdb->last_error) {
             $response['error'] = 1;
             $response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/;
             
@@ -242,19 +242,19 @@ 
 		
 		$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);
 		
 		$return['finished'] = 1;
 
 		//$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'], $this->form_params['extra'], $init);
-		try{
+		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;
@@ -263,26 +263,26 @@ 
 			return $this->send_response($return, $hash = 1);
 		}
 		
-		if($return['finished'])
+		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()))
+			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 ($return['finished'])
 		{
-			if(isset($this->form_params['backup_params']['email_notification']) and $to=$this->form_params['backup_params']['email_notification'])
+			if (isset($this->form_params['backup_params']['email_notification']) and $to = $this->form_params['backup_params']['email_notification'])
 			{
-				try{
+				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->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $this->form_params, "", $additional);
+				}catch (Exception $e)
 				{
 					$this->logger->error($e->getMessage());
 				}
@@ -304,17 +304,17 @@ 
 		
 		$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);
 			
 		//$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'])
+		if (isset($return['error']) and $return['error'])
 			$data['finished'] = 1;
 		else	
 			$data['finished'] = $return['finished'];
@@ -334,10 +334,10 @@ 
 		$this->check_access();
 		
 		$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"}');
 			 
 		$hash = $this->process_params($params);
 		
@@ -348,7 +348,7 @@ 
 		$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["total_files_size"] = sprintf("%.2f", $this->xcloner_file_system->get_scanned_files_total_size() / (1024 * 1024));
 		
 		return $this->send_response($data, $hash = 1);
 	}
@@ -360,7 +360,7 @@ 
 	 */ 
 	private function process_params($params)
 	{
-		if(isset($params->hash))
+		if (isset($params->hash))
 			$this->xcloner_settings->set_hash($params->hash);
 			
 		$this->form_params['extra'] = array();
@@ -368,9 +368,9 @@ 
 		
 		$this->form_params['database'] = array();
 		
-		if(isset($params->backup_params))
+		if (isset($params->backup_params))
 		{
-			foreach($params->backup_params as $param)
+			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'));
@@ -379,28 +379,28 @@ 
 		
 		$this->form_params['database'] = array();
 		
-		if(isset($params->table_params))
+		if (isset($params->table_params))
 		{
-			foreach($params->table_params as $param)
+			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))
+		$this->form_params['excluded_files'] = array();
+		if (isset($params->files_params))
 		{
-			foreach($params->files_params as $param)
+			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)
+			foreach ($params->files_params as $key=>$param)
 			{
-				if(!in_array($param->parent, $this->form_params['excluded_files'])){
+				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'));
@@ -412,13 +412,13 @@ 
 		
 		//$this->form_params['excluded_files'] =  array_merge($this->form_params['excluded_files'], $this->exclude_files_by_default);
 		
-		if(isset($params->extra))
+		if (isset($params->extra))
 		{
-			foreach($params->extra as $key=>$value)
+			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'])
+		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']);
@@ -440,7 +440,7 @@ 
 		
 		$data = array();
 		
-		if($folder == "#"){
+		if ($folder == "#") {
 			
 			$folder = "/";
 			$data[] = array(
@@ -453,9 +453,9 @@ 
 						);
 		}
 			
-			try{
+			try {
 				$files = $this->xcloner_file_system->list_directory($folder);
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				
 				print $e->getMessage();
 				$this->logger->error($e->getMessage());
@@ -470,17 +470,17 @@ 
 			}
 			array_multisort($type, SORT_ASC, $files);
 			
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
 				$children = false;
 				$text = $file['basename'];
 				
-				if($file['type'] == "dir")
+				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))
+				if ($this->xcloner_file_system->is_excluded($file))
 					$selected = true;
 				else
 					$selected = false;
@@ -515,25 +515,25 @@ 
 		
 		$xcloner_backup_only_wp_tables = $this->xcloner_settings->get_xcloner_option('xcloner_backup_only_wp_tables');
 	
-		if($database == "#")
+		if ($database == "#")
 		{
-			try{
+			try {
 				$return = $this->xcloner_database->get_all_databases();
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 			
-			foreach($return as $database)
+			foreach ($return as $database)
 			{
-				if($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_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())
+				if ($database['name'] == $this->xcloner_settings->get_db_database())
 				{
 					$state['selected'] = true;
-					if($database['num_tables'] < 25)
+					if ($database['num_tables'] < 25)
 						$state['opened'] = false;
 				}
 					
@@ -549,22 +549,22 @@ 
 			
 		}
 		
-		else{
+		else {
 			
-			try{
+			try {
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 			
-			foreach($return as $table)
+			foreach ($return as $table)
 			{
 				$state = array();
 				
-				if($xcloner_backup_only_wp_tables and !stristr($table['name'], $this->xcloner_settings->get_table_prefix()))
+				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())
+				if (isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database())
 					$state = array('selected' => true);
 					
 				$data[] = array(
@@ -592,12 +592,12 @@ 
 		
 		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
 		$scheduler = $this->xcloner_scheduler;
-		$data  = $scheduler->get_schedule_by_id($schedule_id);
+		$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['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['backup_params']->diff_start_date = date("Y-m-d", ($data['backup_params']->diff_start_date));
 		}
 		
 		return $this->send_response($data);
@@ -613,14 +613,14 @@ 
 		$this->check_access();
 		
 		$scheduler = $this->xcloner_scheduler;
-		$data  = $scheduler->get_scheduler_list();
+		$data = $scheduler->get_scheduler_list();
 		$return['data'] = array();
 		
-		foreach($data as $res)
+		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)
+			if ($res->status)
 				$status = '<i class="material-icons active status">timer</i>';
 			else
 				$status = '<i class="material-icons status inactive">timer_off</i>';
@@ -631,14 +631,14 @@ 
 			
 			$remote_storage = $res->remote_storage;
 			
-			if(!$next_run_time >= time())
+			if (!$next_run_time >= time())
 				$next_run = " ";
 			
-			if(trim($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));
+				$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())
+				if ($next_run_time >= time())
 					$next_run = "in ".human_time_diff($next_run_time, time());
 				else
 					$next_run = __("executed", 'xcloner-backup-and-restore');
@@ -651,13 +651,13 @@ 
 			$backup_size = "";
 			$backup_time = "";
 			
-			if($res->last_backup)
+			if ($res->last_backup)
 			{
-				if( $this->xcloner_file_system->get_storage_filesystem()->has($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_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>";
@@ -665,12 +665,12 @@ 
 			
 			$schedules = wp_get_schedules();
 
-			if(isset($schedules[$res->recurrence]))
+			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['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);
@@ -687,7 +687,7 @@ 
 		
 		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
 		$scheduler = $this->xcloner_scheduler;
-		$data['finished']  = $scheduler->delete_schedule_by_id($schedule_id);
+		$data['finished'] = $scheduler->delete_schedule_by_id($schedule_id);
 		
 		return $this->send_response($data);
 	}
@@ -721,32 +721,32 @@ 
 		
 		$backup_file = $source_backup_file;
 		
-		if($this->xcloner_file_system->is_multipart($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']];
 		}
 		
-		try{
+		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)
+		}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);
+		$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']))
+		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();
@@ -756,18 +756,18 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
-			if($this->xcloner_file_system->is_multipart($source_backup_file))
+		} else {
+			if ($this->xcloner_file_system->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;
 				
 			}
@@ -790,17 +790,17 @@ 
 		
 		try
 		{
-			if(method_exists($xcloner_remote_storage, "copy_backup_remote_to_local"))
+			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){
+		}catch (Exception $e) {
 		
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
 		}
 		
-		if(!$return)
+		if (!$return)
 		{
 			$return['error'] = 1;
 			$return['message'] = "Upload failed, please check the error log for more information!";
@@ -829,17 +829,17 @@ 
 		
 		try
 		{
-			if(method_exists($xcloner_remote_storage, "upload_backup_to_storage"))
+			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){
+		}catch (Exception $e) {
 		
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
 		}
 		
-		if(!$return)
+		if (!$return)
 		{
 			$return['error'] = 1;
 			$return['message'] = "Upload failed, please check the error log for more information!";
@@ -873,7 +873,7 @@ 
 		
 		@ob_end_clean();
 		
-		$adapter = new Local(dirname(__DIR__) ,LOCK_EX, 'SKIP_LINKS');
+		$adapter = new Local(dirname(__DIR__), LOCK_EX, 'SKIP_LINKS');
 		$xcloner_plugin_filesystem = new Filesystem($adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -903,7 +903,7 @@ 
 		//$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 		
 		$files = $xcloner_plugin_filesystem->listContents("vendor/", true);
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			$tar->addFile(dirname(__DIR__).DS.$file['path'], $file['path']);
 		}
@@ -922,7 +922,7 @@ 
 		    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);
 		    
 		}
@@ -945,8 +945,8 @@ 
 		$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');
@@ -956,7 +956,7 @@ 
 	    header('Content-Transfer-Encoding: binary');
 	    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();
 	    
@@ -984,10 +984,10 @@ 
 		$file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 		$hash = $this->xcloner_sanitization->sanitize_input_as_string($_POST['hash']);
 		
-		if(isset($_POST['part']))
+		if (isset($_POST['part']))
 			$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
 		
-		if(isset($_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']);
@@ -995,46 +995,46 @@ 
 		
 		$return['total_size'] = $this->xcloner_file_system->get_backup_size($file);
 		
-		if($this->xcloner_file_system->is_multipart($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]))
+			if ($return['part'] and isset($backup_parts[$return['part'] - 1]))
 			{
-				$file = $backup_parts[$return['part']-1];
+				$file = $backup_parts[$return['part'] - 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);
 		
-		}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);
+			$this->send_response($return, 0);
 		
 		}
 		
 		$return['status'] = 200;
 		
 		//we have finished the upload
-		if(!$return['start'] and $is_multipart)
+		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);
 	}
 	
 	public function restore_backup()
@@ -1042,7 +1042,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;
 	}
 	
@@ -1054,12 +1054,12 @@ 
 	private function send_response($data, $attach_hash = 1)
 	{
 		
-		if($attach_hash and null !== $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() )
+		if (ob_get_length())
 			ob_clean();
 		wp_send_json($data);
 		

Braces +103 added lines, -80 removed lines

@@ -32,8 +32,9 @@ 
 			error_reporting(0);
 		}
 		
-		if( ob_get_length() )
-			ob_end_clean();
+		if( ob_get_length() ) {
+					ob_end_clean();
+		}
 		ob_start();
 		
 		$wpdb->show_errors			= false;
@@ -86,7 +87,7 @@ 
 		{
 			$this->xcloner_database->init($data);
 
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -113,8 +114,9 @@ 
 		$schedule = array();
 		$response = array();
 		
-		if(isset($_POST['data']))
-			$params = json_decode(stripslashes($_POST['data']));
+		if(isset($_POST['data'])) {
+					$params = json_decode(stripslashes($_POST['data']));
+		}
 		
 		$this->process_params($params);
 		
@@ -125,7 +127,7 @@ 
 			$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{
+			} 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']);
@@ -144,8 +146,9 @@ 
 			{
 					$table = str_replace("\r","", $table);
 					$data = explode(".", $table);
-					if(isset($data[1]))
-						$return[$data[0]][] = $data[1];
+					if(isset($data[1])) {
+											$return[$data[0]][] = $data[1];
+					}
 			}
 			
 			$this->form_params['database'] = ($return);
@@ -156,19 +159,21 @@ 
 			foreach($excluded_files as $file)
 			{
 				$file = str_replace("\r","", $file);
-				if($file)
-					$return[] = $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{
+			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'] .
@@ -183,7 +188,7 @@ 
 		if(!$schedule['start_at'])						
 		{
 			$schedule['start_at'] = date('Y-m-d H:i:s', time());
-		}else{
+		} else{
 			$schedule['start_at'] = date('Y-m-d H:i:s', $schedule['start_at'] - (get_option( 'gmt_offset' ) * HOUR_IN_SECONDS) );	
 		}
 		
@@ -203,7 +208,7 @@ 
 					'%s' 
 				) 
 			);
-		}else		{
+		} else		{
 			$wpdb->update( 
 				$wpdb->prefix.'xcloner_scheduler', 
 				$schedule, 
@@ -244,8 +249,9 @@ 
 		
 		$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);
 		
@@ -254,7 +260,7 @@ 
 		//$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)
+		} catch(Exception $e)
 		{
 			$return = array();
 			$return['error'] = true;
@@ -266,8 +272,9 @@ 
 		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();
+			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;
@@ -282,7 +289,7 @@ 
 					$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)
+				} catch(Exception $e)
 				{
 					$this->logger->error($e->getMessage());
 				}
@@ -306,18 +313,20 @@ 
 		
 		$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);
 			
 		//$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;
 		
@@ -336,8 +345,9 @@ 
 		$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);
 		
@@ -360,8 +370,9 @@ 
 	 */ 
 	private function process_params($params)
 	{
-		if(isset($params->hash))
-			$this->xcloner_settings->set_hash($params->hash);
+		if(isset($params->hash)) {
+					$this->xcloner_settings->set_hash($params->hash);
+		}
 			
 		$this->form_params['extra'] = array();
 		$this->form_params['backup_params'] = array();
@@ -414,8 +425,9 @@ 
 		
 		if(isset($params->extra))
 		{
-			foreach($params->extra as $key=>$value)
-				$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
+			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'])
@@ -455,7 +467,7 @@ 
 			
 			try{
 				$files = $this->xcloner_file_system->list_directory($folder);
-			}catch(Exception $e){
+			} catch(Exception $e){
 				
 				print $e->getMessage();
 				$this->logger->error($e->getMessage());
@@ -475,15 +487,17 @@ 
 				$children = false;
 				$text = $file['basename'];
 				
-				if($file['type'] == "dir")
-					$children = true;
-				else
-					 $text .= " (". $this->xcloner_requirements->file_format_size($file['size']).")";
+				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;
+				if($this->xcloner_file_system->is_excluded($file)) {
+									$selected = true;
+				} else {
+									$selected = false;
+				}
 					
 				$data[] = array(
 							'id' => $file['path'],
@@ -519,22 +533,24 @@ 
 		{
 			try{
 				$return = $this->xcloner_database->get_all_databases();
-			}catch(Exception $e){
+			} 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;
+				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;
+					if($database['num_tables'] < 25) {
+											$state['opened'] = false;
+					}
 				}
 					
 				$data[] = array(
@@ -547,13 +563,11 @@ 
 						);
 			}
 			
-		}
-		
-		else{
+		} else{
 			
 			try{
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->logger->error($e->getMessage());
 			}
 			
@@ -561,11 +575,13 @@ 
 			{
 				$state = array();
 				
-				if($xcloner_backup_only_wp_tables and !stristr($table['name'], $this->xcloner_settings->get_table_prefix()))
-					continue;
+				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);
+				if(isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database()) {
+									$state = array('selected' => true);
+				}
 					
 				$data[] = array(
 						'id' => $table['name'],
@@ -620,10 +636,11 @@ 
 		{
 			$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>';
+			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));
 				
@@ -631,17 +648,19 @@ 
 			
 			$remote_storage = $res->remote_storage;
 			
-			if(!$next_run_time >= time())
-				$next_run = " ";
+			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');
+				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)";	
@@ -732,7 +751,7 @@ 
 			$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();
@@ -760,15 +779,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->xcloner_file_system->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -794,7 +814,7 @@ 
 			{
 				$return = call_user_func_array(array($xcloner_remote_storage, "copy_backup_remote_to_local"), array($backup_file, $storage_type));
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -833,7 +853,7 @@ 
 			{
 				$return = call_user_func_array(array($xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $storage_type));
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -984,11 +1004,13 @@ 
 		$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']);
@@ -1015,7 +1037,7 @@ 
 			$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;
@@ -1059,8 +1081,9 @@ 
 			$data['hash'] = $this->xcloner_settings->get_hash();
 		}
 			
-		if( ob_get_length() )
-			ob_clean();
+		if( ob_get_length() ) {
+					ob_clean();
+		}
 		wp_send_json($data);
 		
 		die();

includes/class-xcloner-activator.php

Spacing +22 added lines, -22 removed lines

@@ -35,22 +35,22 @@ 
 	
 		global $wpdb;
 		
-		if(version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<'))
+		if (version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<'))
 		{
-			wp_die('<p>'.sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"),Xcloner_Activator::xcloner_minimum_version, phpversion()).'</p>',  __("XCloner Activation Error"), array( 'response'=>500, 'back_link'=>TRUE ) );
+			wp_die('<p>'.sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"), Xcloner_Activator::xcloner_minimum_version, phpversion()).'</p>', __("XCloner Activation Error"), array('response'=>500, 'back_link'=>TRUE));
 		}
 		
 		$charset_collate = $wpdb->get_charset_collate();	
 		
-		$installed_ver = get_option( "xcloner_db_version" );
+		$installed_ver = get_option("xcloner_db_version");
 		
 		$xcloner_db_version = Xcloner_Activator::xcloner_db_version;
 		
-		$xcloner_scheduler_table = $wpdb->prefix . "xcloner_scheduler";
+		$xcloner_scheduler_table = $wpdb->prefix."xcloner_scheduler";
 		
-		if($installed_ver != $xcloner_db_version)		
+		if ($installed_ver != $xcloner_db_version)		
 		{
-			$xcloner_schedule_sql="CREATE TABLE `".$xcloner_scheduler_table."` (
+			$xcloner_schedule_sql = "CREATE TABLE `".$xcloner_scheduler_table."` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
 				  `name` varchar(255) NOT NULL,
 				  `recurrence` varchar(25) NOT NULL,
@@ -64,53 +64,53 @@ 
 				) ".$charset_collate.";
 				";
 			
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-			dbDelta( $xcloner_schedule_sql );
+			require_once(ABSPATH.'wp-admin/includes/upgrade.php');
+			dbDelta($xcloner_schedule_sql);
 			
-			update_option( "xcloner_db_version", $xcloner_db_version );
+			update_option("xcloner_db_version", $xcloner_db_version);
 		}
 		
-		if(get_option('xcloner_backup_compression_level') === false)
+		if (get_option('xcloner_backup_compression_level') === false)
 			update_option('xcloner_backup_compression_level', 0);
 		
-		if(get_option('xcloner_enable_log') === false)
+		if (get_option('xcloner_enable_log') === false)
 			update_option('xcloner_enable_log', 1);
 			
-		if(get_option('xcloner_enable_mysql_backup') === false)
+		if (get_option('xcloner_enable_mysql_backup') === false)
 			update_option('xcloner_enable_mysql_backup', 1);
 		
-		if(get_option('xcloner_system_settings_page') === false)
+		if (get_option('xcloner_system_settings_page') === false)
 			update_option('xcloner_system_settings_page', 100);
 			
-		if(get_option('xcloner_files_to_process_per_request') === false)
+		if (get_option('xcloner_files_to_process_per_request') === false)
 			update_option('xcloner_files_to_process_per_request', 250);
 
-		if(get_option('xcloner_database_records_per_request') === false)
+		if (get_option('xcloner_database_records_per_request') === false)
 			update_option('xcloner_database_records_per_request', 10000);
 
-		if(get_option('xcloner_exclude_files_larger_than_mb') === false)
+		if (get_option('xcloner_exclude_files_larger_than_mb') === false)
 			update_option('xcloner_exclude_files_larger_than_mb', 0);
 		
-		if(get_option('xcloner_split_backup_limit') === false)
+		if (get_option('xcloner_split_backup_limit') === false)
 			update_option('xcloner_split_backup_limit', 2048);
 			
-		if(get_option('xcloner_size_limit_per_request') === false)
+		if (get_option('xcloner_size_limit_per_request') === false)
 			update_option('xcloner_size_limit_per_request', 50);
 			
-		if(get_option('xcloner_cleanup_retention_limit_days') === false)
+		if (get_option('xcloner_cleanup_retention_limit_days') === false)
 			update_option('xcloner_cleanup_retention_limit_days', 60);
 			
-		if(get_option('xcloner_cleanup_retention_limit_archives') === false)
+		if (get_option('xcloner_cleanup_retention_limit_archives') === false)
 			update_option('xcloner_cleanup_retention_limit_archives', 100);
 			
-		if(get_option('xcloner_directories_to_scan_per_request') === false)
+		if (get_option('xcloner_directories_to_scan_per_request') === false)
 			update_option('xcloner_directories_to_scan_per_request', 25);
 			
 		/*if(!get_option('xcloner_diff_backup_recreate_period'))
 			update_option('xcloner_diff_backup_recreate_period', 10);
 			* */
 			
-		if(!get_option('xcloner_regex_exclude'))
+		if (!get_option('xcloner_regex_exclude'))
 			update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
 
 	}

Braces +39 added lines, -26 removed lines

@@ -70,48 +70,61 @@
 			update_option( "xcloner_db_version", $xcloner_db_version );
 		}
 		
-		if(get_option('xcloner_backup_compression_level') === false)
-			update_option('xcloner_backup_compression_level', 0);
+		if(get_option('xcloner_backup_compression_level') === false) {
+					update_option('xcloner_backup_compression_level', 0);
+		}
 		
-		if(get_option('xcloner_enable_log') === false)
-			update_option('xcloner_enable_log', 1);
+		if(get_option('xcloner_enable_log') === false) {
+					update_option('xcloner_enable_log', 1);
+		}
 			
-		if(get_option('xcloner_enable_mysql_backup') === false)
-			update_option('xcloner_enable_mysql_backup', 1);
+		if(get_option('xcloner_enable_mysql_backup') === false) {
+					update_option('xcloner_enable_mysql_backup', 1);
+		}
 		
-		if(get_option('xcloner_system_settings_page') === false)
-			update_option('xcloner_system_settings_page', 100);
+		if(get_option('xcloner_system_settings_page') === false) {
+					update_option('xcloner_system_settings_page', 100);
+		}
 			
-		if(get_option('xcloner_files_to_process_per_request') === false)
-			update_option('xcloner_files_to_process_per_request', 250);
+		if(get_option('xcloner_files_to_process_per_request') === false) {
+					update_option('xcloner_files_to_process_per_request', 250);
+		}
 
-		if(get_option('xcloner_database_records_per_request') === false)
-			update_option('xcloner_database_records_per_request', 10000);
+		if(get_option('xcloner_database_records_per_request') === false) {
+					update_option('xcloner_database_records_per_request', 10000);
+		}
 
-		if(get_option('xcloner_exclude_files_larger_than_mb') === false)
-			update_option('xcloner_exclude_files_larger_than_mb', 0);
+		if(get_option('xcloner_exclude_files_larger_than_mb') === false) {
+					update_option('xcloner_exclude_files_larger_than_mb', 0);
+		}
 		
-		if(get_option('xcloner_split_backup_limit') === false)
-			update_option('xcloner_split_backup_limit', 2048);
+		if(get_option('xcloner_split_backup_limit') === false) {
+					update_option('xcloner_split_backup_limit', 2048);
+		}
 			
-		if(get_option('xcloner_size_limit_per_request') === false)
-			update_option('xcloner_size_limit_per_request', 50);
+		if(get_option('xcloner_size_limit_per_request') === false) {
+					update_option('xcloner_size_limit_per_request', 50);
+		}
 			
-		if(get_option('xcloner_cleanup_retention_limit_days') === false)
-			update_option('xcloner_cleanup_retention_limit_days', 60);
+		if(get_option('xcloner_cleanup_retention_limit_days') === false) {
+					update_option('xcloner_cleanup_retention_limit_days', 60);
+		}
 			
-		if(get_option('xcloner_cleanup_retention_limit_archives') === false)
-			update_option('xcloner_cleanup_retention_limit_archives', 100);
+		if(get_option('xcloner_cleanup_retention_limit_archives') === false) {
+					update_option('xcloner_cleanup_retention_limit_archives', 100);
+		}
 			
-		if(get_option('xcloner_directories_to_scan_per_request') === false)
-			update_option('xcloner_directories_to_scan_per_request', 25);
+		if(get_option('xcloner_directories_to_scan_per_request') === false) {
+					update_option('xcloner_directories_to_scan_per_request', 25);
+		}
 			
 		/*if(!get_option('xcloner_diff_backup_recreate_period'))
 			update_option('xcloner_diff_backup_recreate_period', 10);
 			* */
 			
-		if(!get_option('xcloner_regex_exclude'))
-			update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
+		if(!get_option('xcloner_regex_exclude')) {
+					update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
+		}
 
 	}
 	

includes/class-xcloner-database.php

Spacing +92 added lines, -92 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 = "mysql_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;
@@ -511,7 +511,7 @@ 
 						$value = $this->_real_escape($value);
 						$buffer .= "'".$value."', ";
 					}
-					$buffer = rtrim($buffer, ', ') . ");\n";
+					$buffer = rtrim($buffer, ', ').");\n";
 					$this->fs->get_tmp_filesystem_append()->write($dumpfile, $buffer);
 					unset($buffer);
 					
@@ -526,7 +526,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));
 		
@@ -541,14 +541,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;
@@ -571,7 +571,7 @@ 
 
 	}
 
-	public function resetcountRecords(){
+	public function resetcountRecords() {
 		
 		$this->countRecords = 0;
 
@@ -579,7 +579,7 @@ 
 	
 	}
 
-	public function getcountRecords(){
+	public function getcountRecords() {
 		
 		return $this->countRecords;
 		
@@ -596,14 +596,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";
 
@@ -613,13 +613,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 = "mysql_fetch_array";
 		}

includes/class-xcloner-file-system.php

Indentation +18 added lines, -18 removed lines

@@ -299,12 +299,12 @@ 
 	}
 	
 	public function getMetadataFull($adapter = "storage_adapter" , $path)
-    {
-        $location = $this->$adapter->applyPathPrefix($path);
-        $spl_info = new SplFileInfo($location);
+	{
+		$location = $this->$adapter->applyPathPrefix($path);
+		$spl_info = new SplFileInfo($location);
         
-        return ($spl_info);
-    }
+		return ($spl_info);
+	}
 	
 	
 	public function get_backup_archives_list($storage_selection = "")
@@ -697,27 +697,27 @@ 
 	
 	private function array_orderby()
 	{
-	    $args = func_get_args();
-	    $data = array_shift($args);
+		$args = func_get_args();
+		$data = array_shift($args);
 	    
-	    foreach ($args as $n => $field) {
-	        if (is_string($field)) {
-	            $tmp = array();
-	            foreach ($data as $key => $row)
-	            {
+		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;
+				$args[$n] = $tmp;
+				}
+		}
+		$args[] = &$data;
 	    
-	    call_user_func_array('array_multisort', $args);
+		call_user_func_array('array_multisort', $args);
 	    
-	    return array_pop($args);
+		return array_pop($args);
 	}
 	
 	private function check_file_diff_time($file)

Spacing +156 added lines, -156 removed lines

@@ -4,18 +4,18 @@ 
 use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
 
-class Xcloner_File_System{
+class Xcloner_File_System {
 	
-	private $excluded_files 			= "";
-	private $excluded_files_by_default	= array("administrator/backups", "wp-content/backups");
-	private $included_files_handler 	= "backup_files.csv";
-	private $temp_dir_handler 			= ".dir";
+	private $excluded_files = "";
+	private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
+	private $included_files_handler = "backup_files.csv";
+	private $temp_dir_handler = ".dir";
 	public  $filesystem;
 	public  $tmp_filesystem;
 	public  $storage_filesystem;
 	private $xcloner_settings_append;
 	private $xcloner_container;
-	private $diff_timestamp_start		= "";
+	private $diff_timestamp_start = "";
 	
 	private $logger;
 	private $start_adapter;
@@ -38,47 +38,47 @@ 
 	{
 		$this->xcloner_container = $xcloner_container;
 		
-		$this->logger 				= $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
 		$this->xcloner_settings 	= $xcloner_container->get_xcloner_settings();
 
-		try{
+		try {
 			
-			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(),LOCK_EX, 'SKIP_LINKS');
+			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
 			$this->start_filesystem = new Filesystem($this->start_adapter, new Config([
 					'disable_asserts' => true,
 				]));
 			
-			$this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(),LOCK_EX, 'SKIP_LINKS');
+			$this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
 			$this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-			$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(),LOCK_EX|FILE_APPEND, 'SKIP_LINKS');
+			$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
 			$this->tmp_filesystem_append = new Filesystem($adapter, new Config([
 					'disable_asserts' => true,
 				]));
 
-			$adapter = new Local($this->xcloner_settings->get_xcloner_store_path(),LOCK_EX, 'SKIP_LINKS');
+			$adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
 			$this->storage_filesystem = new Filesystem($adapter, new Config([
 					'disable_asserts' => true,
 				]));	
 			
-			$this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(),FILE_APPEND, 'SKIP_LINKS');
+			$this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND, 'SKIP_LINKS');
 			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			$this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
+		if ($value = get_option('xcloner_directories_to_scan_per_request'))
 			$this->folders_to_process_per_session = $value;
 
 	}
 	
 	public function set_diff_timestamp_start($timestamp = "")
 	{
-		if($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;
@@ -113,12 +113,12 @@ 
 	
 	public function get_storage_filesystem($remote_storage_selection = "")
 	{
-		if($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))
+			if (!method_exists($remote_storage, $method))
 				return false;
 				
 			list($adapter, $filesystem) = $remote_storage->$method();	
@@ -156,7 +156,7 @@ 
 	
 	public function get_start_path_file_info($file)
 	{
-		$info= $this->getMetadataFull('start_adapter', $file);
+		$info = $this->getMetadataFull('start_adapter', $file);
 		return $this->start_filesystem->normalizeFileInfo($info);
 	}
 	
@@ -165,10 +165,10 @@ 
 		return $this->getMetadataFull('storage_adapter', $file);
 	}
 	
-	public function get_included_files_handler($metadata  = 0)
+	public function get_included_files_handler($metadata = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
+		if (!$metadata)
 			return $path;
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
@@ -185,16 +185,16 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 		
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
-		if(isset($new_list[0]))
+		if (isset($new_list[0]))
 			return $new_list[0];
 	}
 	
@@ -202,13 +202,13 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
 		return $new_list;
@@ -219,8 +219,8 @@ 
 		$files = $this->get_backup_archives_list();
 		$total = 0;
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 				$total += $file['size'];
 				
 		return $total;		
@@ -228,7 +228,7 @@ 
 	
 	public function is_part($backup_name)
 	{
-		if(stristr($backup_name, "-part"))
+		if (stristr($backup_name, "-part"))
 			return true;
 		
 		return false;	
@@ -236,7 +236,7 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -245,10 +245,10 @@ 
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->get_storage_filesystem()->getSize($backup_name);
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
+			foreach ($backup_parts as $part_file)
 				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
 		}
 		
@@ -259,12 +259,12 @@ 
 	{
 		$files = array();
 		
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$files[] = $data[0];
@@ -277,12 +277,12 @@ 
 	
 	public function delete_backup_by_name($backup_name, $storage_selection = "")
 	{
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$this->get_storage_filesystem($storage_selection)->delete($data[0]);
@@ -290,7 +290,7 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem($storage_selection)->delete($backup_name))
+		if ($this->get_storage_filesystem($storage_selection)->delete($backup_name))
 			$return = true;
 		else
 			$return = false;
@@ -298,7 +298,7 @@ 
 		return $return;	
 	}
 	
-	public function getMetadataFull($adapter = "storage_adapter" , $path)
+	public function getMetadataFull($adapter = "storage_adapter", $path)
     {
         $location = $this->$adapter->applyPathPrefix($path);
         $spl_info = new SplFileInfo($location);
@@ -312,25 +312,25 @@ 
 		$list = array();
 		
 
-		if(method_exists($this->get_storage_filesystem($storage_selection), "listContents"))
+		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)
+		foreach ($list as $file_info)
 		{
-			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$data = array();
 				
 				$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->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['basename'];
 							$file_info['childs'][] = $data;
 							$file_info['size'] += $data[2];
@@ -339,18 +339,18 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
 				$backup_files[$file_info['path']] = $file_info;
 		}
 		
-		foreach($backup_files as $key=>$file_info)
+		foreach ($backup_files as $key=>$file_info)
 		{
-			if(!isset($backup_files[$key]['timestamp']))
+			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']]))
+			if (isset($parents[$file_info['basename']]))
 				$backup_files[$key]['parent'] = $parents[$file_info['basename']];
 		}
 		
@@ -359,40 +359,40 @@ 
 	
 	public function start_file_recursion($init = 0)
 	{
-		if($init)
+		if ($init)
 		{
 			$this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"), $this->xcloner_settings->get_xcloner_start_path()));
 			$this->do_system_init();
 		}
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler())){
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
 		//.dir exists, we presume we have files to iterate	
 			$content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
 			$files = array_filter(explode("\n", $content));
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 			
 			$counter = 0;
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if($counter < $this->folders_to_process_per_session){
+				if ($counter < $this->folders_to_process_per_session) {
 					$this->build_files_list($file);
 					$counter++;
-				}else{
+				} else {
 					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
 				}
 			}
-		}else{
+		} else {
 			$this->build_files_list();
 		}
 		
-		if($this->scan_finished())
+		if ($this->scan_finished())
 		{
 			$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
 			$this->store_file($metadata_dumpfile, 'tmp_filesystem');
 			$this->files_counter++;
 		
 			//adding included dump file to the included files list
-			if($this->get_tmp_filesystem()->has($this->get_included_files_handler()))
+			if ($this->get_tmp_filesystem()->has($this->get_included_files_handler()))
 			{
 				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
 				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
@@ -400,13 +400,13 @@ 
 			}
 		
 			//adding a default index.html to the temp xcloner folder
-			if(!$this->get_tmp_filesystem()->has("index.html"))
+			if (!$this->get_tmp_filesystem()->has("index.html"))
 			{
-				$this->get_tmp_filesystem()->write("index.html","");
+				$this->get_tmp_filesystem()->write("index.html", "");
 			}
 			
 			//adding the default log file
-			if($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1)))
+			if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1)))
 			{
 				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
 				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
@@ -423,7 +423,7 @@ 
 	{
 		$return = array();
 		$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 			$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
 		
 		return $return;
@@ -436,8 +436,8 @@ 
 		
 		$contents = $this->get_tmp_filesystem()->listContents();
 	
-		if(is_array($contents))
-		foreach($contents as $file_info)
+		if (is_array($contents))
+		foreach ($contents as $file_info)
 			$this->get_tmp_filesystem()->delete($file_info['path']);
 			
 		@rmdir($this->xcloner_settings->get_xcloner_tmp_path());
@@ -447,16 +447,16 @@ 
 	
 	public function cleanup_tmp_directories()
 	{
-		$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false),LOCK_EX|FILE_APPEND, 'SKIP_LINKS');
+		$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)
+		foreach ($contents as $file)
 		{
-			if(preg_match("/.xcloner-(.*)/",$file['path']))
+			if (preg_match("/.xcloner-(.*)/", $file['path']))
 			{
 				$tmp_filesystem->deleteDir($file['path']);
 				$this->logger->info(sprintf("Delete temporary directory %s", $file['path']));
@@ -470,16 +470,16 @@ 
 	{
 		$this->files_counter = 0;
 		
-		if(!$this->storage_filesystem->has("index.html"))	
-			$this->storage_filesystem->write("index.html","");
+		if (!$this->storage_filesystem->has("index.html"))	
+			$this->storage_filesystem->write("index.html", "");
 		
-		if(!$this->tmp_filesystem->has("index.html"))	
-			$this->tmp_filesystem->write("index.html","");
+		if (!$this->tmp_filesystem->has("index.html"))	
+			$this->tmp_filesystem->write("index.html", "");
 			
-		if($this->tmp_filesystem->has($this->get_included_files_handler()))
+		if ($this->tmp_filesystem->has($this->get_included_files_handler()))
 			$this->tmp_filesystem->delete($this->get_included_files_handler());
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 	}
 	
@@ -500,7 +500,7 @@ 
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
+		if (!is_array($excluded_files))
 			$excluded_files = array();
 			
 		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
@@ -523,35 +523,35 @@ 
 		$this->logger->debug(sprintf(("Building the files system list")));
 		
 		//if we start with the root folder(empty value), we initializa the file system
-		if(!$folder){
+		if (!$folder) {
 			
 		}
 			
-		try{
+		try {
 			
 			$files = $this->start_filesystem->listContents($folder);
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path']))
+				if (!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path']))
 				{
-					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"), $file['path']), array("FILESYSTEM SCAN","NOT READABLE"));
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"), $file['path']), array("FILESYSTEM SCAN", "NOT READABLE"));
 				}
-				elseif(!$matching_pattern = $this->is_excluded($file) ){
-					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array("FILESYSTEM SCAN","INCLUDE"));
+				elseif (!$matching_pattern = $this->is_excluded($file)) {
+					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array("FILESYSTEM SCAN", "INCLUDE"));
 					$file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
-					if($this->store_file($file))
+					if ($this->store_file($file))
 					{
 						$this->files_counter++;
 					}
-					if(isset($file['size']))
+					if (isset($file['size']))
 						$this->files_size += $file['size'];
 					
-				}else{
-					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"), $file['path'], $matching_pattern), array("FILESYSTEM SCAN","EXCLUDE"));
+				} else {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"), $file['path'], $matching_pattern), array("FILESYSTEM SCAN", "EXCLUDE"));
 					}
 			}
 			
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
 			$this->logger->error($e->getMessage());
 		
@@ -565,9 +565,9 @@ 
 				
 		$start_time = microtime();
 		
-		$data = str_repeat(rand(0,9), 1024*1024); //write 1MB data
+		$data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
 		
-		try{
+		try {
 			$this->tmp_filesystem->write($tmp_file, $data);
 			
 			$end_time = microtime() - $start_time;
@@ -578,7 +578,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
 			$this->logger->error($e->getMessage());
 			
@@ -599,10 +599,10 @@ 
 		
 		$files = $this->storage_filesystem->listContents();
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 			{
-				if(isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
+				if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
 				{
 					$_storage_size += $file['size']; //bytes
 					$_backup_files_list[] = $file;
@@ -610,15 +610,15 @@ 
 			}
 		
 		
-		$this->sort_by($_backup_files_list, "timestamp","asc");
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
 		
 		$_backups_counter = sizeof($_backup_files_list);
 				
-		foreach($_backup_files_list as $file)
+		foreach ($_backup_files_list as $file)
 		{
 			//processing rule folder capacity
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-			$_storage_size >= ($set_storage_limit = 1024*1024*$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))	//bytes	
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
+			$_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))	//bytes	
 			{
 				$this->storage_filesystem->delete($file['path']);
 				$_storage_size -= $file['size'];
@@ -626,14 +626,14 @@ 
 			}
 			
 			//processing rule days limit
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp'])
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp'])
 			{
 				$this->storage_filesystem->delete($file['path']);
 				$this->logger->info("Deleting backup ".$file['path']." matching rule", array("RETENTION LIMIT TIMESTAMP", $file['timestamp']." =< ".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')));
 			}
 			
 			//processing backup countert limit
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives'))
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives'))
 			{
 				$this->storage_filesystem->delete($file['path']);
 				$_backups_counter--;
@@ -659,33 +659,33 @@ 
 	
 	}
 	
-	public function process_backup_name($name = "", $max_length=100)
+	public function process_backup_name($name = "", $max_length = 100)
 	{
-		if(!$name)
+		if (!$name)
 			$name = $this->xcloner_settings->get_default_backup_name();
 		
-		foreach($this->backup_name_tags as $tag)
+		foreach ($this->backup_name_tags as $tag)
 		{
-			if($tag == '[time]')
-				$name = str_replace($tag, date("Y-m-d_H-i"),$name);
-			elseif($tag == '[hostname]')
-				$name = str_replace($tag, gethostname() ,$name);	
-			elseif($tag == '[domain]')
+			if ($tag == '[time]')
+				$name = str_replace($tag, date("Y-m-d_H-i"), $name);
+			elseif ($tag == '[hostname]')
+				$name = str_replace($tag, gethostname(), $name);	
+			elseif ($tag == '[domain]')
 			{
 				$domain = parse_url(admin_url(), PHP_URL_HOST);
-				$name = str_replace($tag, $domain ,$name);	
+				$name = str_replace($tag, $domain, $name);	
 			}
 		}
 		
-		if($max_length)
+		if ($max_length)
 			$name = substr($name, 0, $max_length);
 			
 		return $name;	
 	}
 	
-	public function sort_by( &$array, $field, $direction = 'asc')
+	public function sort_by(&$array, $field, $direction = 'asc')
 	{
-		if(strtolower($direction) == "desc" || $direction == SORT_DESC)
+		if (strtolower($direction) == "desc" || $direction == SORT_DESC)
 			$direction = SORT_DESC;
 		else
 			$direction = SORT_ASC;
@@ -705,7 +705,7 @@ 
 	            $tmp = array();
 	            foreach ($data as $key => $row)
 	            {
-					if(is_array($row))
+					if (is_array($row))
 						$tmp[$key] = $row[$field];
 					else
 						$tmp[$key] = $row->$field;
@@ -722,18 +722,18 @@ 
 	
 	private function check_file_diff_time($file)
 	{
-		if($this->get_diff_timestamp_start() != "")
+		if ($this->get_diff_timestamp_start() != "")
 		{
 			$fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
 			$timestamp = $fileMeta->getMTime();
-			if($timestamp < $fileMeta->getCTime())
+			if ($timestamp < $fileMeta->getCTime())
 			{
 				$timestamp = $fileMeta->getCTime();
 			}
 			
-			if($timestamp <= $this->get_diff_timestamp_start())
+			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;
 			}
 		}
 		
@@ -744,35 +744,35 @@ 
 	{
 		$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
 		
-		if($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb'))
+		if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb'))
 		{
-			if(isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb))
+			if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb))
 				return "> ".$xcloner_exclude_files_larger_than_mb."MB";
 		}
 		
-		if(!sizeof($this->excluded_files))
+		if (!sizeof($this->excluded_files))
 			$this->set_excluded_files();
 				
-		if(is_array($this->excluded_files))
-		foreach($this->excluded_files as $excluded_file_pattern)
+		if (is_array($this->excluded_files))
+		foreach ($this->excluded_files as $excluded_file_pattern)
 		{
-			if($excluded_file_pattern == "/")
+			if ($excluded_file_pattern == "/")
 				$needle = "$";
 			else
 				$needle = "$".$excluded_file_pattern;
 				
-			if(strstr("$".$file['path'], $needle)){
+			if (strstr("$".$file['path'], $needle)) {
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
+		if ($regex = $this->is_excluded_regex($file))
 			return $regex;
 		
-		if($file['type'] == "file")
+		if ($file['type'] == "file")
 		{
 			$check_file_diff_timestamp = $this->check_file_diff_time($file);
-			if($check_file_diff_timestamp)
+			if ($check_file_diff_timestamp)
 			{
 				return $check_file_diff_timestamp;
 			}
@@ -821,25 +821,25 @@ 
 		
 		//print_r($regex_patterns);exit;
 		
-		if(is_array($regex_patterns))
+		if (is_array($regex_patterns))
 		{
 			//$this->excluded_files = array();
 			//$this->excluded_files[] ="(.*)\.(git)(.*)$";
 			//$this->excluded_files[] ="wp-content\/backups(.*)$";
 			
-			foreach($regex_patterns as $excluded_file_pattern)
+			foreach ($regex_patterns as $excluded_file_pattern)
 			{
 				
-				if( substr($excluded_file_pattern, strlen($excluded_file_pattern)-1, strlen($excluded_file_pattern)) == "\r")
-					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern)-1);
+				if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1, strlen($excluded_file_pattern)) == "\r")
+					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
 					
-				if($file['path'] == "/")
+				if ($file['path'] == "/")
 					$needle = "/";
 				else
 					$needle = "/".$file['path'];
 				//echo $needle."---".$excluded_file_pattern."---\n";
 				
-				if(@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)){
+				if (@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)) {
 					return $excluded_file_pattern;
 				}
 			}
@@ -852,36 +852,36 @@ 
 	{
 		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
 		
-		if(!isset($file['size']))
+		if (!isset($file['size']))
 			$file['size'] = 0;
-		if(!isset($file['visibility']))	
+		if (!isset($file['visibility']))	
 			$file['visibility'] = "private";
 		
-		$csv_filename = str_replace('"','""', $file['path']);
+		$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{
+		if ($file['type'] == "dir") {
+			try {
 				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());	
 			}
 		}
 		
-		if($this->get_diff_timestamp_start())
+		if ($this->get_diff_timestamp_start())
 		{
-			if($file['type'] != "file" && $response = $this->check_file_diff_time($file))
+			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"));
+				$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()))
+		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;
@@ -890,7 +890,7 @@ 
 			
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 		
 			$this->logger->error($e->getMessage());	
 		}
@@ -905,13 +905,13 @@ 
 	
 	public function get_filesystem($system = "")
 	{
-		if($system == "storage_filesystem_append")
+		if ($system == "storage_filesystem_append")
 			return $this->storage_filesystem_append;
-		elseif($system == "tmp_filesystem_append")
+		elseif ($system == "tmp_filesystem_append")
 			return $this->tmp_filesystem_append;
-		elseif($system == "tmp_filesystem")
+		elseif ($system == "tmp_filesystem")
 			return $this->tmp_filesystem;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_filesystem;
 		else
 			return $this->start_filesystem;	
@@ -919,9 +919,9 @@ 
 	
 	public function get_adapter($system)
 	{
-		if($system == "tmp_filesystem")
+		if ($system == "tmp_filesystem")
 			return $this->tmp_adapter;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_adapter;
 		else
 			return $this->start_adapter;	
@@ -929,10 +929,10 @@ 
 	
 	private function scan_finished()
 	{
-		if($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler()))
+		if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler()))
 			return false;
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler()))
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 		
 		$this->logger->debug(sprintf(("File scan finished")));
@@ -942,7 +942,7 @@ 
 	
 	private function calc_to_bytes($mb_size)
 	{
-		return $mb_size*(1024*1024);
+		return $mb_size * (1024 * 1024);
 	}
 	
 }

Braces +167 added lines, -123 removed lines

@@ -66,13 +66,14 @@ 
 			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
-			$this->folders_to_process_per_session = $value;
+		if($value = get_option('xcloner_directories_to_scan_per_request')) {
+					$this->folders_to_process_per_session = $value;
+		}
 
 	}
 	
@@ -118,8 +119,9 @@ 
 			$remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 			$method = "get_".$remote_storage_selection."_filesystem";
 			
-			if(!method_exists($remote_storage, $method))
-				return false;
+			if(!method_exists($remote_storage, $method)) {
+							return false;
+			}
 				
 			list($adapter, $filesystem) = $remote_storage->$method();	
 			
@@ -168,8 +170,9 @@ 
 	public function get_included_files_handler($metadata  = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
-			return $path;
+		if(!$metadata) {
+					return $path;
+		}
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
 		return $spl_info;
@@ -185,31 +188,36 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 		
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if(is_array($files)) {
+					$this->sort_by($files, "timestamp","desc");
+		}
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach($files as $key=>$file) {
+					if(!isset($file['parent']))
 				$new_list[] = ($files[$key]);
+		}
 
-		if(isset($new_list[0]))
-			return $new_list[0];
+		if(isset($new_list[0])) {
+					return $new_list[0];
+		}
 	}
 	
 	public function get_latest_backups()
 	{
 		$files = $this->get_backup_archives_list();
 
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if(is_array($files)) {
+					$this->sort_by($files, "timestamp","desc");
+		}
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach($files as $key=>$file) {
+					if(!isset($file['parent']))
 				$new_list[] = ($files[$key]);
+		}
 
 		return $new_list;
 	}
@@ -219,25 +227,28 @@ 
 		$files = $this->get_backup_archives_list();
 		$total = 0;
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if(is_array($files)) {
+					foreach($files as $file)
 				$total += $file['size'];
+		}
 				
 		return $total;		
 	}
 	
 	public function is_part($backup_name)
 	{
-		if(stristr($backup_name, "-part"))
-			return true;
+		if(stristr($backup_name, "-part")) {
+					return true;
+		}
 		
 		return false;	
 	}
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -248,8 +259,9 @@ 
 		if($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
-				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			foreach($backup_parts as $part_file) {
+							$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -290,10 +302,11 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem($storage_selection)->delete($backup_name))
-			$return = true;
-		else
-			$return = false;
+		if($this->get_storage_filesystem($storage_selection)->delete($backup_name)) {
+					$return = true;
+		} else {
+					$return = false;
+		}
 			
 		return $return;	
 	}
@@ -312,8 +325,9 @@ 
 		$list = array();
 		
 
-		if(method_exists($this->get_storage_filesystem($storage_selection), "listContents"))
-			$list = $this->get_storage_filesystem($storage_selection)->listContents();
+		if(method_exists($this->get_storage_filesystem($storage_selection), "listContents")) {
+					$list = $this->get_storage_filesystem($storage_selection)->listContents();
+		}
 
 		
 		$backup_files = array();
@@ -326,10 +340,11 @@ 
 				$data = array();
 				
 				$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->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['basename'];
 							$file_info['childs'][] = $data;
@@ -339,8 +354,9 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
-				$backup_files[$file_info['path']] = $file_info;
+			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions)) {
+							$backup_files[$file_info['path']] = $file_info;
+			}
 		}
 		
 		foreach($backup_files as $key=>$file_info)
@@ -350,8 +366,9 @@ 
 				//$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']];
+			if(isset($parents[$file_info['basename']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['basename']];
+			}
 		}
 		
 		return $backup_files;
@@ -377,11 +394,11 @@ 
 				if($counter < $this->folders_to_process_per_session){
 					$this->build_files_list($file);
 					$counter++;
-				}else{
+				} else{
 					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
 				}
 			}
-		}else{
+		} else{
 			$this->build_files_list();
 		}
 		
@@ -423,8 +440,9 @@ 
 	{
 		$return = array();
 		$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
-			$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+					$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		}
 		
 		return $return;
 	}
@@ -436,9 +454,10 @@ 
 		
 		$contents = $this->get_tmp_filesystem()->listContents();
 	
-		if(is_array($contents))
-		foreach($contents as $file_info)
+		if(is_array($contents)) {
+				foreach($contents as $file_info)
 			$this->get_tmp_filesystem()->delete($file_info['path']);
+		}
 			
 		@rmdir($this->xcloner_settings->get_xcloner_tmp_path());
 		
@@ -470,17 +489,21 @@ 
 	{
 		$this->files_counter = 0;
 		
-		if(!$this->storage_filesystem->has("index.html"))	
-			$this->storage_filesystem->write("index.html","");
+		if(!$this->storage_filesystem->has("index.html")) {
+					$this->storage_filesystem->write("index.html","");
+		}
 		
-		if(!$this->tmp_filesystem->has("index.html"))	
-			$this->tmp_filesystem->write("index.html","");
+		if(!$this->tmp_filesystem->has("index.html")) {
+					$this->tmp_filesystem->write("index.html","");
+		}
 			
-		if($this->tmp_filesystem->has($this->get_included_files_handler()))
-			$this->tmp_filesystem->delete($this->get_included_files_handler());
+		if($this->tmp_filesystem->has($this->get_included_files_handler())) {
+					$this->tmp_filesystem->delete($this->get_included_files_handler());
+		}
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
-			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		if($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+					$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
 	}
 	
 	public function get_scanned_files_num()
@@ -500,8 +523,9 @@ 
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
-			$excluded_files = array();
+		if(!is_array($excluded_files)) {
+					$excluded_files = array();
+		}
 			
 		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
 		
@@ -535,23 +559,23 @@ 
 				if(!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path']))
 				{
 					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"), $file['path']), array("FILESYSTEM SCAN","NOT READABLE"));
-				}
-				elseif(!$matching_pattern = $this->is_excluded($file) ){
+				} elseif(!$matching_pattern = $this->is_excluded($file) ){
 					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array("FILESYSTEM SCAN","INCLUDE"));
 					$file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
 					if($this->store_file($file))
 					{
 						$this->files_counter++;
 					}
-					if(isset($file['size']))
-						$this->files_size += $file['size'];
+					if(isset($file['size'])) {
+											$this->files_size += $file['size'];
+					}
 					
-				}else{
+				} else{
 					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"), $file['path'], $matching_pattern), array("FILESYSTEM SCAN","EXCLUDE"));
 					}
 			}
 			
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			$this->logger->error($e->getMessage());
 		
@@ -578,7 +602,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			$this->logger->error($e->getMessage());
 			
@@ -599,12 +623,14 @@ 
 		
 		$files = $this->storage_filesystem->listContents();
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if(is_array($files)) {
+					foreach($files as $file)
 			{
 				if(isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
 				{
-					$_storage_size += $file['size']; //bytes
+					$_storage_size += $file['size'];
+		}
+		//bytes
 					$_backup_files_list[] = $file;
 				}
 			}
@@ -618,9 +644,11 @@ 
 		{
 			//processing rule folder capacity
 			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-			$_storage_size >= ($set_storage_limit = 1024*1024*$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))	//bytes	
+			$_storage_size >= ($set_storage_limit = 1024*1024*$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit'))) {
+				//bytes	
 			{
 				$this->storage_filesystem->delete($file['path']);
+			}
 				$_storage_size -= $file['size'];
 				$this->logger->info("Deleting backup ".$file['path']." matching rule", array("STORAGE SIZE LIMIT", $_storage_size." >= ".$set_storage_limit));
 			}
@@ -661,34 +689,37 @@ 
 	
 	public function process_backup_name($name = "", $max_length=100)
 	{
-		if(!$name)
-			$name = $this->xcloner_settings->get_default_backup_name();
+		if(!$name) {
+					$name = $this->xcloner_settings->get_default_backup_name();
+		}
 		
 		foreach($this->backup_name_tags as $tag)
 		{
-			if($tag == '[time]')
-				$name = str_replace($tag, date("Y-m-d_H-i"),$name);
-			elseif($tag == '[hostname]')
-				$name = str_replace($tag, gethostname() ,$name);	
-			elseif($tag == '[domain]')
+			if($tag == '[time]') {
+							$name = str_replace($tag, date("Y-m-d_H-i"),$name);
+			} elseif($tag == '[hostname]') {
+							$name = str_replace($tag, gethostname() ,$name);
+			} elseif($tag == '[domain]')
 			{
 				$domain = parse_url(admin_url(), PHP_URL_HOST);
 				$name = str_replace($tag, $domain ,$name);	
 			}
 		}
 		
-		if($max_length)
-			$name = substr($name, 0, $max_length);
+		if($max_length) {
+					$name = substr($name, 0, $max_length);
+		}
 			
 		return $name;	
 	}
 	
 	public function sort_by( &$array, $field, $direction = 'asc')
 	{
-		if(strtolower($direction) == "desc" || $direction == SORT_DESC)
-			$direction = SORT_DESC;
-		else
-			$direction = SORT_ASC;
+		if(strtolower($direction) == "desc" || $direction == SORT_DESC) {
+					$direction = SORT_DESC;
+		} else {
+					$direction = SORT_ASC;
+		}
 					
 	   $array = $this->array_orderby($array, $field, $direction);
 	    
@@ -705,10 +736,11 @@ 
 	            $tmp = array();
 	            foreach ($data as $key => $row)
 	            {
-					if(is_array($row))
-						$tmp[$key] = $row[$field];
-					else
-						$tmp[$key] = $row->$field;
+					if(is_array($row)) {
+											$tmp[$key] = $row[$field];
+					} else {
+											$tmp[$key] = $row->$field;
+					}
 				}
 	            $args[$n] = $tmp;
 	            }
@@ -746,28 +778,32 @@ 
 		
 		if($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb'))
 		{
-			if(isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb))
-				return "> ".$xcloner_exclude_files_larger_than_mb."MB";
+			if(isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
+							return "> ".$xcloner_exclude_files_larger_than_mb."MB";
+			}
 		}
 		
-		if(!sizeof($this->excluded_files))
-			$this->set_excluded_files();
+		if(!sizeof($this->excluded_files)) {
+					$this->set_excluded_files();
+		}
 				
-		if(is_array($this->excluded_files))
-		foreach($this->excluded_files as $excluded_file_pattern)
+		if(is_array($this->excluded_files)) {
+				foreach($this->excluded_files as $excluded_file_pattern)
 		{
 			if($excluded_file_pattern == "/")
 				$needle = "$";
-			else
-				$needle = "$".$excluded_file_pattern;
+		} else {
+							$needle = "$".$excluded_file_pattern;
+			}
 				
 			if(strstr("$".$file['path'], $needle)){
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
-			return $regex;
+		if( $regex = $this->is_excluded_regex($file)) {
+					return $regex;
+		}
 		
 		if($file['type'] == "file")
 		{
@@ -830,13 +866,15 @@ 
 			foreach($regex_patterns as $excluded_file_pattern)
 			{
 				
-				if( substr($excluded_file_pattern, strlen($excluded_file_pattern)-1, strlen($excluded_file_pattern)) == "\r")
-					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern)-1);
+				if( substr($excluded_file_pattern, strlen($excluded_file_pattern)-1, strlen($excluded_file_pattern)) == "\r") {
+									$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern)-1);
+				}
 					
-				if($file['path'] == "/")
-					$needle = "/";
-				else
-					$needle = "/".$file['path'];
+				if($file['path'] == "/") {
+									$needle = "/";
+				} else {
+									$needle = "/".$file['path'];
+				}
 				//echo $needle."---".$excluded_file_pattern."---\n";
 				
 				if(@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)){
@@ -852,10 +890,12 @@ 
 	{
 		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
 		
-		if(!isset($file['size']))
-			$file['size'] = 0;
-		if(!isset($file['visibility']))	
-			$file['visibility'] = "private";
+		if(!isset($file['size'])) {
+					$file['size'] = 0;
+		}
+		if(!isset($file['visibility'])) {
+					$file['visibility'] = "private";
+		}
 		
 		$csv_filename = str_replace('"','""', $file['path']);
 		
@@ -866,7 +906,7 @@ 
 		if($file['type'] == "dir"){
 			try{
 				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->logger->error($e->getMessage());	
 			}
 		}
@@ -890,7 +930,7 @@ 
 			
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$this->logger->error($e->getMessage());	
 		}
@@ -905,35 +945,39 @@ 
 	
 	public function get_filesystem($system = "")
 	{
-		if($system == "storage_filesystem_append")
-			return $this->storage_filesystem_append;
-		elseif($system == "tmp_filesystem_append")
-			return $this->tmp_filesystem_append;
-		elseif($system == "tmp_filesystem")
-			return $this->tmp_filesystem;
-		elseif($system == "storage_filesystem")
-			return $this->storage_filesystem;
-		else
-			return $this->start_filesystem;	
+		if($system == "storage_filesystem_append") {
+					return $this->storage_filesystem_append;
+		} elseif($system == "tmp_filesystem_append") {
+					return $this->tmp_filesystem_append;
+		} elseif($system == "tmp_filesystem") {
+					return $this->tmp_filesystem;
+		} elseif($system == "storage_filesystem") {
+					return $this->storage_filesystem;
+		} else {
+					return $this->start_filesystem;
+		}
 	}
 	
 	public function get_adapter($system)
 	{
-		if($system == "tmp_filesystem")
-			return $this->tmp_adapter;
-		elseif($system == "storage_filesystem")
-			return $this->storage_adapter;
-		else
-			return $this->start_adapter;	
+		if($system == "tmp_filesystem") {
+					return $this->tmp_adapter;
+		} elseif($system == "storage_filesystem") {
+					return $this->storage_adapter;
+		} else {
+					return $this->start_adapter;
+		}
 	}
 	
 	private function scan_finished()
 	{
-		if($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler()))
-			return false;
+		if($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
+					return false;
+		}
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))
-			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		if($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+					$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
 		
 		$this->logger->debug(sprintf(("File scan finished")));
 			

includes/class-xcloner-scheduler.php

Spacing +67 added lines, -67 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Xcloner_Scheduler{
+class Xcloner_Scheduler {
 	
 	private $db;
 	private $scheduler_table = "xcloner_scheduler";
@@ -21,8 +21,8 @@ 
 	{
 		global $wpdb;
 		
-		$this->db 					= $wpdb;
-		$wpdb->show_errors			= false;
+		$this->db = $wpdb;
+		$wpdb->show_errors = false;
 		
 		$this->xcloner_container	= $xcloner_container;
 		$this->xcloner_settings 	= $xcloner_container->get_xcloner_settings();
@@ -40,18 +40,18 @@ 
 		$this->xcloner_container = $container;
 	}
 	
-	public function get_scheduler_list($return_only_enabled = 0 )
+	public function get_scheduler_list($return_only_enabled = 0)
 	{
 		$list = $this->db->get_results("SELECT * FROM ".$this->scheduler_table);
 		
-		if($return_only_enabled)
+		if ($return_only_enabled)
 		{
-			$new_list= array();
+			$new_list = array();
 			
-			foreach($list as $res)
-				if($res->status)
+			foreach ($list as $res)
+				if ($res->status)
 				{
-					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id))+(get_option( 'gmt_offset' ) * HOUR_IN_SECONDS);
+					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id)) + (get_option('gmt_offset') * HOUR_IN_SECONDS);
 					$new_list[] = $res;
 				}
 			$list = $new_list;	
@@ -77,7 +77,7 @@ 
 	{
 		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 		
-		if(!$data)
+		if (!$data)
 			return false;
 		
 		$params = json_decode($data['params']);
@@ -94,10 +94,10 @@ 
 	
 	public function delete_schedule_by_id($id)
 	{
-		$hook =  'xcloner_scheduler_'.$id;
-		wp_clear_scheduled_hook( $hook, array($id) );
+		$hook = 'xcloner_scheduler_'.$id;
+		wp_clear_scheduled_hook($hook, array($id));
 		
-		$data = $this->db->delete( $this->scheduler_table , array( 'id' => $id ) );
+		$data = $this->db->delete($this->scheduler_table, array('id' => $id));
 		
 		return $data;
 	}
@@ -106,12 +106,12 @@ 
 	{
 		$list = $this->get_scheduler_list();
 		
-		foreach($list as $schedule)
+		foreach ($list as $schedule)
 		{
-			$hook =  'xcloner_scheduler_'.$schedule->id;
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 			
-			$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-			wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+			$timestamp = wp_next_scheduled($hook, array($schedule->id));
+			wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		}
 	}
 	
@@ -119,26 +119,26 @@ 
 	{
 		$list = $this->get_scheduler_list();
 		
-		foreach($list as $schedule)
+		foreach ($list as $schedule)
 		{
-			$hook =  'xcloner_scheduler_'.$schedule->id;
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 			
 			//adding the xcloner_scheduler hook with xcloner_scheduler_callback callback
-			add_action( $hook, array($this, 'xcloner_scheduler_callback'), 10,  1 );
+			add_action($hook, array($this, 'xcloner_scheduler_callback'), 10, 1);
 			
-			if ( ! wp_next_scheduled( $hook, array($schedule->id) ) and $schedule->status) {
+			if (!wp_next_scheduled($hook, array($schedule->id)) and $schedule->status) {
 				
-				if($schedule->recurrence == "single")
+				if ($schedule->recurrence == "single")
 				{
-					wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-				}else{	
-					wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+					wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
+				} else {	
+					wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 				}
 					
-			}elseif(!$schedule->status)
+			}elseif (!$schedule->status)
 			{
-				$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-				wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+				$timestamp = wp_next_scheduled($hook, array($schedule->id));
+				wp_unschedule_event($timestamp, $hook, array($schedule->id));
 			}
 		}
 	
@@ -147,18 +147,18 @@ 
 	public function update_cron_hook($id)
 	{
 		$schedule = $this->get_schedule_by_id_object($id);
-		$hook =  'xcloner_scheduler_'.$schedule->id;
+		$hook = 'xcloner_scheduler_'.$schedule->id;
 		
-		$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-		wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+		$timestamp = wp_next_scheduled($hook, array($schedule->id));
+		wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		
 		if ($schedule->status) {
 			
-			if($schedule->recurrence == "single")
+			if ($schedule->recurrence == "single")
 			{
-				wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-			}else{	
-				wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+				wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
+			} else {	
+				wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 			}
 				
 		}
@@ -166,16 +166,16 @@ 
 	
 	public function disable_single_cron($schedule_id)
 	{
-		$hook =  'xcloner_scheduler_'.$schedule_id;
-		$timestamp = wp_next_scheduled( $hook , array($schedule_id) );
-		wp_unschedule_event( $timestamp, $hook, array($schedule_id) );
+		$hook = 'xcloner_scheduler_'.$schedule_id;
+		$timestamp = wp_next_scheduled($hook, array($schedule_id));
+		wp_unschedule_event($timestamp, $hook, array($schedule_id));
 		
 		$schedule['status'] = 0;
 		
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -191,7 +191,7 @@ 
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -207,7 +207,7 @@ 
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -224,25 +224,25 @@ 
 		$xcloner->init();
 		$this->set_xcloner_container($xcloner);
 		
-		$this->xcloner_file_system 		= $this->get_xcloner_container()->get_xcloner_filesystem();
-		$this->xcloner_database 		= $this->get_xcloner_container()->get_xcloner_database();
-		$this->archive_system 			= $this->get_xcloner_container()->get_archive_system();
-		$this->logger 					= $this->get_xcloner_container()->get_xcloner_logger()->withName("xcloner_scheduler");
-		$this->xcloner_remote_storage 	= $this->get_xcloner_container()->get_xcloner_remote_storage();
+		$this->xcloner_file_system = $this->get_xcloner_container()->get_xcloner_filesystem();
+		$this->xcloner_database = $this->get_xcloner_container()->get_xcloner_database();
+		$this->archive_system = $this->get_xcloner_container()->get_archive_system();
+		$this->logger = $this->get_xcloner_container()->get_xcloner_logger()->withName("xcloner_scheduler");
+		$this->xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 		
 		$this->logger->info(sprintf("New schedule hash is %s", $this->xcloner_settings->get_hash()));
 		
-		if($schedule['backup_params']->diff_start_date)
+		if ($schedule['backup_params']->diff_start_date)
 		{
 			$this->xcloner_file_system->set_diff_timestamp_start($schedule['backup_params']->diff_start_date);
 		}
 				
-		if($schedule['recurrence'] == "single")
+		if ($schedule['recurrence'] == "single")
 		{
 			$this->disable_single_cron($schedule['id']);
 		}
 		
-		if(!$schedule)
+		if (!$schedule)
 		{
 			$this->logger->info(sprintf("Could not load schedule with id'%s'", $id), array("CRON"));
 			return;
@@ -257,7 +257,7 @@ 
 		$init = 1;
 		$continue = 1;
 
-		while($continue)
+		while ($continue)
 		{
 			$continue = $this->xcloner_file_system->start_file_recursion($init);
 			
@@ -271,9 +271,9 @@ 
 		$init = 1;
 		$return['finished'] = 0;
 		
-		while(!$return['finished'])
+		while (!$return['finished'])
 		{
-			$return  = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
+			$return = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
 			$init = 0;
 		}
 		
@@ -285,7 +285,7 @@ 
 		$return['finished'] = 0;
 		$return['extra'] = array();
 		
-		while(!$return['finished'])
+		while (!$return['finished'])
 		{
 			$return = $this->archive_system->start_incremental_backup((array)$schedule['backup_params'], $return['extra'], $init);
 			$init = 0;
@@ -294,31 +294,31 @@ 
 		
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
+		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();
 		
 		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 		
-		if($schedule['remote_storage'] and array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages()))
+		if ($schedule['remote_storage'] and array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages()))
 		{
 			$backup_file = $return['extra']['backup_parent'];
 			
 			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 			
-			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
+			if (method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
 				call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
 		}
 		
 		
-		if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
+		if (isset($schedule['backup_params']->email_notification) and $to = $schedule['backup_params']->email_notification)
 		{	
-			try{
+			try {
 				$from = "XCloner Scheduler";
 				$additional['lines_total'] = $return['extra']['lines_total'];
-				$subject = sprintf(__("%s - new backup generated %s") , $schedule['name'], $return['extra']['backup_parent']);
+				$subject = sprintf(__("%s - new backup generated %s"), $schedule['name'], $return['extra']['backup_parent']);
 				
 				$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional);
-			}catch(Exception $e)
+			}catch (Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -333,22 +333,22 @@ 
 	{
 		$schedule = $this->get_schedule_by_id($id);
 		
-		try{
+		try {
 
 			$this->__xcloner_scheduler_callback($id, $schedule);
 			
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
 			//send email to site admin if email notification is not set in the scheduler
-			if(!isset($schedule['backup_params']->email_notification) || !$schedule['backup_params']->email_notification)
+			if (!isset($schedule['backup_params']->email_notification) || !$schedule['backup_params']->email_notification)
 			{
 				$schedule['backup_params']->email_notification = get_option('admin_email');
 			}
 				
-			if(isset($schedule['backup_params']->email_notification) && $to=$schedule['backup_params']->email_notification)
+			if (isset($schedule['backup_params']->email_notification) && $to = $schedule['backup_params']->email_notification)
 			{
 				$from = "XCloner Scheduler";
-				$this->archive_system->send_notification($to, $from, $schedule['name']." - backup error","", "", $e->getMessage());
+				$this->archive_system->send_notification($to, $from, $schedule['name']." - backup error", "", "", $e->getMessage());
 			}
 			
 		}
@@ -361,10 +361,10 @@ 
 		$new_schedules = array();
 		
 		foreach ($schedules as $key => $row) {
-			if(in_array($key, $this->allowed_schedules))
+			if (in_array($key, $this->allowed_schedules))
 			{
 				$new_schedules[$key] = $row;
-				$intervals[$key]  = $row['interval'];
+				$intervals[$key] = $row['interval'];
 			}
 		}
 		

Braces +17 added lines, -13 removed lines

@@ -48,10 +48,11 @@ 
 		{
 			$new_list= array();
 			
-			foreach($list as $res)
-				if($res->status)
+			foreach($list as $res) {
+							if($res->status)
 				{
 					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id))+(get_option( 'gmt_offset' ) * HOUR_IN_SECONDS);
+			}
 					$new_list[] = $res;
 				}
 			$list = $new_list;	
@@ -77,8 +78,9 @@ 
 	{
 		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 		
-		if(!$data)
-			return false;
+		if(!$data) {
+					return false;
+		}
 		
 		$params = json_decode($data['params']);
 		
@@ -131,11 +133,11 @@ 
 				if($schedule->recurrence == "single")
 				{
 					wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-				}else{	
+				} else{	
 					wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
 				}
 					
-			}elseif(!$schedule->status)
+			} elseif(!$schedule->status)
 			{
 				$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
 				wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
@@ -157,7 +159,7 @@ 
 			if($schedule->recurrence == "single")
 			{
 				wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-			}else{	
+			} else{	
 				wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
 			}
 				
@@ -294,8 +296,9 @@ 
 		
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
-				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+		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();
+		}
 		
 		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 		
@@ -305,8 +308,9 @@ 
 			
 			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 			
-			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
-				call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage")) {
+							call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			}
 		}
 		
 		
@@ -318,7 +322,7 @@ 
 				$subject = sprintf(__("%s - new backup generated %s") , $schedule['name'], $return['extra']['backup_parent']);
 				
 				$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional);
-			}catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -337,7 +341,7 @@ 
 
 			$this->__xcloner_scheduler_callback($id, $schedule);
 			
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			//send email to site admin if email notification is not set in the scheduler
 			if(!isset($schedule['backup_params']->email_notification) || !$schedule['backup_params']->email_notification)

includes/class-xcloner.php

Indentation +18 added lines, -18 removed lines

@@ -307,7 +307,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' ) ) );
 
 	}
 
@@ -341,8 +341,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);
 		
@@ -393,15 +393,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()
@@ -441,19 +441,19 @@ 
 			add_action( 'wp_ajax_restore_backup', 				array($xcloner_api,'restore_backup')  );
 			add_action( 'admin_notices', 						array($this, 'xcloner_error_admin_notices' ));
             
-        }
+		}
 		
 	}
 	
 	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' );
@@ -537,9 +537,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 +73 added lines, -73 removed lines

@@ -148,15 +148,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);
@@ -164,7 +164,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);
@@ -178,15 +178,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
 	}
@@ -213,79 +213,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);
 
@@ -304,7 +304,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' ) ) );
@@ -320,11 +320,11 @@ 
 	 */
 	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');
 		
 	}
 	
@@ -333,24 +333,24 @@ 
 	 * 
 	 * @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']);
 			}
 		}
@@ -373,10 +373,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');
 
 	}
 	
@@ -385,20 +385,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}");
@@ -406,47 +406,47 @@ 
 		
 	private function define_ajax_hooks()
 	{
-		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);
+			$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);
+			$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' ));
+			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'));
             
         }
 		
 	}
 	
 	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>';
@@ -456,13 +456,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();
@@ -543,7 +543,7 @@ 
 	
 		$page = sanitize_key($_GET['page']);
 
-		if($page)
+		if ($page)
 		{
 			$this->display($page);
 		}