ovidiul / XCloner-Wordpress

includes/class-xcloner-activator.php

Spacing +22 added lines, -22 removed lines

@@ -35,22 +35,22 @@ 
 	
 		global $wpdb;
 		
-		if(version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<'))
+		if (version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<'))
 		{
-			wp_die('<p>'.sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"),Xcloner_Activator::xcloner_minimum_version, phpversion()).'</p>',  __("XCloner Activation Error"), array( 'response'=>500, 'back_link'=>TRUE ) );
+			wp_die('<p>'.sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"), Xcloner_Activator::xcloner_minimum_version, phpversion()).'</p>', __("XCloner Activation Error"), array('response'=>500, 'back_link'=>TRUE));
 		}
 		
 		$charset_collate = $wpdb->get_charset_collate();	
 		
-		$installed_ver = get_option( "xcloner_db_version" );
+		$installed_ver = get_option("xcloner_db_version");
 		
 		$xcloner_db_version = Xcloner_Activator::xcloner_db_version;
 		
-		$xcloner_scheduler_table = $wpdb->prefix . "xcloner_scheduler";
+		$xcloner_scheduler_table = $wpdb->prefix."xcloner_scheduler";
 		
-		if($installed_ver != $xcloner_db_version)		
+		if ($installed_ver != $xcloner_db_version)		
 		{
-			$xcloner_schedule_sql="CREATE TABLE `".$xcloner_scheduler_table."` (
+			$xcloner_schedule_sql = "CREATE TABLE `".$xcloner_scheduler_table."` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
 				  `name` varchar(255) NOT NULL,
 				  `recurrence` varchar(25) NOT NULL,
@@ -64,53 +64,53 @@ 
 				) ".$charset_collate.";
 				";
 			
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-			dbDelta( $xcloner_schedule_sql );
+			require_once(ABSPATH.'wp-admin/includes/upgrade.php');
+			dbDelta($xcloner_schedule_sql);
 			
-			update_option( "xcloner_db_version", $xcloner_db_version );
+			update_option("xcloner_db_version", $xcloner_db_version);
 		}
 		
-		if(get_option('xcloner_backup_compression_level') === false)
+		if (get_option('xcloner_backup_compression_level') === false)
 			update_option('xcloner_backup_compression_level', 0);
 		
-		if(get_option('xcloner_enable_log') === false)
+		if (get_option('xcloner_enable_log') === false)
 			update_option('xcloner_enable_log', 1);
 			
-		if(get_option('xcloner_enable_mysql_backup') === false)
+		if (get_option('xcloner_enable_mysql_backup') === false)
 			update_option('xcloner_enable_mysql_backup', 1);
 		
-		if(get_option('xcloner_system_settings_page') === false)
+		if (get_option('xcloner_system_settings_page') === false)
 			update_option('xcloner_system_settings_page', 100);
 			
-		if(get_option('xcloner_files_to_process_per_request') === false)
+		if (get_option('xcloner_files_to_process_per_request') === false)
 			update_option('xcloner_files_to_process_per_request', 250);
 
-		if(get_option('xcloner_database_records_per_request') === false)
+		if (get_option('xcloner_database_records_per_request') === false)
 			update_option('xcloner_database_records_per_request', 10000);
 
-		if(get_option('xcloner_exclude_files_larger_than_mb') === false)
+		if (get_option('xcloner_exclude_files_larger_than_mb') === false)
 			update_option('xcloner_exclude_files_larger_than_mb', 0);
 		
-		if(get_option('xcloner_split_backup_limit') === false)
+		if (get_option('xcloner_split_backup_limit') === false)
 			update_option('xcloner_split_backup_limit', 2048);
 			
-		if(get_option('xcloner_size_limit_per_request') === false)
+		if (get_option('xcloner_size_limit_per_request') === false)
 			update_option('xcloner_size_limit_per_request', 50);
 			
-		if(get_option('xcloner_cleanup_retention_limit_days') === false)
+		if (get_option('xcloner_cleanup_retention_limit_days') === false)
 			update_option('xcloner_cleanup_retention_limit_days', 60);
 			
-		if(get_option('xcloner_cleanup_retention_limit_archives') === false)
+		if (get_option('xcloner_cleanup_retention_limit_archives') === false)
 			update_option('xcloner_cleanup_retention_limit_archives', 100);
 			
-		if(get_option('xcloner_directories_to_scan_per_request') === false)
+		if (get_option('xcloner_directories_to_scan_per_request') === false)
 			update_option('xcloner_directories_to_scan_per_request', 25);
 			
 		/*if(!get_option('xcloner_diff_backup_recreate_period'))
 			update_option('xcloner_diff_backup_recreate_period', 10);
 			* */
 			
-		if(!get_option('xcloner_regex_exclude'))
+		if (!get_option('xcloner_regex_exclude'))
 			update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
 
 	}

Braces +39 added lines, -26 removed lines

@@ -70,48 +70,61 @@
 			update_option( "xcloner_db_version", $xcloner_db_version );
 		}
 		
-		if(get_option('xcloner_backup_compression_level') === false)
-			update_option('xcloner_backup_compression_level', 0);
+		if(get_option('xcloner_backup_compression_level') === false) {
+					update_option('xcloner_backup_compression_level', 0);
+		}
 		
-		if(get_option('xcloner_enable_log') === false)
-			update_option('xcloner_enable_log', 1);
+		if(get_option('xcloner_enable_log') === false) {
+					update_option('xcloner_enable_log', 1);
+		}
 			
-		if(get_option('xcloner_enable_mysql_backup') === false)
-			update_option('xcloner_enable_mysql_backup', 1);
+		if(get_option('xcloner_enable_mysql_backup') === false) {
+					update_option('xcloner_enable_mysql_backup', 1);
+		}
 		
-		if(get_option('xcloner_system_settings_page') === false)
-			update_option('xcloner_system_settings_page', 100);
+		if(get_option('xcloner_system_settings_page') === false) {
+					update_option('xcloner_system_settings_page', 100);
+		}
 			
-		if(get_option('xcloner_files_to_process_per_request') === false)
-			update_option('xcloner_files_to_process_per_request', 250);
+		if(get_option('xcloner_files_to_process_per_request') === false) {
+					update_option('xcloner_files_to_process_per_request', 250);
+		}
 
-		if(get_option('xcloner_database_records_per_request') === false)
-			update_option('xcloner_database_records_per_request', 10000);
+		if(get_option('xcloner_database_records_per_request') === false) {
+					update_option('xcloner_database_records_per_request', 10000);
+		}
 
-		if(get_option('xcloner_exclude_files_larger_than_mb') === false)
-			update_option('xcloner_exclude_files_larger_than_mb', 0);
+		if(get_option('xcloner_exclude_files_larger_than_mb') === false) {
+					update_option('xcloner_exclude_files_larger_than_mb', 0);
+		}
 		
-		if(get_option('xcloner_split_backup_limit') === false)
-			update_option('xcloner_split_backup_limit', 2048);
+		if(get_option('xcloner_split_backup_limit') === false) {
+					update_option('xcloner_split_backup_limit', 2048);
+		}
 			
-		if(get_option('xcloner_size_limit_per_request') === false)
-			update_option('xcloner_size_limit_per_request', 50);
+		if(get_option('xcloner_size_limit_per_request') === false) {
+					update_option('xcloner_size_limit_per_request', 50);
+		}
 			
-		if(get_option('xcloner_cleanup_retention_limit_days') === false)
-			update_option('xcloner_cleanup_retention_limit_days', 60);
+		if(get_option('xcloner_cleanup_retention_limit_days') === false) {
+					update_option('xcloner_cleanup_retention_limit_days', 60);
+		}
 			
-		if(get_option('xcloner_cleanup_retention_limit_archives') === false)
-			update_option('xcloner_cleanup_retention_limit_archives', 100);
+		if(get_option('xcloner_cleanup_retention_limit_archives') === false) {
+					update_option('xcloner_cleanup_retention_limit_archives', 100);
+		}
 			
-		if(get_option('xcloner_directories_to_scan_per_request') === false)
-			update_option('xcloner_directories_to_scan_per_request', 25);
+		if(get_option('xcloner_directories_to_scan_per_request') === false) {
+					update_option('xcloner_directories_to_scan_per_request', 25);
+		}
 			
 		/*if(!get_option('xcloner_diff_backup_recreate_period'))
 			update_option('xcloner_diff_backup_recreate_period', 10);
 			* */
 			
-		if(!get_option('xcloner_regex_exclude'))
-			update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
+		if(!get_option('xcloner_regex_exclude')) {
+					update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
+		}
 
 	}
 	

includes/class-xcloner-scheduler.php

Spacing +67 added lines, -67 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' 
@@ -224,25 +224,25 @@ 
 		$xcloner->init();
 		$this->set_xcloner_container($xcloner);
 		
-		$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($schedule['backup_params']->diff_start_date)
+		if ($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;
@@ -257,7 +257,7 @@ 
 		$init = 1;
 		$continue = 1;
 
-		while($continue)
+		while ($continue)
 		{
 			$continue = $this->xcloner_file_system->start_file_recursion($init);
 			
@@ -271,9 +271,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;
 		}
 		
@@ -285,7 +285,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;
@@ -294,31 +294,31 @@ 
 		
 		//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($schedule['remote_storage'] and array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages()))
+		if ($schedule['remote_storage'] and 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 = "XCloner Scheduler";
 				$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);
-			}catch(Exception $e)
+			}catch (Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -333,22 +333,22 @@ 
 	{
 		$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 = "XCloner Scheduler";
-				$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());
 			}
 			
 		}
@@ -361,10 +361,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) );
 			}
 				
@@ -294,8 +296,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']);
 		
@@ -305,8 +308,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']));
+			}
 		}
 		
 		
@@ -318,7 +322,7 @@ 
 				$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);
-			}catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -337,7 +341,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)

includes/class-xcloner-deactivator.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		
 		global $xcloner_plugin;
 		
-		if(is_a($xcloner_plugin, 'Xcloner'))
+		if (is_a($xcloner_plugin, 'Xcloner'))
 		{
 			$xcloner_plugin->get_xcloner_filesystem()->cleanup_tmp_directories();
 			

xcloner.php

Spacing +20 added lines, -20 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@ 
 }
 
 //i will not load the plugin outside admin or cron
-if(!is_admin() and !defined('DOING_CRON'))
+if(!is_admin() and !defined('DOING_CRON')) {
 	return;
+}
 
 if(!defined("DS"))
 {
@@ -126,7 +127,7 @@ 
 	
 	$xcloner_plugin = run_xcloner();
 	
-}catch(Exception $e){
+} catch(Exception $e){
 	
 	echo $e->getMessage();
 	

admin/partials/xcloner_init_page.php

Spacing +48 added lines, -48 removed lines

@@ -12,20 +12,20 @@ 
  * @subpackage Xcloner/admin/partials
  */
 
-$requirements	 		= $this->get_xcloner_container()->get_xcloner_requirements();
-$xcloner_settings 		= $this->get_xcloner_container()->get_xcloner_settings();
-$xcloner_file_system 	= $this->get_xcloner_container()->get_xcloner_filesystem();
-$logger					= $this->get_xcloner_container()->get_xcloner_logger();
-$xcloner_scheduler 		= $this->get_xcloner_container()->get_xcloner_scheduler();
+$requirements = $this->get_xcloner_container()->get_xcloner_requirements();
+$xcloner_settings = $this->get_xcloner_container()->get_xcloner_settings();
+$xcloner_file_system = $this->get_xcloner_container()->get_xcloner_filesystem();
+$logger = $this->get_xcloner_container()->get_xcloner_logger();
+$xcloner_scheduler = $this->get_xcloner_container()->get_xcloner_scheduler();
 
 $logger_content = $logger->getLastDebugLines();
 
-$date_format = get_option( 'date_format' );
-$time_format = get_option( 'time_format' );
+$date_format = get_option('date_format');
+$time_format = get_option('time_format');
 
-if($requirements->check_backup_ready_status())
+if ($requirements->check_backup_ready_status())
 {
-	$latest_backup =  $xcloner_file_system->get_latest_backup();
+	$latest_backup = $xcloner_file_system->get_latest_backup();
 	$xcloner_file_system->backup_storage_cleanup();
 }
 ?>
@@ -38,7 +38,7 @@ 
 	</div>
 </div>
 
-<?php if(isset($latest_backup['timestamp']) and $latest_backup['timestamp'] < strtotime("-1 day")): ?>
+<?php if (isset($latest_backup['timestamp']) and $latest_backup['timestamp'] < strtotime("-1 day")): ?>
 	<div id="setting-error-" class="error settings-error notice is-dismissible"> 
 		<p><strong>
 			<?php echo __('Your latest backup is older than 24 hours, please create a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
@@ -47,7 +47,7 @@ 
 	</div>
 <?php endif?>
 
-<?php if(!isset($latest_backup['timestamp']) ): ?>
+<?php if (!isset($latest_backup['timestamp'])): ?>
 	<div id="setting-error-" class="error settings-error notice is-dismissible"> 
 		<p><strong>
 			<?php echo __('You have no backup that I could find, please generate a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
@@ -56,7 +56,7 @@ 
 	</div>
 <?php endif?>
 
-<?php if(!$requirements->check_backup_ready_status()):?>
+<?php if (!$requirements->check_backup_ready_status()):?>
 	<div id="setting-error-" class="error settings-error notice is-dismissible"> 
 		<p><strong>
 			<?php echo __('Backup system not ready, please check and fix the issues marked in red', 'xcloner-backup-and-restore') ?>
@@ -83,7 +83,7 @@ 
 							<div class="row">
 								<h5><?php echo __("Latest Backup", 'xcloner-backup-and-restore')?></h5>
 								<blockquote>
-								<?php if($latest_backup):?>
+								<?php if ($latest_backup):?>
 									<div class="item">
 										<div class="title"><?php echo __("Backup Name", 'xcloner-backup-and-restore')?>:</div>
 										<?php echo $latest_backup['basename']?>
@@ -97,7 +97,7 @@ 
 									<div class="item">
 										<div class="title"><?php echo __("Backup Date", 'xcloner-backup-and-restore')?>:</div>
 										<?php 
-										echo date($date_format." ".$time_format, $latest_backup['timestamp']+(get_option( 'gmt_offset' ) * HOUR_IN_SECONDS))
+										echo date($date_format." ".$time_format, $latest_backup['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 										?>
 									</div> 
 								<?php else:?>
@@ -111,7 +111,7 @@ 
 								<blockquote>
 								<div class="item">
 									<div class="title"><?php echo __("Total Size", 'xcloner-backup-and-restore')?>:</div>
-									<?php echo size_format($xcloner_file_system->get_storage_usage());?>
+									<?php echo size_format($xcloner_file_system->get_storage_usage()); ?>
 								</div>
 								</blockquote>
 							<h5><?php echo __("Next Scheduled Backup", 'xcloner-backup-and-restore')?></h5>
@@ -120,25 +120,25 @@ 
 									<?php
 									$list = ($xcloner_scheduler->get_next_run_schedule());
 										
-										if(is_array($list))
+										if (is_array($list))
 										{
-											$xcloner_file_system->sort_by($list, "next_run_time","asc");
+											$xcloner_file_system->sort_by($list, "next_run_time", "asc");
 										}
 										
-										if(isset($list[0]))
+										if (isset($list[0]))
 											$latest_schedule = $list[0];
 									?>
-									<?php if(isset($latest_schedule->name)):?>
+									<?php if (isset($latest_schedule->name)):?>
 									<div class="title"><?php echo __("Schedule Name", 'xcloner-backup-and-restore')?>:</div>
-										<?php	echo $latest_schedule->name;?>
-									<?php endif;?>	
+										<?php	echo $latest_schedule->name; ?>
+									<?php endif; ?>	
 								</div>
 								<div class="item">
 									<div class="title"><?php echo __("Next Call", 'xcloner-backup-and-restore')?>:</div>
-									<?php if(isset($latest_schedule->next_run_time))	
+									<?php if (isset($latest_schedule->next_run_time))	
 											echo date($date_format." ".$time_format, $latest_schedule->next_run_time);
 										  else
-											echo __("Unscheduled",'xcloner-backup-and-restore');
+											echo __("Unscheduled", 'xcloner-backup-and-restore');
 									?>
 								</div>
 								</blockquote>
@@ -146,7 +146,7 @@ 
 					</div>
 				</li>
 				
-				<?php if($xcloner_settings->get_xcloner_option('xcloner_enable_log')) :?>
+				<?php if ($xcloner_settings->get_xcloner_option('xcloner_enable_log')) :?>
 				<li class="active">
 					<div class="collapsible-header active">
 						<i class="material-icons">bug_report</i><?php echo __('XCloner Debugger', 'xcloner-backup-and-restore')?>
@@ -157,7 +157,7 @@ 
 						</div>
 					</div>
 					<div class="collapsible-body">
-						<div class="console" id="xcloner-console"><?php if($logger_content) echo implode("<br />\n", array_reverse($logger_content)); ?></div>
+						<div class="console" id="xcloner-console"><?php if ($logger_content) echo implode("<br />\n", array_reverse($logger_content)); ?></div>
 					</div>
 				</li>
 				<script>
@@ -169,7 +169,7 @@ 
 					}, 2000);*/
 				})
 				</script>
-				<?php endif;?>
+				<?php endif; ?>
 			
 			</ul>
 			
@@ -181,59 +181,59 @@ 
 	  
 	  <div class="card blue-grey darken-1 z-depth-4 backup-ready">
 		<div class="card-content white-text">
-		  <span class="card-title"><?php echo __("System Check",'xcloner-backup-and-restore')?></span>
+		  <span class="card-title"><?php echo __("System Check", 'xcloner-backup-and-restore')?></span>
 		  <ul>
-				<li class="card-panel <?php echo ($requirements->check_xcloner_start_path(1)?"teal":"red")?> lighten-2" >
-					<?php echo __('Backup Start Location','xcloner-backup-and-restore')?>: <span class="shorten_string "><?php echo $requirements->check_xcloner_start_path();?></span>
+				<li class="card-panel <?php echo ($requirements->check_xcloner_start_path(1) ? "teal" : "red")?> lighten-2" >
+					<?php echo __('Backup Start Location', 'xcloner-backup-and-restore')?>: <span class="shorten_string "><?php echo $requirements->check_xcloner_start_path(); ?></span>
 				</li>
-				<li class="card-panel <?php echo ($requirements->check_xcloner_store_path(1)?"teal":"red")?> lighten-2" >
-					<?php echo __('Backup Storage Location','xcloner-backup-and-restore')?>: <span class="shorten_string"><?php echo $requirements->check_xcloner_store_path();?></span>
+				<li class="card-panel <?php echo ($requirements->check_xcloner_store_path(1) ? "teal" : "red")?> lighten-2" >
+					<?php echo __('Backup Storage Location', 'xcloner-backup-and-restore')?>: <span class="shorten_string"><?php echo $requirements->check_xcloner_store_path(); ?></span>
 				</li>
-				<li class="card-panel <?php echo ($requirements->check_xcloner_tmp_path(1)?"teal":"red")?> lighten-2" >
-					<?php echo __('Temporary Location','xcloner-backup-and-restore')?>: <span class="shorten_string"><?php echo $requirements->check_xcloner_tmp_path();?></span>
+				<li class="card-panel <?php echo ($requirements->check_xcloner_tmp_path(1) ? "teal" : "red")?> lighten-2" >
+					<?php echo __('Temporary Location', 'xcloner-backup-and-restore')?>: <span class="shorten_string"><?php echo $requirements->check_xcloner_tmp_path(); ?></span>
 				</li>
 				
-				<li class="card-panel <?php echo ($requirements->check_min_php_version(1)?"teal":"red")?> lighten-2" >
-					<?php echo __('PHP Version Check','xcloner-backup-and-restore')?>: <?php echo $requirements->check_min_php_version();?>
+				<li class="card-panel <?php echo ($requirements->check_min_php_version(1) ? "teal" : "red")?> lighten-2" >
+					<?php echo __('PHP Version Check', 'xcloner-backup-and-restore')?>: <?php echo $requirements->check_min_php_version(); ?>
 					( >= <?php echo $requirements->get_constant('min_php_version')?>)
 				</li>
-				<li class="card-panel <?php echo ($requirements->check_safe_mode(1)?"teal":"orange")?> lighten-2" >
-					<?php echo __('PHP Safe Mode','xcloner-backup-and-restore')?>: <?php echo $requirements->check_safe_mode();?>
+				<li class="card-panel <?php echo ($requirements->check_safe_mode(1) ? "teal" : "orange")?> lighten-2" >
+					<?php echo __('PHP Safe Mode', 'xcloner-backup-and-restore')?>: <?php echo $requirements->check_safe_mode(); ?>
 					( <?php echo $requirements->get_constant('safe_mode')?>)
 				</li>
-				<li class="card-panel <?php echo ($requirements->check_backup_ready_status()?"teal":"red")?> lighten-2">
-					<?php echo ($requirements->check_backup_ready_status()?__('BACKUP READY','xcloner-backup-and-restore'):__('Backup not ready, please check above requirements','xcloner-backup-and-restore'))?>
-					<i class="material-icons right tiny"><?php echo ($requirements->check_backup_ready_status()?'thumb_up':'thumb_down')?></i>
+				<li class="card-panel <?php echo ($requirements->check_backup_ready_status() ? "teal" : "red")?> lighten-2">
+					<?php echo ($requirements->check_backup_ready_status() ? __('BACKUP READY', 'xcloner-backup-and-restore') : __('Backup not ready, please check above requirements', 'xcloner-backup-and-restore'))?>
+					<i class="material-icons right tiny"><?php echo ($requirements->check_backup_ready_status() ? 'thumb_up' : 'thumb_down')?></i>
 				</li>
 		  </ul>
 		  <ul class="additional_system_info">
 				<li class="card-panel grey darken-1" >
-					<?php echo __('PHP max_execution_time','xcloner-backup-and-restore')?>: <?php echo $requirements->get_max_execution_time();?>
+					<?php echo __('PHP max_execution_time', 'xcloner-backup-and-restore')?>: <?php echo $requirements->get_max_execution_time(); ?>
 				</li>
 				<li class="card-panel grey darken-1" >
-					<?php echo __('PHP memory_limit','xcloner-backup-and-restore')?>: <?php echo $requirements->get_memory_limit();?>
+					<?php echo __('PHP memory_limit', 'xcloner-backup-and-restore')?>: <?php echo $requirements->get_memory_limit(); ?>
 				</li>
 				<li class="card-panel grey darken-1" >
-					<?php echo __('PHP open_basedir','xcloner-backup-and-restore')?>: <?php echo $requirements->get_open_basedir();?>
+					<?php echo __('PHP open_basedir', 'xcloner-backup-and-restore')?>: <?php echo $requirements->get_open_basedir(); ?>
 				</li>
 				<?php 
 				$data = array();
-				if($requirements->check_backup_ready_status())
+				if ($requirements->check_backup_ready_status())
 					$data = $xcloner_file_system->estimate_read_write_time();
 				?>
 				<li class="card-panel grey darken-1" >
-					<?php echo __('Reading Time 1MB Block','xcloner-backup-and-restore')?>: <?php echo (isset($data['reading_time'])?$data['reading_time']:__("unknown"));?>
+					<?php echo __('Reading Time 1MB Block', 'xcloner-backup-and-restore')?>: <?php echo (isset($data['reading_time']) ? $data['reading_time'] : __("unknown")); ?>
 				</li>
 				<li class="card-panel grey darken-1" >
-					<?php echo __('Writing Time 1MB Block','xcloner-backup-and-restore')?>: <?php echo (isset($data['writing_time'])?$data['writing_time']:__("unknown"));?>
+					<?php echo __('Writing Time 1MB Block', 'xcloner-backup-and-restore')?>: <?php echo (isset($data['writing_time']) ? $data['writing_time'] : __("unknown")); ?>
 				</li>
 				<li class="card-panel grey darken-1" >
-					<?php echo __('Free Disk Space','xcloner-backup-and-restore')?>: <?php echo $requirements->get_free_disk_space();;?>
+					<?php echo __('Free Disk Space', 'xcloner-backup-and-restore')?>: <?php echo $requirements->get_free_disk_space(); ;?>
 				</li>
 		  </ul>
 		</div>
 		<div class="card-action">
-		  <a class="waves-effect waves-light btn system_info_toggle blue darken-1"><i class="material-icons left">list</i><?php echo __('Toggle Additional System Info','xcloner-backup-and-restore')?></a>
+		  <a class="waves-effect waves-light btn system_info_toggle blue darken-1"><i class="material-icons left">list</i><?php echo __('Toggle Additional System Info', 'xcloner-backup-and-restore')?></a>
 		</div>
 	  </div>
 

Braces +19 added lines, -10 removed lines

@@ -100,7 +100,8 @@ 
 										echo date($date_format." ".$time_format, $latest_backup['timestamp']+(get_option( 'gmt_offset' ) * HOUR_IN_SECONDS))
 										?>
 									</div> 
-								<?php else:?>
+								<?php else {
+	:?>
 									<div class="item">
 										<div class="title"><?php echo __("No Backup Yet", 'xcloner-backup-and-restore')?></div>
 									</div> 
@@ -111,7 +112,9 @@ 
 								<blockquote>
 								<div class="item">
 									<div class="title"><?php echo __("Total Size", 'xcloner-backup-and-restore')?>:</div>
-									<?php echo size_format($xcloner_file_system->get_storage_usage());?>
+									<?php echo size_format($xcloner_file_system->get_storage_usage());
+}
+?>
 								</div>
 								</blockquote>
 							<h5><?php echo __("Next Scheduled Backup", 'xcloner-backup-and-restore')?></h5>
@@ -125,8 +128,9 @@ 
 											$xcloner_file_system->sort_by($list, "next_run_time","asc");
 										}
 										
-										if(isset($list[0]))
-											$latest_schedule = $list[0];
+										if(isset($list[0])) {
+																					$latest_schedule = $list[0];
+										}
 									?>
 									<?php if(isset($latest_schedule->name)):?>
 									<div class="title"><?php echo __("Schedule Name", 'xcloner-backup-and-restore')?>:</div>
@@ -135,10 +139,11 @@ 
 								</div>
 								<div class="item">
 									<div class="title"><?php echo __("Next Call", 'xcloner-backup-and-restore')?>:</div>
-									<?php if(isset($latest_schedule->next_run_time))	
+									<?php if(isset($latest_schedule->next_run_time)) {
 											echo date($date_format." ".$time_format, $latest_schedule->next_run_time);
-										  else
-											echo __("Unscheduled",'xcloner-backup-and-restore');
+} else {
+										  											echo __("Unscheduled",'xcloner-backup-and-restore');
+										  }
 									?>
 								</div>
 								</blockquote>
@@ -157,7 +162,10 @@ 
 						</div>
 					</div>
 					<div class="collapsible-body">
-						<div class="console" id="xcloner-console"><?php if($logger_content) echo implode("<br />\n", array_reverse($logger_content)); ?></div>
+						<div class="console" id="xcloner-console"><?php if($logger_content) {
+	echo implode("<br />\n", array_reverse($logger_content));
+}
+?></div>
 					</div>
 				</li>
 				<script>
@@ -218,8 +226,9 @@ 
 				</li>
 				<?php 
 				$data = array();
-				if($requirements->check_backup_ready_status())
-					$data = $xcloner_file_system->estimate_read_write_time();
+				if($requirements->check_backup_ready_status()) {
+									$data = $xcloner_file_system->estimate_read_write_time();
+				}
 				?>
 				<li class="card-panel grey darken-1" >
 					<?php echo __('Reading Time 1MB Block','xcloner-backup-and-restore')?>: <?php echo (isset($data['reading_time'])?$data['reading_time']:__("unknown"));?>

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>
 									</div>
@@ -230,7 +230,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>
 			
@@ -244,11 +244,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>
 			
@@ -256,17 +256,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>	
@@ -278,7 +278,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>
@@ -290,12 +290,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>
@@ -305,7 +305,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>
@@ -324,14 +324,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">
@@ -346,9 +346,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>
@@ -356,7 +356,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>
@@ -367,7 +367,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>
@@ -450,7 +450,7 @@ 
 		}
 	});
 	
-	<?php if($xcloner_settings->get_enable_mysql_backup()):?>
+	<?php if ($xcloner_settings->get_enable_mysql_backup()):?>
 	jQuery('#jstree_database_container').jstree({
 			'core' : {
 				'check_callback' : true,

admin/partials/xcloner_restore_page.php

Spacing +64 added lines, -64 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 local target system restore, leave Url field below empty and click 'Check Connection'",'xcloner-backup-and-restore')?> 
+							<li><?php echo __("If you want to do a local target system restore, leave Url field below empty and click 'Check Connection'", 'xcloner-backup-and-restore')?> 
 							</li>	
-							<li><?php echo __("If you want to do a remote target system restore, 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 remote target system restore, please download the restore script from", 'xcloner-backup-and-restore')?> <a href='#' onclick="window.location=ajaxurl+'?action=download_restore_script&phar=true'"><strong><?php echo __("here", 'xcloner-backup-and-restore')?></strong></a>
 							</li>	
 							<li>
-							<?php echo __("Extract the files on your new host",'xcloner-backup-and-restore')?>
+							<?php echo __("Extract the files on your new host", 'xcloner-backup-and-restore')?>
 							</li>
 							<li>
-							<?php echo __("Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php",'xcloner-backup-and-restore')?>
+							<?php echo __("Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php", 'xcloner-backup-and-restore')?>
 							</li>
 							<li>
-							<?php echo __("If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.",'xcloner-backup-and-restore')?>
+							<?php echo __("If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.", 'xcloner-backup-and-restore')?>
 							</li>
-							<?php if(is_ssl()):?>
+							<?php if (is_ssl()):?>
 							<li>
 								<?php echo __("We have detected your connection to the site as being secure, so your restore script address must start with https://.")?>
 							</li>
@@ -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 right">send</i>
 							</button>
-							<button class="btn waves-effect waves-light red upload-backup cancel" type="submit" id="" name="action"><?php echo __("Cancel",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light red upload-backup cancel" type="submit" id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore')?>
 							    <i class="material-icons right">close</i>
 							</button>
 						</div>
-						<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next",'xcloner-backup-and-restore')?>" id="skip_upload_backup" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+						<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_upload_backup" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 						    <i class="material-icons right">navigate_next</i>
 						</button>
 					</div>
@@ -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,28 +133,28 @@ 
 									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="" />
-									<label for="filter_files_all"><?php echo __("Restore All Files","xcloner-backup-and-restore")?></label>
+									<label for="filter_files_all"><?php echo __("Restore All Files", "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"><?php echo __("Only Plugins","xcloner-backup-and-restore")?></label>
+									<label for="filter_files_plugins"><?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"><?php echo __("Only Uploads","xcloner-backup-and-restore")?></label>
+									<label for="filter_files_uploads"><?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"><?php echo __("Only Themes","xcloner-backup-and-restore")?></label>
+									<label for="filter_files_themes"><?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"><?php echo __("Only Database Backup","xcloner-backup-and-restore")?></label>
+									<label for="filter_files_database"><?php echo __("Only Database Backup", "xcloner-backup-and-restore")?></label>
 								</div>
 							</div>
 							
@@ -168,14 +168,14 @@ 
 				       
 				        <div class="col s12 l4 right-align">
 							<div class="toggler">
-								<button class="btn waves-effect waves-light restore_remote_backup normal " type="submit" id="" name="action"><?php echo __("Restore",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light restore_remote_backup normal " type="submit" id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">send</i>
 								</button>
-								<button class="btn waves-effect waves-light red restore_remote_backup cancel" type="submit" id="" name="action"><?php echo __("Cancel",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light red restore_remote_backup cancel" type="submit" id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">close</i>
 								</button>
 							</div>
-							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next",'xcloner-backup-and-restore')?>" id="skip_remote_backup_step" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_remote_backup_step" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 				        </div>
@@ -183,66 +183,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>
@@ -250,7 +250,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>
@@ -269,15 +269,15 @@ 
 				      
 				        <div class="col s12 l5 right-align">
 							<div class="toggler">
-								<button class="btn waves-effect waves-light restore_remote_mysqldump normal " type="submit" id="" name="action"><?php echo __("Restore",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light restore_remote_mysqldump normal " type="submit" id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">send</i>
 								</button>
-								<button class="btn waves-effect waves-light red restore_remote_mysqldump cancel" type="submit" id="" name="action"><?php echo __("Cancel",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light red restore_remote_mysqldump cancel" type="submit" id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">close</i>
 								</button>
 							</div>
 							
-							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next",'xcloner-backup-and-restore')?>" id="skip_restore_remote_database_step" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_restore_remote_database_step" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 							
@@ -287,13 +287,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">
@@ -310,7 +310,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">
@@ -326,7 +326,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">
@@ -345,8 +345,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>
@@ -354,13 +354,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>
@@ -378,7 +378,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_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>