ovidiul / XCloner-Wordpress

uninstall.php

Spacing +1 added lines, -1 removed lines

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

restore/xcloner_restore.php

Spacing +190 added lines, -190 removed lines

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

includes/class-xcloner-database.php

Spacing +93 added lines, -93 removed lines

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

admin/partials/xcloner_manage_backups_page.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,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;
 

admin/partials/xcloner_restore_page.php

Spacing +75 added lines, -75 removed lines

@@ -11,10 +11,10 @@ 
 
 ?>
 
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <script>
-    var xcloner_auth_key = '<?php echo md5( AUTH_KEY )?>';
+    var xcloner_auth_key = '<?php echo md5(AUTH_KEY)?>';
 </script>
 
 <div class="row xcloner-restore">
@@ -22,36 +22,36 @@ 
         <ul class="collapsible xcloner-restore " data-collapsible="accordion">
             <li data-step="1" class="restore-script-upload-step steps active show">
                 <div class="collapsible-header active"><i
-                            class="material-icons">settings_remote</i><?php echo __( "Restore Script Upload", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">settings_remote</i><?php echo __("Restore Script Upload", 'xcloner-backup-and-restore') ?>
                 </div>
                 <div class="collapsible-body row">
 
                     <ul class="text-steps">
-                        <li><?php echo __( "If you want to do a <strong>Local Target System Restore</strong>, leave Url field below empty and click 'Check Connection', you can skip the next steps.", 'xcloner-backup-and-restore' ) ?>
+                        <li><?php echo __("If you want to do a <strong>Local Target System Restore</strong>, leave Url field below empty and click 'Check Connection', you can skip the next steps.", 'xcloner-backup-and-restore') ?>
                         </li>
-                        <li><?php echo __( "If you want to do a <strong>Remote Target System Restore</strong>, please download the restore script from", 'xcloner-backup-and-restore' ) ?>
+                        <li><?php echo __("If you want to do a <strong>Remote Target System Restore</strong>, please download the restore script from", 'xcloner-backup-and-restore') ?>
                             <a href='#'
-                               onclick="window.location=ajaxurl+'?action=download_restore_script&phar=true'"><strong><?php echo __( "here", 'xcloner-backup-and-restore' ) ?></strong></a>
+                               onclick="window.location=ajaxurl+'?action=download_restore_script&phar=true'"><strong><?php echo __("here", 'xcloner-backup-and-restore') ?></strong></a>
                         </li>
                         <li>
-							<?php echo __( "Extract the restore script archive files on your new host", 'xcloner-backup-and-restore' ) ?>
+							<?php echo __("Extract the restore script archive files on your new host", 'xcloner-backup-and-restore') ?>
                         </li>
                         <li>
-							<?php echo __( "Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php", 'xcloner-backup-and-restore' ) ?>
+							<?php echo __("Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php", 'xcloner-backup-and-restore') ?>
                         </li>
                         <li>
-							<?php echo __( "If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.", 'xcloner-backup-and-restore' ) ?>
+							<?php echo __("If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.", 'xcloner-backup-and-restore') ?>
                         </li>
-						<?php if ( is_ssl() ): ?>
+						<?php if (is_ssl()): ?>
                             <li class="warning">
-								<?php echo __( "We have detected your connection to the site as being secure, so your restore script address must start with https://." ) ?>
+								<?php echo __("We have detected your connection to the site as being secure, so your restore script address must start with https://.") ?>
                             </li>
 						<?php endif ?>
 
                     </ul>
 
                     <div class="input-field col l9 s12">
-                        <input value="<?php echo ( is_ssl() ) ? "https://" : "" ?>" id="restore_script_url" type="text"
+                        <input value="<?php echo (is_ssl()) ? "https://" : "" ?>" id="restore_script_url" type="text"
                                class="validate"
                                placeholder="Url to XCloner Restore Script, example http://myddns.com/xcloner/xcloner_restore.php">
                         <label for="restore_script_url"></label>
@@ -59,7 +59,7 @@ 
                     </div>
                     <div class="col l3 s12 right-align">
                         <button class="btn waves-effect waves-light" type="submit" id="validate_url"
-                                name="action"><?php echo __( "Check Connection", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Check Connection", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">send</i>
                         </button>
                     </div>
@@ -68,18 +68,18 @@ 
 
             <li data-step="2" class="backup-upload-step steps">
                 <div class="collapsible-header active"><i
-                            class="material-icons">file_upload</i><?php echo __( "Upload Local Backup Archive To Target Host", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">file_upload</i><?php echo __("Upload Local Backup Archive To Target Host", 'xcloner-backup-and-restore') ?>
                 </div>
                 <div class="collapsible-body row">
-                    <p><?php echo __( "You can skip this step if you want to transfer the archive in some other way, make sure you upload it in the same directory as the restore script from the previous step.", 'xcloner-backup-and-restore' ) ?></p>
+                    <p><?php echo __("You can skip this step if you want to transfer the archive in some other way, make sure you upload it in the same directory as the restore script from the previous step.", 'xcloner-backup-and-restore') ?></p>
                     <div class="input-field col s12 l7">
                         <select id="backup_file" name="backup_file" class="browser-default">
                             <option value="" disabled
-                                    selected><?php echo __( "Please select a local backup archive to upload to target host", 'xcloner-backup-and-restore' ) ?></option>
-							<?php if ( is_array( $backup_list ) ): ?>
-								<?php foreach ( $backup_list as $file ): ?>
+                                    selected><?php echo __("Please select a local backup archive to upload to target host", 'xcloner-backup-and-restore') ?></option>
+							<?php if (is_array($backup_list)): ?>
+								<?php foreach ($backup_list as $file): ?>
                                     <option value="<?php echo $file['basename'] ?>">
-										<?php echo $file['basename'] ?> (<?php echo size_format( $file['size'] ) ?>)
+										<?php echo $file['basename'] ?> (<?php echo size_format($file['size']) ?>)
                                     </option>
 								<?php endforeach ?>
 							<?php endif ?>
@@ -94,18 +94,18 @@ 
                     <div class="col s12 l5 right-align">
                         <div class="toggler">
                             <button class="btn waves-effect waves-light upload-backup normal" type="submit" id=""
-                                    name="action"><?php echo __( "Upload", 'xcloner-backup-and-restore' ) ?>
+                                    name="action"><?php echo __("Upload", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons left">navigate_before</i>
                             </button>
                             <button class="btn waves-effect waves-light red upload-backup cancel" type="submit" id=""
-                                    name="action"><?php echo __( "Cancel", 'xcloner-backup-and-restore' ) ?>
+                                    name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons right">close</i>
                             </button>
                         </div>
                         <button class="btn waves-effect waves-light grey" type="submit"
-                                title="<?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>"
+                                title="<?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>"
                                 id="skip_upload_backup"
-                                name="action"><?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">navigate_next</i>
                         </button>
                     </div>
@@ -114,13 +114,13 @@ 
 
             <li data-step="3" class="restore-remote-backup-step steps active">
                 <div class="collapsible-header"><i
-                            class="material-icons">folder_open</i><?php echo __( "Restore Files Backup Available On Target Location", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">folder_open</i><?php echo __("Restore Files Backup Available On Target Location", 'xcloner-backup-and-restore') ?>
                     <i class="material-icons right" title="Refresh Target Backup Files List"
                        id="refresh_remote_backup_file">cached</i>
 
                     <div class="switch right">
                         <label>
-							<?php echo __( 'Verbose Output', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('Verbose Output', 'xcloner-backup-and-restore') ?>
                             <input type="checkbox" id="toggle_file_restore_display" name="toggle_file_restore_display"
                                    class="" checked value="1">
                             <span class="lever"></span>
@@ -135,11 +135,11 @@ 
                             <div class="col s12">
                                 <a class="btn-floating tooltipped btn-small right" data-html="true" data-position="left"
                                    data-delay="50"
-                                   data-tooltip="<?php echo __( "This is the directory where you would like to restore the backup archive files.<br /> 
-										Please use this with caution when restoring to a live site.", 'xcloner-backup-and-restore' ) ?>"><i
+                                   data-tooltip="<?php echo __("This is the directory where you would like to restore the backup archive files.<br /> 
+										Please use this with caution when restoring to a live site.", 'xcloner-backup-and-restore') ?>"><i
                                             class="material-icons">help_outline</i>
                                 </a>
-                                <h5><?php echo __( "Restore Target Path:", 'xcloner-backup-and-restore' ) ?></h5>
+                                <h5><?php echo __("Restore Target Path:", 'xcloner-backup-and-restore') ?></h5>
                                 <input type="text" name="remote_restore_path" id="remote_restore_path" class="validate"
                                        placeholder="Restore Target Path">
                                 <label></label>
@@ -151,13 +151,13 @@ 
                             <div class="col s12">
                                 <a href="#backup_localhost-2017-04-03_10-58-sql-diff2017-03-22_00-00-5b6c4.tgz"
                                    class="list-backup-content btn-floating tooltipped btn-small right"
-                                   data-tooltip="<?php echo __( 'Click To List The Selected Backup Content', 'xcloner-backup-and-restore' ) ?>">
+                                   data-tooltip="<?php echo __('Click To List The Selected Backup Content', 'xcloner-backup-and-restore') ?>">
                                     <i class="material-icons">folder_open</i>
                                 </a>
-                                <h5><?php echo __( "Restore Backup Archive:", 'xcloner-backup-and-restore' ) ?></h5>
+                                <h5><?php echo __("Restore Backup Archive:", 'xcloner-backup-and-restore') ?></h5>
                                 <select id="remote_backup_file" name="remote_backup_file" class="browser-default">
                                     <option value="" disabled
-                                            selected><?php echo __( "Please select the target backup file to restore", 'xcloner-backup-and-restore' ) ?></option>
+                                            selected><?php echo __("Please select the target backup file to restore", 'xcloner-backup-and-restore') ?></option>
                                 </select>
                                 <label></label>
                             </div>
@@ -166,41 +166,41 @@ 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_all" checked
                                        value="" disabled/>
                                 <label for="filter_files_all" class="tooltipped" data-position="right"
-                                       data-tooltip="<?php echo __( "Restore all backup files. Available only when doing a Remote Target System Restore", 'xcloner-backup-and-restore' ) ?>"><?php echo __( "Restore All Files", "xcloner-backup-and-restore" ) ?></label>
+                                       data-tooltip="<?php echo __("Restore all backup files. Available only when doing a Remote Target System Restore", 'xcloner-backup-and-restore') ?>"><?php echo __("Restore All Files", "xcloner-backup-and-restore") ?></label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_wp_content"
                                        value="/^wp-content\/(.*)/"/>
                                 <label for="filter_files_wp_content" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only wp-content", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only wp-content", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_plugins"
                                        value="/^wp-content\/plugins(.*)/"/>
                                 <label for="filter_files_plugins" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/plugins/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Plugins", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/plugins/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Plugins", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_uploads"
                                        value="/^wp-content\/uploads(.*)/"/>
                                 <label for="filter_files_uploads" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/uploads/ folder only', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Uploads", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/uploads/ folder only', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Uploads", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_themes"
                                        value="/^wp-content\/themes(.*)/"/>
                                 <label for="filter_files_themes" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/themes/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Themes", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/themes/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Themes", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_database"
                                        value="/^xcloner-(.*)\/(.*)\.sql/"/>
                                 <label for="filter_files_database" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the database-sql.sql mysql backup from the xcloner-xxxxx/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Database Backup", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the database-sql.sql mysql backup from the xcloner-xxxxx/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Database Backup", "xcloner-backup-and-restore") ?>
                                 </label>
                             </div>
                         </div>
@@ -216,18 +216,18 @@ 
                     <div class="col s12 l5 right-align">
                         <div class="toggler">
                             <button class="btn waves-effect waves-light restore_remote_backup normal " type="submit"
-                                    id="" name="action"><?php echo __( "Restore", 'xcloner-backup-and-restore' ) ?>
+                                    id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons left">navigate_before</i>
                             </button>
                             <button class="btn waves-effect waves-light red restore_remote_backup cancel" type="submit"
-                                    id="" name="action"><?php echo __( "Cancel", 'xcloner-backup-and-restore' ) ?>
+                                    id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons right">close</i>
                             </button>
                         </div>
                         <button class="btn waves-effect waves-light grey" type="submit"
-                                title="<?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>"
+                                title="<?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>"
                                 id="skip_remote_backup_step"
-                                name="action"><?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">navigate_next</i>
                         </button>
                     </div>
@@ -236,7 +236,7 @@ 
 
             <li data-step="4" class="restore-remote-database-step steps active">
                 <div class="collapsible-header"><i
-                            class="material-icons">list</i><?php echo __( "Restore Target Database - Search and Replace", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">list</i><?php echo __("Restore Target Database - Search and Replace", 'xcloner-backup-and-restore') ?>
                     <i class="material-icons right" title="Refresh Database Backup Files List"
                        id="refresh_database_file">cached</i>
                 </div>
@@ -246,68 +246,68 @@ 
                         <div class="col s12">
                             <a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50"
                                data-html="true"
-                               data-tooltip="<?php echo __( 'Please provide below the mysql connection details for the target host database.<br />For live sites we recommend using a new separate database.', 'xcloner-backup-and-restore' ) ?>"
+                               data-tooltip="<?php echo __('Please provide below the mysql connection details for the target host database.<br />For live sites we recommend using a new separate database.', 'xcloner-backup-and-restore') ?>"
                                data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>
-                            <h5><?php echo __( 'Target Mysql Details', 'xcloner-backup-and-restore' ) ?></h5>
+                            <h5><?php echo __('Target Mysql Details', 'xcloner-backup-and-restore') ?></h5>
                         </div>
                         <div class=" col s12">
                             <div class="input-field col s12 m6">
                                 <input type="text" name="remote_mysql_host" id="remote_mysql_host" class="validate"
                                        placeholder="Target Mysql Hostname">
-                                <label><?php echo __( "Target Mysql Hostname", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Hostname", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                             <div class="input-field  col s12 m6">
                                 <input type="text" name="remote_mysql_db" id="remote_mysql_db" class="validate"
                                        placeholder="Target Mysql Database">
-                                <label><?php echo __( "Target Mysql Database", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Database", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                             <div class="input-field  col s12 m6">
                                 <input type="text" name="remote_mysql_user" id="remote_mysql_user" class="validate"
                                        placeholder="Target Mysql Username">
-                                <label><?php echo __( "Target Mysql Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
 
                             <div class="input-field  col s12 m6">
                                 <input type="text" name="remote_mysql_pass" id="remote_mysql_pass" class="validate"
                                        placeholder="Target Mysql Password">
-                                <label><?php echo __( "Target Mysql Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                         </div>
                         <div class="col s12">
                             <a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50"
                                data-html="true"
-                               data-tooltip="<?php echo __( 'I will attempt to replace all mysql backup records matching the provided Source Url with the provided Target Url. <br />Leave blank the Target Url if you would like to skip this option. <br />As a bonus, I will also replace all matching serialized data and fix it\'s parsing.', 'xcloner-backup-and-restore' ) ?>"
+                               data-tooltip="<?php echo __('I will attempt to replace all mysql backup records matching the provided Source Url with the provided Target Url. <br />Leave blank the Target Url if you would like to skip this option. <br />As a bonus, I will also replace all matching serialized data and fix it\'s parsing.', 'xcloner-backup-and-restore') ?>"
                                data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>
-                            <h5><?php echo __( 'Target Mysql Search and Replace', 'xcloner-backup-and-restore' ) ?></h5>
+                            <h5><?php echo __('Target Mysql Search and Replace', 'xcloner-backup-and-restore') ?></h5>
                         </div>
                         <div class="col s12">
                             <div class="input-field col s12 m6 ">
                                 <input type="text" name="wp_home_url" id="wp_home_url" class="validate"
                                        placeholder="WP Home Url" value="<?php echo home_url(); ?>">
-                                <label><?php echo __( "Source Home Url", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Source Home Url", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                             <div class="input-field col s12 m6 ">
                                 <input type="text" name="remote_restore_url" id="remote_restore_url" class="validate"
                                        placeholder="Restore Target Url">
-                                <label><?php echo __( "With Target Home Url", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("With Target Home Url", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
-							<?php if ( site_url() != home_url() ) : ?>
+							<?php if (site_url() != home_url()) : ?>
                                 <div class="input-field col s12 m6 ">
                                     <input type="text" name="wp_site_url" id="wp_site_url" class="validate"
                                            placeholder="WP Site Url" value="<?php echo site_url(); ?>">
-                                    <label><?php echo __( "Source Site Url", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label><?php echo __("Source Site Url", 'xcloner-backup-and-restore') ?></label>
                                 </div>
 
                                 <div class="input-field col s12 m6 ">
                                     <input type="text" name="remote_restore_site_url" id="remote_restore_site_url"
                                            class="validate" placeholder="Restore Target Url">
-                                    <label><?php echo __( "With Target Site Url", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label><?php echo __("With Target Site Url", 'xcloner-backup-and-restore') ?></label>
                                 </div>
 
 							<?php endif; ?>
@@ -319,7 +319,7 @@ 
                         <div class="input-field row">
                             <select id="remote_database_file" name="remote_database_file" class="browser-default">
                                 <option value="" disabled
-                                        selected><?php echo __( "Please select the target database backup file to restore", 'xcloner-backup-and-restore' ) ?></option>
+                                        selected><?php echo __("Please select the target database backup file to restore", 'xcloner-backup-and-restore') ?></option>
                             </select>
 
                             <label></label>
@@ -331,7 +331,7 @@ 
 
                         <div class="status"></div>
                         <div class="query-box">
-                            <h6><?php echo __( 'Use the field below to fix your mysql query and Retry again the Restore, or replace with # to Skip next', 'xcloner-backup-and-restore' ) ?></h6>
+                            <h6><?php echo __('Use the field below to fix your mysql query and Retry again the Restore, or replace with # to Skip next', 'xcloner-backup-and-restore') ?></h6>
                             <textarea class="query-list" cols="5"></textarea>
                         </div>
                     </div>
@@ -339,20 +339,20 @@ 
                     <div class="col s12 l5 right-align">
                         <div class="toggler">
                             <button class="btn waves-effect waves-light restore_remote_mysqldump normal " type="submit"
-                                    id="" name="action"><?php echo __( "Restore", 'xcloner-backup-and-restore' ) ?>
+                                    id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons left">navigate_before</i>
                             </button>
                             <button class="btn waves-effect waves-light red restore_remote_mysqldump cancel"
                                     type="submit" id=""
-                                    name="action"><?php echo __( "Cancel", 'xcloner-backup-and-restore' ) ?>
+                                    name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons right">close</i>
                             </button>
                         </div>
 
                         <button class="btn waves-effect waves-light grey" type="submit"
-                                title="<?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>"
+                                title="<?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>"
                                 id="skip_restore_remote_database_step"
-                                name="action"><?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">navigate_next</i>
                         </button>
 
@@ -363,13 +363,13 @@ 
 
             <li data-step="5" class="restore-finish-step steps active">
                 <div class="collapsible-header"><i
-                            class="material-icons">folder_open</i><?php echo __( "Finishing up...", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">folder_open</i><?php echo __("Finishing up...", 'xcloner-backup-and-restore') ?>
                 </div>
                 <div class="collapsible-body row">
 
                     <div class="row">
                         <div class="col s4">
-                            <label><?php echo __( "Update wp-config.php mysql details and update the Target Site Url", 'xcloner-backup-and-restore' ) ?></label>
+                            <label><?php echo __("Update wp-config.php mysql details and update the Target Site Url", 'xcloner-backup-and-restore') ?></label>
                         </div>
 
                         <div class="col s8">
@@ -387,7 +387,7 @@ 
 
                     <div class="row">
                         <div class="col s4">
-                            <label><?php echo __( "Delete Restored Backup Temporary Folder", 'xcloner-backup-and-restore' ) ?></label>
+                            <label><?php echo __("Delete Restored Backup Temporary Folder", 'xcloner-backup-and-restore') ?></label>
                         </div>
                         <div class="col s8">
                             <div class="switch">
@@ -404,7 +404,7 @@ 
 
                     <div class="row">
                         <div class="col s4">
-                            <label><?php echo __( "Delete Restore Script", 'xcloner-backup-and-restore' ) ?></label>
+                            <label><?php echo __("Delete Restore Script", 'xcloner-backup-and-restore') ?></label>
                         </div>
                         <div class="col s8">
                             <div class="switch">
@@ -424,8 +424,8 @@ 
                     </div>
 
                     <div class=" row col s12 center-align" id="xcloner_restore_finish">
-                        <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" target="_blank">Wordpress XCloner forums</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" target="_blank">Wordpress XCloner forums</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>
@@ -435,14 +435,14 @@ 
                         <div class="row">
                             <div class="col s6 right-align">
                                 <button class="btn waves-effect waves-light teal" type="submit" id="restore_finish"
-                                        name="action"><?php echo __( "Finish", 'xcloner-backup-and-restore' ) ?>
+                                        name="action"><?php echo __("Finish", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">navigate_next</i>
                                 </button>
                             </div>
 
                             <div id="open_target_site" class="col s6 left-align">
                                 <a disabled="disabled" href="#" class="btn waves-effect waves-light teal" type="button"
-                                   target="_blank"><?php echo __( "Open Target Site", 'xcloner-backup-and-restore' ) ?>
+                                   target="_blank"><?php echo __("Open Target Site", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">navigate_next</i>
                                 </a>
                             </div>
@@ -459,7 +459,7 @@ 
 <!-- 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">

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 ( $latest_backup ): ?>
+									<?php if ($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_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 __( "Keeps Deleted Backups in Trash", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash"><?php echo __("Keeps Deleted Backups in 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 __( "Enabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_off"><?php echo __("Enabled", '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 __( "Disabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_on"><?php echo __("Disabled", '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>

admin/partials/xcloner_console_page.php

Spacing +4 added lines, -4 removed lines

@@ -7,17 +7,17 @@
 <div class="col s12 ">
     <div>
         <h5 class="left-align">
-			<?php echo __( 'XCloner Debugger Dashboard', 'xcloner-backup-and-restore' ) ?>
+			<?php echo __('XCloner Debugger Dashboard', 'xcloner-backup-and-restore') ?>
         </h5>
 
-		<?php if ( $xcloner_settings->get_xcloner_option( 'xcloner_enable_log' ) ) : ?>
+		<?php if ($xcloner_settings->get_xcloner_option('xcloner_enable_log')) : ?>
             <ul class="collapsible xcloner-debugger" data-collapsible="accordion">
                 <li class="active">
                     <div class="collapsible-header active"><i class="material-icons">bug_report</i>XCloner Debugger
                     </div>
                     <div class="collapsible-body">
-                        <div class="console" id="xcloner-console"><?php if ( isset( $logger_content ) ) {
-								echo implode( "<br />\n", $logger_content );
+                        <div class="console" id="xcloner-console"><?php if (isset($logger_content)) {
+								echo implode("<br />\n", $logger_content);
 							} ?></div>
                     </div>
                 </li>

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,15 +97,15 @@ 
                     <div class="row">
                         <div class="input-field col s12">
                             <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 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>
 
@@ -114,18 +114,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
@@ -135,17 +135,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 ?>
@@ -154,7 +154,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>
 
@@ -162,7 +162,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>
@@ -171,7 +171,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>
 
@@ -180,7 +180,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>
 
@@ -189,7 +189,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>
@@ -199,7 +199,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>