ovidiul / XCloner-Wordpress

admin/partials/xcloner_scheduled_backups_page.php

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
 $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 $available_storages = $xcloner_remote_storage->get_available_storages();
 ?>
-<?php if(!defined("DISABLE_WP_CRON") || !DISABLE_WP_CRON): ?>
+<?php if (!defined("DISABLE_WP_CRON") || !DISABLE_WP_CRON): ?>
 	<div id="setting-error-" class="error settings-error notice is-dismissible"> 
 		<p><strong>
 			<?php echo sprintf(__('We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore'), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress") ?>
@@ -48,7 +48,7 @@ 
 
 <div class="row">
 	<div class="col s12 m6 offset-m6 teal lighten-1" id="server_time">
-		<h2><?php echo __('Current Server Time', 'xcloner-backup-and-restore')?>: <span class="right"><?php echo current_time('mysql');?></span></h2>
+		<h2><?php echo __('Current Server Time', 'xcloner-backup-and-restore')?>: <span class="right"><?php echo current_time('mysql'); ?></span></h2>
 	</div>
 </div>
 
@@ -94,11 +94,11 @@ 
 					</div>
 					<!--<div class="input-field inline col s12 l6">
 						<select id="backup_type" class="" name="backup_type" id="backup_type">
-							<option value=""><?php echo __("Full Backup","xcloner-backup-and-restore");?></option>
-							<option value="diff"><?php echo __("Differential Backups","xcloner-backup-and-restore");?></option>
-							<option value="full_diff"><?php echo __("Full Backup + Differential Backups","xcloner-backup-and-restore");?></option>
+							<option value=""><?php echo __("Full Backup", "xcloner-backup-and-restore"); ?></option>
+							<option value="diff"><?php echo __("Differential Backups", "xcloner-backup-and-restore"); ?></option>
+							<option value="full_diff"><?php echo __("Full Backup + Differential Backups", "xcloner-backup-and-restore"); ?></option>
 						</select>
-						<label for="backup_type"><?php echo __('Scheduled Backup Type','xcloner-backup-and-restore')?></label>
+						<label for="backup_type"><?php echo __('Scheduled Backup Type', 'xcloner-backup-and-restore')?></label>
 					</div>-->
 				</div>
 				
@@ -114,7 +114,7 @@ 
 							<?php
 							$schedules = $xcloner_scheduler->get_available_intervals();
 							
-							foreach($schedules as $key=>$schedule)
+							foreach ($schedules as $key=>$schedule)
 							{
 							?>
 								<option value="<?php echo $key?>"><?php echo $schedule['display']?></option>
@@ -125,12 +125,12 @@ 
 					</div>
 				</div>
 				
-				<?php if(sizeof($available_storages)):?>
+				<?php if (sizeof($available_storages)):?>
 				<div class="row">
 					<div class="input-field col s12 l12">
 						<select name="schedule_storage" id="schedule_storage" class="validate" >
 							<option value="" selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
-							<?php foreach($available_storages as $storage=>$text):?>
+							<?php foreach ($available_storages as $storage=>$text):?>
 								<option value="<?php echo $storage?>"><?php echo $text?></option>
 							<?php endforeach?>
 						</select>

includes/class-xcloner-scheduler.php

Doc Comments +3 added lines

@@ -334,6 +334,9 @@
 		$this->xcloner_file_system->backup_storage_cleanup();
 	}
 	
+	/**
+	 * @param integer $id
+	 */
 	public function xcloner_scheduler_callback($id, $schedule = "")
 	{
 		if($id)

Spacing +70 added lines, -70 removed lines

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

Braces +17 added lines, -13 removed lines

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

admin/partials/xcloner_restore_page.php

Spacing +65 added lines, -65 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,24 +21,24 @@ 
 	<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 __("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')?> <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 __("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>
 							</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://.")?>
 							</li>
@@ -47,12 +47,12 @@ 
 						</ul>	
 						
 						<div class="input-field col l9 s12">
-							<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" >
+							<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>
 							<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 Connection",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" id="validate_url" name="action"><?php echo __("Check Connection", 'xcloner-backup-and-restore')?>
 							    <i class="material-icons right">send</i>
 							</button>
 				        </div>
@@ -60,15 +60,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 Target Host",'xcloner-backup-and-restore')?>
+				<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')?>
 				</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):?>
+					      <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):?>
 								<option value="<?php echo $file['basename']?>">
 								<?php echo $file['basename']?> (<?php echo size_format($file['size'])?>)
 								</option>
@@ -84,14 +84,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 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')?>
+							<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 __("Skip 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 __("Skip Next", 'xcloner-backup-and-restore')?>
 						    <i class="material-icons right">navigate_next</i>
 						</button>
 					</div>
@@ -99,7 +99,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 Target Location",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header"><i 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">
@@ -120,7 +120,7 @@ 
 										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>
 								</div>
@@ -133,40 +133,40 @@ 
 									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') ?>">
 										<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>
+										<option value="" disabled selected><?php echo __("Please select the target backup file to restore", 'xcloner-backup-and-restore')?></option>
 								    </select>
 								    <label></label>
 							    </div>
 							
 								<div class="col s12">
 									<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>
+									<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>
 									
 									<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")?>
+										<?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")?>
+										<?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")?>
+										<?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")?>
+										<?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")?>
+										<?php echo __("Only Database Backup", "xcloner-backup-and-restore")?>
 									</label>
 								</div>
 							</div>
@@ -181,14 +181,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 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')?>
+								<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 __("Skip 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 __("Skip Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 				        </div>
@@ -196,66 +196,66 @@ 
 			</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 Target Database - Search and Replace",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header"><i 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>
 				<div class="collapsible-body row">
 						
 						<div id="remote-restore-options">
 						<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-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>
+							<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-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>
 						</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-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>
+						<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 __('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>
+									<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>
@@ -263,7 +263,7 @@ 
 						<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 target database backup file to restore",'xcloner-backup-and-restore')?></option>
+									<option value="" disabled selected><?php echo __("Please select the target database backup file to restore", 'xcloner-backup-and-restore')?></option>
 							    </select>
 							    
 							    <label></label>
@@ -282,15 +282,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 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')?>
+								<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 __("Skip 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 __("Skip Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 							
@@ -300,13 +300,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 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">
@@ -323,7 +323,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">
@@ -339,7 +339,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">
@@ -358,8 +358,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>
 				        </div>
@@ -367,13 +367,13 @@ 
 				        <div class="col s12 center-align">
 							<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')?>
+								<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>
 									
 								<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')?>
+									<a disabled="disabled" href="#" class="btn waves-effect waves-light teal" type="button" target="_blank"><?php echo __("Open Target Site", 'xcloner-backup-and-restore')?>
 										<i class="material-icons right">navigate_next</i>
 									</a>
 								</div>
@@ -391,7 +391,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_remote_storage_page.php

Braces +8 added lines, -3 removed lines

@@ -3,8 +3,9 @@ 
 
 $gdrive_auth_url = "";
 
-if(method_exists($remote_storage, "get_gdrive_auth_url"))
+if(method_exists($remote_storage, "get_gdrive_auth_url")) {
 	$gdrive_auth_url = $remote_storage->get_gdrive_auth_url();
+}
 
 $gdrive_construct = $remote_storage->gdrive_construct();
 ?>
@@ -24,7 +25,8 @@ 
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) {
+	echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -280,6 +282,7 @@ 
 							<option readonly value=""><?php echo __("Please Select AWS Region")?></option>
 							<?php 							
 							$aws_regions = $remote_storage->get_aws_regions();
+}
 							
 							foreach($aws_regions as $key=>$region){
 								?>
@@ -332,7 +335,8 @@ 
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) {
+	echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -751,6 +755,7 @@ 
 								<div class="center">
 									<?php 
 										$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=xcloner-google-drive'), 'install-plugin_xcloner-google-drive');
+}
 									?>
 									<h6><?php echo __("This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated.")?></h6>
 									<h6><?php echo __("PHP 5.5 minimum version is required.")?></h6>

Spacing +136 added lines, -136 removed lines

@@ -3,7 +3,7 @@ 
 
 $gdrive_auth_url = "";
 
-if(method_exists($remote_storage, "get_gdrive_auth_url"))
+if (method_exists($remote_storage, "get_gdrive_auth_url"))
 	$gdrive_auth_url = $remote_storage->get_gdrive_auth_url();
 
 $gdrive_construct = $remote_storage->gdrive_construct();
@@ -20,11 +20,11 @@ 
 			<!-- FTP STORAGE-->
 			<li id="ftp">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("FTP Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("FTP Storage", 'xcloner-backup-and-restore')?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if (get_option("xcloner_ftp_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -33,96 +33,96 @@ 
 				<div class="collapsible-body">
 					<div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_host"><?php echo __("Ftp Hostname",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_host"><?php echo __("Ftp Hostname", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class="col s12 m6">
-							<input placeholder="<?php echo __("Ftp Hostname",'xcloner-backup-and-restore')?>" id="ftp_host" type="text" name="xcloner_ftp_hostname" class="validate" value="<?php echo get_option("xcloner_ftp_hostname")?>">
+							<input placeholder="<?php echo __("Ftp Hostname", 'xcloner-backup-and-restore')?>" id="ftp_host" type="text" name="xcloner_ftp_hostname" class="validate" value="<?php echo get_option("xcloner_ftp_hostname")?>">
 				        </div>
 				        <div class=" col s12 m2">
-							<input placeholder="<?php echo __("Ftp Port",'xcloner-backup-and-restore')?>" id="ftp_port" type="text" name="xcloner_ftp_port" class="validate" value="<?php echo get_option("xcloner_ftp_port", 21)?>">
+							<input placeholder="<?php echo __("Ftp Port", 'xcloner-backup-and-restore')?>" id="ftp_port" type="text" name="xcloner_ftp_port" class="validate" value="<?php echo get_option("xcloner_ftp_port", 21)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_username"><?php echo __("Ftp Username",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_username"><?php echo __("Ftp Username", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Ftp Username",'xcloner-backup-and-restore')?>" id="ftp_username" type="text" name="xcloner_ftp_username" class="validate" value="<?php echo get_option("xcloner_ftp_username")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Ftp Username", 'xcloner-backup-and-restore')?>" id="ftp_username" type="text" name="xcloner_ftp_username" class="validate" value="<?php echo get_option("xcloner_ftp_username")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_password"><?php echo __("Ftp Password",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_password"><?php echo __("Ftp Password", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Ftp Password",'xcloner-backup-and-restore')?>" id="ftp_password" type="password" name="xcloner_ftp_password" class="validate" value="<?php echo get_option("xcloner_ftp_password")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Ftp Password", 'xcloner-backup-and-restore')?>" id="ftp_password" type="password" name="xcloner_ftp_password" class="validate" value="<?php echo get_option("xcloner_ftp_password")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_root"><?php echo __("Ftp Storage Folder",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_root"><?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Ftp Storage Folder",'xcloner-backup-and-restore')?>" id="ftp_root" type="text" name="xcloner_ftp_path" class="validate" value="<?php echo get_option("xcloner_ftp_path")?>">
+							<input placeholder="<?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore')?>" id="ftp_root" type="text" name="xcloner_ftp_path" class="validate" value="<?php echo get_option("xcloner_ftp_path")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_root"><?php echo __("Ftp Transfer Mode",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_root"><?php echo __("Ftp Transfer Mode", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6 input-field inline">
-							<input name="xcloner_ftp_transfer_mode" type="radio" id="passive" value="1" <?php if(get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
-							<label for="passive"><?php echo __("Passive",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_transfer_mode" type="radio" id="passive" value="1" <?php if (get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
+							<label for="passive"><?php echo __("Passive", 'xcloner-backup-and-restore')?></label>
 
-							<input name="xcloner_ftp_transfer_mode" type="radio" id="active" value="0" <?php if(!get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
-							<label for="active"><?php echo __("Active",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_transfer_mode" type="radio" id="active" value="0" <?php if (!get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
+							<label for="active"><?php echo __("Active", 'xcloner-backup-and-restore')?></label>
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_ssl_mode"><?php echo __("Ftp Secure Connection",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_ssl_mode"><?php echo __("Ftp Secure Connection", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6 input-field inline">
-							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_inactive" value="0" <?php if(!get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
-							<label for="ftp_ssl_mode_inactive"><?php echo __("Disable",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_inactive" value="0" <?php if (!get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
+							<label for="ftp_ssl_mode_inactive"><?php echo __("Disable", 'xcloner-backup-and-restore')?></label>
 
-							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_active" value="1" <?php if(get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
-							<label for="ftp_ssl_mode_active"><?php echo __("Enable",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_active" value="1" <?php if (get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
+							<label for="ftp_ssl_mode_active"><?php echo __("Enable", 'xcloner-backup-and-restore')?></label>
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_timeout"><?php echo __("Ftp Timeout",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_timeout"><?php echo __("Ftp Timeout", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m2">
-							<input placeholder="<?php echo __("Ftp Timeout",'xcloner-backup-and-restore')?>" id="ftp_timeout" type="text" name="xcloner_ftp_timeout" class="validate" value="<?php echo get_option("xcloner_ftp_timeout", 30)?>">
+							<input placeholder="<?php echo __("Ftp Timeout", 'xcloner-backup-and-restore')?>" id="ftp_timeout" type="text" name="xcloner_ftp_timeout" class="validate" value="<?php echo get_option("xcloner_ftp_timeout", 30)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_cleanup_days"><?php echo __("Ftp Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_cleanup_days"><?php echo __("Ftp Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="ftp_cleanup_days" type="text" name="xcloner_ftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_ftp_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="ftp_cleanup_days" type="text" name="xcloner_ftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_ftp_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="ftp"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="ftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="ftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="ftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -133,11 +133,11 @@ 
 			<!-- SFTP STORAGE-->
 			<li id="sftp">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("SFTP Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("SFTP Storage", 'xcloner-backup-and-restore')?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_sftp_enable" class="status" value="1" <?php if(get_option("xcloner_sftp_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_sftp_enable" class="status" value="1" <?php if (get_option("xcloner_sftp_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -146,79 +146,79 @@ 
 				<div class="collapsible-body">
 					<div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_host"><?php echo __("SFTP Hostname",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_host"><?php echo __("SFTP Hostname", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class="col s12 m6">
-							<input placeholder="<?php echo __("SFTP Hostname",'xcloner-backup-and-restore')?>" id="sftp_host" type="text" name="xcloner_sftp_hostname" class="validate" value="<?php echo get_option("xcloner_sftp_hostname")?>">
+							<input placeholder="<?php echo __("SFTP Hostname", 'xcloner-backup-and-restore')?>" id="sftp_host" type="text" name="xcloner_sftp_hostname" class="validate" value="<?php echo get_option("xcloner_sftp_hostname")?>">
 				        </div>
 				        <div class=" col s12 m2">
-							<input placeholder="<?php echo __("SFTP Port",'xcloner-backup-and-restore')?>" id="sftp_port" type="text" name="xcloner_sftp_port" class="validate" value="<?php echo get_option("xcloner_sftp_port", 22)?>">
+							<input placeholder="<?php echo __("SFTP Port", 'xcloner-backup-and-restore')?>" id="sftp_port" type="text" name="xcloner_sftp_port" class="validate" value="<?php echo get_option("xcloner_sftp_port", 22)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_username"><?php echo __("SFTP Username",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_username"><?php echo __("SFTP Username", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("SFTP Username",'xcloner-backup-and-restore')?>" id="sftp_username" type="text" name="xcloner_sftp_username" class="validate" value="<?php echo get_option("xcloner_sftp_username")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("SFTP Username", 'xcloner-backup-and-restore')?>" id="sftp_username" type="text" name="xcloner_sftp_username" class="validate" value="<?php echo get_option("xcloner_sftp_username")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_password"><?php echo __("SFTP or Private Key Password",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_password"><?php echo __("SFTP or Private Key Password", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("SFTP or Private Key Password",'xcloner-backup-and-restore')?>" id="ftp_spassword" type="password" name="xcloner_sftp_password" class="validate" value="<?php echo get_option("xcloner_sftp_password")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("SFTP or Private Key Password", 'xcloner-backup-and-restore')?>" id="ftp_spassword" type="password" name="xcloner_sftp_password" class="validate" value="<?php echo get_option("xcloner_sftp_password")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_private_key"><?php echo __("SFTP Private Key(RSA)",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_private_key"><?php echo __("SFTP Private Key(RSA)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<textarea rows="5" placeholder="<?php echo __("Local Server Path or Contents of the SFTP Private Key RSA File",'xcloner-backup-and-restore')?>" id="sftp_private_key" type="text" name="xcloner_sftp_private_key" class="validate" value=""><?php echo get_option("xcloner_sftp_private_key")?></textarea>
+							<textarea rows="5" placeholder="<?php echo __("Local Server Path or Contents of the SFTP Private Key RSA File", 'xcloner-backup-and-restore')?>" id="sftp_private_key" type="text" name="xcloner_sftp_private_key" class="validate" value=""><?php echo get_option("xcloner_sftp_private_key")?></textarea>
 						</div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_root"><?php echo __("SFTP Storage Folder",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_root"><?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("SFTP Storage Folder",'xcloner-backup-and-restore')?>" id="sftp_root" type="text" name="xcloner_sftp_path" class="validate" value="<?php echo get_option("xcloner_sftp_path")?>">
+							<input placeholder="<?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore')?>" id="sftp_root" type="text" name="xcloner_sftp_path" class="validate" value="<?php echo get_option("xcloner_sftp_path")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_timeout"><?php echo __("SFTP Timeout",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_timeout"><?php echo __("SFTP Timeout", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m2">
-							<input placeholder="<?php echo __("SFTP Timeout",'xcloner-backup-and-restore')?>" id="sftp_timeout" type="text" name="xcloner_sftp_timeout" class="validate" value="<?php echo get_option("xcloner_sftp_timeout", 30)?>">
+							<input placeholder="<?php echo __("SFTP Timeout", 'xcloner-backup-and-restore')?>" id="sftp_timeout" type="text" name="xcloner_sftp_timeout" class="validate" value="<?php echo get_option("xcloner_sftp_timeout", 30)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_cleanup_days"><?php echo __("SFTP Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_cleanup_days"><?php echo __("SFTP Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="sftp_cleanup_days" type="text" name="xcloner_sftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_sftp_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="sftp_cleanup_days" type="text" name="xcloner_sftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_sftp_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="sftp"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="sftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="sftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="sftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -230,11 +230,11 @@ 
 			<!-- AWS STORAGE-->
 			<li id="aws">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("AWS Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("AWS Storage", 'xcloner-backup-and-restore')?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_aws_enable" class="status" value="1" <?php if(get_option("xcloner_aws_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_aws_enable" class="status" value="1" <?php if (get_option("xcloner_aws_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -255,35 +255,35 @@ 
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_key"><?php echo __("AWS Key",'xcloner-backup-and-restore')?></label>
+							<label for="aws_key"><?php echo __("AWS Key", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("AWS Key",'xcloner-backup-and-restore')?>" id="aws_key" type="text" name="xcloner_aws_key" class="validate" value="<?php echo get_option("xcloner_aws_key")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("AWS Key", 'xcloner-backup-and-restore')?>" id="aws_key" type="text" name="xcloner_aws_key" class="validate" value="<?php echo get_option("xcloner_aws_key")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_secret"><?php echo __("AWS Secret",'xcloner-backup-and-restore')?></label>
+							<label for="aws_secret"><?php echo __("AWS Secret", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("AWS Secret",'xcloner-backup-and-restore')?>" id="aws_secret" type="text" name="xcloner_aws_secret" class="validate" value="<?php echo get_option("xcloner_aws_secret")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("AWS Secret", 'xcloner-backup-and-restore')?>" id="aws_secret" type="text" name="xcloner_aws_secret" class="validate" value="<?php echo get_option("xcloner_aws_secret")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_region"><?php echo __("AWS Region",'xcloner-backup-and-restore')?></label>
+							<label for="aws_region"><?php echo __("AWS Region", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<select placeholder="<?php echo __("example: us-east-1",'xcloner-backup-and-restore')?>" id="aws_region" type="text" name="xcloner_aws_region" class="validate" value="<?php echo get_option("xcloner_aws_region")?>" autocomplete="off" >
+							<select placeholder="<?php echo __("example: us-east-1", 'xcloner-backup-and-restore')?>" id="aws_region" type="text" name="xcloner_aws_region" class="validate" value="<?php echo get_option("xcloner_aws_region")?>" autocomplete="off" >
 							<option readonly value=""><?php echo __("Please Select AWS Region")?></option>
 							<?php 							
 							$aws_regions = $remote_storage->get_aws_regions();
 							
-							foreach($aws_regions as $key=>$region){
+							foreach ($aws_regions as $key=>$region) {
 								?>
-								<option value="<?php echo $key?>" <?php echo ($key == get_option('xcloner_aws_region')?"selected":"")?>><?php echo $region?> = <?php echo $key?></option>
+								<option value="<?php echo $key?>" <?php echo ($key == get_option('xcloner_aws_region') ? "selected" : "")?>><?php echo $region?> = <?php echo $key?></option>
 								<?php
 								}
 							?>
@@ -293,30 +293,30 @@ 
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_bucket_name"><?php echo __("AWS Bucket Name",'xcloner-backup-and-restore')?></label>
+							<label for="aws_bucket_name"><?php echo __("AWS Bucket Name", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("AWS Bucket Name",'xcloner-backup-and-restore')?>" id="aws_bucket_name" type="text" name="xcloner_aws_bucket_name" class="validate" value="<?php echo get_option("xcloner_aws_bucket_name")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("AWS Bucket Name", 'xcloner-backup-and-restore')?>" id="aws_bucket_name" type="text" name="xcloner_aws_bucket_name" class="validate" value="<?php echo get_option("xcloner_aws_bucket_name")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_cleanup_days"><?php echo __("AWS Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="aws_cleanup_days"><?php echo __("AWS Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="aws_cleanup_days" type="text" name="xcloner_aws_cleanup_days" class="validate" value="<?php echo get_option("xcloner_aws_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="aws_cleanup_days" type="text" name="xcloner_aws_cleanup_days" class="validate" value="<?php echo get_option("xcloner_aws_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="aws"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="aws"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="aws" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="aws" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -328,11 +328,11 @@ 
 			<!-- DROPBOX STORAGE-->
 			<li id="dropbox">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("Dropbox Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("Dropbox Storage", 'xcloner-backup-and-restore')?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if (get_option("xcloner_dropbox_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -353,49 +353,49 @@ 
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_access_token"><?php echo __("Dropbox Access Token",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_access_token"><?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Dropbox Access Token",'xcloner-backup-and-restore')?>" id="dropbox_access_token" type="text" name="xcloner_dropbox_access_token" class="validate" value="<?php echo get_option("xcloner_dropbox_access_token")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore')?>" id="dropbox_access_token" type="text" name="xcloner_dropbox_access_token" class="validate" value="<?php echo get_option("xcloner_dropbox_access_token")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_app_secret"><?php echo __("Dropbox App Secret",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_app_secret"><?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Dropbox App Secret",'xcloner-backup-and-restore')?>" id="dropbox_app_secret" type="text" name="xcloner_dropbox_app_secret" class="validate" value="<?php echo get_option("xcloner_dropbox_app_secret")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore')?>" id="dropbox_app_secret" type="text" name="xcloner_dropbox_app_secret" class="validate" value="<?php echo get_option("xcloner_dropbox_app_secret")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_prefix"><?php echo __("Dropbox Prefix",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_prefix"><?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Dropbox Prefix",'xcloner-backup-and-restore')?>" id="dropbox_prefix" type="text" name="xcloner_dropbox_prefix" class="validate" value="<?php echo get_option("xcloner_dropbox_prefix")?>">
+							<input placeholder="<?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore')?>" id="dropbox_prefix" type="text" name="xcloner_dropbox_prefix" class="validate" value="<?php echo get_option("xcloner_dropbox_prefix")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_cleanup_days"><?php echo __("Dropbox Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_cleanup_days"><?php echo __("Dropbox Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="dropbox_cleanup_days" type="text" name="xcloner_dropbox_cleanup_days" class="validate" value="<?php echo get_option("xcloner_dropbox_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="dropbox_cleanup_days" type="text" name="xcloner_dropbox_cleanup_days" class="validate" value="<?php echo get_option("xcloner_dropbox_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="dropbox"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="dropbox"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="dropbox" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="dropbox" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -407,11 +407,11 @@ 
 			<!-- AZURE STORAGE-->
 			<li id="azure">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("Azure Blob Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("Azure Blob Storage", 'xcloner-backup-and-restore')?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_azure_enable" class="status" value="1" <?php if(get_option("xcloner_azure_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_azure_enable" class="status" value="1" <?php if (get_option("xcloner_azure_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -425,56 +425,56 @@ 
 						</div>	
 						<div class=" col s12 m6">
 							<p>
-								<?php echo sprintf(__('Visit %s and get your "Api Key".','xcloner-backup-and-restore'), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>')?>
+								<?php echo sprintf(__('Visit %s and get your "Api Key".', 'xcloner-backup-and-restore'), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>')?>
 							</p>
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_account_name"><?php echo __("Azure Account Name",'xcloner-backup-and-restore')?></label>
+							<label for="azure_account_name"><?php echo __("Azure Account Name", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Azure Account Name",'xcloner-backup-and-restore')?>" id="azure_account_name" type="text" name="xcloner_azure_account_name" class="validate" value="<?php echo get_option("xcloner_azure_account_name")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Azure Account Name", 'xcloner-backup-and-restore')?>" id="azure_account_name" type="text" name="xcloner_azure_account_name" class="validate" value="<?php echo get_option("xcloner_azure_account_name")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_api_key"><?php echo __("Azure Api Key",'xcloner-backup-and-restore')?></label>
+							<label for="azure_api_key"><?php echo __("Azure Api Key", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Azure Api Key",'xcloner-backup-and-restore')?>" id="azure_api_key" type="text" name="xcloner_azure_api_key" class="validate" value="<?php echo get_option("xcloner_azure_api_key")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Azure Api Key", 'xcloner-backup-and-restore')?>" id="azure_api_key" type="text" name="xcloner_azure_api_key" class="validate" value="<?php echo get_option("xcloner_azure_api_key")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_container"><?php echo __("Azure Container",'xcloner-backup-and-restore')?></label>
+							<label for="azure_container"><?php echo __("Azure Container", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Azure Container",'xcloner-backup-and-restore')?>" id="azure_container" type="text" name="xcloner_azure_container" class="validate" value="<?php echo get_option("xcloner_azure_container")?>">
+							<input placeholder="<?php echo __("Azure Container", 'xcloner-backup-and-restore')?>" id="azure_container" type="text" name="xcloner_azure_container" class="validate" value="<?php echo get_option("xcloner_azure_container")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_cleanup_days"><?php echo __("Azure Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="azure_cleanup_days"><?php echo __("Azure Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="azure_cleanup_days" type="text" name="xcloner_azure_cleanup_days" class="validate" value="<?php echo get_option("xcloner_azure_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="azure_cleanup_days" type="text" name="xcloner_azure_cleanup_days" class="validate" value="<?php echo get_option("xcloner_azure_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="azure"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="azure"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="azure" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="azure" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -486,11 +486,11 @@ 
 			<!-- BACKBLAZE STORAGE-->
 			<li id="backblaze">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("Backblaze Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("Backblaze Storage", 'xcloner-backup-and-restore')?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_backblaze_enable" class="status" value="1" <?php if(get_option("xcloner_backblaze_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_backblaze_enable" class="status" value="1" <?php if (get_option("xcloner_backblaze_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -504,56 +504,56 @@ 
 						</div>	
 						<div class=" col s12 m6">
 							<p>
-								<?php echo sprintf(__('Visit %s and get your Account Id and  Application Key.','xcloner-backup-and-restore'), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>')?>
+								<?php echo sprintf(__('Visit %s and get your Account Id and  Application Key.', 'xcloner-backup-and-restore'), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>')?>
 							</p>
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_account_id"><?php echo __("Backblaze Account Id",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_account_id"><?php echo __("Backblaze Account Id", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Backblaze Account Id",'xcloner-backup-and-restore')?>" id="backblaze_account_id" type="text" name="xcloner_backblaze_account_id" class="validate" value="<?php echo get_option("xcloner_backblaze_account_id")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Backblaze Account Id", 'xcloner-backup-and-restore')?>" id="backblaze_account_id" type="text" name="xcloner_backblaze_account_id" class="validate" value="<?php echo get_option("xcloner_backblaze_account_id")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_application_key"><?php echo __("Backblaze Application Key",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_application_key"><?php echo __("Backblaze Application Key", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Backblaze Application Key",'xcloner-backup-and-restore')?>" id="backblaze_application_key" type="text" name="xcloner_backblaze_application_key" class="validate" value="<?php echo get_option("xcloner_backblaze_application_key")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Backblaze Application Key", 'xcloner-backup-and-restore')?>" id="backblaze_application_key" type="text" name="xcloner_backblaze_application_key" class="validate" value="<?php echo get_option("xcloner_backblaze_application_key")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_bucket_name"><?php echo __("Backblaze Bucket Name",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_bucket_name"><?php echo __("Backblaze Bucket Name", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Backblaze Bucket Name",'xcloner-backup-and-restore')?>" id="backblaze_bucket_name" type="text" name="xcloner_backblaze_bucket_name" class="validate" value="<?php echo get_option("xcloner_backblaze_bucket_name")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Backblaze Bucket Name", 'xcloner-backup-and-restore')?>" id="backblaze_bucket_name" type="text" name="xcloner_backblaze_bucket_name" class="validate" value="<?php echo get_option("xcloner_backblaze_bucket_name")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_cleanup_days"><?php echo __("Backblaze Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_cleanup_days"><?php echo __("Backblaze Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="backblaze_cleanup_days" type="text" name="xcloner_backblaze_cleanup_days" class="validate" value="<?php echo get_option("xcloner_backblaze_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="backblaze_cleanup_days" type="text" name="xcloner_backblaze_cleanup_days" class="validate" value="<?php echo get_option("xcloner_backblaze_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="backblaze"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="backblaze"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="backblaze" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="backblaze" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -565,11 +565,11 @@ 
 			<!-- WEBDAV STORAGE-->
 			<li id="webdav">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("WebDAV Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("WebDAV Storage", 'xcloner-backup-and-restore')?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_webdav_enable" class="status" value="1" <?php if(get_option("xcloner_webdav_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_webdav_enable" class="status" value="1" <?php if (get_option("xcloner_webdav_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -590,57 +590,57 @@ 
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="webdav_url"><?php echo __("WebDAV Base Url",'xcloner-backup-and-restore')?></label>
+							<label for="webdav_url"><?php echo __("WebDAV Base Url", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("WebDAV Base Url",'xcloner-backup-and-restore')?>" id="webdav_url" type="text" name="xcloner_webdav_url" class="validate" value="<?php echo get_option("xcloner_webdav_url")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("WebDAV Base Url", 'xcloner-backup-and-restore')?>" id="webdav_url" type="text" name="xcloner_webdav_url" class="validate" value="<?php echo get_option("xcloner_webdav_url")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="webdav_username"><?php echo __("WebDAV Username",'xcloner-backup-and-restore')?></label>
+							<label for="webdav_username"><?php echo __("WebDAV Username", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("WebDAV Username",'xcloner-backup-and-restore')?>" id="webdav_username" type="text" name="xcloner_webdav_username" class="validate" value="<?php echo get_option("xcloner_webdav_username")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("WebDAV Username", 'xcloner-backup-and-restore')?>" id="webdav_username" type="text" name="xcloner_webdav_username" class="validate" value="<?php echo get_option("xcloner_webdav_username")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="webdav_password"><?php echo __("WebDAV Password",'xcloner-backup-and-restore')?></label>
+							<label for="webdav_password"><?php echo __("WebDAV Password", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("WebDAV Password",'xcloner-backup-and-restore')?>" id="webdav_password" type="password" name="xcloner_webdav_password" class="validate" value="<?php echo get_option("xcloner_webdav_password")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("WebDAV Password", 'xcloner-backup-and-restore')?>" id="webdav_password" type="password" name="xcloner_webdav_password" class="validate" value="<?php echo get_option("xcloner_webdav_password")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="webdav_target_folder"><?php echo __("WebDAV Target Folder",'xcloner-backup-and-restore')?></label>
+							<label for="webdav_target_folder"><?php echo __("WebDAV Target Folder", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("WebDAV Target Folder",'xcloner-backup-and-restore')?>" id="webdav_target_folder" type="text" name="xcloner_webdav_target_folder" class="validate" value="<?php echo get_option("xcloner_webdav_target_folder")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("WebDAV Target Folder", 'xcloner-backup-and-restore')?>" id="webdav_target_folder" type="text" name="xcloner_webdav_target_folder" class="validate" value="<?php echo get_option("xcloner_webdav_target_folder")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="webdav_cleanup_days"><?php echo __("WebDAV Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="webdav_cleanup_days"><?php echo __("WebDAV Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="webdav_cleanup_days" type="text" name="xcloner_webdav_cleanup_days" class="validate" value="<?php echo get_option("xcloner_webdav_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="webdav_cleanup_days" type="text" name="xcloner_webdav_cleanup_days" class="validate" value="<?php echo get_option("xcloner_webdav_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="webdav"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="webdav"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="webdav" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="webdav" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -652,12 +652,12 @@ 
 			<!-- Google DRIVE STORAGE-->
 			<li id="gdrive">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("Google Drive Storage",'xcloner-backup-and-restore')?>
-					<?php if($gdrive_construct):?>
+					<i class="material-icons">computer</i><?php echo __("Google Drive Storage", 'xcloner-backup-and-restore')?>
+					<?php if ($gdrive_construct):?>
 					<div class="switch right">
 						<label>
 						Off
-						<input type="checkbox" name="xcloner_gdrive_enable" class="status" value="1" <?php if(get_option("xcloner_gdrive_enable")) echo "checked"?> \>
+						<input type="checkbox" name="xcloner_gdrive_enable" class="status" value="1" <?php if (get_option("xcloner_gdrive_enable")) echo "checked"?> \>
 						<span class="lever"></span>
 						On
 						</label>
@@ -666,7 +666,7 @@ 
 				</div>
 				<div class="collapsible-body">
 			        
-			        <?php if($gdrive_construct) : ?>
+			        <?php if ($gdrive_construct) : ?>
 			        
 				        <div class="row">
 							<div class="col s12 m3 label">
@@ -674,28 +674,28 @@ 
 							</div>	
 							<div class=" col s12 m9">
 								<p>
-									<?php echo sprintf(__('Visit %s to create a new application and get your Client ID and Client Secret.','xcloner-backup-and-restore'), '<a href="https://console.developers.google.com" target="_blank">https://console.developers.google.com</a>')?>
+									<?php echo sprintf(__('Visit %s to create a new application and get your Client ID and Client Secret.', 'xcloner-backup-and-restore'), '<a href="https://console.developers.google.com" target="_blank">https://console.developers.google.com</a>')?>
 									<a href="https://youtu.be/YXUVPUVgG8k" target="_blank" class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-html="true" 
-									data-tooltip="<?php echo sprintf(__('Click here to view a short video explaining how to create the Client ID and Client Secret as well as connecting XCloner with the Google Drive API %s','xcloner-backup-and-restore'),"<br />https://youtu.be/YXUVPUVgG8k")?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
+									data-tooltip="<?php echo sprintf(__('Click here to view a short video explaining how to create the Client ID and Client Secret as well as connecting XCloner with the Google Drive API %s', 'xcloner-backup-and-restore'), "<br />https://youtu.be/YXUVPUVgG8k")?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
 								</p>
 					        </div>
 				        </div>
 			        
 						<div class="row">
 							<div class="col s12 m3 label">
-								<label for="gdrive_client_id"><?php echo __("Client ID",'xcloner-backup-and-restore')?></label>
+								<label for="gdrive_client_id"><?php echo __("Client ID", 'xcloner-backup-and-restore')?></label>
 							</div>
 							<div class=" col s12 m6">
-								<input placeholder="<?php echo __("Google Client ID",'xcloner-backup-and-restore')?>" id="gdrive_client_id" type="text" name="xcloner_gdrive_client_id" class="validate" value="<?php echo get_option("xcloner_gdrive_client_id")?>">
+								<input placeholder="<?php echo __("Google Client ID", 'xcloner-backup-and-restore')?>" id="gdrive_client_id" type="text" name="xcloner_gdrive_client_id" class="validate" value="<?php echo get_option("xcloner_gdrive_client_id")?>">
 					        </div>
 				        </div>
 				        
 				        <div class="row">
 							<div class="col s12 m3 label">
-								<label for="gdrive_client_secret"><?php echo __("Client Secret",'xcloner-backup-and-restore')?></label>
+								<label for="gdrive_client_secret"><?php echo __("Client Secret", 'xcloner-backup-and-restore')?></label>
 							</div>
 							<div class=" col s12 m6">
-								<input placeholder="<?php echo __("Google Client Secret",'xcloner-backup-and-restore')?>" id="gdrive_client_secret" type="text" name="xcloner_gdrive_client_secret" class="validate" value="<?php echo get_option("xcloner_gdrive_client_secret")?>">
+								<input placeholder="<?php echo __("Google Client Secret", 'xcloner-backup-and-restore')?>" id="gdrive_client_secret" type="text" name="xcloner_gdrive_client_secret" class="validate" value="<?php echo get_option("xcloner_gdrive_client_secret")?>">
 					        </div>
 				        </div>
 				        
@@ -705,41 +705,41 @@ 
 								&nbsp;
 							</div>	
 							<div class=" col s12 m6">
-									<a class="btn" target="_blank" id="gdrive_authorization_click" onclick="jQuery('#authentification_code').show()" href="<?php echo $gdrive_auth_url?>"><?php echo sprintf(__('Authorize Google Drive','xcloner-backup-and-restore'))?></a>
-									<input type="text" name="authentification_code" id="authentification_code" placeholder="<?php echo __("Paste Authorization Code Here","xcloner-backup-and-restore")?>">
+									<a class="btn" target="_blank" id="gdrive_authorization_click" onclick="jQuery('#authentification_code').show()" href="<?php echo $gdrive_auth_url?>"><?php echo sprintf(__('Authorize Google Drive', 'xcloner-backup-and-restore'))?></a>
+									<input type="text" name="authentification_code" id="authentification_code" placeholder="<?php echo __("Paste Authorization Code Here", "xcloner-backup-and-restore")?>">
 					        </div>
 				        </div>
 				        
 				        <div class="row">
 							<div class="col s12 m3 label">
-								<label for="gdrive_target_folder"><?php echo __("Folder ID or Root Path",'xcloner-backup-and-restore')?>
+								<label for="gdrive_target_folder"><?php echo __("Folder ID or Root Path", 'xcloner-backup-and-restore')?>
 									<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-html="true" \
 									data-tooltip="<?php echo __('Folder ID can be found by right clicking on the folder name and selecting \'Get shareable link\' menu, format https://drive.google.com/open?id={FOLDER_ID}<br />
 									If you supply a folder name, it has to exists in the drive root and start with / , example /backups.xcloner.com/','xcloner-backup-and-restore')?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
 								</label>
 							</div>	
 							<div class=" col s12 m6">
-								<input placeholder="<?php echo __("Target Folder ID or Root Path",'xcloner-backup-and-restore')?>" id="gdrive_target_folder" type="text" name="xcloner_gdrive_target_folder" class="validate" value="<?php echo get_option("xcloner_gdrive_target_folder")?>" autocomplete="off" >
+								<input placeholder="<?php echo __("Target Folder ID or Root Path", 'xcloner-backup-and-restore')?>" id="gdrive_target_folder" type="text" name="xcloner_gdrive_target_folder" class="validate" value="<?php echo get_option("xcloner_gdrive_target_folder")?>" autocomplete="off" >
 					        </div>
 				        </div>
 				        
 				        <div class="row">
 							<div class="col s12 m3 label">
-								<label for="gdrive_cleanup_days"><?php echo __("Google Drive Cleanup (days)",'xcloner-backup-and-restore')?></label>
+								<label for="gdrive_cleanup_days"><?php echo __("Google Drive Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 							</div>
 							<div class=" col s12 m6">
-								<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="gdrive_cleanup_days" type="text" name="xcloner_gdrive_cleanup_days" class="validate" value="<?php echo get_option("xcloner_gdrive_cleanup_days")?>">
+								<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="gdrive_cleanup_days" type="text" name="xcloner_gdrive_cleanup_days" class="validate" value="<?php echo get_option("xcloner_gdrive_cleanup_days")?>">
 					        </div>
 				        </div>
 				        
 				        <div class="row">
 							<div class="col s6 m4">
-								<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="gdrive"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="gdrive"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 									<i class="material-icons right">save</i>
 								</button>
 							</div>	
 							<div class="col s6 m4">
-								<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="gdrive" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="gdrive" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 									<i class="material-icons right">import_export</i>
 								</button>
 							</div>
@@ -755,15 +755,15 @@ 
 									<h6><?php echo __("This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated.")?></h6>
 									<h6><?php echo __("PHP 5.5 minimum version is required.")?></h6>
 									<br />
-									<a class="install-now btn" data-slug="xcloner-google-drive" href="<?php echo $url;?>" aria-label="Install XCloner Google Drive 1.0.0 now" data-name="XCloner Google Drive 1.0.0">
-										<?php echo sprintf(__('Install Now','xcloner-backup-and-restore'))?>
+									<a class="install-now btn" data-slug="xcloner-google-drive" href="<?php echo $url; ?>" aria-label="Install XCloner Google Drive 1.0.0 now" data-name="XCloner Google Drive 1.0.0">
+										<?php echo sprintf(__('Install Now', 'xcloner-backup-and-restore'))?>
 									</a>
 									
 									<a href="<?php echo admin_url("plugin-install.php")?>?tab=plugin-information&amp;plugin=xcloner-google-drive&amp;TB_iframe=true&amp;width=772&amp;height=499" class="btn thickbox open-plugin-details-modal" aria-label="More information about Theme Check 20160523.1" data-title="Theme Check 20160523.1">
 									<!--
 									<a class="btn" href="https://github.com/ovidiul/XCloner-Google-Drive/archive/master.zip">
 									-->
-										<?php echo sprintf(__('More Details','xcloner-backup-and-restore'))?>
+										<?php echo sprintf(__('More Details', 'xcloner-backup-and-restore'))?>
 									</a>
 								</div>
 					        </div>

includes/class-xcloner-logger.php

Spacing +20 added lines, -20 removed lines

@@ -4,44 +4,44 @@ 
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\RotatingFileHandler;
 
-class Xcloner_Logger extends Logger{
+class Xcloner_Logger extends Logger {
 	
-	private $logger_path ;
+	private $logger_path;
 	private $max_logger_files = 7;
 	private $main_logger_url;
 	
 	public function __construct(Xcloner $xcloner_container, $logger_name = "xcloner_logger")
 	{
-		if(!$xcloner_container->get_xcloner_settings())
+		if (!$xcloner_container->get_xcloner_settings())
 		{
 			$xcloner_settings 	= new Xcloner_Settings($xcloner_container);
-		}else{
+		} else {
 			$xcloner_settings 	= $xcloner_container->get_xcloner_settings();
 		}
 		
 		$hash = $xcloner_settings->get_hash();
-		if($hash == "-".$xcloner_settings->get_server_unique_hash(5))
+		if ($hash == "-".$xcloner_settings->get_server_unique_hash(5))
 		{
 			$hash = "";
 		}
 		
-		$logger_path 		= $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
-		$logger_path_tmp 	= "";
+		$logger_path = $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
+		$logger_path_tmp = "";
 		
-		if($hash)
+		if ($hash)
 		{
 			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
 		}
 		
 		$this->logger_path = $logger_path;
 		
-		if(!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
+		if (!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
 		{
 			$logger_path = 'php://stderr';
 			$logger_path_tmp = "";
 		}
 		
-		if(!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if (!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 		{
 			$logger_path = 'php://stderr';
 			$logger_path_tmp = "";
@@ -52,27 +52,27 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
+		if (WP_DEBUG)
 		{
 			$debug_level = Logger::DEBUG;
 		}
 
 	
-		if($logger_path)
+		if ($logger_path)
 		{
-			if(!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+			if (!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 			{
 				$stream = new StreamHandler($logger_path, $debug_level);
-			}else{
+			} else {
 				$stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level);
 			}
 				
 			$this->pushHandler($stream);
 			
-			$this->main_logger_url =  $stream->getUrl();
+			$this->main_logger_url = $stream->getUrl();
 		}
 			
-		if($hash and $logger_path_tmp)
+		if ($hash and $logger_path_tmp)
 		{
 			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
 		}
@@ -89,7 +89,7 @@ 
 	{
 		$lines = array();
 		
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
+		if (!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
 			return false;
 		
 		$fp = fopen($this->main_logger_url, 'r');
@@ -98,12 +98,12 @@ 
 		$lastLine = "";
 		
 		// Loop backword until we have our lines or we reach the start
-		while($pos > 0 && count($lines) < $totalLines) {
+		while ($pos > 0 && count($lines) < $totalLines) {
 		
 		$C = fgetc($fp);
-		if($C == "\n") {
+		if ($C == "\n") {
 		  // skip empty lines
-		  if(trim($lastLine) != "") {
+		  if (trim($lastLine) != "") {
 			$lines[] = $lastLine;
 		  }
 		  $lastLine = '';

Braces +5 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 		if(!$xcloner_container->get_xcloner_settings())
 		{
 			$xcloner_settings 	= new Xcloner_Settings($xcloner_container);
-		}else{
+		} else{
 			$xcloner_settings 	= $xcloner_container->get_xcloner_settings();
 		}
 		
@@ -63,7 +63,7 @@ 
 			if(!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 			{
 				$stream = new StreamHandler($logger_path, $debug_level);
-			}else{
+			} else{
 				$stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level);
 			}
 				
@@ -89,8 +89,9 @@ 
 	{
 		$lines = array();
 		
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
-			return false;
+		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url)) {
+					return false;
+		}
 		
 		$fp = fopen($this->main_logger_url, 'r');
 		fseek($fp, -1, SEEK_END);

includes/class-xcloner-deactivator.php

Spacing +3 added lines, -3 removed lines

@@ -33,11 +33,11 @@
 		
 		global $xcloner_plugin;
 		
-		if(is_a($xcloner_plugin, 'Xcloner'))
+		if (is_a($xcloner_plugin, 'Xcloner'))
 		{
-			try{
+			try {
 				$xcloner_plugin->get_xcloner_filesystem()->cleanup_tmp_directories();
-			}catch(Exception $e)
+			}catch (Exception $e)
 			{
 				$xcloner_plugin->trigger_message_notice($e->getMessage());
 			}

Braces +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 		{
 			try{
 				$xcloner_plugin->get_xcloner_filesystem()->cleanup_tmp_directories();
-			}catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$xcloner_plugin->trigger_message_notice($e->getMessage());
 			}

includes/class-xcloner.php

Indentation +21 added lines, -21 removed lines

@@ -307,7 +307,7 @@ 
 		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 		
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
-        //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
+		//   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
 
 	}
 
@@ -341,8 +341,8 @@ 
 	
 	private function define_plugin_settings(){
 		/**
-		* register wporg_settings_init to the admin_init action hook
-		*/
+		 * register wporg_settings_init to the admin_init action hook
+		 */
 
 		$this->xcloner_settings = new XCloner_Settings($this);
 				
@@ -487,15 +487,15 @@ 
 	}
 	
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 		
 	private function define_ajax_hooks()
@@ -537,24 +537,24 @@ 
 			add_action( 'wp_ajax_restore_backup', 				array($xcloner_api,'restore_backup')  );
 			add_action( 'admin_notices', 						array($this, 'xcloner_error_admin_notices' ));
             
-        }
+		}
         
-        //Do a pre-update backup of targeted files
-        if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
-        {
+		//Do a pre-update backup of targeted files
+		if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
+		{
 			add_action("pre_auto_update", array($this, "pre_auto_update"), 1, 3);
 		}
 	}
 	
 	function add_plugin_action_links($links, $file) {
-        if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+		if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
 		{	
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';
 		}
         
-        return $links;
-    }
+		return $links;
+	}
 	
 	public function xcloner_error_admin_notices() {
 			settings_errors( 'xcloner_error_message' );
@@ -638,9 +638,9 @@ 
 	function xcloner_display()
 	{	
 		// check user capabilities
-	    if (!current_user_can('manage_options')) {
-	        return;
-	    }
+		if (!current_user_can('manage_options')) {
+			return;
+		}
 	
 		$page = sanitize_key($_GET['page']);
 

Spacing +83 added lines, -83 removed lines

@@ -148,15 +148,15 @@ 
 		return $this->xcloner_file_transfer;
 	}
 	
-	public function check_dependencies(){
+	public function check_dependencies() {
 		
 		$backup_storage_path = realpath(__DIR__.DS."..".DS."..".DS."..").DS."backups".DS;
 		
 		define("XCLONER_STORAGE_PATH", realpath($backup_storage_path));
 
-		if(!is_dir($backup_storage_path))
+		if (!is_dir($backup_storage_path))
 		{
-			if(!@mkdir($backup_storage_path))
+			if (!@mkdir($backup_storage_path))
 			{
 				$status = "error";
 				$message = sprintf(__("Unable to create the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -164,7 +164,7 @@ 
 				return;
 			}
 		}	
-		if(!is_writable($backup_storage_path))
+		if (!is_writable($backup_storage_path))
 		{
 			$status = "error";
 			$message = sprintf(__("Unable to write to the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -178,15 +178,15 @@ 
 	public function trigger_message($message, $status = "error", $message_param1 = "", $message_param2 = "", $message_param3 = "")
 	{
 			$message = sprintf(__($message), $message_param1, $message_param2, $message_param3);
-			add_action( 'xcloner_admin_notices', array($this,"trigger_message_notice"), 10, 2);
-			do_action( 'xcloner_admin_notices', $message, $status);
+			add_action('xcloner_admin_notices', array($this, "trigger_message_notice"), 10, 2);
+			do_action('xcloner_admin_notices', $message, $status);
 	}
 	
 	public function trigger_message_notice($message, $status = "success")
 	{
 		?>
 		<div class="notice notice-<?php echo $status?> is-dismissible">
-	        <p><?php _e( $message, 'xcloner-backup-and-restore' ); ?></p>
+	        <p><?php _e($message, 'xcloner-backup-and-restore'); ?></p>
 	    </div>
 		<?php
 	}
@@ -213,79 +213,79 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-i18n.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-xcloner-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-xcloner-admin.php';
 		
 		/**
 		 * The class responsible for debugging XCloner.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-logger.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-logger.php';
 		
 		/**
 		 * The class responsible for defining the admin settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-settings.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-settings.php';
 		
 		/**
 		 * The class responsible for defining the Remote Storage settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-remote-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-remote-storage.php';
 		
 		/**
 		 * The class responsible for implementing the database backup methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-database.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-database.php';
 		
 		/**
 		 * The class responsible for sanitization of users input.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-sanitization.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-sanitization.php';
 		
 		/**
 		 * The class responsible for XCloner system requirements validation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-requirements.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-requirements.php';
 		
 		/**
 		 * The class responsible for XCloner backup archive creation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-archive.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-archive.php';
 		
 		/**
 		 * The class responsible for XCloner API requests.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-api.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-api.php';
 		
 		/**
 		 * The class responsible for the XCloner File System methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-system.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-system.php';
 		
 		/**
 		 * The class responsible for the XCloner File Transfer methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-transfer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-transfer.php';
 		
 		/**
 		 * The class responsible for the XCloner Scheduler methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-scheduler.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-scheduler.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-xcloner-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-xcloner-public.php';
 		
 		$this->loader = new Xcloner_Loader($this);
 
@@ -304,7 +304,7 @@ 
 
 		$plugin_i18n = new Xcloner_i18n();
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 		
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
         //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
@@ -320,11 +320,11 @@ 
 	 */
 	private function define_admin_hooks() {
 	
-		$plugin_admin = new Xcloner_Admin( $this );
+		$plugin_admin = new Xcloner_Admin($this);
 		$this->plugin_admin = $plugin_admin;
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 		
 	}
 	
@@ -333,24 +333,24 @@ 
 	 * 
 	 * @access 	private
 	 */
-	private function define_admin_menu(){
+	private function define_admin_menu() {
 		
 		add_action('admin_menu', array($this->loader, 'xcloner_backup_add_admin_menu'));
 		
 	}
 	
-	private function define_plugin_settings(){
+	private function define_plugin_settings() {
 		/**
 		* register wporg_settings_init to the admin_init action hook
 		*/
 
 		$this->xcloner_settings = new XCloner_Settings($this);
 				
-		if(defined('DOING_CRON') || isset($_POST['hash'])){
+		if (defined('DOING_CRON') || isset($_POST['hash'])) {
 			
-			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
+			if (defined('DOING_CRON') || $_POST['hash'] == "generate_hash") {
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else {
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
@@ -370,7 +370,7 @@ 
 	 */
 	public function pre_auto_update($type, $item, $context)
 	{
-		if(!$type)
+		if (!$type)
 		{
 			return false;
 		}	
@@ -379,10 +379,10 @@ 
 		
 		$content_dir = str_replace(ABSPATH, "", WP_CONTENT_DIR); 
 		$plugins_dir 	= str_replace(ABSPATH, "", WP_PLUGIN_DIR);
-		$langs_dir 		= $content_dir . DS . "languages";
-		$themes_dir 		= $content_dir . DS . "themes";
+		$langs_dir 		= $content_dir.DS."languages";
+		$themes_dir 		= $content_dir.DS."themes";
 						
-		switch ( $type ) {
+		switch ($type) {
 			case 'core':
 				$exclude_files = array(
 									"^(?!(wp-admin|wp-includes|(?!.*\/.*.php)))(.*)$",
@@ -392,7 +392,7 @@ 
 			
 				$dir_array = explode(DS, $plugins_dir);
 				
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -408,7 +408,7 @@ 
 
 				$dir_array = explode(DS, $themes_dir);
 				
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -424,7 +424,7 @@ 
 
 				$dir_array = explode(DS, $langs_dir);
 				
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -450,9 +450,9 @@ 
 		$schedule['backup_params']->email_notification = get_option('admin_email');
 		$schedule['backup_params']->backup_name = "backup_pre_auto_update_".$type."_[domain]-[time]-sql";
 		
-		try{
+		try {
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 	
@@ -467,10 +467,10 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Xcloner_Public( $this );
+		$plugin_public = new Xcloner_Public($this);
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 	}
 	
@@ -479,20 +479,20 @@ 
 		$logger = new XCloner_Logger($this, "php_system");
 		$error = error_get_last();
 		
-		if($error['type'] and $logger)
+		if ($error['type'] and $logger)
 		{
-			$logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 	
 	}
 	
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
+	    static $levels = null;
+	    if ($levels === null) {
+	        $levels = [];
 	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+	            if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 	        }
 	    }
 	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -502,52 +502,52 @@ 
 	{
 		//adding the pre-update hook
 		
-		if(is_admin() || defined('DOING_CRON'))
+		if (is_admin() || defined('DOING_CRON'))
 		{
-			$this->xcloner_logger 			= new XCloner_Logger($this, "xcloner_api");
-			$this->xcloner_filesystem 		= new Xcloner_File_System($this);
+			$this->xcloner_logger = new XCloner_Logger($this, "xcloner_api");
+			$this->xcloner_filesystem = new Xcloner_File_System($this);
 			
 			//$this->xcloner_filesystem->set_diff_timestamp_start (strtotime("-15 days"));
 			
-			$this->archive_system 			= new Xcloner_Archive($this);
-			$this->xcloner_database 		= new Xcloner_Database($this);
-			$this->xcloner_scheduler 		= new Xcloner_Scheduler($this);
-			$this->xcloner_remote_storage 	= new Xcloner_Remote_Storage($this);
-			$this->xcloner_file_transfer 	= new Xcloner_File_Transfer($this);
+			$this->archive_system = new Xcloner_Archive($this);
+			$this->xcloner_database = new Xcloner_Database($this);
+			$this->xcloner_scheduler = new Xcloner_Scheduler($this);
+			$this->xcloner_remote_storage = new Xcloner_Remote_Storage($this);
+			$this->xcloner_file_transfer = new Xcloner_File_Transfer($this);
 			
-			$xcloner_api 					= new Xcloner_Api($this);
+			$xcloner_api = new Xcloner_Api($this);
 
-			add_action( 'wp_ajax_get_database_tables_action', 	array($xcloner_api,'get_database_tables_action')  );
-			add_action( 'wp_ajax_get_file_system_action', 		array($xcloner_api,'get_file_system_action')  );
-			add_action( 'wp_ajax_scan_filesystem', 				array($xcloner_api,'scan_filesystem')  );
-			add_action( 'wp_ajax_backup_database', 				array($xcloner_api,'backup_database')  );
-			add_action( 'wp_ajax_backup_files'	, 				array($xcloner_api,'backup_files')  );
-			add_action( 'wp_ajax_save_schedule'	, 				array($xcloner_api,'save_schedule')  );
-			add_action( 'wp_ajax_get_schedule_by_id',	 		array($xcloner_api,'get_schedule_by_id')  );
-			add_action( 'wp_ajax_get_scheduler_list',	 		array($xcloner_api,'get_scheduler_list')  );
-			add_action( 'wp_ajax_delete_schedule_by_id'	, 		array($xcloner_api,'delete_schedule_by_id')  );
-			add_action( 'wp_ajax_delete_backup_by_name'	, 		array($xcloner_api,'delete_backup_by_name')  );
-			add_action( 'wp_ajax_download_backup_by_name', 		array($xcloner_api,'download_backup_by_name')  );
-			add_action( 'wp_ajax_remote_storage_save_status', 	array($xcloner_api,'remote_storage_save_status')  );
-			add_action( 'wp_ajax_upload_backup_to_remote', 		array($xcloner_api,'upload_backup_to_remote')  );
-			add_action( 'wp_ajax_list_backup_files'	,			array($xcloner_api,'list_backup_files')  );
-			add_action( 'wp_ajax_restore_upload_backup'	, 		array($xcloner_api,'restore_upload_backup')  );
-			add_action( 'wp_ajax_download_restore_script', 		array($xcloner_api,'download_restore_script')  );
-			add_action( 'wp_ajax_copy_backup_remote_to_local', 	array($xcloner_api,'copy_backup_remote_to_local')  );
-			add_action( 'wp_ajax_restore_backup', 				array($xcloner_api,'restore_backup')  );
-			add_action( 'admin_notices', 						array($this, 'xcloner_error_admin_notices' ));
+			add_action('wp_ajax_get_database_tables_action', array($xcloner_api, 'get_database_tables_action'));
+			add_action('wp_ajax_get_file_system_action', array($xcloner_api, 'get_file_system_action'));
+			add_action('wp_ajax_scan_filesystem', array($xcloner_api, 'scan_filesystem'));
+			add_action('wp_ajax_backup_database', array($xcloner_api, 'backup_database'));
+			add_action('wp_ajax_backup_files', array($xcloner_api, 'backup_files'));
+			add_action('wp_ajax_save_schedule', array($xcloner_api, 'save_schedule'));
+			add_action('wp_ajax_get_schedule_by_id', array($xcloner_api, 'get_schedule_by_id'));
+			add_action('wp_ajax_get_scheduler_list', array($xcloner_api, 'get_scheduler_list'));
+			add_action('wp_ajax_delete_schedule_by_id', array($xcloner_api, 'delete_schedule_by_id'));
+			add_action('wp_ajax_delete_backup_by_name', array($xcloner_api, 'delete_backup_by_name'));
+			add_action('wp_ajax_download_backup_by_name', array($xcloner_api, 'download_backup_by_name'));
+			add_action('wp_ajax_remote_storage_save_status', array($xcloner_api, 'remote_storage_save_status'));
+			add_action('wp_ajax_upload_backup_to_remote', array($xcloner_api, 'upload_backup_to_remote'));
+			add_action('wp_ajax_list_backup_files', array($xcloner_api, 'list_backup_files'));
+			add_action('wp_ajax_restore_upload_backup', array($xcloner_api, 'restore_upload_backup'));
+			add_action('wp_ajax_download_restore_script', array($xcloner_api, 'download_restore_script'));
+			add_action('wp_ajax_copy_backup_remote_to_local', array($xcloner_api, 'copy_backup_remote_to_local'));
+			add_action('wp_ajax_restore_backup', array($xcloner_api, 'restore_backup'));
+			add_action('admin_notices', array($this, 'xcloner_error_admin_notices'));
             
         }
         
         //Do a pre-update backup of targeted files
-        if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
+        if ($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
         {
 			add_action("pre_auto_update", array($this, "pre_auto_update"), 1, 3);
 		}
 	}
 	
 	function add_plugin_action_links($links, $file) {
-        if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+        if ($file == plugin_basename(dirname(dirname(__FILE__)).'/xcloner.php'))
 		{	
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';
@@ -557,13 +557,13 @@ 
     }
 	
 	public function xcloner_error_admin_notices() {
-			settings_errors( 'xcloner_error_message' );
+			settings_errors('xcloner_error_message');
 		}
 	
 	public function define_cron_hooks()
 	{
 		//registering new schedule intervals
-		add_filter( 'cron_schedules', array($this, 'add_new_intervals'));
+		add_filter('cron_schedules', array($this, 'add_new_intervals'));
 			
 		
 		$xcloner_scheduler = $this->get_xcloner_scheduler();
@@ -644,7 +644,7 @@ 
 	
 		$page = sanitize_key($_GET['page']);
 
-		if($page)
+		if ($page)
 		{
 			$this->display($page);
 		}

Braces +2 added lines, -2 removed lines

@@ -350,7 +350,7 @@ 
 			
 			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else{
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
@@ -452,7 +452,7 @@ 
 		
 		try{
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 	

admin/partials/xcloner_generate_backups_page.php

Spacing +53 added lines, -53 removed lines

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