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-i18n.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 		load_plugin_textdomain(
 			'xcloner-backup-and-restore',
 			false,
-			dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
+			dirname(dirname(plugin_basename(__FILE__))).'/languages/'
 		);
 
 	}

includes/class-xcloner-file-transfer.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Xcloner_File_Transfer extends Xcloner_File_System{
+class Xcloner_File_Transfer extends Xcloner_File_System {
 	
 	private $target_url;
 	private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
@@ -8,7 +8,7 @@ 
 	
 	public function set_target($target_url)
 	{
-		return $this->target_url= $target_url;
+		return $this->target_url = $target_url;
 	}
 	
 	public function get_target()
@@ -19,7 +19,7 @@ 
 	
 	public function transfer_file($file, $start = 0, $hash = "")
 	{
-		if(!$this->target_url)
+		if (!$this->target_url)
 			throw new Exception("Please setup a target url for upload");
 
 		
@@ -27,7 +27,7 @@ 
 		
 		fseek($fp, $start, SEEK_SET);
 		
-		$binary_data =  fread($fp, $this->transfer_limit);
+		$binary_data = fread($fp, $this->transfer_limit);
 		
 		$tmp_filename = "xcloner_upload_".substr(md5(time()), 0, 5);
 		
@@ -38,11 +38,11 @@ 
 		$send_array = array();
 		
 		$send_array['file'] 	= $file;
-		$send_array['start'] 	= $start;
-		$send_array['action'] 	= "write_file";
+		$send_array['start'] = $start;
+		$send_array['action'] = "write_file";
 		$send_array['hash'] 	= $hash;
 		#$send_array['blob'] 	= $binary_data;
-		$send_array['blob'] 	= $this->curl_file_create($tmp_file_path,'application/x-binary',$tmp_filename);
+		$send_array['blob'] 	= $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
 		
 		//$data = http_build_query($send_array);
 		
@@ -50,7 +50,7 @@ 
 		
 		
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL,$this->target_url);
+		curl_setopt($ch, CURLOPT_URL, $this->target_url);
 		
 		curl_setopt($ch, CURLOPT_POST, 1);
 		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); 
@@ -59,24 +59,24 @@ 
         curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array );
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
 		curl_setopt($ch, CURLOPT_VERBOSE, true);
 		
-		$original_result = curl_exec ($ch);
+		$original_result = curl_exec($ch);
 		
 		$this->get_tmp_filesystem()->delete($tmp_filename);
 		
 		$result = json_decode($original_result);
 				
-		if(!$result)
-			throw new Exception("We have received no valid response from the remote host, original message: ". $original_result);
+		if (!$result)
+			throw new Exception("We have received no valid response from the remote host, original message: ".$original_result);
 			
-		if($result->status != 200)
+		if ($result->status != 200)
 		{
 			throw new Exception($result->response);
 		}
 		
-		if(ftell($fp) >= $this->get_storage_filesystem()->getSize($file))
+		if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file))
 		{
 			$this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes", $file, $this->target_url, ftell($fp)));
 			$this->remove_tmp_filesystem();
@@ -93,7 +93,7 @@ 
 	            . ($postname ?: basename($filename))
 	            . ($mimetype ? ";type=$mimetype" : '');
 		
-		}else{
+		} else {
 			
 			return curl_file_create($filename, $mimetype, $postname);	
 				

xcloner.php

Spacing +19 added lines, -19 removed lines

@@ -26,12 +26,12 @@ 
  */
 
 // 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;
 
 define("DS", DIRECTORY_SEPARATOR);
@@ -42,7 +42,7 @@ 
  */
 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 @@ 
  */
 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();
 }
@@ -91,9 +91,9 @@ 
 	wp_deregister_script('heartbeat');
 }
 
-if(isset($_GET['page']) and stristr($_GET['page'] ,  "xcloner_"))
+if (isset($_GET['page']) and stristr($_GET['page'], "xcloner_"))
 {
-	add_action( 'init', 'stop_heartbeat', 1 );
+	add_action('init', 'stop_heartbeat', 1);
 }	
 
 /**
@@ -116,14 +116,14 @@ 
 
 }
 
-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{
+try {
 	
 	$xcloner_plugin = run_xcloner();
 	
-}catch(Exception $e){
+}catch (Exception $e) {
 	
 	echo $e->getMessage();
 	

admin/partials/xcloner_console_page.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-$xcloner_settings 	= $this->get_xcloner_container()->get_xcloner_settings();
-$logger				= $this->get_xcloner_container()->get_xcloner_logger();
-$logger_content 	= $logger->getLastDebugLines();
+$xcloner_settings = $this->get_xcloner_container()->get_xcloner_settings();
+$logger = $this->get_xcloner_container()->get_xcloner_logger();
+$logger_content = $logger->getLastDebugLines();
 ?>
 <div class="col s12 ">
 	<div>
@@ -10,12 +10,12 @@ 
 				<?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>
+					<div class="console" id="xcloner-console"><?php if (isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
 				</div>
 			</li>
 		</ul>
@@ -28,6 +28,6 @@ 
 				}, 2000);*/
 			})
 		</script>
-		<?php endif;?>
+		<?php endif; ?>
 	</div>
 </div>

admin/partials/xcloner_init_page.php

Spacing +48 added lines, -48 removed lines

@@ -12,20 +12,20 @@ 
  * @subpackage Xcloner/admin/partials
  */
 
-$requirements	 		= $this->get_xcloner_container()->get_xcloner_requirements();
-$xcloner_settings 		= $this->get_xcloner_container()->get_xcloner_settings();
-$xcloner_file_system 	= $this->get_xcloner_container()->get_xcloner_filesystem();
-$logger					= $this->get_xcloner_container()->get_xcloner_logger();
-$xcloner_scheduler 		= $this->get_xcloner_container()->get_xcloner_scheduler();
+$requirements = $this->get_xcloner_container()->get_xcloner_requirements();
+$xcloner_settings = $this->get_xcloner_container()->get_xcloner_settings();
+$xcloner_file_system = $this->get_xcloner_container()->get_xcloner_filesystem();
+$logger = $this->get_xcloner_container()->get_xcloner_logger();
+$xcloner_scheduler = $this->get_xcloner_container()->get_xcloner_scheduler();
 
 $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');
 
-if($requirements->check_backup_ready_status())
+if ($requirements->check_backup_ready_status())
 {
-	$latest_backup =  $xcloner_file_system->get_latest_backup();
+	$latest_backup = $xcloner_file_system->get_latest_backup();
 	$xcloner_file_system->backup_storage_cleanup();
 }
 ?>
@@ -38,7 +38,7 @@ 
 	</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') ?>
@@ -47,7 +47,7 @@ 
 	</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') ?>
@@ -56,7 +56,7 @@ 
 	</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') ?>
@@ -83,7 +83,7 @@ 
 							<div class="row">
 								<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>
 										<?php echo $latest_backup['basename']?>
@@ -97,7 +97,7 @@ 
 									<div class="item">
 										<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:?>
@@ -111,7 +111,7 @@ 
 								<blockquote>
 								<div class="item">
 									<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>
@@ -120,25 +120,25 @@ 
 									<?php
 									$list = ($xcloner_scheduler->get_next_run_schedule());
 										
-										if(is_array($list))
+										if (is_array($list))
 										{
-											$xcloner_file_system->sort_by($list, "next_run_time","asc");
+											$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)):?>
+									<?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;?>	
+										<?php	echo $latest_schedule->name; ?>
+									<?php endif; ?>	
 								</div>
 								<div class="item">
 									<div class="title"><?php echo __("Next Call", 'xcloner-backup-and-restore')?>:</div>
-									<?php if(isset($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>
 								</blockquote>
@@ -146,14 +146,14 @@ 
 					</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')?>
 						<span class="right"><a href="#<?php echo $logger_basename = basename($logger->get_main_logger_url())?>" class="download-logger"><?php echo $logger_basename?></a></span>
 					</div>
 					<div class="collapsible-body">
-						<div class="console" id="xcloner-console"><?php if($logger_content) echo implode("<br />\n", array_reverse($logger_content)); ?></div>
+						<div class="console" id="xcloner-console"><?php if ($logger_content) echo implode("<br />\n", array_reverse($logger_content)); ?></div>
 					</div>
 				</li>
 				<script>
@@ -165,7 +165,7 @@ 
 					}, 2000);*/
 				})
 				</script>
-				<?php endif;?>
+				<?php endif; ?>
 			
 			</ul>
 			
@@ -177,59 +177,59 @@ 
 	  
 	  <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 class="shorten_string "><?php echo $requirements->check_xcloner_start_path();?></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 class="shorten_string"><?php echo $requirements->check_xcloner_store_path();?></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 class="shorten_string"><?php echo $requirements->check_xcloner_tmp_path();?></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')?>: <?php echo $requirements->check_min_php_version();?>
+				<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')?>)
 				</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')?>: <?php echo $requirements->check_safe_mode();?>
+				<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')?>)
 				</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 $requirements->get_max_execution_time();?>
+					<?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 $requirements->get_memory_limit();?>
+					<?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 $requirements->get_open_basedir();?>
+					<?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>
+		  <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_restore_page.php

Spacing +55 added lines, -55 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-$xcloner_settings 		= $this->get_xcloner_container()->get_xcloner_settings();
-$logger					= $this->get_xcloner_container()->get_xcloner_logger();
-$xcloner_file_system 	= $this->get_xcloner_container()->get_xcloner_filesystem();
-$xcloner_file_transfer 	= $this->get_xcloner_container()->get_xcloner_file_transfer();
+$xcloner_settings = $this->get_xcloner_container()->get_xcloner_settings();
+$logger = $this->get_xcloner_container()->get_xcloner_logger();
+$xcloner_file_system = $this->get_xcloner_container()->get_xcloner_filesystem();
+$xcloner_file_transfer = $this->get_xcloner_container()->get_xcloner_file_transfer();
 
-$start = 0 ;
+$start = 0;
 
 $backup_list = $xcloner_file_system->get_latest_backups();
 
@@ -21,22 +21,22 @@ 
 	<div class="col s12">
 		<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')?></div>
+				<div class="collapsible-header active"><i 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 __("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>
+							<li><?php echo __("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>
 							</li>	
 							<li>
-							<?php echo __("Extract the files on your new host",'xcloner-backup-and-restore')?>
+							<?php echo __("Extract the 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>
 								<?php echo __("We have detected your connection to the site as being secure, so your restore script address must start with https://.")?>
 							</li>
@@ -45,12 +45,12 @@ 
 						</ul>	
 						
 						<div class="input-field col l9 s12">
-							<input value="<?php echo (is_ssl())?"https://":"http://"?>" id="restore_script_url" type="text" class="validate" placeholder="Url to XCloner Restore Script, example http://myddns.com/xcloner/xcloner_restore.php" >
+							<input value="<?php echo (is_ssl()) ? "https://" : "http://"?>" 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>
 							<div id="url_validation_status" class="status"></div>
 				        </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",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" id="validate_url" name="action"><?php echo __("Check", 'xcloner-backup-and-restore')?>
 							    <i class="material-icons right">send</i>
 							</button>
 				        </div>
@@ -58,15 +58,15 @@ 
 			</li>
 			
 			<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 Remote Host",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header active"><i class="material-icons">file_upload</i><?php echo __("Upload Local Backup Archive To Remote 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 remote host",'xcloner-backup-and-restore')?></option>
-					      <?php if(is_array($backup_list)):?>
-							<?php foreach($backup_list as $file):?>
+					      <option value="" disabled selected><?php echo __("Please select a local backup archive to upload to remote 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'])?>)
 								</option>
@@ -82,14 +82,14 @@ 
 					</div>
 					<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')?>
+							<button class="btn waves-effect waves-light upload-backup normal" type="submit" id="" name="action"><?php echo __("Upload", 'xcloner-backup-and-restore')?>
 							    <i class="material-icons right">send</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')?>
+							<button class="btn waves-effect waves-light red upload-backup cancel" type="submit" 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')?>" id="skip_upload_backup" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+						<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_upload_backup" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 						    <i class="material-icons right">navigate_next</i>
 						</button>
 					</div>
@@ -97,7 +97,7 @@ 
 			</li>	
 			
 			<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 Remote Host",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header"><i class="material-icons">folder_open</i><?php echo __("Restore Files Backup Available On Remote Host", 'xcloner-backup-and-restore')?>
 						<i class="material-icons right" title="Refresh Remote Backup Files List" id="refresh_remote_backup_file">cached</i>
 
 						<div class="switch right">
@@ -114,12 +114,12 @@ 
 						<div class=" col s12 l7">
 							<div class="input-field row">
 								<input type="text" name="remote_restore_path" id="remote_restore_path" class="validate" placeholder="Restore Target Path">
-								<label><?php echo __("Remote Restore Target Path",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote Restore Target Path", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 							<div class="input-field row">
 								<select id="remote_backup_file" name="remote_backup_file" class="browser-default">
-									<option value="" disabled selected><?php echo __("Please select the remote backup file to restore",'xcloner-backup-and-restore')?></option>
+									<option value="" disabled selected><?php echo __("Please select the remote backup file to restore", 'xcloner-backup-and-restore')?></option>
 							    </select>
 							    <label></label>
 							</div>
@@ -134,14 +134,14 @@ 
 				       
 				        <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')?>
+								<button class="btn waves-effect waves-light restore_remote_backup normal " type="submit" id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">send</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')?>
+								<button class="btn waves-effect waves-light red restore_remote_backup cancel" type="submit" 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')?>" id="skip_remote_backup_step" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_remote_backup_step" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 				        </div>
@@ -149,71 +149,71 @@ 
 			</li>
 			
 			<li data-step="4" class="restore-remote-database-step steps active">
-				<div class="collapsible-header"><i class="material-icons">list</i><?php echo __("Restore Remote Database - Search and Replace",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header"><i class="material-icons">list</i><?php echo __("Restore Remote 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>
 				<div class="collapsible-body row">
 						
 						<div class="col s12">
-							<a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50" data-tooltip="<?php echo __('Please provide below the mysql connection details for the remote host database.','xcloner-backup-and-restore')?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
-							<h5><?php echo __('Remote Mysql Details','xcloner-backup-and-restore')?></h5>
+							<a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50" data-tooltip="<?php echo __('Please provide below the mysql connection details for the remote host database.', 'xcloner-backup-and-restore')?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
+							<h5><?php echo __('Remote 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="Remote Mysql Hostname" value="localhost">
-								<label><?php echo __("Remote Mysql Hostname",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote 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="Remote Mysql Database">
-								<label><?php echo __("Remote Mysql Database",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote 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="Remote Mysql Username">
-								<label><?php echo __("Remote Mysql Username",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote 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="Remote Mysql Password">
-								<label><?php echo __("Remote Mysql Password",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote 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-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
-							<h5><?php echo __('Remote Mysql Search and Replace','xcloner-backup-and-restore')?></h5>
+						<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-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
+							<h5><?php echo __('Remote 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>
+									<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>
 							</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>
+									<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>
 							</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;?>
+						<?php endif; ?>
 						</div>
 						
 						<div class=" col s12 l7">
 							<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 remote database backup file to restore",'xcloner-backup-and-restore')?></option>
+									<option value="" disabled selected><?php echo __("Please select the remote database backup file to restore", 'xcloner-backup-and-restore')?></option>
 							    </select>
 							    
 							    <label></label>
@@ -232,15 +232,15 @@ 
 				      
 				        <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')?>
+								<button class="btn waves-effect waves-light restore_remote_mysqldump normal " type="submit" id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">send</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')?>
+								<button class="btn waves-effect waves-light red restore_remote_mysqldump cancel" type="submit" 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')?>" id="skip_restore_remote_database_step" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_restore_remote_database_step" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 							
@@ -250,13 +250,13 @@ 
 			</li>
 			
 			<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')?>
+				<div class="collapsible-header"><i 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 restored site Url",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Update wp-config.php mysql details and update the restored site Url", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 							<div class="col s8">
@@ -273,7 +273,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">
@@ -289,7 +289,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">
@@ -308,15 +308,15 @@ 
 				        </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>
 				        </div>
 				        
 				        <div class="col s12 center-align">
 
-							<button class="btn waves-effect waves-light teal" type="submit" id="restore_finish" name="action"><?php echo __("Finish",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light teal" type="submit" id="restore_finish" name="action"><?php echo __("Finish", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 				        </div>

admin/class-xcloner-admin.php

Spacing +36 added lines, -36 removed lines

@@ -48,11 +48,11 @@ 
 	 * @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();
-		$this->xcloner_container 	= $xcloner_container;
+		$this->plugin_name = $xcloner_container->get_plugin_name();
+		$this->version = $xcloner_container->get_version();
+		$this->xcloner_container = $xcloner_container;
 	}
 	
 	public function get_xcloner_container()
@@ -67,7 +67,7 @@ 
 	 */
 	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;
 
 		/**
@@ -82,13 +82,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,7 +99,7 @@ 
 	 */
 	public function enqueue_scripts($hook) {
 
-		if(!stristr($hook, "page_".$this->plugin_name))
+		if (!stristr($hook, "page_".$this->plugin_name))
 			return;
 			
 		/**
@@ -117,17 +117,17 @@ 
 		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($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);
 		
 
 	}
@@ -145,19 +145,19 @@ 
 		
 		$_POST['action'] = $xcloner_sanitization->sanitize_input_as_string($_POST['action']);
 		
-		if(isset($_POST['action']))
+		if (isset($_POST['action']))
 		{
 			$remote_storage->save($_POST['action']);
 		}
 		
-		if(isset($_POST['authentification_code']) && $_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']);
 		}
 			
-		if(isset($_POST['connection_check']) && $_POST['connection_check'])
+		if (isset($_POST['connection_check']) && $_POST['connection_check'])
 		{
 			$remote_storage->check($_POST['action']);
 		}
@@ -170,7 +170,7 @@ 
 	{
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 		
-		if(!$requirements->check_backup_ready_status())
+		if (!$requirements->check_backup_ready_status())
 		{
 			require_once("partials/xcloner_init_page.php");
 			return false;
@@ -202,7 +202,7 @@ 
 	{
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 		
-		if(!$requirements->check_backup_ready_status())
+		if (!$requirements->check_backup_ready_status())
 		{
 			require_once("partials/xcloner_init_page.php");
 			return false;
@@ -235,10 +235,10 @@ 
 	    <?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{
+            else {
 				$active_tab = "general_options";
 			}
             
@@ -257,20 +257,20 @@ 
 	        <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');
 					
-				}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' ) {
+				}elseif ($active_tab == 'system_options') {
 					
 					settings_fields('xcloner_system_settings_group');
 					do_settings_sections('xcloner_system_settings_page');
-				}elseif( $active_tab == 'cleanup_options' ) {
+				}elseif ($active_tab == 'cleanup_options') {
 					
 					settings_fields('xcloner_cleanup_settings_group');
 					do_settings_sections('xcloner_cleanup_settings_page');

includes/class-xcloner-remote-storage.php

Spacing +53 added lines, -53 removed lines

@@ -21,9 +21,9 @@ 
 use Sabre\DAV\Client as SabreClient;
 use League\Flysystem\WebDAV\WebDAVAdapter;
 
-class Xcloner_Remote_Storage{
+class Xcloner_Remote_Storage {
 	
-	private $gdrive_app_name 		= "XCloner Backup and Restore";
+	private $gdrive_app_name = "XCloner Backup and Restore";
 	
 	private $storage_fields = array(
 					"option_prefix" => "xcloner_",
@@ -133,8 +133,8 @@ 
 	{
 		$this->xcloner_sanitization 	= $xcloner_container->get_xcloner_sanitization();
 		$this->xcloner_file_system 		= $xcloner_container->get_xcloner_filesystem();
-		$this->logger 					= $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
-		$this->xcloner 					= $xcloner_container;
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
+		$this->xcloner = $xcloner_container;
 	}
 	
 	private function get_xcloner_container()
@@ -145,10 +145,10 @@ 
 	public function get_available_storages()
 	{
 		$return = array();
-		foreach($this->storage_fields as $storage=>$data)
+		foreach ($this->storage_fields as $storage=>$data)
 		{
 			$check_field = $this->storage_fields["option_prefix"].$storage."_enable";
-			if(get_option($check_field))
+			if (get_option($check_field))
 				$return[$storage] = $data['text'];
 		}
 		
@@ -157,7 +157,7 @@ 
 	
 	public function save($action = "ftp")
 	{
-		if(!$action)
+		if (!$action)
 		{
 			return false;
 		}
@@ -165,17 +165,17 @@ 
 		$storage = $this->xcloner_sanitization->sanitize_input_as_string($action);
 		$this->logger->debug(sprintf("Saving the remote storage %s options", strtoupper($action)));	
 		
-		if(is_array($this->storage_fields[$storage]))
+		if (is_array($this->storage_fields[$storage]))
 		{
-			foreach($this->storage_fields[$storage] as $field=>$validation)
+			foreach ($this->storage_fields[$storage] as $field=>$validation)
 			{
 				$check_field = $this->storage_fields["option_prefix"].$field;
 				$sanitize_method = "sanitize_input_as_".$validation;
 				
-				if(!isset($_POST[$check_field]))
+				if (!isset($_POST[$check_field]))
 					$_POST[$check_field] = 0;
 				
-				if(!method_exists($this->xcloner_sanitization, $sanitize_method))
+				if (!method_exists($this->xcloner_sanitization, $sanitize_method))
 					$sanitize_method = "sanitize_input_as_string";
 					
 				$sanitized_value = $this->xcloner_sanitization->$sanitize_method($_POST[$check_field]);
@@ -189,11 +189,11 @@ 
 	
 	public function check($action = "ftp")
 	{
-		try{
+		try {
 			$this->verify_filesystem($action);
 			$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", ucfirst($action));
 			$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));	
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", ucfirst($action));
 		}
 	}
@@ -204,35 +204,35 @@ 
 		
 		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem", strtoupper($storage_type)));	
 		
-		if(!method_exists($this, $method))
+		if (!method_exists($this, $method))
 			return false;
 		
 		list($adapter, $filesystem) = $this->$method();
 		
 		$test_file = substr(".xcloner_".md5(time()), 0, 15);
 		
-		if($storage_type == "gdrive")
+		if ($storage_type == "gdrive")
 		{
-			if(!is_array($filesystem->listContents()))
-				throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+			if (!is_array($filesystem->listContents()))
+				throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
 			$this->logger->debug(sprintf("I can list data from remote storage %s", strtoupper($storage_type)));	
 			
 			return true;
 		}
 			
 		//testing write access
-		if(!$filesystem->write($test_file, "data"))
-			throw new Exception(__("Could not write data",'xcloner-backup-and-restore'));
+		if (!$filesystem->write($test_file, "data"))
+			throw new Exception(__("Could not write data", 'xcloner-backup-and-restore'));
 		$this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));	
 		
 		//testing read access
-		if(!$filesystem->read($test_file))
-			throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		if (!$filesystem->read($test_file))
+			throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
 		$this->logger->debug(sprintf("I can read data to remote storage %s", strtoupper($storage_type)));		
 		
 		//delete test file
-		if(!$filesystem->delete($test_file))
-			throw new Exception(__("Could not delete data",'xcloner-backup-and-restore'));
+		if (!$filesystem->delete($test_file))
+			throw new Exception(__("Could not delete data", 'xcloner-backup-and-restore'));
 		$this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));		
 		
 		return true;
@@ -240,7 +240,7 @@ 
 	
 	public function upload_backup_to_storage($file, $storage)
 	{
-		if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
+		if (!$this->xcloner_file_system->get_storage_filesystem()->has($file))
 		{
 			$this->logger->info(sprintf("File not found %s in local storage", $file));
 			return false;
@@ -248,7 +248,7 @@ 
 			
 		$method = "get_".$storage."_filesystem";	
 		
-		if(!method_exists($this, $method))
+		if (!method_exists($this, $method))
 			return false;
 			
 		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
@@ -266,22 +266,22 @@ 
 		
 		$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($file);
 
-		if(!$remote_storage_filesystem->writeStream($file, $backup_file_stream))
+		if (!$remote_storage_filesystem->writeStream($file, $backup_file_stream))
 		{
 			$this->logger->info(sprintf("Could not transfer file %s", $file));
 			return false;
 		}
 		
-		if($this->xcloner_file_system->is_multipart($file))
+		if ($this->xcloner_file_system->is_multipart($file))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if (is_array($parts))
+				foreach ($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $part_file, strtoupper($storage)), array(""));
 					
 					$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($part_file);
-					if(!$remote_storage_filesystem->writeStream($part_file, $backup_file_stream))
+					if (!$remote_storage_filesystem->writeStream($part_file, $backup_file_stream))
 						return false;
 				}
 		}
@@ -298,18 +298,18 @@ 
 		
 		$target_filename = $file;
 		
-		if(!method_exists($this, $method))
+		if (!method_exists($this, $method))
 			return false;
 			
 		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 		
-		if(!$remote_storage_filesystem->has($file))
+		if (!$remote_storage_filesystem->has($file))
 		{
 			$this->logger->info(sprintf("File not found %s in remote storage %s", $file, strtoupper($storage)));
 			return false;
 		}
 		
-		if($storage == "gdrive")
+		if ($storage == "gdrive")
 		{
 			$metadata = $remote_storage_filesystem->getMetadata($file);
 			$target_filename = $metadata['filename'].".".$metadata['extension'];
@@ -319,22 +319,22 @@ 
 		
 		$backup_file_stream = $remote_storage_filesystem->readStream($file);
 
-		if(!$this->xcloner_file_system->get_storage_filesystem()->writeStream($target_filename, $backup_file_stream))
+		if (!$this->xcloner_file_system->get_storage_filesystem()->writeStream($target_filename, $backup_file_stream))
 		{
 			$this->logger->info(sprintf("Could not transfer file %s", $file));
 			return false;
 		}
 		
-		if($this->xcloner_file_system->is_multipart($target_filename))
+		if ($this->xcloner_file_system->is_multipart($target_filename))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file, $storage);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if (is_array($parts))
+				foreach ($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $part_file, strtoupper($storage)), array(""));
 					
 					$backup_file_stream = $remote_storage_filesystem->readStream($part_file);
-					if(!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file, $backup_file_stream))
+					if (!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file, $backup_file_stream))
 						return false;
 				}
 		}
@@ -348,19 +348,19 @@ 
 	public function clean_remote_storage($storage, $remote_storage_filesystem)
 	{
 		$check_field = $this->storage_fields["option_prefix"].$storage."_cleanup_days";
-		if($expire_days = get_option($check_field))
+		if ($expire_days = get_option($check_field))
 		{
 			$this->logger->info(sprintf("Doing %s remote storage cleanup for %s days limit", strtoupper($storage), $expire_days));
 			$files = $remote_storage_filesystem->listContents();
 			
 			$current_timestamp = strtotime("-".$expire_days." days");
 			
-			if(is_array($files))
-			foreach($files as $file)
+			if (is_array($files))
+			foreach ($files as $file)
 			{
 				$file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
 				
-				if($current_timestamp >= $file['timestamp'])
+				if ($current_timestamp >= $file['timestamp'])
 				{
 					$remote_storage_filesystem->delete($file['path']);
 					$this->logger->info("Deleting remote file ".$file['path']." matching rule", array("RETENTION LIMIT TIMESTAMP", $file['timestamp']." =< ".$expire_days));
@@ -498,7 +498,7 @@ 
 	{
 
 		//if((function_exists("is_plugin_active") && !is_plugin_active("xcloner-google-drive/xcloner-google-drive.php")) || !file_exists(__DIR__ . "/../../xcloner-google-drive/vendor/autoload.php"))
-		if(!class_exists('Google_Client'))
+		if (!class_exists('Google_Client'))
 		{
 			return false;
 		}
@@ -524,7 +524,7 @@ 
 	{
 		$client = $this->gdrive_construct();
 		
-		if(!$client)
+		if (!$client)
 			return false;
 			
 		return $authUrl = $client->createAuthUrl();
@@ -534,7 +534,7 @@ 
 	{
 		$client = $this->gdrive_construct();
 		
-		if(!$client)
+		if (!$client)
 		{
 			$error_msg = "Could not initialize the Google Drive Class, please check that the xcloner-google-drive plugin is enabled...";
 			$this->logger->error($error_msg);
@@ -547,7 +547,7 @@ 
 		update_option("xcloner_gdrive_access_token", $token['access_token']);
 		update_option("xcloner_gdrive_refresh_token", $token['refresh_token']);
 		
-		$redirect_url = ('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']."?page=xcloner_remote_storage_page#gdrive");
+		$redirect_url = ('http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']."?page=xcloner_remote_storage_page#gdrive");
 		
 		?>
 		<script>
@@ -572,7 +572,7 @@ 
 		
 		$client = $this->gdrive_construct();
 		
-		if(!$client)
+		if (!$client)
 		{
 			$error_msg = "Could not initialize the Google Drive Class, please check that the xcloner-google-drive plugin is enabled...";
 			$this->logger->error($error_msg);
@@ -584,18 +584,18 @@ 
 		$service = new \Google_Service_Drive($client);
 		
 		$parent = 'root';
-		$dir = basename( get_option("xcloner_gdrive_target_folder"));
+		$dir = basename(get_option("xcloner_gdrive_target_folder"));
 		
 		$folderID = get_option("xcloner_gdrive_target_folder");
 		
 		$tmp = parse_url($folderID);
 		
-		if(isset($tmp['query']))
+		if (isset($tmp['query']))
 		{
 			$folderID = str_replace("id=", "", $tmp['query']);
 		}
 		
-		if(stristr($folderID, "/"))
+		if (stristr($folderID, "/"))
 		{
 			$query = sprintf('mimeType = \'application/vnd.google-apps.folder\' and \'%s\' in parents and name contains \'%s\'', $parent, $dir);
 			$response = $service->files->listFiles([
@@ -603,12 +603,12 @@ 
 	                'q' => $query
 	            ]);
 			
-			if(sizeof($response))
+			if (sizeof($response))
 			{
 				foreach ($response as $obj) {
-					$folderID =  $obj->getId();
+					$folderID = $obj->getId();
 				}
-			}else{
+			} else {
 				$this->xcloner->trigger_message(sprintf(__("Could not find folder ID by name %s", 'xcloner-backup-and-restore'), $folderID), "error");
 			}
 		}