ovidiul / XCloner-Wordpress

includes/class-xcloner-scheduler.php

Spacing +68 added lines, -68 removed lines

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

includes/class-xcloner-archive.php

Spacing +89 added lines, -89 removed lines

@@ -8,11 +8,11 @@ 
 	/*
 	 * bytes
 	 */ 
-	private $file_size_per_request_limit	= 52428800 ; //50MB = 52428800; 1MB = 1048576
-	private $files_to_process_per_request 	= 250; //block of 512 bytes
-	private $compression_level 				= 0; //0-9 , 0 uncompressed
+	private $file_size_per_request_limit	= 52428800; //50MB = 52428800; 1MB = 1048576
+	private $files_to_process_per_request = 250; //block of 512 bytes
+	private $compression_level = 0; //0-9 , 0 uncompressed
 	private $xcloner_split_backup_limit		= 2048; //2048MB
-	private $processed_size_bytes			= 0 ;
+	private $processed_size_bytes = 0;
 	
 	private $archive_name;
 	private $backup_archive;
@@ -22,25 +22,25 @@ 
 	
 	public function __construct(Xcloner $xcloner_container, $archive_name = "")
 	{
-		$this->filesystem 		= $xcloner_container->get_xcloner_filesystem();
-		$this->logger 			= $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
+		$this->filesystem = $xcloner_container->get_xcloner_filesystem();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
 		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
 		
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request'))
-			$this->file_size_per_request_limit = $value*1024*1024; //MB
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request'))
+			$this->file_size_per_request_limit = $value * 1024 * 1024; //MB
 			
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request'))
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request'))
 			$this->files_to_process_per_request = $value;
 		
-		if($value = get_option('xcloner_backup_compression_level'))
+		if ($value = get_option('xcloner_backup_compression_level'))
 			$this->compression_level = $value;
 		
-		if($value = get_option('xcloner_split_backup_limit'))
+		if ($value = get_option('xcloner_split_backup_limit'))
 			$this->xcloner_split_backup_limit = $value;
 		
-		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024*1024; //transform to bytes
+		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
 			
-		if(isset($archive_name) && $archive_name)
+		if (isset($archive_name) && $archive_name)
 		{
 			$this->set_archive_name($archive_name);
 		}
@@ -68,23 +68,23 @@ 
 		
 		$this->archive_name = $this->filesystem->process_backup_name($name);
 		
-		if($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start())
+		if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start())
 		{
 			//$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
 			$new_name = $this->archive_name;
 			
-			if(!stristr($new_name, "-diff"))
-				$new_name = $this->archive_name . "-diff".date("Y-m-d_H-i",$diff_timestamp_start);
+			if (!stristr($new_name, "-diff"))
+				$new_name = $this->archive_name."-diff".date("Y-m-d_H-i", $diff_timestamp_start);
 			
 			$this->archive_name = $new_name;
 			
 		}
 		
-		if(isset($part) and $part)
+		if (isset($part) and $part)
 		{
-			$new_name =  preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
-			if(!stristr($new_name, "-part"))
-				$new_name = $this->archive_name . "-part".$part;
+			$new_name = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
+			if (!stristr($new_name, "-part"))
+				$new_name = $this->archive_name."-part".$part;
 			
 			$this->archive_name = $new_name;	
 		}
@@ -109,7 +109,7 @@ 
 	 */ 
 	public function get_archive_name_multipart()
 	{
-		$new_name =  preg_replace('/-part(\d*)/', "", $this->archive_name);
+		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
 		return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
 	}
 	
@@ -135,7 +135,7 @@ 
 		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
 		$body .= "<br /><>";
 		
-		$body  .= sprintf(__("Error Message: %s"), $error_message); 
+		$body .= sprintf(__("Error Message: %s"), $error_message); 
 		
 		$this->logger->info(sprintf("Sending backup error notification to %s", $to));
 		
@@ -143,10 +143,10 @@ 
 		
 		$headers = array('Content-Type: text/html; charset=UTF-8');
 		
-		if($admin_email and $from )
+		if ($admin_email and $from)
 			$headers[] = 'From: '.$from.' <'.$admin_email.'>';
 
-		$return = wp_mail( $to, $subject, $body, $headers );
+		$return = wp_mail($to, $subject, $body, $headers);
 		
 		return $return;
 	}
@@ -156,29 +156,29 @@ 
 	 * Send backup archive notfication by E-Mail
 	 * 
 	 */ 
-	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message="", $additional = array())
+	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message = "", $additional = array())
 	{
-		if(!$from)
+		if (!$from)
 		{
 			$from = "XCloner Backup";
 		}
 			
-		if(($error_message))
+		if (($error_message))
 		{
 			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
 		}
 		
 		$params = (array)$params;
 		
-		if(!$subject)
+		if (!$subject)
 		{
-			$subject = sprintf(__("New backup generated %s") ,$backup_name);
+			$subject = sprintf(__("New backup generated %s"), $backup_name);
 		}
 			
 		$body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
 		$body .= "<br /><br />";
 		
-		if(isset($additional['lines_total']))
+		if (isset($additional['lines_total']))
 		{
 			$body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
 			$body .= "<br /><br />";
@@ -186,30 +186,30 @@ 
 		
 		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 		
-		if(!$backups_counter = sizeof($backup_parts))
+		if (!$backups_counter = sizeof($backup_parts))
 			$backups_counter = 1;
 		
 		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
 		$body .= "<br />";
 		
-		if(sizeof($backup_parts))
+		if (sizeof($backup_parts))
 		{
-			$body .= implode("<br />",$backup_parts);
+			$body .= implode("<br />", $backup_parts);
 			$body .= "<br />";
 		}
 		
-		$body.= "<br />";
+		$body .= "<br />";
 		
 		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
 		$body .= "<br />";
 		
-		if(isset($params['backup_params']->backup_comments))
+		if (isset($params['backup_params']->backup_comments))
 		{
 			$body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
 			$body .= "<br /><br />";
 		}
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 			$body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n", $this->logger->getLastDebugLines(50));
 		
 		$attachments = $this->filesystem->get_backup_attachments();
@@ -219,7 +219,7 @@ 
 		$tar = new Tar();
 		$tar->create($attachments_archive);
 			
-		foreach($attachments as $key => $file)
+		foreach ($attachments as $key => $file)
 		{
 			$tar->addFile($file, basename($file));
 		}
@@ -231,7 +231,7 @@ 
 		
 		$headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
 		
-		$return = wp_mail( $to, $subject, $body, $headers, array($attachments_archive) );
+		$return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 	
 		return $return;
 	}
@@ -245,17 +245,17 @@ 
 	{
 		$return = array();
 		
-		if(!isset($extra_params['backup_part']))
+		if (!isset($extra_params['backup_part']))
 			$extra_params['backup_part'] = 0;
 		
 		$return['extra']['backup_part'] = $extra_params['backup_part'];
 					
-		if(isset( $extra_params['backup_archive_name']))
+		if (isset($extra_params['backup_archive_name']))
 			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
 		else
 			$this->set_archive_name($backup_params['backup_name']);
 			
-		if(!$this->get_archive_name())
+		if (!$this->get_archive_name())
 			$this->set_archive_name();
 		
 		$this->backup_archive = new Tar();
@@ -263,7 +263,7 @@ 
 		
 		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 		
-		if($init)
+		if ($init)
 		{
 			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 		
@@ -271,7 +271,7 @@ 
 			
 			$return['extra']['backup_init'] = 1;
 			
-		}else{
+		} else {
 			$this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 			
 			$this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
@@ -283,13 +283,13 @@ 
 		$return['extra']['backup_archive_name'] = $this->get_archive_name();
 		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 		
-		if(!isset($extra_params['start_at_line']))
+		if (!isset($extra_params['start_at_line']))
 			$extra_params['start_at_line'] = 0;
 		
-		if(!isset($extra_params['start_at_byte']))
+		if (!isset($extra_params['start_at_byte']))
 			$extra_params['start_at_byte'] = 0;
 		
-		if(!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler()))
+		if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler()))
 		{
 			$this->logger->error(sprintf("Missing the includes file handler %s, aborting...", $this->filesystem->get_included_files_handler()));
 			
@@ -303,14 +303,14 @@ 
 		
 		$file->seek(PHP_INT_MAX);
 
-		$return['extra']['lines_total'] = ($file->key()-1);
+		$return['extra']['lines_total'] = ($file->key() - 1);
 		
 		//we skip the first CSV line with headers 
-		if(!$extra_params['start_at_line'])
+		if (!$extra_params['start_at_line'])
 		{
 			$file->seek(1);
-		}else{
-			$file->seek($extra_params['start_at_line']+1);
+		} else {
+			$file->seek($extra_params['start_at_line'] + 1);
 		}
 		
 		$this->processed_size_bytes = 0;
@@ -321,7 +321,7 @@ 
 		
 		$byte_limit = 0;
 		
-		while(!$file->eof() and $counter<=$this->files_to_process_per_request)
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request)
 		{
 			$current_line_str = $file->current();
 			
@@ -331,15 +331,15 @@ 
 			
 			$start_filesystem = "start_filesystem";
 			
-			if(isset($line[4])){
+			if (isset($line[4])) {
 				$start_filesystem = $line[4];
 			}
 			
 			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 			
-			if(!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
+			if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
 			{
-				if($relative_path != "")
+				if ($relative_path != "")
 				{
 					$this->logger->error(sprintf("Could not add file %b to backup archive, file not found", $relative_path));
 				}
@@ -351,37 +351,37 @@ 
 			
 			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 			
-			if(!isset($file_info['size']))
+			if (!isset($file_info['size']))
 				$file_info['size'] = 0;
 			
-			if($start_filesystem == "tmp_filesystem")
+			if ($start_filesystem == "tmp_filesystem")
 			{	
 				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
 			}
 			
-			$byte_limit = (int)$this->file_size_per_request_limit/512;
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 			
 			$append = 0;
 			
-			if($file_info['size'] > $byte_limit*512 or $start_byte)
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte)
 				$append = 1;
 						
-			if(!isset($return['extra']['backup_size']))
-				$return['extra']['backup_size'] =0;
+			if (!isset($return['extra']['backup_size']))
+				$return['extra']['backup_size'] = 0;
 			
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
 			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 			
 			//we create a new backup part if we reach the Split Achive Limit
-			if($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte))
+			if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte))
 			{
-				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",$this->xcloner_split_backup_limit, $estimated_new_size));
+				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ", $this->xcloner_split_backup_limit, $estimated_new_size));
 				list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
 				
-				if($file_info['size'] > $this->xcloner_split_backup_limit)
+				if ($file_info['size'] > $this->xcloner_split_backup_limit)
 				{
-					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",$file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
+					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file", $file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
 					$extra_params['start_at_line']++;
 				}
 				
@@ -393,7 +393,7 @@ 
 				return $return;
 			}
 			
-			list($bytes_wrote, $last_position) = $this->add_file_to_archive( $file_info, $start_byte, $byte_limit, $append, $start_filesystem);
+			list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit, $append, $start_filesystem);
 			$this->processed_size_bytes += $bytes_wrote;
 			
 			//echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
@@ -401,17 +401,17 @@ 
 			$return['extra']['processed_file_size'] = $file_info['size'];
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
-			if($last_position>0){	
+			if ($last_position > 0) {	
 				$start_byte = $last_position;
 			}
-			else{	
+			else {	
 				$extra_params['start_at_line']++;
 				$file->next();
 				$start_byte = 0;
 				$counter++;
 			}
 			
-			if($this->processed_size_bytes >= $this->file_size_per_request_limit)
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit)
 			{
 				clearstatcache();
 				$return['extra']['backup_size'] = $archive_info->getSize();
@@ -424,7 +424,7 @@ 
 			}
 		}
 		
-		if(!$file->eof())
+		if (!$file->eof())
 		{
 			clearstatcache();
 			$return['extra']['backup_size'] = $archive_info->getSize();
@@ -441,12 +441,12 @@ 
 		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.", $this->get_archive_name_with_extension()));
 		$this->backup_archive->close();
 				
-		if($return['extra']['backup_part'])
+		if ($return['extra']['backup_part'])
 			$this->write_multipart_file($this->get_archive_name_with_extension());
 		
-		$return['extra']['start_at_line'] = $extra_params['start_at_line']-1;
+		$return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
 		
-		if(isset($file_info))
+		if (isset($file_info))
 		{
 			$return['extra']['processed_file'] = $file_info['path'];
 			$return['extra']['processed_file_size'] = $file_info['size'];
@@ -488,20 +488,20 @@ 
 		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.", $this->get_archive_name_with_extension()));
 		$this->backup_archive->close();		
 		
-		if(!$part)
+		if (!$part)
 		{
 			$old_name = $this->get_archive_name_with_extension();
 			$this->set_archive_name($this->get_archive_name(), ++$part);
 			$this->rename_archive($old_name, $this->get_archive_name_with_extension());
 			
-			if($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart()))
+			if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart()))
 				$this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
 				
 			$this->write_multipart_file($this->get_archive_name_with_extension());
 			
-		}else
+		} else
 		{
-			$this->logger->info(sprintf("Creating new multipart info file %s",$this->get_archive_name_with_extension()));
+			$this->logger->info(sprintf("Creating new multipart info file %s", $this->get_archive_name_with_extension()));
 			$this->write_multipart_file($this->get_archive_name_with_extension());
 		}
 				
@@ -529,10 +529,10 @@ 
 		$start_adapter = $this->filesystem->get_adapter($filesystem);
 		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 		
-		if(!$file_info['path'])
+		if (!$file_info['path'])
 			return;
 		
-		if(isset($file_info['archive_prefix_path']))	
+		if (isset($file_info['archive_prefix_path']))	
 			$file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
 		else
 			$file_info['target_path'] = $file_info['path'];
@@ -541,36 +541,36 @@ 
 		
 		//$start_adapter = $this->filesystem->get_start_adapter();
 
-		if(!$append){
+		if (!$append) {
 			$bytes_wrote = $file_info['size'];
 			$this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote, $file_info['target_path'], $this->get_archive_name_with_extension()));
 			$this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']), $file_info['target_path']);
 		}
-		else{	
+		else {	
 			$tmp_file = md5($file_info['path']);
 			
 			//we isolate file to tmp if we are at byte 0, the starting point of file reading
-			if(!$start_at_byte)
+			if (!$start_at_byte)
 			{
 				$this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes", $file_info['path'], $tmp_file));
 				$file_stream = $start_filesystem->readStream($file_info['path']);
 				
-				if(is_resource($file_stream['stream']))
+				if (is_resource($file_stream['stream']))
 					$this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
 			}
 			
-			if($this->filesystem->get_tmp_filesystem()->has($tmp_file))
+			if ($this->filesystem->get_tmp_filesystem()->has($tmp_file))
 			{
 				$is_tmp = 1;
 				$last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_file), $file_info['target_path'], $start_at_byte, $byte_limit);
 			}
-			else{
+			else {
 				$is_tmp = 0;
 				$last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']), $file_info['target_path'], $start_at_byte, $byte_limit);
 			}
 				
 			
-			if($last_position == -1)
+			if ($last_position == -1)
 			{
 				$bytes_wrote = $file_info['size'] - $start_at_byte;
 			}
@@ -580,18 +580,18 @@ 
 			}
 			
 			
-			if($is_tmp)
+			if ($is_tmp)
 			{
 				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ", $bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
 			}
-			else{
+			else {
 				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ", $bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
 			}
 			
 			//we delete here the isolated tmp file
-			if($last_position == -1)
+			if ($last_position == -1)
 			{
-				if($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file))
+				if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file))
 				{
 					$this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
 					$this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);

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>
 

admin/partials/xcloner_remote_storage_page.php

Spacing +136 added lines, -136 removed lines

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

admin/partials/xcloner_generate_backups_page.php

Spacing +53 added lines, -53 removed lines

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