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

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_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_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/class-xcloner-admin.php

Spacing +68 added lines, -68 removed lines

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

xcloner.php

Spacing +21 added lines, -21 removed lines

@@ -25,17 +25,17 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
 //i will not load the plugin outside admin or cron
-if ( ! is_admin() and ! defined( 'DOING_CRON' ) ) {
+if (!is_admin() and !defined('DOING_CRON')) {
 	return;
 }
 
-if ( ! defined( "DS" ) ) {
-	define( "DS", DIRECTORY_SEPARATOR );
+if (!defined("DS")) {
+	define("DS", DIRECTORY_SEPARATOR);
 }
 
 /**
@@ -43,7 +43,7 @@ 
  * This action is documented in includes/class-xcloner-activator.php
  */
 function activate_xcloner() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-xcloner-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-xcloner-activator.php';
 	Xcloner_Activator::activate();
 }
 
@@ -52,31 +52,31 @@ 
  * This action is documented in includes/class-xcloner-deactivator.php
  */
 function deactivate_xcloner() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-xcloner-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-xcloner-deactivator.php';
 	Xcloner_Deactivator::deactivate();
 }
 
-register_activation_hook( __FILE__, 'activate_xcloner' );
-register_deactivation_hook( __FILE__, 'deactivate_xcloner' );
+register_activation_hook(__FILE__, 'activate_xcloner');
+register_deactivation_hook(__FILE__, 'deactivate_xcloner');
 
-require_once plugin_dir_path( __FILE__ ) . 'includes/class-xcloner-activator.php';
+require_once plugin_dir_path(__FILE__).'includes/class-xcloner-activator.php';
 
-if ( version_compare( phpversion(), Xcloner_Activator::xcloner_minimum_version, '<' ) ) {
+if (version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<')) {
 	?>
     <div class="error notice">
-        <p><?php echo sprintf( __( "XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s. Plugin is now deactivated." ), Xcloner_Activator::xcloner_minimum_version, phpversion() ) ?></p>
+        <p><?php echo sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s. Plugin is now deactivated."), Xcloner_Activator::xcloner_minimum_version, phpversion()) ?></p>
     </div>
 	<?php
-	require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-	deactivate_plugins( plugin_basename( __FILE__ ) );
+	require_once(ABSPATH.'wp-admin/includes/plugin.php');
+	deactivate_plugins(plugin_basename(__FILE__));
 
 	return;
 }
 
-$db_installed_ver   = get_option( "xcloner_db_version" );
+$db_installed_ver   = get_option("xcloner_db_version");
 $xcloner_db_version = Xcloner_Activator::xcloner_db_version;
 
-if ( $db_installed_ver != $xcloner_db_version ) {
+if ($db_installed_ver != $xcloner_db_version) {
 	Xcloner_Activator::activate();
 }
 
@@ -87,11 +87,11 @@ 
  */
 
 function xcloner_stop_heartbeat() {
-	wp_deregister_script( 'heartbeat' );
+	wp_deregister_script('heartbeat');
 }
 
-if ( isset( $_GET['page'] ) and stristr( $_GET['page'], "xcloner_" ) ) {
-	add_action( 'init', 'xcloner_stop_heartbeat', 1 );
+if (isset($_GET['page']) and stristr($_GET['page'], "xcloner_")) {
+	add_action('init', 'xcloner_stop_heartbeat', 1);
 }
 
 /**
@@ -112,12 +112,12 @@ 
 	return $plugin;
 }
 
-require_once( plugin_dir_path( __FILE__ ) . '/vendor/autoload.php' );
-require plugin_dir_path( __FILE__ ) . 'includes/class-xcloner.php';
+require_once(plugin_dir_path(__FILE__).'/vendor/autoload.php');
+require plugin_dir_path(__FILE__).'includes/class-xcloner.php';
 
 try {
 	$xcloner_plugin = run_xcloner();
-} catch ( Exception $e ) {
+}catch (Exception $e) {
 	echo $e->getMessage();
 }
 

public/class-xcloner-public.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param      string $plugin_name The name of the plugin.
 	 * @param      string $version The version of this plugin.
 	 */
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 
 		$this->plugin_name = $xcloner_container->get_plugin_name();
 		$this->version     = $xcloner_container->get_version();
@@ -74,7 +74,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/xcloner-public.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/xcloner-public.css', array(), $this->version, 'all');
 
 	}
 
@@ -97,7 +97,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/xcloner-public.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/xcloner-public.js', array('jquery'), $this->version, false);
 
 	}
 

includes/class-xcloner-sanitization.php

Spacing +22 added lines, -22 removed lines

@@ -7,29 +7,29 @@ 
 	public function __construct() {
 	}
 
-	public function sanitize_input_as_int( $option ) {
-		return filter_var( $option, FILTER_SANITIZE_NUMBER_INT );
+	public function sanitize_input_as_int($option) {
+		return filter_var($option, FILTER_SANITIZE_NUMBER_INT);
 	}
 
-	public function sanitize_input_as_float( $option ) {
-		return filter_var( $option, FILTER_VALIDATE_FLOAT );
+	public function sanitize_input_as_float($option) {
+		return filter_var($option, FILTER_VALIDATE_FLOAT);
 	}
 
-	public function sanitize_input_as_string( $option ) {
-		return filter_var( $option, FILTER_SANITIZE_STRING );
+	public function sanitize_input_as_string($option) {
+		return filter_var($option, FILTER_SANITIZE_STRING);
 	}
 
-	public function sanitize_input_as_absolute_path( $option ) {
-		$path = filter_var( $option, FILTER_SANITIZE_URL );
+	public function sanitize_input_as_absolute_path($option) {
+		$path = filter_var($option, FILTER_SANITIZE_URL);
 
 		try {
-			$option = Util::normalizePath( $path );
-		} catch ( Exception $e ) {
-			add_settings_error( 'xcloner_error_message', '', __( $e->getMessage() ), 'error' );
+			$option = Util::normalizePath($path);
+		}catch (Exception $e) {
+			add_settings_error('xcloner_error_message', '', __($e->getMessage()), 'error');
 		}
 
-		if ( $path and ! is_dir( $path ) ) {
-			add_settings_error( 'xcloner_error_message', '', __( sprintf( 'Invalid Server Path %s', $option ) ), 'error' );
+		if ($path and !is_dir($path)) {
+			add_settings_error('xcloner_error_message', '', __(sprintf('Invalid Server Path %s', $option)), 'error');
 
 			return false;
 		}
@@ -37,23 +37,23 @@ 
 		return $path;
 	}
 
-	public function sanitize_input_as_path( $option ) {
-		return filter_var( $option, FILTER_SANITIZE_URL );
+	public function sanitize_input_as_path($option) {
+		return filter_var($option, FILTER_SANITIZE_URL);
 	}
 
-	public function sanitize_input_as_relative_path( $option ) {
-		$option = filter_var( $option, FILTER_SANITIZE_URL );
-		$option = str_replace( "..", "", $option );
+	public function sanitize_input_as_relative_path($option) {
+		$option = filter_var($option, FILTER_SANITIZE_URL);
+		$option = str_replace("..", "", $option);
 
 		return $option;
 	}
 
-	public function sanitize_input_as_email( $option ) {
-		return filter_var( $option, FILTER_SANITIZE_EMAIL );
+	public function sanitize_input_as_email($option) {
+		return filter_var($option, FILTER_SANITIZE_EMAIL);
 	}
 
-	public function sanitize_input_as_raw( $option ) {
-		return filter_var( $option, FILTER_UNSAFE_RAW );
+	public function sanitize_input_as_raw($option) {
+		return filter_var($option, FILTER_UNSAFE_RAW);
 	}
 
 }

includes/class-xcloner-requirements.php

Spacing +40 added lines, -40 removed lines

@@ -8,7 +8,7 @@ 
 	private $xcloner_settings;
 	private $xcloner_container;
 
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 		$this->xcloner_container = $xcloner_container;
 		$this->xcloner_settings  = $xcloner_container->get_xcloner_settings();
 	}
@@ -18,37 +18,37 @@ 
 	}
 
 	public function check_backup_ready_status() {
-		if ( ! $this->check_min_php_version( 1 ) ) {
+		if (!$this->check_min_php_version(1)) {
 			return false;
 		}
 
-		if ( ! $this->check_safe_mode( 1 ) ) {
+		if (!$this->check_safe_mode(1)) {
 			return false;
 		}
 
-		if ( ! $this->check_xcloner_start_path( 1 ) ) {
+		if (!$this->check_xcloner_start_path(1)) {
 			return false;
 		}
 
-		if ( ! $this->check_xcloner_store_path( 1 ) ) {
+		if (!$this->check_xcloner_store_path(1)) {
 			return false;
 		}
 
-		if ( ! $this->check_xcloner_tmp_path( 1 ) ) {
+		if (!$this->check_xcloner_tmp_path(1)) {
 			return false;
 		}
 
 		return true;
 	}
 
-	public function get_constant( $var ) {
+	public function get_constant($var) {
 		return $this->$var;
 	}
 
-	public function check_min_php_version( $return_bool = 0 ) {
+	public function check_min_php_version($return_bool = 0) {
 
-		if ( $return_bool == 1 ) {
-			if ( version_compare( phpversion(), $this->min_php_version, '<' ) ) {
+		if ($return_bool == 1) {
+			if (version_compare(phpversion(), $this->min_php_version, '<')) {
 				return false;
 			} else {
 				return true;
@@ -58,7 +58,7 @@ 
 		return phpversion();
 	}
 
-	public function check_safe_mode( $return_bool = 0 ) {
+	public function check_safe_mode($return_bool = 0) {
 		/*no longer needed for PHP 7*/
 		$safe_mode = "Off";
 
@@ -77,68 +77,68 @@ 
 		return $safe_mode;
 	}
 
-	public function check_xcloner_start_path( $return_bool = 0 ) {
+	public function check_xcloner_start_path($return_bool = 0) {
 		$path = $this->xcloner_settings->get_xcloner_start_path();
 
-		if ( $return_bool ) {
-			if ( ! file_exists( $path ) ) {
+		if ($return_bool) {
+			if (!file_exists($path)) {
 				return false;
 			}
 
-			return is_readable( $path );
+			return is_readable($path);
 		}
 
 		return $path;
 	}
 
-	public function check_xcloner_tmp_path( $return_bool = 0 ) {
+	public function check_xcloner_tmp_path($return_bool = 0) {
 		$path = $this->xcloner_settings->get_xcloner_tmp_path();
 
-		if ( $return_bool ) {
-			if ( ! file_exists( $path ) ) {
+		if ($return_bool) {
+			if (!file_exists($path)) {
 				return false;
 			}
 
-			if ( ! is_writeable( $path ) ) {
-				@chmod( $path, 0777 );
+			if (!is_writeable($path)) {
+				@chmod($path, 0777);
 			}
 
-			return is_writeable( $path );
+			return is_writeable($path);
 		}
 
 		return $path;
 	}
 
-	public function check_xcloner_store_path( $return_bool = 0 ) {
+	public function check_xcloner_store_path($return_bool = 0) {
 		$path = $this->xcloner_settings->get_xcloner_store_path();
 
-		if ( $return_bool ) {
-			if ( ! file_exists( $path ) ) {
+		if ($return_bool) {
+			if (!file_exists($path)) {
 				return false;
 			}
 
-			if ( ! is_writeable( $path ) ) {
-				@chmod( $path, 0777 );
+			if (!is_writeable($path)) {
+				@chmod($path, 0777);
 			}
 
-			return is_writeable( $path );
+			return is_writeable($path);
 		}
 
 		return $path;
 	}
 
 	public function get_max_execution_time() {
-		return ini_get( 'max_execution_time' );
+		return ini_get('max_execution_time');
 	}
 
 	public function get_memory_limit() {
-		return ini_get( 'memory_limit' );
+		return ini_get('memory_limit');
 	}
 
 	public function get_open_basedir() {
-		$open_basedir = ini_get( 'open_basedir' );
+		$open_basedir = ini_get('open_basedir');
 
-		if ( ! $open_basedir ) {
+		if (!$open_basedir) {
 			$open_basedir = "none";
 		}
 
@@ -146,21 +146,21 @@ 
 	}
 
 	public function get_free_disk_space() {
-		return $this->file_format_size( disk_free_space( $this->xcloner_settings->get_xcloner_store_path() ) );
+		return $this->file_format_size(disk_free_space($this->xcloner_settings->get_xcloner_store_path()));
 	}
 
-	public function file_format_size( $bytes, $decimals = 2 ) {
-		$unit_list = array( 'B', 'KB', 'MB', 'GB', 'PB' );
+	public function file_format_size($bytes, $decimals = 2) {
+		$unit_list = array('B', 'KB', 'MB', 'GB', 'PB');
 
-		if ( $bytes == 0 ) {
-			return $bytes . ' ' . $unit_list[0];
+		if ($bytes == 0) {
+			return $bytes.' '.$unit_list[0];
 		}
 
-		$unit_count = count( $unit_list );
-		for ( $i = $unit_count - 1; $i >= 0; $i -- ) {
+		$unit_count = count($unit_list);
+		for ($i = $unit_count - 1; $i >= 0; $i--) {
 			$power = $i * 10;
-			if ( ( $bytes >> $power ) >= 1 ) {
-				return round( $bytes / ( 1 << $power ), $decimals ) . ' ' . $unit_list[ $i ];
+			if (($bytes >> $power) >= 1) {
+				return round($bytes / (1 << $power), $decimals).' '.$unit_list[$i];
 			}
 		}
 	}