ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

Spacing +193 added lines, -193 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;
@@ -115,12 +115,12 @@ 
 	{
 		register_shutdown_function(array($this, 'exception_handler'));
 
-		if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+		if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 		{
 			$dir = $parent_api->get_xcloner_container()->get_xcloner_settings()->get_xcloner_store_path();
 		}
 		
-		if(!isset($dir) || !$dir){
+		if (!isset($dir) || !$dir) {
 			$dir = dirname(__FILE__);
 		}
 		
@@ -128,7 +128,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,
 			]));
@@ -137,15 +137,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));
 		}
 
 	}
@@ -157,9 +157,9 @@ 
 		
 		$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));
 		}
 	
 	}
@@ -169,12 +169,12 @@ 
      * @return mixed|string
      */
 	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}");
@@ -182,7 +182,7 @@ 
 	
 	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;
 	}
@@ -195,7 +195,7 @@ 
      */
 	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);
 			
@@ -203,13 +203,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");
 				}
 		}
 		
@@ -224,38 +224,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");
 			}
 			
@@ -276,20 +276,20 @@ 
      * @return mysqli
      * @throws Exception
      */
-	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;");
@@ -304,15 +304,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);
@@ -322,8 +322,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)
@@ -337,7 +337,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;
@@ -347,7 +347,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);
@@ -355,49 +355,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);
@@ -418,12 +418,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."));
 		}
 		
@@ -446,12 +446,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;
@@ -472,37 +472,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();
@@ -512,18 +512,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;
 				
 			}
@@ -546,28 +546,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();
 			}
@@ -585,7 +585,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,
 			]));
@@ -593,13 +593,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']);
 				}
@@ -617,29 +617,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());
@@ -661,11 +661,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.");
@@ -673,10 +673,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;
@@ -697,7 +697,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);
 		}
@@ -715,7 +715,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);
@@ -735,7 +735,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,
 			]));
@@ -743,25 +743,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'] = "";	
@@ -771,7 +771,7 @@ 
 			}	
 		}
 		
-		$this->sort_by($mysqldump_list, 'timestamp','desc');
+		$this->sort_by($mysqldump_list, 'timestamp', 'desc');
 		$return['files'] = $mysqldump_list;
 		
 		$this->send_response(200, $return);
@@ -785,12 +785,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;
@@ -809,18 +809,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];
@@ -829,19 +829,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']));
@@ -851,7 +851,7 @@ 
 				
 		}
 		
-		$this->sort_by($new_list, "timestamp","desc");
+		$this->sort_by($new_list, "timestamp", "desc");
 		
 		$return['files'] = $new_list;
 		
@@ -867,15 +867,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,
 			]));
@@ -887,9 +887,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);
@@ -897,41 +897,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;
@@ -948,24 +948,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;
 		}	
@@ -984,17 +984,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']));
 		
@@ -1010,8 +1010,8 @@ 
      */
     private function return_bytes($val) {
         $numeric_val = (int)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':
                 $numeric_val *= 1024;
@@ -1032,7 +1032,7 @@ 
      */
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -1048,10 +1048,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);
 		}
 		
@@ -1068,12 +1068,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];
@@ -1092,7 +1092,7 @@ 
      * @param string $direction
      * @return bool
      */
-    private function sort_by( &$array, $field, $direction = 'asc')
+    private function sort_by(&$array, $field, $direction = 'asc')
     {
         $direction = strtolower($direction);
 
@@ -1107,18 +1107,18 @@ 
                     return 0;
                 }
 
-                if($direction == 'desc') {
-                    if($a > $b) {
+                if ($direction == 'desc') {
+                    if ($a > $b) {
                         return -1;
                     }
-                    else{
+                    else {
                         return 1;
                     }
-                }else {
-                    if($a < $b) {
+                } else {
+                    if ($a < $b) {
                         return -1;
                     }
-                    else{
+                    else {
                         return 1;
                     }
                 }
@@ -1144,11 +1144,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;
@@ -1167,12 +1167,12 @@ 
 	 
 	function do_serialized_fix($query)
 	{
-		$query = str_replace(array("\\n","\\r","\\'"), array("","","\""), ($query));
+		$query = str_replace(array("\\n", "\\r", "\\'"), array("", "", "\""), ($query));
 		
-		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function ($m) {
+		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function($m) {
 				  $data = "";
 				  	
-				  if(!isset($m[3]))
+				  if (!isset($m[3]))
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
@@ -1199,8 +1199,8 @@ 
      * @return mixed
      */
 	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);
 	}
 
@@ -1212,14 +1212,14 @@ 
      */
 	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;
 		}
 

admin/partials/xcloner_init_page.php

Spacing +64 added lines, -64 removed lines

@@ -20,12 +20,12 @@ 
 
 $logger_content = $logger->getLastDebugLines();
 
-$date_format = get_option( 'date_format' );
-$time_format = get_option( 'time_format' );
+$date_format = get_option('date_format');
+$time_format = get_option('time_format');
 
 //$xcloner_file_system->cleanup_tmp_directories();
 
-if ( $requirements->check_backup_ready_status() ) {
+if ($requirements->check_backup_ready_status()) {
 	$latest_backup = $xcloner_file_system->get_latest_backup();
 	$xcloner_file_system->backup_storage_cleanup();
 }
@@ -34,15 +34,15 @@ 
 <div class="row">
     <div class="col s12">
         <h5 class="left-align">
-			<?php echo __( 'Backup Dashboard', 'xcloner-backup-and-restore' ) ?>
+			<?php echo __('Backup Dashboard', 'xcloner-backup-and-restore') ?>
         </h5>
     </div>
 </div>
 
-<?php if ( isset( $latest_backup['timestamp'] ) and $latest_backup['timestamp'] < strtotime( "-1 day" ) ): ?>
+<?php if (isset($latest_backup['timestamp']) and $latest_backup['timestamp'] < strtotime("-1 day")): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo __( 'Your latest backup is older than 24 hours, please create a new backup to keep your site protected.', 'xcloner-backup-and-restore' ) ?>
+				<?php echo __('Your latest backup is older than 24 hours, please create a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -50,10 +50,10 @@ 
     </div>
 <?php endif ?>
 
-<?php if ( ! isset( $latest_backup['timestamp'] ) ): ?>
+<?php if (!isset($latest_backup['timestamp'])): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo __( 'You have no backup that I could find, please generate a new backup to keep your site protected.', 'xcloner-backup-and-restore' ) ?>
+				<?php echo __('You have no backup that I could find, please generate a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -61,10 +61,10 @@ 
     </div>
 <?php endif ?>
 
-<?php if ( ! $requirements->check_backup_ready_status() ): ?>
+<?php if (!$requirements->check_backup_ready_status()): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo __( 'Backup system not ready, please check and fix the issues marked in red', 'xcloner-backup-and-restore' ) ?>
+				<?php echo __('Backup system not ready, please check and fix the issues marked in red', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -87,74 +87,74 @@ 
                     <div class="collapsible-body">
                         <div class="" id="backup-status">
                             <div class="row">
-                                <h5><?php echo __( "Latest Backup", 'xcloner-backup-and-restore' ) ?></h5>
+                                <h5><?php echo __("Latest Backup", 'xcloner-backup-and-restore') ?></h5>
                                 <blockquote>
-									<?php if ( isset($latest_backup) ): ?>
+									<?php if (isset($latest_backup)): ?>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Backup Name", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Backup Name", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
 											<?php echo $latest_backup['basename'] ?>
                                         </div>
                                         <div class="item">
                                             <div class="title">
-												<?php echo __( "Backup Size", 'xcloner-backup-and-restore' ) ?>:
+												<?php echo __("Backup Size", 'xcloner-backup-and-restore') ?>:
                                             </div>
-											<?php echo size_format( $latest_backup['size'] ) ?>
+											<?php echo size_format($latest_backup['size']) ?>
                                         </div>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Backup Date", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Backup Date", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
 											<?php
-											echo date( $date_format . " " . $time_format, $latest_backup['timestamp'] + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
+											echo date($date_format." ".$time_format, $latest_backup['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 											?>
                                         </div>
 									<?php else: ?>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "No Backup Yet", 'xcloner-backup-and-restore' ) ?></div>
+                                            <div class="title"><?php echo __("No Backup Yet", 'xcloner-backup-and-restore') ?></div>
                                         </div>
 									<?php endif ?>
                                 </blockquote>
                                 <div>
-                                    <h5><?php echo __( "Backup Storage Usage", 'xcloner-backup-and-restore' ) ?></h5>
+                                    <h5><?php echo __("Backup Storage Usage", 'xcloner-backup-and-restore') ?></h5>
                                     <blockquote>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Total Size", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Total Size", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
-											<?php echo size_format( $xcloner_file_system->get_storage_usage() ); ?>
+											<?php echo size_format($xcloner_file_system->get_storage_usage()); ?>
                                         </div>
                                     </blockquote>
-                                    <h5><?php echo __( "Next Scheduled Backup", 'xcloner-backup-and-restore' ) ?></h5>
+                                    <h5><?php echo __("Next Scheduled Backup", 'xcloner-backup-and-restore') ?></h5>
                                     <blockquote>
                                         <div class="item">
 											<?php
-											$list = ( $xcloner_scheduler->get_next_run_schedule() );
+											$list = ($xcloner_scheduler->get_next_run_schedule());
 
-											if ( is_array( $list ) ) {
-												$xcloner_file_system->sort_by( $list, "next_run_time", "asc" );
+											if (is_array($list)) {
+												$xcloner_file_system->sort_by($list, "next_run_time", "asc");
 											}
 
-											if ( isset( $list[0] ) ) {
+											if (isset($list[0])) {
 												$latest_schedule = $list[0];
 											}
 											?>
-											<?php if ( isset( $latest_schedule->name ) ): ?>
-                                                <div class="title"><?php echo __( "Schedule Name", 'xcloner-backup-and-restore' ) ?>
+											<?php if (isset($latest_schedule->name)): ?>
+                                                <div class="title"><?php echo __("Schedule Name", 'xcloner-backup-and-restore') ?>
                                                     :
                                                 </div>
 												<?php echo $latest_schedule->name; ?>
 											<?php endif; ?>
                                         </div>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Next Call", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Next Call", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
-											<?php if ( isset( $latest_schedule->next_run_time ) ) {
-												echo date( $date_format . " " . $time_format, $latest_schedule->next_run_time );
+											<?php if (isset($latest_schedule->next_run_time)) {
+												echo date($date_format." ".$time_format, $latest_schedule->next_run_time);
 											} else {
-												echo __( "Unscheduled", 'xcloner-backup-and-restore' );
+												echo __("Unscheduled", 'xcloner-backup-and-restore');
 											}
 											?>
                                         </div>
@@ -163,20 +163,20 @@ 
                             </div>
                 </li>
 
-				<?php if ( $xcloner_settings->get_xcloner_option( 'xcloner_enable_log' ) ) : ?>
+				<?php if ($xcloner_settings->get_xcloner_option('xcloner_enable_log')) : ?>
                     <li class="active">
                         <div class="collapsible-header active">
-                            <i class="material-icons">bug_report</i><?php echo __( 'XCloner Debugger', 'xcloner-backup-and-restore' ) ?>
+                            <i class="material-icons">bug_report</i><?php echo __('XCloner Debugger', 'xcloner-backup-and-restore') ?>
                             <div class="right">
-                                <a href="#<?php echo $logger_basename = basename( $logger->get_main_logger_url() ) ?>"
+                                <a href="#<?php echo $logger_basename = basename($logger->get_main_logger_url()) ?>"
                                    class="download-logger" title="<?php echo $logger_basename ?>">
                                     <span class="shorten_string"><?php echo $logger_basename ?>&nbsp;&nbsp;&nbsp;</span>
                                 </a>
                             </div>
                         </div>
                         <div class="collapsible-body">
-                            <div class="console" id="xcloner-console"><?php if ( $logger_content ) {
-									echo implode( "<br />\n", array_reverse( $logger_content ) );
+                            <div class="console" id="xcloner-console"><?php if ($logger_content) {
+									echo implode("<br />\n", array_reverse($logger_content));
 								} ?></div>
                         </div>
                     </li>
@@ -201,71 +201,71 @@ 
 
         <div class="card blue-grey darken-1 z-depth-4 backup-ready">
             <div class="card-content white-text">
-                <span class="card-title"><?php echo __( "System Check", 'xcloner-backup-and-restore' ) ?></span>
+                <span class="card-title"><?php echo __("System Check", 'xcloner-backup-and-restore') ?></span>
                 <ul>
-                    <li class="card-panel <?php echo( $requirements->check_xcloner_start_path( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'Backup Start Location', 'xcloner-backup-and-restore' ) ?>: <span
+                    <li class="card-panel <?php echo($requirements->check_xcloner_start_path(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('Backup Start Location', 'xcloner-backup-and-restore') ?>: <span
                                 class="shorten_string "><?php echo $requirements->check_xcloner_start_path(); ?></span>
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_xcloner_store_path( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'Backup Storage Location', 'xcloner-backup-and-restore' ) ?>: <span
+                    <li class="card-panel <?php echo($requirements->check_xcloner_store_path(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('Backup Storage Location', 'xcloner-backup-and-restore') ?>: <span
                                 class="shorten_string"><?php echo $requirements->check_xcloner_store_path(); ?></span>
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_xcloner_tmp_path( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'Temporary Location', 'xcloner-backup-and-restore' ) ?>: <span
+                    <li class="card-panel <?php echo($requirements->check_xcloner_tmp_path(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('Temporary Location', 'xcloner-backup-and-restore') ?>: <span
                                 class="shorten_string"><?php echo $requirements->check_xcloner_tmp_path(); ?></span>
                     </li>
 
-                    <li class="card-panel <?php echo( $requirements->check_min_php_version( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'PHP Version Check', 'xcloner-backup-and-restore' ) ?>
+                    <li class="card-panel <?php echo($requirements->check_min_php_version(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('PHP Version Check', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->check_min_php_version(); ?>
-                        ( >= <?php echo $requirements->get_constant( 'min_php_version' ) ?>)
+                        ( >= <?php echo $requirements->get_constant('min_php_version') ?>)
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_safe_mode( 1 ) ? "teal" : "orange" ) ?> lighten-2">
-						<?php echo __( 'PHP Safe Mode', 'xcloner-backup-and-restore' ) ?>
+                    <li class="card-panel <?php echo($requirements->check_safe_mode(1) ? "teal" : "orange") ?> lighten-2">
+						<?php echo __('PHP Safe Mode', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->check_safe_mode(); ?>
-                        ( <?php echo $requirements->get_constant( 'safe_mode' ) ?>)
+                        ( <?php echo $requirements->get_constant('safe_mode') ?>)
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_backup_ready_status() ? "teal" : "red" ) ?> lighten-2">
-						<?php echo( $requirements->check_backup_ready_status() ? __( 'BACKUP READY', 'xcloner-backup-and-restore' ) : __( 'Backup not ready, please check above requirements', 'xcloner-backup-and-restore' ) ) ?>
-                        <i class="material-icons right tiny"><?php echo( $requirements->check_backup_ready_status() ? 'thumb_up' : 'thumb_down' ) ?></i>
+                    <li class="card-panel <?php echo($requirements->check_backup_ready_status() ? "teal" : "red") ?> lighten-2">
+						<?php echo($requirements->check_backup_ready_status() ? __('BACKUP READY', 'xcloner-backup-and-restore') : __('Backup not ready, please check above requirements', 'xcloner-backup-and-restore')) ?>
+                        <i class="material-icons right tiny"><?php echo($requirements->check_backup_ready_status() ? 'thumb_up' : 'thumb_down') ?></i>
                     </li>
                 </ul>
                 <ul class="additional_system_info">
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'PHP max_execution_time', 'xcloner-backup-and-restore' ) ?>
+						<?php echo __('PHP max_execution_time', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->get_max_execution_time(); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'PHP memory_limit', 'xcloner-backup-and-restore' ) ?>
+						<?php echo __('PHP memory_limit', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->get_memory_limit(); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'PHP open_basedir', 'xcloner-backup-and-restore' ) ?>
+						<?php echo __('PHP open_basedir', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->get_open_basedir(); ?>
                     </li>
 					<?php
 					$data = array();
-					if ( $requirements->check_backup_ready_status() ) {
+					if ($requirements->check_backup_ready_status()) {
 						$data = $xcloner_file_system->estimate_read_write_time();
 					}
 					?>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'Reading Time 1MB Block', 'xcloner-backup-and-restore' ) ?>
-                        : <?php echo( isset( $data['reading_time'] ) ? $data['reading_time'] : __( "unknown" ) ); ?>
+						<?php echo __('Reading Time 1MB Block', 'xcloner-backup-and-restore') ?>
+                        : <?php echo(isset($data['reading_time']) ? $data['reading_time'] : __("unknown")); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'Writing Time 1MB Block', 'xcloner-backup-and-restore' ) ?>
-                        : <?php echo( isset( $data['writing_time'] ) ? $data['writing_time'] : __( "unknown" ) ); ?>
+						<?php echo __('Writing Time 1MB Block', 'xcloner-backup-and-restore') ?>
+                        : <?php echo(isset($data['writing_time']) ? $data['writing_time'] : __("unknown")); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'Free Disk Space', 'xcloner-backup-and-restore' ) ?>
-                        : <?php echo $requirements->get_free_disk_space();; ?>
+						<?php echo __('Free Disk Space', 'xcloner-backup-and-restore') ?>
+                        : <?php echo $requirements->get_free_disk_space(); ; ?>
                     </li>
                 </ul>
             </div>
             <div class="card-action">
-                <a class="waves-effect waves-light btn system_info_toggle blue darken-1"><i class="material-icons left">list</i><?php echo __( 'Toggle Additional System Info', 'xcloner-backup-and-restore' ) ?>
+                <a class="waves-effect waves-light btn system_info_toggle blue darken-1"><i class="material-icons left">list</i><?php echo __('Toggle Additional System Info', 'xcloner-backup-and-restore') ?>
                 </a>
             </div>
         </div>

admin/partials/xcloner_scheduled_backups_page.php

Spacing +44 added lines, -44 removed lines

@@ -4,10 +4,10 @@ 
 $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 $available_storages     = $xcloner_remote_storage->get_available_storages();
 ?>
-<?php if ( ! defined( "DISABLE_WP_CRON" ) || ! DISABLE_WP_CRON ): ?>
+<?php if (!defined("DISABLE_WP_CRON") || !DISABLE_WP_CRON): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo sprintf( __( 'We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore' ), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress" ) ?>
+				<?php echo sprintf(__('We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore'), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress") ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -15,32 +15,32 @@ 
     </div>
 <?php endif ?>
 
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <div class="row">
     <table id="scheduled_backups" class="col s12" cellspacing="0" width="100%">
         <thead>
         <tr class="grey lighten-2">
-            <th><?php echo __( 'ID', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Recurrence', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Next Execution', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Remote Storage', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Last Backup', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Status', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="no-sort"><?php echo __( 'Action', 'xcloner-backup-and-restore' ) ?></th>
+            <th><?php echo __('ID', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Recurrence', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Next Execution', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Remote Storage', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Last Backup', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Status', 'xcloner-backup-and-restore') ?></th>
+            <th class="no-sort"><?php echo __('Action', 'xcloner-backup-and-restore') ?></th>
         </tr>
         </thead>
         <tfoot>
         <tr>
-            <th><?php echo __( 'ID', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Recurrence', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Next Execution', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Remote Storage', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Last Backup', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Status', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Action', 'xcloner-backup-and-restore' ) ?></th>
+            <th><?php echo __('ID', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Recurrence', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Next Execution', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Remote Storage', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Last Backup', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Status', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Action', 'xcloner-backup-and-restore') ?></th>
         </tr>
         </tfoot>
         <tbody>
@@ -50,8 +50,8 @@ 
 
 <div class="row">
     <div class="col s12 m6 offset-m6 teal lighten-1" id="server_time">
-        <h2><?php echo __( 'Current Server Time', 'xcloner-backup-and-restore' ) ?>: <span
-                    class="right"><?php echo current_time( 'mysql' ); ?></span></h2>
+        <h2><?php echo __('Current Server Time', 'xcloner-backup-and-restore') ?>: <span
+                    class="right"><?php echo current_time('mysql'); ?></span></h2>
     </div>
 </div>
 
@@ -65,17 +65,17 @@ 
 
             <div class="row">
                 <div class="col s12 m6">
-                    <h4><?php echo __( 'Edit Schedule', 'xcloner-backup-and-restore' ) ?> #<span
+                    <h4><?php echo __('Edit Schedule', 'xcloner-backup-and-restore') ?> #<span
                                 id="schedule_id"></span></h4>
                 </div>
 
                 <div class="col s12 m6 right-align">
                     <div class="switch">
                         <label>
-							<?php echo __( 'Off', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('Off', 'xcloner-backup-and-restore') ?>
                             <input type="checkbox" id="status" name="status" value="1">
                             <span class="lever"></span>
-							<?php echo __( 'On', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('On', 'xcloner-backup-and-restore') ?>
                         </label>
                     </div>
                 </div>
@@ -85,10 +85,10 @@ 
 
             <ul class="nav-tab-wrapper content row">
                 <li><a href="#scheduler_settings"
-                       class="nav-tab col s12 m6 nav-tab-active"><?php echo __( 'Scheduler Settings', 'xcloner-backup-and-restore' ) ?></a>
+                       class="nav-tab col s12 m6 nav-tab-active"><?php echo __('Scheduler Settings', 'xcloner-backup-and-restore') ?></a>
                 </li>
                 <li><a href="#advanced_scheduler_settings"
-                       class="nav-tab col s12 m6"><?php echo __( 'Advanced', 'xcloner-backup-and-restore' ) ?></a></li>
+                       class="nav-tab col s12 m6"><?php echo __('Advanced', 'xcloner-backup-and-restore') ?></a></li>
             </ul>
 
             <div class="nav-tab-wrapper-content">
@@ -97,7 +97,7 @@ 
                     <div class="row">
                         <div class="input-field col s12 l6">
                             <input placeholder="" name="schedule_name" id="schedule_name" type="text" required value="">
-                            <label for="schedule_name"><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="schedule_name"><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></label>
                         </div>
                         <div class="input-field col s12 l6">
                             <div class="switch">
@@ -112,11 +112,11 @@ 
                         </div>
                         <!--<div class="input-field inline col s12 l6">
 						<select id="backup_type" class="" name="backup_type" id="backup_type">
-							<option value=""><?php echo __( "Full Backup", "xcloner-backup-and-restore" ); ?></option>
-							<option value="diff"><?php echo __( "Differential Backups", "xcloner-backup-and-restore" ); ?></option>
-							<option value="full_diff"><?php echo __( "Full Backup + Differential Backups", "xcloner-backup-and-restore" ); ?></option>
+							<option value=""><?php echo __("Full Backup", "xcloner-backup-and-restore"); ?></option>
+							<option value="diff"><?php echo __("Differential Backups", "xcloner-backup-and-restore"); ?></option>
+							<option value="full_diff"><?php echo __("Full Backup + Differential Backups", "xcloner-backup-and-restore"); ?></option>
 						</select>
-						<label for="backup_type"><?php echo __( 'Scheduled Backup Type', 'xcloner-backup-and-restore' ) ?></label>
+						<label for="backup_type"><?php echo __('Scheduled Backup Type', 'xcloner-backup-and-restore') ?></label>
 					</div>-->
                     </div>
 
@@ -125,18 +125,18 @@ 
                             <input placeholder="" name="schedule_start_date" id="schedule_start_date" type="datetime"
                                    value="">
                             <label for="schedule_start_date"
-                                   class="active"><?php echo __( 'Schedule Start At', 'xcloner-backup-and-restore' ) ?>
+                                   class="active"><?php echo __('Schedule Start At', 'xcloner-backup-and-restore') ?>
                                 :</label>
                         </div>
 
                         <div class="input-field col s12 l6">
                             <select name="schedule_frequency" id="schedule_frequency" class="validate" required>
                                 <option value="" disabled
-                                        selected><?php echo __( 'Schedule Recurrence', 'xcloner-backup-and-restore' ) ?></option>
+                                        selected><?php echo __('Schedule Recurrence', 'xcloner-backup-and-restore') ?></option>
 								<?php
 								$schedules = $xcloner_scheduler->get_available_intervals();
 
-								foreach ( $schedules as $key => $schedule ) {
+								foreach ($schedules as $key => $schedule) {
 									?>
                                     <option value="<?php echo $key ?>"><?php echo $schedule['display'] ?></option>
 									<?php
@@ -146,17 +146,17 @@ 
                         </div>
                     </div>
 
-					<?php if ( sizeof( $available_storages ) ): ?>
+					<?php if (sizeof($available_storages)): ?>
                         <div class="row">
                             <div class="input-field col s12 l12">
                                 <select name="schedule_storage" id="schedule_storage" class="validate">
                                     <option value=""
-                                            selected><?php echo __( 'none', 'xcloner-backup-and-restore' ) ?></option>
-									<?php foreach ( $available_storages as $storage => $text ): ?>
+                                            selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
+									<?php foreach ($available_storages as $storage => $text): ?>
                                         <option value="<?php echo $storage ?>"><?php echo $text ?></option>
 									<?php endforeach ?>
                                 </select>
-                                <label><?php echo __( 'Send To Remote Storage ', 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __('Send To Remote Storage ', 'xcloner-backup-and-restore') ?></label>
                             </div>
                         </div>
 					<?php endif ?>
@@ -165,7 +165,7 @@ 
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="email_notification" id="email_notification" type="text"
                                    value="">
-                            <label for="email_notification"><?php echo __( 'Email Notification Address', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="email_notification"><?php echo __('Email Notification Address', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -173,7 +173,7 @@ 
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="diff_start_date" id="diff_start_date" type="text"
                                    class="datepicker_max_today" value="">
-                            <label for="diff_start_date"><?php echo __( 'Backup Only Files Modified/Created After', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="diff_start_date"><?php echo __('Backup Only Files Modified/Created After', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
                 </div>
@@ -182,7 +182,7 @@ 
                     <div class="row">
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="backup_name" id="backup_name" type="text" required value="">
-                            <label for="backup_name"><?php echo __( 'Backup Name', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="backup_name"><?php echo __('Backup Name', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -191,7 +191,7 @@ 
                             <textarea id="table_params" name="table_params" class="materialize-textarea"
                                       rows="15"></textarea>
                             <label for="table_params"
-                                   class="active"><?php echo __( 'Included Database Data', 'xcloner-backup-and-restore' ) ?></label>
+                                   class="active"><?php echo __('Included Database Data', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -200,7 +200,7 @@ 
                             <textarea id="excluded_files" name="excluded_files" class="materialize-textarea"
                                       rows="15"></textarea>
                             <label for="excluded_files"
-                                   class="active"><?php echo __( 'Excluded Files', 'xcloner-backup-and-restore' ) ?></label>
+                                   class="active"><?php echo __('Excluded Files', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
                 </div>
@@ -210,7 +210,7 @@ 
 
                 <div class="input-field col s12 ">
                     <button class="right btn waves-effect waves-light" type="submit"
-                            name="action"><?php echo __( 'Save', 'xcloner-backup-and-restore' ) ?>
+                            name="action"><?php echo __('Save', 'xcloner-backup-and-restore') ?>
                         <i class="material-icons right">send</i>
                     </button>
                 </div>

admin/partials/xcloner_manage_backups_page.php

Spacing +1 added lines, -1 removed lines

@@ -261,7 +261,7 @@
                     <input type="text"
                            name="decryption_key"
                            id="decryption_key"
-                           placeholder="<?=__('Decryption Key', 'xcloner-backup-and-restore' )?>" />
+                           placeholder="<?=__('Decryption Key', 'xcloner-backup-and-restore')?>" />
                 </p>
                 <p class="center-align">
                     <a class="waves-effect waves-light btn"><?php echo __("START DECRYPTION", 'xcloner-backup-and-restore') ?></a>

admin/partials/xcloner_generate_backups_page.php

Spacing +70 added lines, -70 removed lines

@@ -8,25 +8,25 @@ 
 
 <script>var xcloner_backup = new Xcloner_Backup();</script>
 
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <ul class="nav-tab-wrapper content row">
     <li><a href="#backup_options"
-           class="nav-tab col s12 m3 l2 nav-tab-active"><?php echo $tab . ". " . __( 'Backup Options', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 nav-tab-active"><?php echo $tab.". ".__('Backup Options', 'xcloner-backup-and-restore') ?></a>
     </li>
-	<?php if ( $xcloner_settings->get_enable_mysql_backup() ): ?>
+	<?php if ($xcloner_settings->get_enable_mysql_backup()): ?>
         <li><a href="#database_options"
-               class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Database Options', 'xcloner-backup-and-restore' ) ?></a>
+               class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Database Options', 'xcloner-backup-and-restore') ?></a>
         </li>
 	<?php endif ?>
     <li><a href="#files_options"
-           class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Files Options', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Files Options', 'xcloner-backup-and-restore') ?></a>
     </li>
     <li><a href="#generate_backup"
-           class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Generate Backup', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Generate Backup', 'xcloner-backup-and-restore') ?></a>
     </li>
     <li><a href="#schedule_backup"
-           class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Schedule Backup', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Schedule Backup', 'xcloner-backup-and-restore') ?></a>
     </li>
 </ul>
 
@@ -39,11 +39,11 @@ 
                     <i class="material-icons prefix">input</i>
                     <input name="backup_name" id="backup_name" type="text"
                            value=<?php echo $xcloner_settings->get_default_backup_name() ?>>
-                    <label for="backup_name"><?php echo __( 'Backup Name', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="backup_name"><?php echo __('Backup Name', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'The default backup name, supported tags [time], [hostname], [domain]', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('The default backup name, supported tags [time], [hostname], [domain]', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -52,12 +52,12 @@ 
                 <div class="input-field inline col s12 m10 l6">
                     <i class="material-icons prefix">email</i>
                     <input name="email_notification" id="email_notification" type="text"
-                           value="<?php echo get_option( 'admin_email' ); ?>">
-                    <label for="email_notification"><?php echo __( 'Send Email Notification To', 'xcloner-backup-and-restore' ) ?></label>
+                           value="<?php echo get_option('admin_email'); ?>">
+                    <label for="email_notification"><?php echo __('Send Email Notification To', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'If left blank, no notification will be sent', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('If left blank, no notification will be sent', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -67,11 +67,11 @@ 
                     <i class="material-icons prefix">access_time</i>
                     <input type="datetime-local" id="diff_start_date" class="datepicker_max_today"
                            name="diff_start_date">
-                    <label for="diff_start_date"><?php echo __( 'Backup Only Files Modified/Created After', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="diff_start_date"><?php echo __('Backup Only Files Modified/Created After', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-html="true" data-position="center" data-delay="50"
-                       data-tooltip="<?php echo __( "This option allows you to create a differential backup that will include only <br> changed files since the set date, leave blank to include all files", "xcloner-backup-and-restore" ) ?>"><i
+                       data-tooltip="<?php echo __("This option allows you to create a differential backup that will include only <br> changed files since the set date, leave blank to include all files", "xcloner-backup-and-restore") ?>"><i
                                 class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -79,7 +79,7 @@ 
             <div class="row">
                 <div class="input-field col s6 m5 l4">
                     <i class="material-icons prefix">enhanced_encryption</i>
-                    <label for="backup_comments"><?php echo __( 'Encrypt Backup', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="backup_comments"><?php echo __('Encrypt Backup', 'xcloner-backup-and-restore') ?></label>
 
                 </div>
                 <div class="input-field col s6 m5 l2">
@@ -95,7 +95,7 @@ 
 
                 <div class="hide-on-small-only s12 m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'Enable this option if you want to encrypt the final backup', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('Enable this option if you want to encrypt the final backup', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -104,11 +104,11 @@ 
                 <div class="input-field col s12 m10 l6">
                     <i class="material-icons prefix">input</i>
                     <textarea name="backup_comments" id="backup_comments" class="materialize-textarea"></textarea>
-                    <label for="backup_comments"><?php echo __( 'Backup Comments', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="backup_comments"><?php echo __('Backup Comments', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'Some default backup comments that will be stored inside the backup archive', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('Some default backup comments that will be stored inside the backup archive', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -121,11 +121,11 @@ 
             </div>
         </div>
 
-		<?php if ( $xcloner_settings->get_enable_mysql_backup() ): ?>
+		<?php if ($xcloner_settings->get_enable_mysql_backup()): ?>
             <div id="database_options" class="tab-content">
-                <h2><?php echo __( 'Select database data to include in the backup', 'xcloner-backup-and-restore' ) ?>:
+                <h2><?php echo __('Select database data to include in the backup', 'xcloner-backup-and-restore') ?>:
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'Enable the \'Backup only WP tables\' setting if you don\'t want to show all other databases and tables not related to this Wordpress install', 'xcloner-backup-and-restore' ); ?>"
+                       data-tooltip="<?php echo __('Enable the \'Backup only WP tables\' setting if you don\'t want to show all other databases and tables not related to this Wordpress install', 'xcloner-backup-and-restore'); ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </h2>
 
@@ -147,10 +147,10 @@ 
 		<?php endif ?>
 
         <div id="files_options" class="tab-content">
-            <h2><?php echo __( 'Select from below the files/folders you want to exclude from your Backup Archive', 'xcloner-backup-and-restore' ) ?>
+            <h2><?php echo __('Select from below the files/folders you want to exclude from your Backup Archive', 'xcloner-backup-and-restore') ?>
                 :
                 <a class="btn-floating tooltipped btn-small" data-position="bottom" data-delay="50" data-html="true"
-                   data-tooltip="<?php echo __( 'You can navigate below through all your site structure(Backup Start Location) to exclude any file/folder you need by clicking the checkbox near it. <br />If the checkobx is disabled, then it matches a Regex Exclude File option and it can\'t be unchecked', 'xcloner-backup-and-restore' ); ?>"
+                   data-tooltip="<?php echo __('You can navigate below through all your site structure(Backup Start Location) to exclude any file/folder you need by clicking the checkbox near it. <br />If the checkobx is disabled, then it matches a Regex Exclude File option and it can\'t be unchecked', 'xcloner-backup-and-restore'); ?>"
                    data-tooltip-id=""><i class="material-icons">help_outline</i></a>
             </h2>
 
@@ -185,9 +185,9 @@ 
                     <ul class="backup-status collapsible" data-collapsible="accordion">
                         <li class="file-system">
                             <div class="collapsible-header">
-                                <i class="material-icons">folder</i><?php echo __( 'Scanning The File System...', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">folder</i><?php echo __('Scanning The File System...', 'xcloner-backup-and-restore') ?>
 
-                                <p class="right"><?php echo sprintf( __( 'Found %s files (%s)', 'xcloner-backup-and-restore' ), '<span class="file-counter">0</span>', '<span  class="file-size-total">0</span>MB' ) ?></p>
+                                <p class="right"><?php echo sprintf(__('Found %s files (%s)', 'xcloner-backup-and-restore'), '<span class="file-counter">0</span>', '<span  class="file-size-total">0</span>MB') ?></p>
 
                                 <div>
                                     <p class="right"><span class="last-logged-file"></span></p>
@@ -199,12 +199,12 @@ 
                             </div>
                             <div class="collapsible-body status-body"></div>
                         </li>
-						<?php if ( $xcloner_settings->get_enable_mysql_backup() ): ?>
+						<?php if ($xcloner_settings->get_enable_mysql_backup()): ?>
                             <li class="database-backup">
                                 <div class="collapsible-header">
-                                    <i class="material-icons">storage</i><?php echo __( 'Generating the Mysql Backup...', 'xcloner-backup-and-restore' ) ?>
+                                    <i class="material-icons">storage</i><?php echo __('Generating the Mysql Backup...', 'xcloner-backup-and-restore') ?>
 
-                                    <p class="right"><?php echo sprintf( __( 'Found %s tables in %s databases (%s)', 'xcloner-backup-and-restore' ), '<span class="table-counter">0</span>', '<span class="database-counter">0</span>', '<span data-processed="0" class="total-records">0</span> records', 'xcloner-backup-and-restore' ) ?></p>
+                                    <p class="right"><?php echo sprintf(__('Found %s tables in %s databases (%s)', 'xcloner-backup-and-restore'), '<span class="table-counter">0</span>', '<span class="database-counter">0</span>', '<span data-processed="0" class="total-records">0</span> records', 'xcloner-backup-and-restore') ?></p>
 
                                     <div>
                                         <p class="right"><span class="last-logged-table"></span></p>
@@ -228,9 +228,9 @@ 
 						<?php endif ?>
                         <li class="files-backup">
                             <div class="collapsible-header">
-                                <i class="material-icons">archive</i><?php echo __( 'Adding Files to Archive...', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">archive</i><?php echo __('Adding Files to Archive...', 'xcloner-backup-and-restore') ?>
 
-                                <p class="right"><?php echo sprintf( __( 'Adding %s files (%s)', 'xcloner-backup-and-restore' ), '<span class="file-counter">0</span>', '<span  data-processed="0" class="file-size-total">0</span>MB' ) ?></p>
+                                <p class="right"><?php echo sprintf(__('Adding %s files (%s)', 'xcloner-backup-and-restore'), '<span class="file-counter">0</span>', '<span  data-processed="0" class="file-size-total">0</span>MB') ?></p>
 
                                 <div>
                                     <p class="right"><span class="last-logged-file"></span></p>
@@ -243,7 +243,7 @@ 
                             <div class="collapsible-body status-body">
                                 <div class="row">
                                     <div class="col l3 s12">
-                                        <h2><?php echo __( "Backup Parts", 'xcloner-backup-and-restore' ) ?>: </h2>
+                                        <h2><?php echo __("Backup Parts", 'xcloner-backup-and-restore') ?>: </h2>
                                     </div>
                                     <div class="col l9 s12">
                                         <ul class="backup-name"></ul>
@@ -253,7 +253,7 @@ 
                         </li>
                         <li class="backup-encryption">
                             <div class="collapsible-header">
-                                <i class="material-icons">enhanced_encryption</i><?php echo __( 'Encrypting Backup Data...', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">enhanced_encryption</i><?php echo __('Encrypting Backup Data...', 'xcloner-backup-and-restore') ?>
 
                                 <p class="right"><span class="status"></span></p>
 
@@ -268,19 +268,19 @@ 
                         </li>
                         <li class="backup-done">
                             <div class="collapsible-header">
-                                <i class="material-icons">done</i><?php echo __( 'Backup Done', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">done</i><?php echo __('Backup Done', 'xcloner-backup-and-restore') ?>
 
                                 <p class="right">
-									<?php if ( sizeof( $available_storages ) ): ?>
+									<?php if (sizeof($available_storages)): ?>
                                         <a href="#" class="cloud-upload"
-                                           title="<?php echo __( "Send Backup To Remote Storage", 'xcloner-backup-and-restore' ) ?>"><i
+                                           title="<?php echo __("Send Backup To Remote Storage", 'xcloner-backup-and-restore') ?>"><i
                                                     class="material-icons">cloud_upload</i></a>
 									<?php endif ?>
                                     <a href="#" class="download"
-                                       title="<?php echo __( "Download Backup", 'xcloner-backup-and-restore' ) ?>"><i
+                                       title="<?php echo __("Download Backup", 'xcloner-backup-and-restore') ?>"><i
                                                 class="material-icons">file_download</i></a>
                                     <a href="#" class="list-backup-content"
-                                       title="<?php echo __( "List Backup Content", 'xcloner-backup-and-restore' ) ?>"><i
+                                       title="<?php echo __("List Backup Content", 'xcloner-backup-and-restore') ?>"><i
                                                 class="material-icons">folder_open</i></a>
                                 </p>
 
@@ -291,8 +291,8 @@ 
                             </div>
                             <div class="collapsible-body center-align">
                                 <div class="row">
-                                    <h5><?php echo __( "Thank you for using XCloner.", 'xcloner-backup-and-restore' ) ?></h5>
-                                    <h6><?php echo sprintf( __( "We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore' ), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore/reviews/" target="_blank">Wordpress XCloner Reviews Section</a>' ) ?></h6>
+                                    <h5><?php echo __("Thank you for using XCloner.", 'xcloner-backup-and-restore') ?></h5>
+                                    <h6><?php echo sprintf(__("We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore'), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore/reviews/" target="_blank">Wordpress XCloner Reviews Section</a>') ?></h6>
                                     <a class="twitter-follow-button" href="https://twitter.com/thinkovi"
                                        data-show-count="false">Follow @thinkovi</a>
                                     <script src="//platform.twitter.com/widgets.js" async="" charset="utf-8"></script>
@@ -313,9 +313,9 @@ 
 
             <div class="row">
                 <div id="schedule_backup_success" class="col s12 l6 updated settings-error notice is-dismissible">
-                    <p><strong><?php echo __( 'Schedule Saved', 'xcloner-backup-and-restore' ) ?></strong></p>
+                    <p><strong><?php echo __('Schedule Saved', 'xcloner-backup-and-restore') ?></strong></p>
                     <button type="button" class="notice-dismiss"><span
-                                class="screen-reader-text"><?php echo __( '(Dismiss this notice.', 'xcloner-backup-and-restore' ) ?></span>
+                                class="screen-reader-text"><?php echo __('(Dismiss this notice.', 'xcloner-backup-and-restore') ?></span>
                     </button>
                 </div>
             </div>
@@ -323,18 +323,18 @@ 
             <div class="row">
                 <div class="input-field inline col s12 l7">
                     <input type="text" id="schedule_name" class="" name="schedule_name" required>
-                    <label for="schedule_name"><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="schedule_name"><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></label>
                 </div>
             </div>
 
             <div class="row">
                 <div class="input-field inline col s12 m8 l4">
                     <input type="datetime-local" id="datepicker" class="datepicker" name="schedule_start_date">
-                    <label for="datepicker"><?php echo __( 'Schedule Backup To Start On:', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="datepicker"><?php echo __('Schedule Backup To Start On:', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="input-field inline col s12 m4 l3">
                     <input id="timepicker_ampm_dark" class="timepicker" type="time" name="schedule_start_time">
-                    <label for="timepicker_ampm_dark"><?php echo __( 'At:', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="timepicker_ampm_dark"><?php echo __('At:', 'xcloner-backup-and-restore') ?></label>
                 </div>
             </div>
 
@@ -342,17 +342,17 @@ 
 			<div class="row">
 				<div class="input-field inline col s10 m11 l7">
 					<select id="backup_type" class="" name="backup_type">
-						<option value=""><?php echo __( "Full Backup", "xcloner-backup-and-restore" ); ?></option>
-						<option value="diff"><?php echo __( "Differential Backups", "xcloner-backup-and-restore" ); ?></option>
-						<option value="full_diff"><?php echo __( "Full Backup + Differential Backups", "xcloner-backup-and-restore" ); ?></option>
+						<option value=""><?php echo __("Full Backup", "xcloner-backup-and-restore"); ?></option>
+						<option value="diff"><?php echo __("Differential Backups", "xcloner-backup-and-restore"); ?></option>
+						<option value="full_diff"><?php echo __("Full Backup + Differential Backups", "xcloner-backup-and-restore"); ?></option>
 					</select>
-					<label for="backup_type"><?php echo __( 'Scheduled Backup Type', 'xcloner-backup-and-restore' ) ?></label>
+					<label for="backup_type"><?php echo __('Scheduled Backup Type', 'xcloner-backup-and-restore') ?></label>
 				</div>
 				<div class="col s2 m1">	
 					<a class="btn-floating tooltipped btn-small" data-html="true" data-position="center" data-delay="50" data-tooltip="<ul style='max-width:760px; text-align:left;'>
-						<li><?php echo __( "Full Backup = it will generate a full backup of all included files each time schedule runs", "xcloner-backup-and-restore" ); ?></li>
-						<li><?php echo __( "Differentials Backups = backups will include only changed files since the schedule started to run", "xcloner-backup-and-restore" ); ?></li>
-						<li><?php echo __( "Full Backup +  Differential Backups = the first time schedule runs, it will create a full backup and all next scheduled backups will include only files created/modified since that last full backup; a full backup is recreated when the number of changed files is bigger than the 'Differetial Backups Max Days' XCloner option.", "xcloner-backup-and-restore" ); ?></li>
+						<li><?php echo __("Full Backup = it will generate a full backup of all included files each time schedule runs", "xcloner-backup-and-restore"); ?></li>
+						<li><?php echo __("Differentials Backups = backups will include only changed files since the schedule started to run", "xcloner-backup-and-restore"); ?></li>
+						<li><?php echo __("Full Backup +  Differential Backups = the first time schedule runs, it will create a full backup and all next scheduled backups will include only files created/modified since that last full backup; a full backup is recreated when the number of changed files is bigger than the 'Differetial Backups Max Days' XCloner option.", "xcloner-backup-and-restore"); ?></li>
 					</ul>"><i class="material-icons">help_outline</i></a>
 				</div>
 			</div>	
@@ -361,38 +361,38 @@ 
                 <div class="input-field col s12 l7">
                     <select name="schedule_frequency" id="schedule_frequency" class="validate" required>
                         <option value="" disabled
-                                selected><?php echo __( 'please select', 'xcloner-backup-and-restore' ) ?></option>
+                                selected><?php echo __('please select', 'xcloner-backup-and-restore') ?></option>
 						<?php
 						$schedules = $xcloner_scheduler->get_available_intervals();
 
-						foreach ( $schedules as $key => $schedule ) {
+						foreach ($schedules as $key => $schedule) {
 							?>
                             <option value="<?php echo $key ?>"><?php echo $schedule['display'] ?></option>
 							<?php
 						}
 						?>
                     </select>
-                    <label><?php echo __( 'Schedule Frequency', 'xcloner-backup-and-restore' ) ?></label>
+                    <label><?php echo __('Schedule Frequency', 'xcloner-backup-and-restore') ?></label>
                 </div>
             </div>
 
-			<?php if ( sizeof( $available_storages ) ): ?>
+			<?php if (sizeof($available_storages)): ?>
                 <div class="row">
                     <div class="input-field col s12 m12 l7">
                         <select name="schedule_storage" id="schedule_storage" class="validate">
-                            <option value="" selected><?php echo __( 'none', 'xcloner-backup-and-restore' ) ?></option>
-							<?php foreach ( $available_storages as $storage => $text ): ?>
+                            <option value="" selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
+							<?php foreach ($available_storages as $storage => $text): ?>
                                 <option value="<?php echo $storage ?>"><?php echo $text ?></option>
 							<?php endforeach ?>
                         </select>
-                        <label><?php echo __( 'Send To Remote Storage', 'xcloner-backup-and-restore' ) ?></label>
+                        <label><?php echo __('Send To Remote Storage', 'xcloner-backup-and-restore') ?></label>
                     </div>
                 </div>
 			<?php endif ?>
             <div class="row">
                 <div class="col s12 l7">
                     <button class="right btn waves-effect waves-light submit_schedule" type="submit"
-                            name="action"><?php echo __( "Submit", 'xcloner-backup-and-restore' ) ?>
+                            name="action"><?php echo __("Submit", 'xcloner-backup-and-restore') ?>
                         <i class="material-icons right">send</i>
                     </button>
                 </div>
@@ -407,19 +407,19 @@ 
                 class="material-icons medium right">help</i></a>
     <div class="modal-content">
         <h4 class="title_line"><span class="title"></span></h4>
-        <!--<h5 class="title_line"><?php echo __( 'Message' ) ?>: <span class="msg.old"></span></h5>-->
-        <h5><?php echo __( 'Response Code', 'xcloner-backup-and-restore' ) ?>: <span class="status"></span></h5>
+        <!--<h5 class="title_line"><?php echo __('Message') ?>: <span class="msg.old"></span></h5>-->
+        <h5><?php echo __('Response Code', 'xcloner-backup-and-restore') ?>: <span class="status"></span></h5>
         <textarea class="body" rows="5"></textarea>
     </div>
     <div class="modal-footer">
-        <a class=" modal-action modal-close waves-effect waves-green btn-flat  red darken-2"><?php echo __( 'Close', 'xcloner-backup-and-restore' ) ?></a>
+        <a class=" modal-action modal-close waves-effect waves-green btn-flat  red darken-2"><?php echo __('Close', 'xcloner-backup-and-restore') ?></a>
     </div>
 </div>
 
 <!-- List Backup Content Modal-->
 <div id="backup_cotent_modal" class="modal">
     <div class="modal-content">
-        <h4><?php echo sprintf( __( "Listing Backup Content ", 'xcloner-backup-and-restore' ), "" ) ?></h4>
+        <h4><?php echo sprintf(__("Listing Backup Content ", 'xcloner-backup-and-restore'), "") ?></h4>
         <h5 class="backup-name"></h5>
 
         <div class="progress">
@@ -434,18 +434,18 @@ 
     <form method="POST" class="remote-storage-form">
         <input type="hidden" name="file" class="backup_name">
         <div class="modal-content">
-            <h4><?php echo __( "Remote Storage Transfer", 'xcloner-backup-and-restore' ) ?></h4>
+            <h4><?php echo __("Remote Storage Transfer", 'xcloner-backup-and-restore') ?></h4>
             <p>
-				<?php if ( sizeof( $available_storages ) ): ?>
+				<?php if (sizeof($available_storages)): ?>
             <div class="row">
                 <div class="col s12 label">
-                    <label><?php echo __( sprintf( 'Send %s to remote storage', "<span class='backup_name'></span>" ), 'xcloner-backup-and-restore' ) ?></label>
+                    <label><?php echo __(sprintf('Send %s to remote storage', "<span class='backup_name'></span>"), 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="input-field col s8 m10">
                     <select name="transfer_storage" id="transfer_storage" class="validate" required>
                         <option value=""
-                                selected><?php echo __( 'please select...', 'xcloner-backup-and-restore' ) ?></option>
-						<?php foreach ( $available_storages as $storage => $text ): ?>
+                                selected><?php echo __('please select...', 'xcloner-backup-and-restore') ?></option>
+						<?php foreach ($available_storages as $storage => $text): ?>
                             <option value="<?php echo $storage ?>"><?php echo $text ?></option>
 						<?php endforeach ?>
                     </select>
@@ -457,7 +457,7 @@ 
                 </div>
             </div>
             <div class="row status">
-				<?php echo __( "Uploading backup to the selected remote storage...", 'xcloner-backup-and-restore' ) ?>
+				<?php echo __("Uploading backup to the selected remote storage...", 'xcloner-backup-and-restore') ?>
                 <span class="status-text"></span>
                 <div class="progress">
                     <div class="indeterminate"></div>
@@ -541,7 +541,7 @@ 
             }
         });
 
-		<?php if($xcloner_settings->get_enable_mysql_backup()):?>
+		<?php if ($xcloner_settings->get_enable_mysql_backup()):?>
         jQuery('#jstree_database_container').jstree({
             'core': {
                 'check_callback': true,

admin/partials/xcloner_remote_storage_page.php

Spacing +197 added lines, -197 removed lines

@@ -3,13 +3,13 @@ 
 
 $gdrive_auth_url = "";
 
-if ( method_exists( $remote_storage, "get_gdrive_auth_url" ) ) {
+if (method_exists($remote_storage, "get_gdrive_auth_url")) {
 	$gdrive_auth_url = $remote_storage->get_gdrive_auth_url();
 }
 
 $gdrive_construct = $remote_storage->gdrive_construct();
 ?>
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <form class="remote-storage-form" method="POST">
 
@@ -21,12 +21,12 @@ 
                 <!-- FTP STORAGE-->
                 <li id="ftp">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "FTP Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("FTP Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_ftp_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -36,121 +36,121 @@ 
                     <div class="collapsible-body">
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_host"><?php echo __( "Ftp Hostname", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_host"><?php echo __("Ftp Hostname", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class="col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Hostname", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Hostname", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_host" type="text" name="xcloner_ftp_hostname" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_hostname" ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_hostname") ?>">
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "Ftp Port", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Port", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_port" type="text" name="xcloner_ftp_port" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_port", 21 ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_port", 21) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_username"><?php echo __( "Ftp Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_username"><?php echo __("Ftp Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Username", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Username", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_username" type="text" name="xcloner_ftp_username" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_username" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_ftp_username") ?>" autocomplete="off">
                             </div>
                         </div>
 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_password"><?php echo __( "Ftp Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_password"><?php echo __("Ftp Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Password", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Password", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_password" type="password" name="xcloner_ftp_password" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_password" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_ftp_password") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_root"><?php echo __( "Ftp Storage Folder", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_root"><?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Storage Folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_root" type="text" name="xcloner_ftp_path" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_path" ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_path") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_root"><?php echo __( "Ftp Transfer Mode", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_root"><?php echo __("Ftp Transfer Mode", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6 input-field inline">
                                 <input name="xcloner_ftp_transfer_mode" type="radio" id="passive"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_transfer_mode", 1 ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_transfer_mode", 1))
 									echo "checked" ?> />
-                                <label for="passive"><?php echo __( "Passive", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="passive"><?php echo __("Passive", 'xcloner-backup-and-restore') ?></label>
 
                                 <input name="xcloner_ftp_transfer_mode" type="radio" id="active"
-                                       value="0" <?php if ( ! get_option( "xcloner_ftp_transfer_mode", 1 ) )
+                                       value="0" <?php if (!get_option("xcloner_ftp_transfer_mode", 1))
 									echo "checked" ?> />
-                                <label for="active"><?php echo __( "Active", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="active"><?php echo __("Active", 'xcloner-backup-and-restore') ?></label>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_ssl_mode"><?php echo __( "Ftp Secure Connection", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_ssl_mode"><?php echo __("Ftp Secure Connection", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6 input-field inline">
                                 <input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_inactive"
-                                       value="0" <?php if ( ! get_option( "xcloner_ftp_ssl_mode" ) )
+                                       value="0" <?php if (!get_option("xcloner_ftp_ssl_mode"))
 									echo "checked" ?> />
-                                <label for="ftp_ssl_mode_inactive"><?php echo __( "Disable", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_ssl_mode_inactive"><?php echo __("Disable", 'xcloner-backup-and-restore') ?></label>
 
                                 <input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_active"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_ssl_mode" ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_ssl_mode"))
 									echo "checked" ?> />
-                                <label for="ftp_ssl_mode_active"><?php echo __( "Enable", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_ssl_mode_active"><?php echo __("Enable", 'xcloner-backup-and-restore') ?></label>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_timeout"><?php echo __( "Ftp Timeout", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_timeout"><?php echo __("Ftp Timeout", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "Ftp Timeout", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Timeout", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_timeout" type="text" name="xcloner_ftp_timeout" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_timeout", 30 ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_timeout", 30) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_cleanup_days"><?php echo __( "Ftp Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_cleanup_days"><?php echo __("Ftp Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_cleanup_days" type="text" name="xcloner_ftp_cleanup_days"
-                                       class="validate" value="<?php echo get_option( "xcloner_ftp_cleanup_days" ) ?>">
+                                       class="validate" value="<?php echo get_option("xcloner_ftp_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="ftp"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="ftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="ftp"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -161,12 +161,12 @@ 
                 <!-- SFTP STORAGE-->
                 <li id="sftp">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "SFTP Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("SFTP Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_sftp_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_sftp_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_sftp_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -176,100 +176,100 @@ 
                     <div class="collapsible-body">
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_host"><?php echo __( "SFTP Hostname", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_host"><?php echo __("SFTP Hostname", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class="col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP Hostname", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Hostname", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_host" type="text" name="xcloner_sftp_hostname" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_hostname" ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_hostname") ?>">
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "SFTP Port", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Port", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_port" type="text" name="xcloner_sftp_port" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_port", 22 ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_port", 22) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_username"><?php echo __( "SFTP Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_username"><?php echo __("SFTP Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP Username", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Username", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_username" type="text" name="xcloner_sftp_username" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_username" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_sftp_username") ?>" autocomplete="off">
                             </div>
                         </div>
 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_password"><?php echo __( "SFTP or Private Key Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_password"><?php echo __("SFTP or Private Key Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP or Private Key Password", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP or Private Key Password", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_spassword" type="password" name="xcloner_sftp_password" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_password" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_sftp_password") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_private_key"><?php echo __( "SFTP Private Key(RSA)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_private_key"><?php echo __("SFTP Private Key(RSA)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
                                 <textarea rows="5"
-                                          placeholder="<?php echo __( "Local Server Path or Contents of the SFTP Private Key RSA File", 'xcloner-backup-and-restore' ) ?>"
+                                          placeholder="<?php echo __("Local Server Path or Contents of the SFTP Private Key RSA File", 'xcloner-backup-and-restore') ?>"
                                           id="sftp_private_key" type="text" name="xcloner_sftp_private_key"
                                           class="validate"
-                                          value=""><?php echo get_option( "xcloner_sftp_private_key" ) ?></textarea>
+                                          value=""><?php echo get_option("xcloner_sftp_private_key") ?></textarea>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_root"><?php echo __( "SFTP Storage Folder", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_root"><?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP Storage Folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_root" type="text" name="xcloner_sftp_path" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_path" ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_path") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_timeout"><?php echo __( "SFTP Timeout", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_timeout"><?php echo __("SFTP Timeout", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "SFTP Timeout", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Timeout", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_timeout" type="text" name="xcloner_sftp_timeout" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_timeout", 30 ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_timeout", 30) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_cleanup_days"><?php echo __( "SFTP Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_cleanup_days"><?php echo __("SFTP Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_cleanup_days" type="text" name="xcloner_sftp_cleanup_days"
-                                       class="validate" value="<?php echo get_option( "xcloner_sftp_cleanup_days" ) ?>">
+                                       class="validate" value="<?php echo get_option("xcloner_sftp_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="sftp"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="sftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="sftp"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -281,12 +281,12 @@ 
                 <!-- AWS STORAGE-->
                 <li id="aws">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "S3 Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("S3 Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_aws_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_aws_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_aws_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -301,49 +301,49 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "Key" and "Secret <br />Visit %s to install your own S3 like service.' ), "<a href='https://aws.amazon.com/s3/' target='_blank'>https://aws.amazon.com/s3/</a>", "<a href='https://minio.io/' target='_blank'>https://minio.io/</a>" ) ?>
+									<?php echo sprintf(__('Visit %s and get your "Key" and "Secret <br />Visit %s to install your own S3 like service.'), "<a href='https://aws.amazon.com/s3/' target='_blank'>https://aws.amazon.com/s3/</a>", "<a href='https://minio.io/' target='_blank'>https://minio.io/</a>") ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_key"><?php echo __( "S3 Key", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_key"><?php echo __("S3 Key", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Key", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Key", 'xcloner-backup-and-restore') ?>"
                                        id="aws_key" type="text" name="xcloner_aws_key" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_key" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_key") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_secret"><?php echo __( "S3 Secret", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_secret"><?php echo __("S3 Secret", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Secret", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Secret", 'xcloner-backup-and-restore') ?>"
                                        id="aws_secret" type="text" name="xcloner_aws_secret" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_secret" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_secret") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_region"><?php echo __( "S3 Region", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_region"><?php echo __("S3 Region", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <select placeholder="<?php echo __( "example: us-east-1", 'xcloner-backup-and-restore' ) ?>"
+                                <select placeholder="<?php echo __("example: us-east-1", 'xcloner-backup-and-restore') ?>"
                                         id="aws_region" type="text" name="xcloner_aws_region" class="validate"
-                                        value="<?php echo get_option( "xcloner_aws_region" ) ?>" autocomplete="off">
+                                        value="<?php echo get_option("xcloner_aws_region") ?>" autocomplete="off">
                                     <option readonly
-                                            value=""><?php echo __( "Please Select AWS S3 Region or Leave Unselected for Custom Endpoint" ) ?></option>
+                                            value=""><?php echo __("Please Select AWS S3 Region or Leave Unselected for Custom Endpoint") ?></option>
 									<?php
 									$aws_regions = $remote_storage->get_aws_regions();
 
-									foreach ( $aws_regions as $key => $region ) {
+									foreach ($aws_regions as $key => $region) {
 										?>
-                                        <option value="<?php echo $key ?>" <?php echo( $key == get_option( 'xcloner_aws_region' ) ? "selected" : "" ) ?>><?php echo $region ?>
+                                        <option value="<?php echo $key ?>" <?php echo($key == get_option('xcloner_aws_region') ? "selected" : "") ?>><?php echo $region ?>
                                             = <?php echo $key ?></option>
 										<?php
 									}
@@ -354,59 +354,59 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_endpoint"><?php echo __( "S3 EndPoint", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_endpoint"><?php echo __("S3 EndPoint", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 EndPoint, leave blank if you want to use the default Amazon AWS Service", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 EndPoint, leave blank if you want to use the default Amazon AWS Service", 'xcloner-backup-and-restore') ?>"
                                        id="aws_endpoint" type="text" name="xcloner_aws_endpoint" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_endpoint" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_endpoint") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_bucket_name"><?php echo __( "S3 Bucket Name", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_bucket_name"><?php echo __("S3 Bucket Name", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Bucket Name", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Bucket Name", 'xcloner-backup-and-restore') ?>"
                                        id="aws_bucket_name" type="text" name="xcloner_aws_bucket_name" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_bucket_name" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_bucket_name") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_prefix"><?php echo __( "S3 Prefix", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_prefix"><?php echo __("S3 Prefix", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Prefix, use / ending to define a folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Prefix, use / ending to define a folder", 'xcloner-backup-and-restore') ?>"
                                        id="aws_prefix" type="text" name="xcloner_aws_prefix" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_prefix" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_prefix") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_cleanup_days"><?php echo __( "S3 Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_cleanup_days"><?php echo __("S3 Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="aws_cleanup_days" type="text" name="xcloner_aws_cleanup_days"
-                                       class="validate" value="<?php echo get_option( "xcloner_aws_cleanup_days" ) ?>">
+                                       class="validate" value="<?php echo get_option("xcloner_aws_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="aws"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="aws"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="aws"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -418,12 +418,12 @@ 
                 <!-- DROPBOX STORAGE-->
                 <li id="dropbox">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Dropbox Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("Dropbox Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_dropbox_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_dropbox_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_dropbox_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -438,20 +438,20 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "App secret".' ), "<a href='https://www.dropbox.com/developers/apps' target='_blank'>https://www.dropbox.com/developers/apps</a>" ) ?>
+									<?php echo sprintf(__('Visit %s and get your "App secret".'), "<a href='https://www.dropbox.com/developers/apps' target='_blank'>https://www.dropbox.com/developers/apps</a>") ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_access_token"><?php echo __( "Dropbox Access Token", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_access_token"><?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Dropbox Access Token", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_access_token" type="text" name="xcloner_dropbox_access_token"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_dropbox_access_token" ) ?>"
+                                       value="<?php echo get_option("xcloner_dropbox_access_token") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -459,50 +459,50 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_app_secret"><?php echo __( "Dropbox App Secret", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_app_secret"><?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Dropbox App Secret", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_app_secret" type="text" name="xcloner_dropbox_app_secret"
-                                       class="validate" value="<?php echo get_option( "xcloner_dropbox_app_secret" ) ?>"
+                                       class="validate" value="<?php echo get_option("xcloner_dropbox_app_secret") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_prefix"><?php echo __( "Dropbox Prefix", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_prefix"><?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Dropbox Prefix", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_prefix" type="text" name="xcloner_dropbox_prefix" class="validate"
-                                       value="<?php echo get_option( "xcloner_dropbox_prefix" ) ?>">
+                                       value="<?php echo get_option("xcloner_dropbox_prefix") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_cleanup_days"><?php echo __( "Dropbox Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_cleanup_days"><?php echo __("Dropbox Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_cleanup_days" type="text" name="xcloner_dropbox_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_dropbox_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_dropbox_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="dropbox"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="dropbox"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="dropbox"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -514,12 +514,12 @@ 
                 <!-- AZURE STORAGE-->
                 <li id="azure">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Azure Blob Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("Azure Blob Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_azure_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_azure_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_azure_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -534,19 +534,19 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "Api Key".', 'xcloner-backup-and-restore' ), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>' ) ?>
+									<?php echo sprintf(__('Visit %s and get your "Api Key".', 'xcloner-backup-and-restore'), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>') ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_account_name"><?php echo __( "Azure Account Name", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_account_name"><?php echo __("Azure Account Name", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Azure Account Name", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Azure Account Name", 'xcloner-backup-and-restore') ?>"
                                        id="azure_account_name" type="text" name="xcloner_azure_account_name"
-                                       class="validate" value="<?php echo get_option( "xcloner_azure_account_name" ) ?>"
+                                       class="validate" value="<?php echo get_option("xcloner_azure_account_name") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -554,49 +554,49 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_api_key"><?php echo __( "Azure Api Key", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_api_key"><?php echo __("Azure Api Key", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Azure Api Key", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Azure Api Key", 'xcloner-backup-and-restore') ?>"
                                        id="azure_api_key" type="text" name="xcloner_azure_api_key" class="validate"
-                                       value="<?php echo get_option( "xcloner_azure_api_key" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_azure_api_key") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_container"><?php echo __( "Azure Container", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_container"><?php echo __("Azure Container", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Azure Container", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Azure Container", 'xcloner-backup-and-restore') ?>"
                                        id="azure_container" type="text" name="xcloner_azure_container" class="validate"
-                                       value="<?php echo get_option( "xcloner_azure_container" ) ?>">
+                                       value="<?php echo get_option("xcloner_azure_container") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_cleanup_days"><?php echo __( "Azure Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_cleanup_days"><?php echo __("Azure Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="azure_cleanup_days" type="text" name="xcloner_azure_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_azure_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_azure_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="azure"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="azure"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="azure"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -608,12 +608,12 @@ 
                 <!-- BACKBLAZE STORAGE-->
                 <li id="backblaze">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Backblaze Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("Backblaze Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_backblaze_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_backblaze_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_backblaze_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -628,20 +628,20 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your Account Id and  Application Key.', 'xcloner-backup-and-restore' ), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>' ) ?>
+									<?php echo sprintf(__('Visit %s and get your Account Id and  Application Key.', 'xcloner-backup-and-restore'), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>') ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_account_id"><?php echo __( "Backblaze Account Id", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_account_id"><?php echo __("Backblaze Account Id", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Backblaze Account Id", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Backblaze Account Id", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_account_id" type="text" name="xcloner_backblaze_account_id"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_account_id" ) ?>"
+                                       value="<?php echo get_option("xcloner_backblaze_account_id") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -649,53 +649,53 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_application_key"><?php echo __( "Backblaze Application Key", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_application_key"><?php echo __("Backblaze Application Key", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Backblaze Application Key", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Backblaze Application Key", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_application_key" type="text"
                                        name="xcloner_backblaze_application_key" class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_application_key" ) ?>"
+                                       value="<?php echo get_option("xcloner_backblaze_application_key") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_bucket_name"><?php echo __( "Backblaze Bucket Name", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_bucket_name"><?php echo __("Backblaze Bucket Name", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Backblaze Bucket Name", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Backblaze Bucket Name", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_bucket_name" type="text" name="xcloner_backblaze_bucket_name"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_bucket_name" ) ?>"
+                                       value="<?php echo get_option("xcloner_backblaze_bucket_name") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_cleanup_days"><?php echo __( "Backblaze Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_cleanup_days"><?php echo __("Backblaze Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_cleanup_days" type="text" name="xcloner_backblaze_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_backblaze_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="backblaze"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="backblaze"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="backblaze"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -707,12 +707,12 @@ 
                 <!-- WEBDAV STORAGE-->
                 <li id="webdav">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "WebDAV Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("WebDAV Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_webdav_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_webdav_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_webdav_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -734,74 +734,74 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_url"><?php echo __( "WebDAV Base Url", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_url"><?php echo __("WebDAV Base Url", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Base Url", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Base Url", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_url" type="text" name="xcloner_webdav_url" class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_url" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_webdav_url") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_username"><?php echo __( "WebDAV Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_username"><?php echo __("WebDAV Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Username", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Username", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_username" type="text" name="xcloner_webdav_username" class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_username" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_webdav_username") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_password"><?php echo __( "WebDAV Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_password"><?php echo __("WebDAV Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Password", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Password", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_password" type="password" name="xcloner_webdav_password"
-                                       class="validate" value="<?php echo get_option( "xcloner_webdav_password" ) ?>"
+                                       class="validate" value="<?php echo get_option("xcloner_webdav_password") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_target_folder"><?php echo __( "WebDAV Target Folder", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_target_folder"><?php echo __("WebDAV Target Folder", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Target Folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Target Folder", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_target_folder" type="text" name="xcloner_webdav_target_folder"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_target_folder" ) ?>"
+                                       value="<?php echo get_option("xcloner_webdav_target_folder") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_cleanup_days"><?php echo __( "WebDAV Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_cleanup_days"><?php echo __("WebDAV Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_cleanup_days" type="text" name="xcloner_webdav_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_webdav_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="webdav"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="webdav"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="webdav"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -813,13 +813,13 @@ 
                 <!-- Google DRIVE STORAGE-->
                 <li id="gdrive">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Google Drive Storage", 'xcloner-backup-and-restore' ) ?>
-						<?php if ( $gdrive_construct ): ?>
+                        <i class="material-icons">computer</i><?php echo __("Google Drive Storage", 'xcloner-backup-and-restore') ?>
+						<?php if ($gdrive_construct): ?>
                             <div class="switch right">
                                 <label>
                                     Off
                                     <input type="checkbox" name="xcloner_gdrive_enable" class="status"
-                                           value="1" <?php if ( get_option( "xcloner_gdrive_enable" ) )
+                                           value="1" <?php if (get_option("xcloner_gdrive_enable"))
 										echo "checked" ?> \>
                                     <span class="lever"></span>
                                     On
@@ -829,7 +829,7 @@ 
                     </div>
                     <div class="collapsible-body">
 
-						<?php if ( $gdrive_construct ) : ?>
+						<?php if ($gdrive_construct) : ?>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
@@ -837,11 +837,11 @@ 
                                 </div>
                                 <div class=" col s12 m9">
                                     <p>
-										<?php echo sprintf( __( 'Visit %s to create a new application and get your Client ID and Client Secret.', 'xcloner-backup-and-restore' ), '<a href="https://console.developers.google.com" target="_blank">https://console.developers.google.com</a>' ) ?>
+										<?php echo sprintf(__('Visit %s to create a new application and get your Client ID and Client Secret.', 'xcloner-backup-and-restore'), '<a href="https://console.developers.google.com" target="_blank">https://console.developers.google.com</a>') ?>
                                         <a href="https://youtu.be/YXUVPUVgG8k" target="_blank"
                                            class="btn-floating tooltipped btn-small" data-position="right"
                                            data-delay="50" data-html="true"
-                                           data-tooltip="<?php echo sprintf( __( 'Click here to view a short video explaining how to create the Client ID and Client Secret as well as connecting XCloner with the Google Drive API %s', 'xcloner-backup-and-restore' ), "<br />https://youtu.be/YXUVPUVgG8k" ) ?>"
+                                           data-tooltip="<?php echo sprintf(__('Click here to view a short video explaining how to create the Client ID and Client Secret as well as connecting XCloner with the Google Drive API %s', 'xcloner-backup-and-restore'), "<br />https://youtu.be/YXUVPUVgG8k") ?>"
                                            data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i
                                                     class="material-icons">help_outline</i></a>
                                     </p>
@@ -850,25 +850,25 @@ 
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_client_id"><?php echo __( "Client ID", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_client_id"><?php echo __("Client ID", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "Google Client ID", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("Google Client ID", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_client_id" type="text" name="xcloner_gdrive_client_id"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_client_id" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_client_id") ?>">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_client_secret"><?php echo __( "Client Secret", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_client_secret"><?php echo __("Client Secret", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "Google Client Secret", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("Google Client Secret", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_client_secret" type="text" name="xcloner_gdrive_client_secret"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_client_secret" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_client_secret") ?>">
                                 </div>
                             </div>
 
@@ -880,72 +880,72 @@ 
                                 <div class=" col s12 m6">
                                     <a class="btn" target="_blank" id="gdrive_authorization_click"
                                        onclick="jQuery('#authentification_code').show()"
-                                       href="<?php echo $gdrive_auth_url ?>"><?php echo sprintf( __( 'Authorize Google Drive', 'xcloner-backup-and-restore' ) ) ?></a>
+                                       href="<?php echo $gdrive_auth_url ?>"><?php echo sprintf(__('Authorize Google Drive', 'xcloner-backup-and-restore')) ?></a>
                                     <input type="text" name="authentification_code" id="authentification_code"
-                                           placeholder="<?php echo __( "Paste Authorization Code Here", "xcloner-backup-and-restore" ) ?>">
+                                           placeholder="<?php echo __("Paste Authorization Code Here", "xcloner-backup-and-restore") ?>">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_target_folder"><?php echo __( "Folder ID or Root Path", 'xcloner-backup-and-restore' ) ?>
+                                    <label for="gdrive_target_folder"><?php echo __("Folder ID or Root Path", 'xcloner-backup-and-restore') ?>
                                         <a class="btn-floating tooltipped btn-small" data-position="right"
                                            data-delay="50" data-html="true" \
-                                           data-tooltip="<?php echo __( 'Folder ID can be found by right clicking on the folder name and selecting \'Get shareable link\' menu, format https://drive.google.com/open?id={FOLDER_ID}<br />
-									If you supply a folder name, it has to exists in the drive root and start with / , example /backups.xcloner.com/', 'xcloner-backup-and-restore' ) ?>"
+                                           data-tooltip="<?php echo __('Folder ID can be found by right clicking on the folder name and selecting \'Get shareable link\' menu, format https://drive.google.com/open?id={FOLDER_ID}<br />
+									If you supply a folder name, it has to exists in the drive root and start with / , example /backups.xcloner.com/', 'xcloner-backup-and-restore') ?>"
                                            data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i
                                                     class="material-icons">help_outline</i></a>
                                     </label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "Target Folder ID or Root Path", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("Target Folder ID or Root Path", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_target_folder" type="text" name="xcloner_gdrive_target_folder"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_target_folder" ) ?>"
+                                           value="<?php echo get_option("xcloner_gdrive_target_folder") ?>"
                                            autocomplete="off">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_cleanup_days"><?php echo __( "Google Drive Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_cleanup_days"><?php echo __("Google Drive Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_cleanup_days" type="text" name="xcloner_gdrive_cleanup_days"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_cleanup_days" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_cleanup_days") ?>">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_empty_trash"><?php echo __( "Automatically Empty Trash?", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash"><?php echo __("Automatically Empty Trash?", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6 input-field inline">
                                     <input name="xcloner_gdrive_empty_trash" type="radio" value="0"
-                                           id="gdrive_empty_trash_off" <?php if ( ! get_option( "xcloner_gdrive_empty_trash", 0 ) )
+                                           id="gdrive_empty_trash_off" <?php if (!get_option("xcloner_gdrive_empty_trash", 0))
 										echo "checked" ?> />
-                                    <label for="gdrive_empty_trash_off"><?php echo __( "Disabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_off"><?php echo __("Disabled", 'xcloner-backup-and-restore') ?></label>
 
                                     <input name="xcloner_gdrive_empty_trash" type="radio" value="1"
-                                           id="gdrive_empty_trash_on" <?php if ( get_option( "xcloner_gdrive_empty_trash", 0 ) )
+                                           id="gdrive_empty_trash_on" <?php if (get_option("xcloner_gdrive_empty_trash", 0))
 										echo "checked" ?> />
-                                    <label for="gdrive_empty_trash_on"><?php echo __( "Enabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_on"><?php echo __("Enabled", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s6 m4">
                                     <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                            value="gdrive"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                            value="gdrive"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                         <i class="material-icons right">save</i>
                                     </button>
                                 </div>
                                 <div class="col s6 m4">
                                     <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                             id="action" value="gdrive"
-                                            onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                            onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                         <i class="material-icons right">import_export</i>
                                     </button>
                                 </div>
@@ -956,26 +956,26 @@ 
                                 <div class=" col s12">
                                     <div class="center">
 										<?php
-										$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=xcloner-google-drive' ), 'install-plugin_xcloner-google-drive' );
+										$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=xcloner-google-drive'), 'install-plugin_xcloner-google-drive');
 										?>
-                                        <h6><?php echo __( "This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated." ) ?></h6>
-                                        <h6><?php echo __( "PHP 5.5 minimum version is required." ) ?></h6>
+                                        <h6><?php echo __("This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated.") ?></h6>
+                                        <h6><?php echo __("PHP 5.5 minimum version is required.") ?></h6>
                                         <br/>
                                         <a class="install-now btn" data-slug="xcloner-google-drive"
                                            href="<?php echo $url; ?>"
                                            aria-label="Install XCloner Google Drive 1.0.0 now"
                                            data-name="XCloner Google Drive 1.0.0">
-											<?php echo sprintf( __( 'Install Now', 'xcloner-backup-and-restore' ) ) ?>
+											<?php echo sprintf(__('Install Now', 'xcloner-backup-and-restore')) ?>
                                         </a>
 
-                                        <a href="<?php echo admin_url( "plugin-install.php" ) ?>?tab=plugin-information&amp;plugin=xcloner-google-drive&amp;TB_iframe=true&amp;width=772&amp;height=499"
+                                        <a href="<?php echo admin_url("plugin-install.php") ?>?tab=plugin-information&amp;plugin=xcloner-google-drive&amp;TB_iframe=true&amp;width=772&amp;height=499"
                                            class="btn thickbox open-plugin-details-modal"
                                            aria-label="More information about Theme Check 20160523.1"
                                            data-title="Theme Check 20160523.1">
                                             <!--
 											<a class="btn" href="https://github.com/ovidiul/XCloner-Google-Drive/archive/master.zip">
 											-->
-											<?php echo sprintf( __( 'More Details', 'xcloner-backup-and-restore' ) ) ?>
+											<?php echo sprintf(__('More Details', 'xcloner-backup-and-restore')) ?>
                                         </a>
                                     </div>
                                 </div>

includes/class-xcloner-settings.php

Spacing +239 added lines, -239 removed lines

@@ -7,10 +7,10 @@ 
 	private $xcloner_sanitization;
 	private $xcloner_container;
 
-	public function __construct( Xcloner $xcloner_container, $hash = "" ) {
+	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);
 		}
 	}
 
@@ -18,37 +18,37 @@ 
 		return $this->xcloner_container;
 	}
 
-	public function get_logger_filename( $include_hash = 0 ) {
-		if ( $include_hash ) {
-			$filename = sprintf( $this->logger_file_hash, $this->get_hash() );
+	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 ) );
+			$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 );
+		if (!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path'))) {
+			$path = realpath(ABSPATH);
 		} else {
-			$path = get_option( 'xcloner_start_path' );
+			$path = get_option('xcloner_start_path');
 		}
 
 		return $path;
 	}
 
-	public function get_xcloner_dir_path( $dir ) {
-		$path = self::get_xcloner_start_path() . DS . $dir;
+	public function get_xcloner_dir_path($dir) {
+		$path = self::get_xcloner_start_path().DS.$dir;
 
 		return $path;
 	}
 
 	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 );
+		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' );
+			$path = get_option('xcloner_store_path');
 		}
 
 		return $path;
@@ -56,7 +56,7 @@ 
 
 	public function get_xcloner_encryption_key() {
 
-	    if(!get_option('xcloner_encryption_key') )
+	    if (!get_option('xcloner_encryption_key'))
         {
 	        return $this->randomString(35);
         }
@@ -72,7 +72,7 @@ 
      */
     private function randomString($length = 6) {
         $str = "";
-        $characters = array_merge(range('A','Z'), range('a','z'), range('0','9'));
+        $characters = array_merge(range('A', 'Z'), range('a', 'z'), range('0', '9'));
         $max = count($characters) - 1;
         for ($i = 0; $i < $length; $i++) {
             $rand = mt_rand(0, $max);
@@ -82,56 +82,56 @@ 
     }
 
 	public function get_xcloner_tmp_path_suffix() {
-		return "xcloner" . $this->get_hash();
+		return "xcloner".$this->get_hash();
 	}
 
 
-	public function get_xcloner_tmp_path( $suffix = true ) {
-		if ( get_option( 'xcloner_force_tmp_path_site_root' ) ) {
+	public function get_xcloner_tmp_path($suffix = true) {
+		if (get_option('xcloner_force_tmp_path_site_root')) {
 			$path = $this->get_xcloner_store_path();
 		} else {
 
 			$path = sys_get_temp_dir();
-			if ( ! is_dir( $path ) ) {
-				@mkdir( $path );
-				@chmod( $path, 0777 );
+			if (!is_dir($path)) {
+				@mkdir($path);
+				@chmod($path, 0777);
 			}
 
-			if ( ! is_dir( $path ) or ! is_writeable( $path ) ) {
+			if (!is_dir($path) or !is_writeable($path)) {
 				$path = $this->get_xcloner_store_path();
 			}
 		}
 
-		if ( $suffix ) {
-			$path = $path . DS . "." . $this->get_xcloner_tmp_path_suffix();
+		if ($suffix) {
+			$path = $path.DS.".".$this->get_xcloner_tmp_path_suffix();
 		}
 
 		return $path;
 	}
 
 	public function get_enable_mysql_backup() {
-		if ( get_option( 'xcloner_enable_mysql_backup' ) ) {
+		if (get_option('xcloner_enable_mysql_backup')) {
 			return true;
 		}
 
 		return false;
 	}
 
-	public function get_backup_extension_name( $ext = "" ) {
-		if ( ! $ext ) {
-			if ( get_option( 'xcloner_backup_compression_level' ) ) {
+	public function get_backup_extension_name($ext = "") {
+		if (!$ext) {
+			if (get_option('xcloner_backup_compression_level')) {
 				$ext = ".tgz";
 			} else {
 				$ext = ".tar";
 			}
 		}
 
-		return ( $this->get_hash() ) . $ext;
+		return ($this->get_hash()).$ext;
 	}
 
 	public function get_hash() {
-		if ( ! $this->hash ) {
-			$this->set_hash( "-" . $this->get_server_unique_hash( 5 ) );
+		if (!$this->hash) {
+			$this->set_hash("-".$this->get_server_unique_hash(5));
 		}
 
 		//echo $this->hash;	
@@ -139,27 +139,27 @@ 
 	}
 
 	public function generate_new_hash() {
-		$hash = "-" . md5( rand() );
+		$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 ) ) {
-			$hash = "-" . $hash;
+	public function set_hash($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;
 	}
 
 	public function get_default_backup_name() {
-		$data = parse_url( get_site_url() );
+		$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;
 	}
@@ -167,7 +167,7 @@ 
 	public function get_db_hostname() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_hostname' ) ) {
+		if (!$data = get_option('xcloner_mysql_hostname')) {
 			$data = $wpdb->dbhost;
 		}
 
@@ -177,7 +177,7 @@ 
 	public function get_db_username() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_username' ) ) {
+		if (!$data = get_option('xcloner_mysql_username')) {
 			$data = $wpdb->dbuser;
 		}
 
@@ -187,7 +187,7 @@ 
 	public function get_db_password() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_password' ) ) {
+		if (!$data = get_option('xcloner_mysql_password')) {
 			$data = $wpdb->dbpassword;
 		}
 
@@ -197,7 +197,7 @@ 
 	public function get_db_database() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_database' ) ) {
+		if (!$data = get_option('xcloner_mysql_database')) {
 			$data = $wpdb->dbname;
 		}
 
@@ -210,17 +210,17 @@ 
 		return $wpdb->prefix;
 	}
 
-	public function get_xcloner_option( $option ) {
-		$data = get_option( $option );
+	public function get_xcloner_option($option) {
+		$data = get_option($option);
 
 		return $data;
 	}
 
-	public function get_server_unique_hash( $strlen = 0 ) {
-		$hash = md5( get_home_url() . __DIR__ );
+	public function get_server_unique_hash($strlen = 0) {
+		$hash = md5(get_home_url().__DIR__);
 
-		if ( $strlen ) {
-			$hash = substr( $hash, 0, $strlen );
+		if ($strlen) {
+			$hash = substr($hash, 0, $strlen);
 		}
 
 		return $hash;
@@ -231,20 +231,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
 
 
@@ -252,31 +252,31 @@ 
 		//GENERAL section
 		add_settings_section(
 			'xcloner_general_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_settings_page'
 		);
 		//MYSQL section
 		add_settings_section(
 			'xcloner_mysql_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			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' ),
+			__('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' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_cleanup_settings_page'
 		);
 
@@ -284,287 +284,287 @@ 
 		//CRON section
 		add_settings_section(
 			'xcloner_cron_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			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(
+		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' ),
+			__('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
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_start_path', array(
+		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' ),
+			__('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'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_store_path', array(
+		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' ),
+            __('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'
             )
         );
 
-        register_setting( 'xcloner_general_settings_group', 'xcloner_encryption_key', array(
+        register_setting('xcloner_general_settings_group', 'xcloner_encryption_key', array(
             $this->xcloner_sanitization,
             "sanitize_input_as_string"
-        ) );
+        ));
         add_settings_field(
             'xcloner_encryption_key',
-            __( 'Backup Encryption Key', 'xcloner-backup-and-restore' ),
-            array( $this, 'do_form_text_field' ),
+            __('Backup Encryption Key', 'xcloner-backup-and-restore'),
+            array($this, 'do_form_text_field'),
             'xcloner_settings_page',
             'xcloner_general_settings_group',
             array(
                 'xcloner_encryption_key',
-                __( 'Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore' ),
+                __('Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore'),
                 $this->get_xcloner_encryption_key(),
                 //'disabled'
             )
         );
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_log', array(
+		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' ),
+			__('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_enable_pre_update_backup', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_pre_update_backup', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_pre_update_backup',
-			__( 'Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_enable_pre_update_backup',
-				sprintf( __( 'Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore' ), $this->get_logger_filename() )
+				sprintf(__('Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_regex_exclude', array(
+		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' ),
+			__('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'
 			)
 		);
 
 		//REGISTERING THE 'MYSQL SECTION' FIELDS
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array(
+		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' ),
+			__('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' );
+		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' ),
+			__('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(
+		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' ),
+			__('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'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_username', array(
+		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' ),
+			__('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'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_database', array(
+		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' ),
+			__('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'
 			)
 		);
 
 		//REGISTERING THE 'SYSTEM SECTION' FIELDS
-		register_setting( 'xcloner_system_settings_group', 'xcloner_size_limit_per_request', array(
+		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' ),
+			__('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
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array(
+		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' ),
+			__('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
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array(
+		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' ),
+			__('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
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_database_records_per_request', array(
+		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' ),
+			__('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
 			)
@@ -582,140 +582,140 @@ 
 	         )
 	    );*/
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array(
+		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' ),
+			__('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(
+		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' ),
+			__('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' );
+		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' ),
+			__('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())
 			)
 		);
 
-        register_setting( 'xcloner_system_settings_group', 'xcloner_disable_email_notification' );
+        register_setting('xcloner_system_settings_group', 'xcloner_disable_email_notification');
         add_settings_field(
             'xcloner_disable_email_notification',
-            __( 'Disable Email Notifications', 'xcloner-backup-and-restore' ),
-            array( $this, 'do_form_switch_field' ),
+            __('Disable Email Notifications', 'xcloner-backup-and-restore'),
+            array($this, 'do_form_switch_field'),
             'xcloner_system_settings_page',
             'xcloner_system_settings_group',
             array(
                 'xcloner_disable_email_notification',
-                sprintf( __( 'Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+                sprintf(__('Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore'), $this->get_table_prefix())
             )
         );
 
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(
+		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' ),
+			__('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(
+		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' ),
+			__('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(
+		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' ),
+			__('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')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_delete_after_remote_transfer',
-			__( 'Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_delete_after_remote_transfer',
-				__( 'Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore' )
+				__('Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore')
 			)
 		);
 
 		//REGISTERING THE 'CRON SECTION' FIELDS
-		register_setting( 'xcloner_cron_settings_group', 'xcloner_cron_frequency' );
+		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' ),
+			__('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' )
+				__('Cron frequency')
 			)
 		);
 	}
@@ -733,26 +733,26 @@ 
 	}
 
 	// text field content cb
-	public function do_form_text_field( $params ) {
-		if ( ! isset( $params['3'] ) ) {
+	public function do_form_text_field($params) {
+		if (!isset($params['3'])) {
 			$params[3] = 0;
 		}
-		if ( ! isset( $params['2'] ) ) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
 
-		list( $fieldname, $label, $value, $disabled ) = $params;
+		list($fieldname, $label, $value, $disabled) = $params;
 
-		if ( ! $value ) {
-			$value = get_option( $fieldname );
+		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 ?>"
+                <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 ) : ''; ?>">
+                       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"
@@ -765,26 +765,26 @@ 
 	}
 
 	// textarea field content cb
-	public function do_form_textarea_field( $params ) {
-		if ( ! isset( $params['3'] ) ) {
+	public function do_form_textarea_field($params) {
+		if (!isset($params['3'])) {
 			$params[3] = 0;
 		}
-		if ( ! isset( $params['2'] ) ) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
 
-		list( $fieldname, $label, $value, $disabled ) = $params;
+		list($fieldname, $label, $value, $disabled) = $params;
 
-		if ( ! $value ) {
-			$value = get_option( $fieldname );
+		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 ?>"
+                <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>
+                          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"
@@ -793,39 +793,39 @@ 
             <div class="col s12">
                 <ul class="xcloner_regex_exclude_limit">
                     <li>Exclude all except .php file: <span
-                                class="regex_pattern"><?php echo htmlentities( '(.*)\.(.+)$(?<!(php))' ) ?></span></li>
+                                class="regex_pattern"><?php echo htmlentities('(.*)\.(.+)$(?<!(php))') ?></span></li>
                     <li>Exclude all except .php and .txt: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(.+)$(?<!(php|txt))' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(.+)$(?<!(php|txt))') ?></span>
                     </li>
                     <li>Exclude all .avi files: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(.+)$(?<=(avi))' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(.+)$(?<=(avi))') ?></span></li>
                     <li>Exclude all .jpg,.gif and .png files: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(.+)$(?<=(gif|png|jpg))' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(.+)$(?<=(gif|png|jpg))') ?></span>
                     </li>
                     <li>Exclude all .svn and .git: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(svn|git)(.*)$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(svn|git)(.*)$') ?></span></li>
                     <li>Exclude root directory /test: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/test(.*)$' ) ?></span> or <span
-                                class="regex_pattern"> <?php echo htmlentities( 'test(.*)$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('\/test(.*)$') ?></span> or <span
+                                class="regex_pattern"> <?php echo htmlentities('test(.*)$') ?></span></li>
                     <li>Exclude the wp-admin folder: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(\/wp-admin)(.*)$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(\/wp-admin)(.*)$') ?></span></li>
                     <li>Exclude the wp-content/uploads folder: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(\/wp-content\/uploads)(.*)$' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('(\/wp-content\/uploads)(.*)$') ?></span>
                     </li>
                     <li>Exclude the wp-admin, wp-includes and wp-config.php: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/(wp-admin|wp-includes|wp-config.php)(.*)$' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('\/(wp-admin|wp-includes|wp-config.php)(.*)$') ?></span>
                     </li>
                     <li>Exclude wp-content/updraft and wp/content/uploads/wp_all_backup folder :<span
                                 class="regex_pattern">\/(wp-content\/updraft|\/wp-content\/uploads\/wp_all_backup)(.*)$</span>
                     </li>
                     <li>Exclude all cache folders from wp-content/ and it's subdirectories: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/wp-content(.*)\/cache($|\/)(.*)' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('\/wp-content(.*)\/cache($|\/)(.*)') ?></span>
                     </li>
                     <li>Exclude wp-content/cache/ folder: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/wp-content\/cache(.*)' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('\/wp-content\/cache(.*)') ?></span>
                     </li>
                     <li>Exclude all error_log files: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)error_log$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)error_log$') ?></span></li>
                 </ul>
             </div>
         </div>
@@ -835,26 +835,26 @@ 
 	}
 
 	// number field content cb
-	public function do_form_number_field( $params ) {
-		if ( ! isset( $params['3'] ) ) {
+	public function do_form_number_field($params) {
+		if (!isset($params['3'])) {
 			$params[3] = 0;
 		}
-		if ( ! isset( $params['2'] ) ) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
 
-		list( $fieldname, $label, $value, $disabled ) = $params;
+		list($fieldname, $label, $value, $disabled) = $params;
 
-		if ( ! $value ) {
-			$value = get_option( $fieldname );
+		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 ?>"
+                <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 ) : ''; ?>">
+                       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"
@@ -866,22 +866,22 @@ 
 		<?php
 	}
 
-	public function do_form_range_field( $params ) {
-		if ( ! isset( $params['4'] ) ) {
+	public function do_form_range_field($params) {
+		if (!isset($params['4'])) {
 			$params[4] = 0;
 		}
 
-		list( $fieldname, $label, $range_start, $range_end, $disabled ) = $params;
-		$value = get_option( $fieldname );
+		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
+		$value = get_option($fieldname);
 		?>
         <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 ?>"
+                    <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 ) : ''; ?>"/>
+                                                                         value="<?php echo isset($value) ? esc_attr($value) : ''; ?>"/>
                 </p>
             </div>
             <div class="col s2 m2 ">
@@ -893,22 +893,22 @@ 
 	}
 
 
-	public function do_form_switch_field( $params ) {
-		if ( ! isset( $params['2'] ) ) {
+	public function do_form_switch_field($params) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
-		list( $fieldname, $label, $disabled ) = $params;
-		$value = get_option( $fieldname );
+		list($fieldname, $label, $disabled) = $params;
+		$value = get_option($fieldname);
 		?>
         <div class="row">
             <div class="input-field col s10 m5 l3">
                 <div class="switch">
                     <label>
                         Off
-                        <input <?php echo ( $disabled ) ? "disabled" : "" ?> type="checkbox"
+                        <input <?php echo ($disabled) ? "disabled" : "" ?> type="checkbox"
                                                                              name="<?php echo $fieldname ?>"
                                                                              id="<?php echo $fieldname ?>"
-                                                                             value="1" <?php echo ( $value ) ? 'checked="checked"' : ''; ?>
+                                                                             value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>
                         ">
                         <span class="lever"></span>
                         On

includes/class-xcloner-activator.php

Spacing +39 added lines, -39 removed lines

@@ -61,22 +61,22 @@ 
 
 		global $wpdb;
 
-		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,
+		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
-			) );
+			));
 		}
 
 		$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 ) {
-			$xcloner_schedule_sql = "CREATE TABLE `" . $xcloner_scheduler_table . "` (
+		if ($installed_ver != $xcloner_db_version) {
+			$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,
@@ -87,73 +87,73 @@ 
 				  `status` int(1) NOT NULL,
 				  `last_backup` varchar(100) DEFAULT NULL,
 				  PRIMARY KEY  (`id`)
-				) " . $charset_collate . ";
+				) " . $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 ) {
-			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$");
 		}
 
-        if ( ! get_option( 'xcloner_regex_exclude' ) ) {
-            update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
+        if (!get_option('xcloner_regex_exclude')) {
+            update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
         }
 
 	}

includes/class-xcloner-api.php

Spacing +73 added lines, -73 removed lines

@@ -89,7 +89,7 @@ 
         $this->xcloner_remote_storage   = $xcloner_container->get_xcloner_remote_storage();
 
         if (isset($_POST['API_ID'])) {
-            $this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
+            $this->logger->info("Processing ajax request ID ".substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
                     0, 15));
         }
 
@@ -131,13 +131,13 @@ 
 
 
         $data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
-        $data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
-        $data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
+        $data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS.".database";
+        $data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS."database-sql.sql";
 
         try {
             $this->xcloner_database->init($data);
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $this->send_response($e->getMessage());
             $this->logger->error($e->getMessage());
@@ -223,8 +223,8 @@ 
         } else {
 
             $schedule['status'] = 1;
-            $schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
-                " " . $this->form_params['backup_params']['schedule_start_time']);
+            $schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'].
+                " ".$this->form_params['backup_params']['schedule_start_time']);
 
             if ($schedule['start_at'] <= time()) {
                 $schedule['start_at'] = "";
@@ -249,7 +249,7 @@ 
 
         if (!isset($_POST['id'])) {
             $wpdb->insert(
-                $wpdb->prefix . 'xcloner_scheduler',
+                $wpdb->prefix.'xcloner_scheduler',
                 $schedule,
                 array(
                     '%s',
@@ -258,7 +258,7 @@ 
             );
         } else {
             $wpdb->update(
-                $wpdb->prefix . 'xcloner_scheduler',
+                $wpdb->prefix.'xcloner_scheduler',
                 $schedule,
                 array('id' => $_POST['id']),
                 array(
@@ -309,7 +309,7 @@ 
         try {
             $return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
                 $this->form_params['extra'], $init);
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $return = array();
             $return['error'] = true;
             $return['status'] = 500;
@@ -336,7 +336,7 @@ 
                     $additional['lines_total'] = $return['extra']['lines_total'];
                     $this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
                         $this->form_params, "", $additional);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $this->logger->error($e->getMessage());
                 }
             }
@@ -430,7 +430,7 @@ 
         if (isset($params->backup_params)) {
             foreach ($params->backup_params as $param) {
                 $this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
-                $this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
+                $this->logger->debug("Adding form parameter ".$param->name.".".$param->value."\n", array(
                     'POST',
                     'fields filter'
                 ));
@@ -442,7 +442,7 @@ 
         if (isset($params->table_params)) {
             foreach ($params->table_params as $param) {
                 $this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
-                $this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
+                $this->logger->debug("Adding database filter ".$param->parent.".".$param->id."\n", array(
                     'POST',
                     'database filter'
                 ));
@@ -461,7 +461,7 @@ 
                 if (!in_array($param->parent, $this->form_params['excluded_files'])) {
                     //$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
                     $unique_exclude_files[] = $param->id;
-                    $this->logger->debug("Adding file filter " . $param->id . "\n", array(
+                    $this->logger->debug("Adding file filter ".$param->id."\n", array(
                         'POST',
                         'exclude files filter'
                     ));
@@ -509,13 +509,13 @@ 
                 'text' => $this->xcloner_settings->get_xcloner_start_path(),
                 //'children' => true,
                 'state' => array('selected' => false, 'opened' => true),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
+                'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-root.png"
             );
         }
 
         try {
             $files = $this->xcloner_file_system->list_directory($folder);
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             print $e->getMessage();
             $this->logger->error($e->getMessage());
@@ -536,7 +536,7 @@ 
             if ($file['type'] == "dir") {
                 $children = true;
             } else {
-                $text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
+                $text .= " (".$this->xcloner_requirements->file_format_size($file['size']).")";
             }
 
             if ($this->xcloner_file_system->is_excluded($file)) {
@@ -552,8 +552,8 @@ 
                 //'title' => "test",
                 'children' => $children,
                 'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
-                        0, 1)) . ".png"
+                'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-".strtolower(substr($file['type'],
+                        0, 1)).".png"
             );
         }
 
@@ -579,7 +579,7 @@ 
         if ($database == "#") {
             try {
                 $return = $this->xcloner_database->get_all_databases();
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
 
@@ -600,10 +600,10 @@ 
                 $data[] = array(
                     'id' => $database['name'],
                     'parent' => '#',
-                    'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
+                    'text' => $database['name']." (".(int)$database['num_tables'].")",
                     'children' => true,
                     'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
+                    'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/database-icon.png"
                 );
             }
 
@@ -611,7 +611,7 @@ 
 
             try {
                 $return = $this->xcloner_database->list_tables($database, "", 1);
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
 
@@ -628,12 +628,12 @@ 
                 }
 
                 $data[] = array(
-                    'id' => $database . "." . $table['name'],
+                    'id' => $database.".".$table['name'],
                     'parent' => $database,
-                    'text' => $table['name'] . " (" . (int)$table['records'] . ")",
+                    'text' => $table['name']." (".(int)$table['records'].")",
                     'children' => false,
                     'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
+                    'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/table-icon.png"
                 );
             }
         }
@@ -677,17 +677,17 @@ 
         $return['data'] = array();
 
         foreach ($data as $res) {
-            $action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
-					<a href=\"#" . $res->id . "\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
+            $action = "<a href=\"#".$res->id."\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
+					<a href=\"#" . $res->id."\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
             if ($res->status) {
                 $status = '<i class="material-icons active status">timer</i>';
             } else {
                 $status = '<i class="material-icons status inactive">timer_off</i>';
             }
 
-            $next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
+            $next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
 
-            $next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
+            $next_run = date(get_option('date_format')." ".get_option('time_format'), $next_run_time);
 
             $remote_storage = $res->remote_storage;
 
@@ -696,16 +696,16 @@ 
             }
 
             if (trim($next_run)) {
-                $date_text = date(get_option('date_format') . " " . get_option('time_format'),
+                $date_text = date(get_option('date_format')." ".get_option('time_format'),
                     $next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 
                 if ($next_run_time >= time()) {
-                    $next_run = "in " . human_time_diff($next_run_time, time());
+                    $next_run = "in ".human_time_diff($next_run_time, time());
                 } else {
                     $next_run = __("executed", 'xcloner-backup-and-restore');
                 }
 
-                $next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
+                $next_run = "<a href='#' title='".$date_text."'>".$next_run."</a>";
                 //$next_run .=" ($date_text)";
             }
 
@@ -717,11 +717,11 @@ 
                 if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
                     $metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
                     $backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
-                    $backup_time = date(get_option('date_format') . " " . get_option('time_format'),
+                    $backup_time = date(get_option('date_format')." ".get_option('time_format'),
                         $metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
                 }
 
-                $backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
+                $backup_text = "<span title='".$backup_time."' class='shorten_string'>".$res->last_backup." (".$backup_size.")</span>";
             }
 
             $schedules = wp_get_schedules();
@@ -733,7 +733,7 @@ 
             $return['data'][] = array(
                 $res->id,
                 $res->name,
-                $res->recurrence,/*$res->start_at,*/
+                $res->recurrence, /*$res->start_at,*/
                 $next_run,
                 $remote_storage,
                 $backup_text,
@@ -795,25 +795,25 @@ 
             $this->process_params($params);
             $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($this->form_params['extra']['backup_parent']);
 
-            if(isset($this->form_params['extra']['start'])) {
+            if (isset($this->form_params['extra']['start'])) {
                 $start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
-            }else{
+            } else {
                 $start = 0;
             }
 
-            if(isset($this->form_params['extra']['iv'])) {
+            if (isset($this->form_params['extra']['iv'])) {
                 $iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
-            }else{
+            } else {
                 $iv = "";
             }
 
-            if(isset($this->form_params['extra']['part'])) {
+            if (isset($this->form_params['extra']['part'])) {
                 $return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['part']);
-            }else{
+            } else {
                 $return['part'] = 0;
             }
 
-        }else{
+        } else {
             $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
             $start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
             $iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
@@ -828,14 +828,14 @@ 
         }
 
         $return['processing_file'] = $backup_file;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 
         try {
             $this->logger->info(json_encode($_POST));
             $this->logger->info($iv);
             $return = array_merge($return,
                 $this->xcloner_encryption->encrypt_file($backup_file, "", "", $start, base64_decode($iv)));
-        }catch(\Exception $e){
+        }catch (\Exception $e) {
             $return['error'] = true;
             $return['message'] = $e->getMessage();
             $return['error_message'] = $e->getMessage();
@@ -843,7 +843,7 @@ 
 
         //echo strlen($return['iv']);exit;
 
-        if($return['finished']) {
+        if ($return['finished']) {
             if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
                 $return['start'] = 0;
 
@@ -857,7 +857,7 @@ 
         }
 
         if (isset($_POST['data'])) {
-            $return['extra'] = array_merge($this->form_params['extra'],  $return);
+            $return['extra'] = array_merge($this->form_params['extra'], $return);
         }
 
         $this->send_response($return, 0);
@@ -876,7 +876,7 @@ 
         $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
         $start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
         $iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
-        $decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']);;
+        $decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']); ;
         $return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
 
         $backup_file = $source_backup_file;
@@ -887,17 +887,17 @@ 
         }
 
         $return['processing_file'] = $backup_file;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 
         try {
             $return = array_merge($return,
                 $this->xcloner_encryption->decrypt_file($backup_file, "", $decryption_key, $start, base64_decode($iv)));
-        }catch(\Exception $e){
+        }catch (\Exception $e) {
             $return['error'] = true;
             $return['message'] = $e->getMessage();
         }
 
-        if($return['finished']) {
+        if ($return['finished']) {
             if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
                 $return['start'] = 0;
 
@@ -929,7 +929,7 @@ 
         foreach ($backup_list as $file_info):?>
             <?php
             if ($storage_selection == "gdrive") {
-                $file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
+                $file_info['path'] = $file_info['filename'].".".$file_info['extension'];
             }
             $file_exists_on_local_storage = true;
 
@@ -989,7 +989,7 @@ 
                                             <a href="#<?php echo $child[0]; ?>" class="download"
                                                title="Download Backup"><i class="material-icons">file_download</i></a>
 
-                                            <?php if($this->xcloner_encryption->is_encrypted_file($child[0])) :?>
+                                            <?php if ($this->xcloner_encryption->is_encrypted_file($child[0])) :?>
                                                 <a href="#<?php echo $child[0] ?>" class="backup-decryption"
                                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
                                                     <i class="material-icons">enhanced_encryption</i>
@@ -1050,10 +1050,10 @@ 
                             <?php endif ?>
                             <?php
                             $basename = $file_info['basename'];
-                            if(isset($file_info['childs']) and sizeof($file_info['childs']))
+                            if (isset($file_info['childs']) and sizeof($file_info['childs']))
                                 $basename = $file_info['childs'][0][0];
                             ?>
-                            <?php if($this->xcloner_encryption->is_encrypted_file($basename)) :?>
+                            <?php if ($this->xcloner_encryption->is_encrypted_file($basename)) :?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="backup-decryption"
                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
                                     <i class="material-icons">enhanced_encryption</i>
@@ -1110,7 +1110,7 @@ 
             $backup_file = $backup_parts[$return['part']];
         }
 
-        if($this->xcloner_encryption->is_encrypted_file($backup_file)) {
+        if ($this->xcloner_encryption->is_encrypted_file($backup_file)) {
             $return['error'] = true;
             $return['message'] = __("Backup archive is encrypted, please decrypt it first before you can list it's content.", "xcloner-backup-and-restore");
             $this->send_response($return, 0);
@@ -1118,10 +1118,10 @@ 
 
         try {
             $tar = new Tar();
-            $tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
+            $tar->open($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file, $start);
 
             $data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $return['error'] = true;
             $return['message'] = $e->getMessage();
             $this->send_response($return, 0);
@@ -1129,14 +1129,14 @@ 
 
         $return['files'] = array();
         $return['finished'] = 1;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
         $i = 0;
 
         if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
             foreach ($data['extracted_files'] as $file) {
                 $return['files'][$i]['path'] = $file->getPath();
                 $return['files'][$i]['size'] = $file->getSize();
-                $return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
+                $return['files'][$i]['mtime'] = date(get_option('date_format')." ".get_option('time_format'),
                     $file->getMtime());
 
                 $i++;
@@ -1184,7 +1184,7 @@ 
                     "copy_backup_remote_to_local"
                 ), array($backup_file, $storage_type));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return['error'] = 1;
             $return['message'] = $e->getMessage();
@@ -1223,7 +1223,7 @@ 
                     "upload_backup_to_storage"
                 ), array($backup_file, $storage_type));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return['error'] = 1;
             $return['message'] = $e->getMessage();
@@ -1283,21 +1283,21 @@ 
         $phar2->setStub($phar2->createDefaultStub('vendor/autoload.php', 'vendor/autoload.php'));
          * */
 
-        $tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
+        $tmp_file = $this->xcloner_settings->get_xcloner_tmp_path().DS."xcloner-restore.tgz";
 
         $tar = new Tar();
         $tar->create($tmp_file);
 
-        $tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
+        $tar->addFile(dirname(__DIR__)."/restore/vendor.build.txt", "vendor.phar");
         //$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 
         $files = $xcloner_plugin_filesystem->listContents("vendor/", true);
         foreach ($files as $file) {
-            $tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
+            $tar->addFile(dirname(__DIR__).DS.$file['path'], $file['path']);
         }
 
-        $content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
-        $content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
+        $content = file_get_contents(dirname(__DIR__)."/restore/xcloner_restore.php");
+        $content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '".md5(AUTH_KEY)."');", $content);
 
         $tar->addData("xcloner_restore.php", $content);
 
@@ -1306,11 +1306,11 @@ 
         if (file_exists($tmp_file)) {
             header('Content-Description: File Transfer');
             header('Content-Type: application/octet-stream');
-            header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
+            header('Content-Disposition: attachment; filename="'.basename($tmp_file).'"');
             header('Expires: 0');
             header('Cache-Control: must-revalidate');
             header('Pragma: public');
-            header('Content-Length: ' . filesize($tmp_file));
+            header('Content-Length: '.filesize($tmp_file));
             readfile($tmp_file);
 
         }
@@ -1342,9 +1342,9 @@ 
         header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
         header('Cache-Control: private', false);
         header('Content-Transfer-Encoding: binary');
-        header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
+        header('Content-Disposition: attachment; filename="'.$metadata['path'].'";');
         header('Content-Type: application/octet-stream');
-        header('Content-Length: ' . $metadata['size']);
+        header('Content-Length: '.$metadata['size']);
 
         @ob_end_clean();
 
@@ -1404,12 +1404,12 @@ 
             $xcloner_file_transfer->set_target($target_url);
             $return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return = array();
             $return['error'] = true;
             $return['status'] = 500;
-            $return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
+            $return['message'] = "CURL communication error with the restore host. ".$e->getMessage();
             $this->send_response($return, 0);
 
         }
@@ -1433,7 +1433,7 @@ 
         $this->check_access();
 
         define("XCLONER_PLUGIN_ACCESS", 1);
-        include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
+        include_once(dirname(__DIR__).DS."restore".DS."xcloner_restore.php");
 
         return;
     }