ovidiul / XCloner-Wordpress

includes/class-xcloner-scheduler.php

Doc Comments +3 added lines

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

Spacing +110 added lines, -110 removed lines

@@ -12,13 +12,13 @@ 
 	private $logger;
 	private $xcloner_file_system;
 
-	private $allowed_schedules = array( "hourly", "twicedaily", "daily", "weekly", "monthly" );
+	private $allowed_schedules = array("hourly", "twicedaily", "daily", "weekly", "monthly");
 
 	/*public function __call($method, $args) {
 		echo "$method is not defined";
 	}*/
 
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 		global $wpdb;
 
 		$this->db          = $wpdb;
@@ -27,26 +27,26 @@ 
 		$this->xcloner_container = $xcloner_container;
 		$this->xcloner_settings  = $xcloner_container->get_xcloner_settings();
 
-		$this->scheduler_table = $this->db->prefix . $this->scheduler_table;
+		$this->scheduler_table = $this->db->prefix.$this->scheduler_table;
 	}
 
 	private function get_xcloner_container() {
 		return $this->xcloner_container;
 	}
 
-	private function set_xcloner_container( Xcloner $container ) {
+	private function set_xcloner_container(Xcloner $container) {
 		$this->xcloner_container = $container;
 	}
 
-	public function get_scheduler_list( $return_only_enabled = 0 ) {
-		$list = $this->db->get_results( "SELECT * FROM " . $this->scheduler_table );
+	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();
 
-			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 );
+			foreach ($list as $res) {
+				if ($res->status) {
+					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id)) + (get_option('gmt_offset') * HOUR_IN_SECONDS);
 					$new_list[]         = $res;
 				}
 			}
@@ -56,42 +56,42 @@ 
 		return $list;
 	}
 
-	public function get_next_run_schedule( $xcloner_file_system = "" ) {
-		$list = $this->get_scheduler_list( $return_only_enabled = 1 );
+	public function get_next_run_schedule($xcloner_file_system = "") {
+		$list = $this->get_scheduler_list($return_only_enabled = 1);
 
 		return $list;
 	}
 
-	public function get_schedule_by_id_object( $id ) {
-		$data = $this->db->get_row( "SELECT * FROM " . $this->scheduler_table . " WHERE id=" . $id );
+	public function get_schedule_by_id_object($id) {
+		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id);
 
 		return $data;
 	}
 
-	public function get_schedule_by_id( $id ) {
-		$data = $this->db->get_row( "SELECT * FROM " . $this->scheduler_table . " WHERE id=" . $id, ARRAY_A );
+	public function get_schedule_by_id($id) {
+		$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'] );
+		$params = json_decode($data['params']);
 
 		//print_r($params);
 		$data['params']         = "";
 		$data['backup_params']  = $params->backup_params;
-		$data['table_params']   = json_encode( $params->database );
-		$data['excluded_files'] = json_encode( $params->excluded_files );
+		$data['table_params']   = json_encode($params->database);
+		$data['excluded_files'] = json_encode($params->excluded_files);
 
 
 		return $data;
 	}
 
-	public function delete_schedule_by_id( $id ) {
-		$hook = 'xcloner_scheduler_' . $id;
-		wp_clear_scheduled_hook( $hook, array( $id ) );
+	public function delete_schedule_by_id($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;
 	}
@@ -99,68 +99,68 @@ 
 	public function deactivate_wp_cron_hooks() {
 		$list = $this->get_scheduler_list();
 
-		foreach ( $list as $schedule ) {
-			$hook = 'xcloner_scheduler_' . $schedule->id;
+		foreach ($list as $schedule) {
+			$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));
 		}
 	}
 
 	public function update_wp_cron_hooks() {
 		$list = $this->get_scheduler_list();
 
-		foreach ( $list as $schedule ) {
-			$hook = 'xcloner_scheduler_' . $schedule->id;
+		foreach ($list as $schedule) {
+			$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" ) {
-					wp_schedule_single_event( strtotime( $schedule->start_at ), $hook, array( $schedule->id ) );
+				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_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 				}
 
-			} elseif ( ! $schedule->status ) {
-				$timestamp = wp_next_scheduled( $hook, array( $schedule->id ) );
-				wp_unschedule_event( $timestamp, $hook, array( $schedule->id ) );
+			} elseif (!$schedule->status) {
+				$timestamp = wp_next_scheduled($hook, array($schedule->id));
+				wp_unschedule_event($timestamp, $hook, array($schedule->id));
 			}
 		}
 
 	}
 
-	public function update_cron_hook( $id ) {
-		$schedule = $this->get_schedule_by_id_object( $id );
-		$hook     = 'xcloner_scheduler_' . $schedule->id;
+	public function update_cron_hook($id) {
+		$schedule = $this->get_schedule_by_id_object($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->status) {
 
-			if ( $schedule->recurrence == "single" ) {
-				wp_schedule_single_event( strtotime( $schedule->start_at ), $hook, array( $schedule->id ) );
+			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_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 			}
 
 		}
 	}
 
-	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 ) );
+	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));
 
 		$schedule['status'] = 0;
 
 		$update = $this->db->update(
 			$this->scheduler_table,
 			$schedule,
-			array( 'id' => $schedule_id ),
+			array('id' => $schedule_id),
 			array(
 				'%s',
 				'%s'
@@ -170,13 +170,13 @@ 
 		return $update;
 	}
 
-	public function update_hash( $schedule_id, $hash ) {
+	public function update_hash($schedule_id, $hash) {
 		$schedule['hash'] = $hash;
 
 		$update = $this->db->update(
 			$this->scheduler_table,
 			$schedule,
-			array( 'id' => $schedule_id ),
+			array('id' => $schedule_id),
 			array(
 				'%s',
 				'%s'
@@ -186,13 +186,13 @@ 
 		return $update;
 	}
 
-	public function update_last_backup( $schedule_id, $last_backup ) {
+	public function update_last_backup($schedule_id, $last_backup) {
 		$schedule['last_backup'] = $last_backup;
 
 		$update = $this->db->update(
 			$this->scheduler_table,
 			$schedule,
-			array( 'id' => $schedule_id ),
+			array('id' => $schedule_id),
 			array(
 				'%s',
 				'%s'
@@ -202,12 +202,12 @@ 
 		return $update;
 	}
 
-	private function _xcloner_scheduler_callback( $id, $schedule ) {
-		set_time_limit( 0 );
+	private function _xcloner_scheduler_callback($id, $schedule) {
+		set_time_limit(0);
 
 		$xcloner = new XCloner();
 		$xcloner->init();
-		$this->set_xcloner_container( $xcloner );
+		$this->set_xcloner_container($xcloner);
 
 		#$hash = $this->xcloner_settings->get_hash();
 		#$this->get_xcloner_container()->get_xcloner_settings()->set_hash($hash);
@@ -216,106 +216,106 @@ 
 		$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->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() ) );
+		$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 ) {
-			$this->xcloner_file_system->set_diff_timestamp_start( $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" ) {
-			$this->disable_single_cron( $schedule['id'] );
+		if ($schedule['recurrence'] == "single") {
+			$this->disable_single_cron($schedule['id']);
 		}
 
-		if ( ! $schedule ) {
-			$this->logger->info( sprintf( "Could not load schedule with id'%s'", $id ), array( "CRON" ) );
+		if (!$schedule) {
+			$this->logger->info(sprintf("Could not load schedule with id'%s'", $id), array("CRON"));
 
 			return;
 		}
 
 		//echo $this->get_xcloner_container()->get_xcloner_settings()->get_hash(); exit;
 
-		$this->update_hash( $schedule['id'], $this->xcloner_settings->get_hash() );
+		$this->update_hash($schedule['id'], $this->xcloner_settings->get_hash());
 
-		$this->logger->info( sprintf( "Starting cron schedule '%s'", $schedule['name'] ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting cron schedule '%s'", $schedule['name']), array("CRON"));
 
-		$this->xcloner_file_system->set_excluded_files( json_decode( $schedule['excluded_files'] ) );
+		$this->xcloner_file_system->set_excluded_files(json_decode($schedule['excluded_files']));
 
 		$init     = 1;
 		$continue = 1;
 
-		while ( $continue ) {
-			$continue = $this->xcloner_file_system->start_file_recursion( $init );
+		while ($continue) {
+			$continue = $this->xcloner_file_system->start_file_recursion($init);
 
 			$init = 0;
 		}
 
-		$this->logger->info( sprintf( "File scan finished" ), array( "CRON" ) );
+		$this->logger->info(sprintf("File scan finished"), array("CRON"));
 
-		$this->logger->info( sprintf( "Starting the database backup" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting the database backup"), array("CRON"));
 
 		$init               = 1;
 		$return['finished'] = 0;
 
-		while ( ! $return['finished'] ) {
-			$return = $this->xcloner_database->start_database_recursion( (array) json_decode( $schedule['table_params'] ), $return, $init );
+		while (!$return['finished']) {
+			$return = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
 			$init   = 0;
 		}
 
-		$this->logger->info( sprintf( "Database backup done" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Database backup done"), array("CRON"));
 
-		$this->logger->info( sprintf( "Starting file archive process" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting file archive process"), array("CRON"));
 
 		$init               = 0;
 		$return['finished'] = 0;
 		$return['extra']    = array();
 
-		while ( ! $return['finished'] ) {
-			$return = $this->archive_system->start_incremental_backup( (array) $schedule['backup_params'], $return['extra'], $init );
+		while (!$return['finished']) {
+			$return = $this->archive_system->start_incremental_backup((array)$schedule['backup_params'], $return['extra'], $init);
 			$init   = 0;
 		}
-		$this->logger->info( sprintf( "File archive process FINISHED." ), array( "CRON" ) );
+		$this->logger->info(sprintf("File archive process FINISHED."), array("CRON"));
 
 		//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'] );
+		$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" ) );
+			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 
-			if ( method_exists( $this->xcloner_remote_storage, "upload_backup_to_storage" ) ) {
-				call_user_func_array( array(
+			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'] ) );
+				), 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 {
 				$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 );
+				$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional);
 
-			} catch ( Exception $e ) {
-				$this->logger->error( $e->getMessage() );
+			}catch (Exception $e) {
+				$this->logger->error($e->getMessage());
 			}
 		}
 
 		//CHECK IF WE SHOULD DELETE BACKUP AFTER REMOTE TRANSFER IS DONE
-		if ( $schedule['remote_storage'] && $this->xcloner_settings->get_xcloner_option( 'xcloner_cleanup_delete_after_remote_transfer' ) ) {
-			$this->logger->info( sprintf( "Deleting %s from local storage matching rule xcloner_cleanup_delete_after_remote_transfer", $return['extra']['backup_parent'] ) );
-			$this->xcloner_file_system->delete_backup_by_name( $return['extra']['backup_parent'] );
+		if ($schedule['remote_storage'] && $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_delete_after_remote_transfer')) {
+			$this->logger->info(sprintf("Deleting %s from local storage matching rule xcloner_cleanup_delete_after_remote_transfer", $return['extra']['backup_parent']));
+			$this->xcloner_file_system->delete_backup_by_name($return['extra']['backup_parent']);
 
 		}
 
@@ -327,25 +327,25 @@ 
 		$this->xcloner_file_system->cleanup_tmp_directories();
 	}
 
-	public function xcloner_scheduler_callback( $id, $schedule = "" ) {
-		if ( $id ) {
-			$schedule = $this->get_schedule_by_id( $id );
+	public function xcloner_scheduler_callback($id, $schedule = "") {
+		if ($id) {
+			$schedule = $this->get_schedule_by_id($id);
 		}
 
 		try {
 
-			$this->_xcloner_scheduler_callback( $id, $schedule );
+			$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 ) {
-				$schedule['backup_params']->email_notification = get_option( 'admin_email' );
+			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());
 			}
 
 		}
@@ -356,14 +356,14 @@ 
 		$schedules     = wp_get_schedules();
 		$new_schedules = array();
 
-		foreach ( $schedules as $key => $row ) {
-			if ( in_array( $key, $this->allowed_schedules ) ) {
-				$new_schedules[ $key ] = $row;
-				$intervals[ $key ]     = $row['interval'];
+		foreach ($schedules as $key => $row) {
+			if (in_array($key, $this->allowed_schedules)) {
+				$new_schedules[$key] = $row;
+				$intervals[$key]     = $row['interval'];
 			}
 		}
 
-		array_multisort( $intervals, SORT_ASC, $new_schedules );
+		array_multisort($intervals, SORT_ASC, $new_schedules);
 
 		return $new_schedules;
 	}

includes/class-xcloner-settings.php

Doc Comments +3 added lines

@@ -183,6 +183,9 @@
 		return $wpdb->prefix;
 	}
 
+	/**
+	 * @param string $option
+	 */
 	public function get_xcloner_option( $option ) {
 		$data = get_option( $option );
 

Spacing +228 added lines, -228 removed lines

@@ -7,10 +7,10 @@ 
 	private $xcloner_sanitization;
 	private $xcloner_container;
 
-	public function __construct( Xcloner $xcloner_container, $hash = "" ) {
+	public function __construct(Xcloner $xcloner_container, $hash = "") {
 		$this->xcloner_container = $xcloner_container;
-		if ( isset( $hash ) ) {
-			$this->set_hash( $hash );
+		if (isset($hash)) {
+			$this->set_hash($hash);
 		}
 	}
 
@@ -18,93 +18,93 @@ 
 		return $this->xcloner_container;
 	}
 
-	public function get_logger_filename( $include_hash = 0 ) {
-		if ( $include_hash ) {
-			$filename = sprintf( $this->logger_file_hash, $this->get_hash() );
+	public function get_logger_filename($include_hash = 0) {
+		if ($include_hash) {
+			$filename = sprintf($this->logger_file_hash, $this->get_hash());
 		} else {
-			$filename = sprintf( $this->logger_file, $this->get_server_unique_hash( 5 ) );
+			$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
 		}
 
 		return $filename;
 	}
 
 	public function get_xcloner_start_path() {
-		if ( ! get_option( 'xcloner_start_path' ) or ! is_dir( get_option( 'xcloner_start_path' ) ) ) {
-			$path = realpath( ABSPATH );
+		if (!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path'))) {
+			$path = realpath(ABSPATH);
 		} else {
-			$path = get_option( 'xcloner_start_path' );
+			$path = get_option('xcloner_start_path');
 		}
 
 		return $path;
 	}
 
-	public function get_xcloner_dir_path( $dir ) {
-		$path = self::get_xcloner_start_path() . DS . $dir;
+	public function get_xcloner_dir_path($dir) {
+		$path = self::get_xcloner_start_path().DS.$dir;
 
 		return $path;
 	}
 
 	public function get_xcloner_store_path() {
-		if ( ! get_option( 'xcloner_store_path' ) or ! is_dir( get_option( 'xcloner_store_path' ) ) ) {
-			$path = realpath( XCLONER_STORAGE_PATH );
+		if (!get_option('xcloner_store_path') or !is_dir(get_option('xcloner_store_path'))) {
+			$path = realpath(XCLONER_STORAGE_PATH);
 		} else {
-			$path = get_option( 'xcloner_store_path' );
+			$path = get_option('xcloner_store_path');
 		}
 
 		return $path;
 	}
 
 	public function get_xcloner_tmp_path_suffix() {
-		return "xcloner" . $this->get_hash();
+		return "xcloner".$this->get_hash();
 	}
 
 
-	public function get_xcloner_tmp_path( $suffix = true ) {
-		if ( get_option( 'xcloner_force_tmp_path_site_root' ) ) {
+	public function get_xcloner_tmp_path($suffix = true) {
+		if (get_option('xcloner_force_tmp_path_site_root')) {
 			$path = $this->get_xcloner_store_path();
 		} else {
 
 			$path = sys_get_temp_dir();
-			if ( ! is_dir( $path ) ) {
-				@mkdir( $path );
-				@chmod( $path, 0777 );
+			if (!is_dir($path)) {
+				@mkdir($path);
+				@chmod($path, 0777);
 			}
 
-			if ( ! is_dir( $path ) or ! is_writeable( $path ) ) {
+			if (!is_dir($path) or !is_writeable($path)) {
 				$path = $this->get_xcloner_store_path();
 			}
 		}
 
-		if ( $suffix ) {
-			$path = $path . DS . "." . $this->get_xcloner_tmp_path_suffix();
+		if ($suffix) {
+			$path = $path.DS.".".$this->get_xcloner_tmp_path_suffix();
 		}
 
 		return $path;
 	}
 
 	public function get_enable_mysql_backup() {
-		if ( get_option( 'xcloner_enable_mysql_backup' ) ) {
+		if (get_option('xcloner_enable_mysql_backup')) {
 			return true;
 		}
 
 		return false;
 	}
 
-	public function get_backup_extension_name( $ext = "" ) {
-		if ( ! $ext ) {
-			if ( get_option( 'xcloner_backup_compression_level' ) ) {
+	public function get_backup_extension_name($ext = "") {
+		if (!$ext) {
+			if (get_option('xcloner_backup_compression_level')) {
 				$ext = ".tgz";
 			} else {
 				$ext = ".tar";
 			}
 		}
 
-		return ( $this->get_hash() ) . $ext;
+		return ($this->get_hash()).$ext;
 	}
 
 	public function get_hash() {
-		if ( ! $this->hash ) {
-			$this->set_hash( "-" . $this->get_server_unique_hash( 5 ) );
+		if (!$this->hash) {
+			$this->set_hash("-".$this->get_server_unique_hash(5));
 		}
 
 		//echo $this->hash;	
@@ -112,27 +112,27 @@ 
 	}
 
 	public function generate_new_hash() {
-		$hash = "-" . md5( rand() );
+		$hash = "-".md5(rand());
 
-		$this->set_hash( substr( $hash, 0, 6 ) );
+		$this->set_hash(substr($hash, 0, 6));
 
 		return $hash;
 	}
 
-	public function set_hash( $hash = "" ) {
-		if ( substr( $hash, 0, 1 ) != "-" and strlen( $hash ) ) {
-			$hash = "-" . $hash;
+	public function set_hash($hash = "") {
+		if (substr($hash, 0, 1) != "-" and strlen($hash)) {
+			$hash = "-".$hash;
 		}
 
-		$this->hash = substr( $hash, 0, 6 );
+		$this->hash = substr($hash, 0, 6);
 
 		return $this;
 	}
 
 	public function get_default_backup_name() {
-		$data = parse_url( get_site_url() );
+		$data = parse_url(get_site_url());
 
-		$backup_name = "backup_[domain]" . ( isset( $data['port'] ) ? "_" . $data['port'] : "" ) . "-[time]-" . ( $this->get_enable_mysql_backup() ? "sql" : "nosql" );
+		$backup_name = "backup_[domain]".(isset($data['port']) ? "_".$data['port'] : "")."-[time]-".($this->get_enable_mysql_backup() ? "sql" : "nosql");
 
 		return $backup_name;
 	}
@@ -140,7 +140,7 @@ 
 	public function get_db_hostname() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_hostname' ) ) {
+		if (!$data = get_option('xcloner_mysql_hostname')) {
 			$data = $wpdb->dbhost;
 		}
 
@@ -150,7 +150,7 @@ 
 	public function get_db_username() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_username' ) ) {
+		if (!$data = get_option('xcloner_mysql_username')) {
 			$data = $wpdb->dbuser;
 		}
 
@@ -160,7 +160,7 @@ 
 	public function get_db_password() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_password' ) ) {
+		if (!$data = get_option('xcloner_mysql_password')) {
 			$data = $wpdb->dbpassword;
 		}
 
@@ -170,7 +170,7 @@ 
 	public function get_db_database() {
 		global $wpdb;
 
-		if ( ! $data = get_option( 'xcloner_mysql_database' ) ) {
+		if (!$data = get_option('xcloner_mysql_database')) {
 			$data = $wpdb->dbname;
 		}
 
@@ -183,17 +183,17 @@ 
 		return $wpdb->prefix;
 	}
 
-	public function get_xcloner_option( $option ) {
-		$data = get_option( $option );
+	public function get_xcloner_option($option) {
+		$data = get_option($option);
 
 		return $data;
 	}
 
-	public function get_server_unique_hash( $strlen = 0 ) {
-		$hash = md5( get_home_url() . __DIR__ );
+	public function get_server_unique_hash($strlen = 0) {
+		$hash = md5(get_home_url().__DIR__);
 
-		if ( $strlen ) {
-			$hash = substr( $hash, 0, $strlen );
+		if ($strlen) {
+			$hash = substr($hash, 0, $strlen);
 		}
 
 		return $hash;
@@ -204,20 +204,20 @@ 
 		$this->xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 
 		//ADDING MISSING OPTIONS
-		if ( false == get_option( 'xcloner_mysql_settings_page' ) ) {
-			add_option( 'xcloner_mysql_settings_page' );
+		if (false == get_option('xcloner_mysql_settings_page')) {
+			add_option('xcloner_mysql_settings_page');
 		} // end if
 
-		if ( false == get_option( 'xcloner_cron_settings_page' ) ) {
-			add_option( 'xcloner_cron_settings_page' );
+		if (false == get_option('xcloner_cron_settings_page')) {
+			add_option('xcloner_cron_settings_page');
 		} // end if
 
-		if ( false == get_option( 'xcloner_system_settings_page' ) ) {
-			add_option( 'xcloner_system_settings_page' );
+		if (false == get_option('xcloner_system_settings_page')) {
+			add_option('xcloner_system_settings_page');
 		} // end if
 
-		if ( false == get_option( 'xcloner_cleanup_settings_page' ) ) {
-			add_option( 'xcloner_cleanup_settings_page' );
+		if (false == get_option('xcloner_cleanup_settings_page')) {
+			add_option('xcloner_cleanup_settings_page');
 		} // end if
 
 
@@ -225,31 +225,31 @@ 
 		//GENERAL section
 		add_settings_section(
 			'xcloner_general_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_settings_page'
 		);
 		//MYSQL section
 		add_settings_section(
 			'xcloner_mysql_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_mysql_settings_page'
 		);
 
 		//SYSTEM section
 		add_settings_section(
 			'xcloner_system_settings_group',
-			__( 'These are advanced options recommended for developers!', 'xcloner-backup-and-restore' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__('These are advanced options recommended for developers!', 'xcloner-backup-and-restore'),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_system_settings_page'
 		);
 
 		//CLEANUP section
 		add_settings_section(
 			'xcloner_cleanup_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_cleanup_settings_page'
 		);
 
@@ -257,269 +257,269 @@ 
 		//CRON section
 		add_settings_section(
 			'xcloner_cron_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_cron_settings_page'
 		);
 
 
 		//REGISTERING THE 'GENERAL SECTION' FIELDS
-		register_setting( 'xcloner_general_settings_group', 'xcloner_backup_compression_level', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_backup_compression_level', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_backup_compression_level',
-			__( 'Backup Compression Level', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Backup Compression Level', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_backup_compression_level',
-				__( 'Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load', 'xcloner-backup-and-restore' ),
+				__('Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load', 'xcloner-backup-and-restore'),
 				0,
 				9
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_start_path', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_start_path', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_absolute_path"
-		) );
+		));
 		add_settings_field(
 			'xcloner_start_path',
-			__( 'Backup Start Location', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Start Location', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_start_path',
-				__( 'Base path location from where XCloner can start the Backup.', 'xcloner-backup-and-restore' ),
+				__('Base path location from where XCloner can start the Backup.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_start_path(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_store_path', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_store_path', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_absolute_path"
-		) );
+		));
 		add_settings_field(
 			'xcloner_store_path',
-			__( 'Backup Storage Location', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Storage Location', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_store_path',
-				__( 'Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore' ),
+				__('Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_store_path(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_log', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_log', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_log',
-			__( 'Enable XCloner Backup Log', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Enable XCloner Backup Log', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_enable_log',
-				sprintf( __( 'Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s', 'xcloner-backup-and-restore' ), $this->get_logger_filename() )
+				sprintf(__('Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_pre_update_backup', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_pre_update_backup', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_pre_update_backup',
-			__( 'Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_enable_pre_update_backup',
-				sprintf( __( 'Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore' ), $this->get_logger_filename() )
+				sprintf(__('Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_regex_exclude', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_regex_exclude', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_regex_exclude',
-			__( 'Regex Exclude Files', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_textarea_field' ),
+			__('Regex Exclude Files', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_textarea_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_regex_exclude',
-				__( 'Regular expression match to exclude files and folders, example patterns provided below, one pattern per line', 'xcloner-backup-and-restore' ),
+				__('Regular expression match to exclude files and folders, example patterns provided below, one pattern per line', 'xcloner-backup-and-restore'),
 				//$this->get_xcloner_store_path(), 
 				//'disabled'
 			)
 		);
 
 		//REGISTERING THE 'MYSQL SECTION' FIELDS
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_mysql_backup',
-			__( 'Enable Mysql Backup', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Enable Mysql Backup', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_enable_mysql_backup',
-				__( 'Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.', 'xcloner-backup-and-restore' )
+				__('Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables' );
+		register_setting('xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables');
 		add_settings_field(
 			'xcloner_backup_only_wp_tables',
-			__( 'Backup only WP tables', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Backup only WP tables', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_backup_only_wp_tables',
-				sprintf( __( 'Enable this if you only want to Backup only tables starting with \'%s\' prefix', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this if you only want to Backup only tables starting with \'%s\' prefix', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_hostname',
-			__( 'Mysql Hostname', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Hostname', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_hostname',
-				__( 'Wordpress mysql hostname', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql hostname', 'xcloner-backup-and-restore'),
 				$this->get_db_hostname(),
 				'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_username', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_username', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_username',
-			__( 'Mysql Username', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Username', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_username',
-				__( 'Wordpress mysql username', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql username', 'xcloner-backup-and-restore'),
 				$this->get_db_username(),
 				'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_database', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_database', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_database',
-			__( 'Mysql Database', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Database', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_database',
-				__( 'Wordpress mysql database', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql database', 'xcloner-backup-and-restore'),
 				$this->get_db_database(),
 				'disabled'
 			)
 		);
 
 		//REGISTERING THE 'SYSTEM SECTION' FIELDS
-		register_setting( 'xcloner_system_settings_group', 'xcloner_size_limit_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_size_limit_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_size_limit_per_request',
-			__( 'Data Size Limit Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Data Size Limit Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_size_limit_per_request',
-				__( 'Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB', 'xcloner-backup-and-restore'),
 				0,
 				1024
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_files_to_process_per_request',
-			__( 'Files To Process Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Files To Process Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_files_to_process_per_request',
-				__( 'Use this option to set how many files XCloner should process at one time before doing another AJAX call', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many files XCloner should process at one time before doing another AJAX call', 'xcloner-backup-and-restore'),
 				0,
 				1000
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_directories_to_scan_per_request',
-			__( 'Directories To Scan Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Directories To Scan Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_directories_to_scan_per_request',
-				__( 'Use this option to set how many directories XCloner should scan at one time before doing another AJAX call', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many directories XCloner should scan at one time before doing another AJAX call', 'xcloner-backup-and-restore'),
 				0,
 				1000
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_database_records_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_database_records_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_database_records_per_request',
-			__( 'Database Records Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Database Records Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_database_records_per_request',
-				__( 'Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records', 'xcloner-backup-and-restore'),
 				0,
 				100000
 			)
@@ -537,127 +537,127 @@ 
 	         )
 	    );*/
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_exclude_files_larger_than_mb',
-			__( 'Exclude files larger than (MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Exclude files larger than (MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_exclude_files_larger_than_mb',
-				__( 'Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore'),
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_split_backup_limit', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_split_backup_limit', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_split_backup_limit',
-			__( 'Split Backup Archive Limit (MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Split Backup Archive Limit (MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_split_backup_limit',
-				__( 'Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB', 'xcloner-backup-and-restore'),
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root' );
+		register_setting('xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root');
 		add_settings_field(
 			'xcloner_force_tmp_path_site_root',
-			__( 'Force Temporary Path Within XCloner Storage', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Force Temporary Path Within XCloner Storage', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_force_tmp_path_site_root',
-				sprintf( __( 'Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_retention_limit_days',
-			__( 'Cleanup by Date(days)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Date(days)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_retention_limit_days',
-				__( 'Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_retention_limit_archives',
-			__( 'Cleanup by Quantity', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Quantity', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_retention_limit_archives',
-				__( 'Specify the maximum number of backup archives to keep on the server. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Specify the maximum number of backup archives to keep on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_capacity_limit',
-			__( 'Cleanup by Capacity(MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Capacity(MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_capacity_limit',
-				__( 'Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_delete_after_remote_transfer',
-			__( 'Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_delete_after_remote_transfer',
-				__( 'Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore' )
+				__('Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore')
 			)
 		);
 
 		//REGISTERING THE 'CRON SECTION' FIELDS
-		register_setting( 'xcloner_cron_settings_group', 'xcloner_cron_frequency' );
+		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
 		add_settings_field(
 			'xcloner_cron_frequency',
-			__( 'Cron frequency', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Cron frequency', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_cron_settings_page',
 			'xcloner_cron_settings_group',
 			array(
 				'xcloner_cron_frequency',
-				__( 'Cron frequency' )
+				__('Cron frequency')
 			)
 		);
 	}
@@ -675,26 +675,26 @@ 
 	}
 
 	// text field content cb
-	public function do_form_text_field( $params ) {
-		if ( ! isset( $params['3'] ) ) {
+	public function do_form_text_field($params) {
+		if (!isset($params['3'])) {
 			$params[3] = 0;
 		}
-		if ( ! isset( $params['2'] ) ) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
 
-		list( $fieldname, $label, $value, $disabled ) = $params;
+		list($fieldname, $label, $value, $disabled) = $params;
 
-		if ( ! $value ) {
-			$value = get_option( $fieldname );
+		if (!$value) {
+			$value = get_option($fieldname);
 		}
 		// output the field
 		?>
         <div class="row">
             <div class="input-field col s10 m10 l8">
-                <input class="validate" <?php echo ( $disabled ) ? "disabled" : "" ?> name="<?php echo $fieldname ?>"
+                <input class="validate" <?php echo ($disabled) ? "disabled" : "" ?> name="<?php echo $fieldname ?>"
                        id="<?php echo $fieldname ?>" type="text" class="validate"
-                       value="<?php echo isset( $value ) ? esc_attr( $value ) : ''; ?>">
+                       value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
             </div>
             <div class="col s2 m2 ">
                 <a class="btn-floating tooltipped btn-small" data-position="left" data-delay="50"
@@ -707,26 +707,26 @@ 
 	}
 
 	// textarea field content cb
-	public function do_form_textarea_field( $params ) {
-		if ( ! isset( $params['3'] ) ) {
+	public function do_form_textarea_field($params) {
+		if (!isset($params['3'])) {
 			$params[3] = 0;
 		}
-		if ( ! isset( $params['2'] ) ) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
 
-		list( $fieldname, $label, $value, $disabled ) = $params;
+		list($fieldname, $label, $value, $disabled) = $params;
 
-		if ( ! $value ) {
-			$value = get_option( $fieldname );
+		if (!$value) {
+			$value = get_option($fieldname);
 		}
 		// output the field
 		?>
         <div class="row">
             <div class="input-field col s10 m10 l8">
-                <textarea class="validate" <?php echo ( $disabled ) ? "disabled" : "" ?> name="<?php echo $fieldname ?>"
+                <textarea class="validate" <?php echo ($disabled) ? "disabled" : "" ?> name="<?php echo $fieldname ?>"
                           id="<?php echo $fieldname ?>" type="text" class="validate"
-                          value=""><?php echo isset( $value ) ? esc_attr( $value ) : ''; ?></textarea>
+                          value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
             </div>
             <div class="col s2 m2 ">
                 <a class="btn-floating tooltipped btn-small" data-position="center" data-html="true" data-delay="50"
@@ -735,39 +735,39 @@ 
             <div class="col s12">
                 <ul class="xcloner_regex_exclude_limit">
                     <li>Exclude all except .php file: <span
-                                class="regex_pattern"><?php echo htmlentities( '(.*)\.(.+)$(?<!(php))' ) ?></span></li>
+                                class="regex_pattern"><?php echo htmlentities('(.*)\.(.+)$(?<!(php))') ?></span></li>
                     <li>Exclude all except .php and .txt: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(.+)$(?<!(php|txt))' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(.+)$(?<!(php|txt))') ?></span>
                     </li>
                     <li>Exclude all .avi files: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(.+)$(?<=(avi))' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(.+)$(?<=(avi))') ?></span></li>
                     <li>Exclude all .jpg,.gif and .png files: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(.+)$(?<=(gif|png|jpg))' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(.+)$(?<=(gif|png|jpg))') ?></span>
                     </li>
                     <li>Exclude all .svn and .git: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)\.(svn|git)(.*)$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)\.(svn|git)(.*)$') ?></span></li>
                     <li>Exclude root directory /test: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/test(.*)$' ) ?></span> or <span
-                                class="regex_pattern"> <?php echo htmlentities( 'test(.*)$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('\/test(.*)$') ?></span> or <span
+                                class="regex_pattern"> <?php echo htmlentities('test(.*)$') ?></span></li>
                     <li>Exclude the wp-admin folder: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(\/wp-admin)(.*)$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(\/wp-admin)(.*)$') ?></span></li>
                     <li>Exclude the wp-content/uploads folder: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(\/wp-content\/uploads)(.*)$' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('(\/wp-content\/uploads)(.*)$') ?></span>
                     </li>
                     <li>Exclude the wp-admin, wp-includes and wp-config.php: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/(wp-admin|wp-includes|wp-config.php)(.*)$' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('\/(wp-admin|wp-includes|wp-config.php)(.*)$') ?></span>
                     </li>
                     <li>Exclude wp-content/updraft and wp/content/uploads/wp_all_backup folder :<span
                                 class="regex_pattern">\/(wp-content\/updraft|\/wp-content\/uploads\/wp_all_backup)(.*)$</span>
                     </li>
                     <li>Exclude all cache folders from wp-content/ and it's subdirectories: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/wp-content(.*)\/cache($|\/)(.*)' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('\/wp-content(.*)\/cache($|\/)(.*)') ?></span>
                     </li>
                     <li>Exclude wp-content/cache/ folder: <span
-                                class="regex_pattern"> <?php echo htmlentities( '\/wp-content\/cache(.*)' ) ?></span>
+                                class="regex_pattern"> <?php echo htmlentities('\/wp-content\/cache(.*)') ?></span>
                     </li>
                     <li>Exclude all error_log files: <span
-                                class="regex_pattern"> <?php echo htmlentities( '(.*)error_log$' ) ?></span></li>
+                                class="regex_pattern"> <?php echo htmlentities('(.*)error_log$') ?></span></li>
                 </ul>
             </div>
         </div>
@@ -777,26 +777,26 @@ 
 	}
 
 	// number field content cb
-	public function do_form_number_field( $params ) {
-		if ( ! isset( $params['3'] ) ) {
+	public function do_form_number_field($params) {
+		if (!isset($params['3'])) {
 			$params[3] = 0;
 		}
-		if ( ! isset( $params['2'] ) ) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
 
-		list( $fieldname, $label, $value, $disabled ) = $params;
+		list($fieldname, $label, $value, $disabled) = $params;
 
-		if ( ! $value ) {
-			$value = get_option( $fieldname );
+		if (!$value) {
+			$value = get_option($fieldname);
 		}
 		// output the field
 		?>
         <div class="row">
             <div class="input-field col s10 m5 l3">
-                <input class="validate" <?php echo ( $disabled ) ? "disabled" : "" ?> name="<?php echo $fieldname ?>"
+                <input class="validate" <?php echo ($disabled) ? "disabled" : "" ?> name="<?php echo $fieldname ?>"
                        id="<?php echo $fieldname ?>" type="number" class="validate"
-                       value="<?php echo isset( $value ) ? esc_attr( $value ) : ''; ?>">
+                       value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
             </div>
             <div class="col s2 m2 ">
                 <a class="btn-floating tooltipped btn-small" data-html="true" data-position="center" data-delay="50"
@@ -808,22 +808,22 @@ 
 		<?php
 	}
 
-	public function do_form_range_field( $params ) {
-		if ( ! isset( $params['4'] ) ) {
+	public function do_form_range_field($params) {
+		if (!isset($params['4'])) {
 			$params[4] = 0;
 		}
 
-		list( $fieldname, $label, $range_start, $range_end, $disabled ) = $params;
-		$value = get_option( $fieldname );
+		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
+		$value = get_option($fieldname);
 		?>
         <div class="row">
             <div class="input-field col s10 m10 l8">
                 <p class="range-field">
-                    <input <?php echo ( $disabled ) ? "disabled" : "" ?> type="range" name="<?php echo $fieldname ?>"
+                    <input <?php echo ($disabled) ? "disabled" : "" ?> type="range" name="<?php echo $fieldname ?>"
                                                                          id="<?php echo $fieldname ?>"
                                                                          min="<?php echo $range_start ?>"
                                                                          max="<?php echo $range_end ?>"
-                                                                         value="<?php echo isset( $value ) ? esc_attr( $value ) : ''; ?>"/>
+                                                                         value="<?php echo isset($value) ? esc_attr($value) : ''; ?>"/>
                 </p>
             </div>
             <div class="col s2 m2 ">
@@ -835,22 +835,22 @@ 
 	}
 
 
-	public function do_form_switch_field( $params ) {
-		if ( ! isset( $params['2'] ) ) {
+	public function do_form_switch_field($params) {
+		if (!isset($params['2'])) {
 			$params[2] = 0;
 		}
-		list( $fieldname, $label, $disabled ) = $params;
-		$value = get_option( $fieldname );
+		list($fieldname, $label, $disabled) = $params;
+		$value = get_option($fieldname);
 		?>
         <div class="row">
             <div class="input-field col s10 m5 l3">
                 <div class="switch">
                     <label>
                         Off
-                        <input <?php echo ( $disabled ) ? "disabled" : "" ?> type="checkbox"
+                        <input <?php echo ($disabled) ? "disabled" : "" ?> type="checkbox"
                                                                              name="<?php echo $fieldname ?>"
                                                                              id="<?php echo $fieldname ?>"
-                                                                             value="1" <?php echo ( $value ) ? 'checked="checked"' : ''; ?>
+                                                                             value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>
                         ">
                         <span class="lever"></span>
                         On

public/class-xcloner-public.php

Doc Comments -2 removed lines

@@ -45,8 +45,6 @@
 	 *
 	 * @since    1.0.0
 	 *
-	 * @param      string $plugin_name The name of the plugin.
-	 * @param      string $version The version of this plugin.
 	 */
 	public function __construct( Xcloner $xcloner_container ) {
 

Spacing +3 added lines, -3 removed lines

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

admin/partials/xcloner_manage_backups_page.php

Indentation +32 added lines, -32 removed lines

@@ -6,7 +6,7 @@ 
 $storage_selection = "";
 
 if (isset($_GET['storage_selection']) and $_GET['storage_selection']) {
-    $storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
+	$storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
 }
 
 $backup_list = $xcloner_file_system->get_backup_archives_list($storage_selection);
@@ -34,7 +34,7 @@ 
 
             <?php foreach ($available_storages as $storage => $text): ?>
                 <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection)
-                    echo "selected" ?>><?php echo $text ?></option>
+					echo "selected" ?>><?php echo $text ?></option>
             <?php endforeach ?>
         </select>
         <?php endif ?>
@@ -61,21 +61,21 @@ 
 
 
         <?php
-        $i = 0;
-        foreach ($backup_list as $file_info):?>
+		$i = 0;
+		foreach ($backup_list as $file_info):?>
             <?php
-            if ($storage_selection == "gdrive") {
-                $file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
-            }
-            $file_exists_on_local_storage = true;
-
-            if ($storage_selection) {
-                if (!$xcloner_file_system->get_storage_filesystem()->has($file_info['path'])) {
-                    $file_exists_on_local_storage = false;
-                }
-            }
-
-            ?>
+			if ($storage_selection == "gdrive") {
+				$file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
+			}
+			$file_exists_on_local_storage = true;
+
+			if ($storage_selection) {
+				if (!$xcloner_file_system->get_storage_filesystem()->has($file_info['path'])) {
+					$file_exists_on_local_storage = false;
+				}
+			}
+
+			?>
             <?php if (!isset($file_info['parent'])): ?>
 
                 <tr>
@@ -91,12 +91,12 @@ 
                         <?php if (!$file_exists_on_local_storage): ?>
                             <a href="#"
                                title="<?php echo __("File does not exists on local storage",
-                                   "xcloner-backup-and-restore") ?>"><i
+								   "xcloner-backup-and-restore") ?>"><i
                                         class="material-icons backup_warning">warning</i></a>
                         <?php endif ?>
                         <?php
-                        if (isset($file_info['childs']) and is_array($file_info['childs'])):
-                            ?>
+						if (isset($file_info['childs']) and is_array($file_info['childs'])):
+							?>
                             <a href="#" title="expand" class="expand-multipart add"><i
                                         class="material-icons">add</i></a>
                             <a href="#" title="collapse" class="expand-multipart remove"><i class="material-icons">remove</i></a>
@@ -105,17 +105,17 @@ 
                                     <li>
                                         <?php echo $child[0] ?> (<?php echo size_format($child[2]) ?>)
                                         <?php
-                                        $child_exists_on_local_storage = true;
-                                        if ($storage_selection) {
-                                            if (!$xcloner_file_system->get_storage_filesystem()->has($child[0])) {
-                                                $child_exists_on_local_storage = false;
-                                            }
-                                        }
-                                        ?>
+										$child_exists_on_local_storage = true;
+										if ($storage_selection) {
+											if (!$xcloner_file_system->get_storage_filesystem()->has($child[0])) {
+												$child_exists_on_local_storage = false;
+											}
+										}
+										?>
                                         <?php if (!$child_exists_on_local_storage): ?>
                                             <a href="#"
                                                title="<?php echo __("File does not exists on local storage",
-                                                   "xcloner-backup-and-restore") ?>"><i
+												   "xcloner-backup-and-restore") ?>"><i
                                                         class="material-icons backup_warning">warning</i></a>
                                         <?php endif ?>
                                         <?php if (!$storage_selection) : ?>
@@ -123,12 +123,12 @@ 
                                                title="Download Backup"><i class="material-icons">file_download</i></a>
                                             <a href="#<?php echo $child[0] ?>" class="list-backup-content"
                                                title="<?php echo __('List Backup Content',
-                                                   'xcloner-backup-and-restore') ?>"><i
+												   'xcloner-backup-and-restore') ?>"><i
                                                         class="material-icons">folder_open</i></a>
                                         <?php elseif ($storage_selection != "gdrive" && !$xcloner_file_system->get_storage_filesystem()->has($child[0])): ?>
                                             <a href="#<?php echo $child[0] ?>" class="copy-remote-to-local"
                                                title="<?php echo __('Push Backup To Local Storage',
-                                                   'xcloner-backup-and-restore') ?>"><i
+												   'xcloner-backup-and-restore') ?>"><i
                                                         class="material-icons">file_upload</i></a>
                                         <?php endif ?>
                                     </li>
@@ -137,7 +137,7 @@ 
                         <?php endif; ?>
                     </td>
                     <td><?php if (isset($file_info['timestamp']))
-                            echo date("Y-m-d H:i", $file_info['timestamp']) ?></td>
+							echo date("Y-m-d H:i", $file_info['timestamp']) ?></td>
                     <td><?php echo size_format($file_info['size']) ?></td>
                     <td>
                         <?php if (!$storage_selection): ?>
@@ -148,7 +148,7 @@ 
                             <?php if (sizeof($available_storages)): ?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="cloud-upload"
                                    title="<?php echo __('Send Backup To Remote Storage',
-                                       'xcloner-backup-and-restore') ?>"><i
+									   'xcloner-backup-and-restore') ?>"><i
                                             class="material-icons">cloud_upload</i></a>
                             <?php endif ?>
                             <a href="#<?php echo $file_info['basename'] ?>" class="list-backup-content"
@@ -220,7 +220,7 @@ 
                 <div class="row">
                     <div class="col s12 label">
                         <label><?php echo sprintf(__('Send %s to remote storage', 'xcloner-backup-and-restore'),
-                                "<span class='backup_name'></span>") ?></label>
+								"<span class='backup_name'></span>") ?></label>
                     </div>
                     <div class="input-field col s8 m10">
                         <select name="transfer_storage" id="transfer_storage" class="validate" required>

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         foreach ($backup_list as $file_info):?>
             <?php
             if ($storage_selection == "gdrive") {
-                $file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
+                $file_info['path'] = $file_info['filename'].".".$file_info['extension'];
             }
             $file_exists_on_local_storage = true;
 

Braces +11 added lines, -5 removed lines

@@ -27,13 +27,16 @@ 
             <?php if ($storage_selection): ?>
                 <option value=""
                         selected><?php echo __('Change To Local Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php else: ?>
+            <?php else {
+	: ?>
                 <option value=""
                         selected><?php echo __('Change To Remote Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <?php foreach ($available_storages as $storage => $text): ?>
-                <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection)
+                <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection) {
                     echo "selected" ?>><?php echo $text ?></option>
             <?php endforeach ?>
         </select>
@@ -62,6 +65,7 @@ 
 
         <?php
         $i = 0;
+}
         foreach ($backup_list as $file_info):?>
             <?php
             if ($storage_selection == "gdrive") {
@@ -136,12 +140,14 @@ 
                             </ul>
                         <?php endif; ?>
                     </td>
-                    <td><?php if (isset($file_info['timestamp']))
+                    <td><?php if (isset($file_info['timestamp'])) {
                             echo date("Y-m-d H:i", $file_info['timestamp']) ?></td>
                     <td><?php echo size_format($file_info['size']) ?></td>
                     <td>
                         <?php if (!$storage_selection): ?>
-                            <a href="#<?php echo $file_info['basename']; ?>" class="download"
+                            <a href="#<?php echo $file_info['basename'];
+}
+?>" class="download"
                                title="<?php echo __('Download Backup', 'xcloner-backup-and-restore') ?>"><i
                                         class="material-icons">file_download</i></a>
 

admin/partials/xcloner_restore_page.php

Spacing +75 added lines, -75 removed lines

@@ -11,10 +11,10 @@ 
 
 ?>
 
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <script>
-    var xcloner_auth_key = '<?php echo md5( AUTH_KEY )?>';
+    var xcloner_auth_key = '<?php echo md5(AUTH_KEY)?>';
 </script>
 
 <div class="row xcloner-restore">
@@ -22,36 +22,36 @@ 
         <ul class="collapsible xcloner-restore " data-collapsible="accordion">
             <li data-step="1" class="restore-script-upload-step steps active show">
                 <div class="collapsible-header active"><i
-                            class="material-icons">settings_remote</i><?php echo __( "Restore Script Upload", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">settings_remote</i><?php echo __("Restore Script Upload", 'xcloner-backup-and-restore') ?>
                 </div>
                 <div class="collapsible-body row">
 
                     <ul class="text-steps">
-                        <li><?php echo __( "If you want to do a <strong>Local Target System Restore</strong>, leave Url field below empty and click 'Check Connection', you can skip the next steps.", 'xcloner-backup-and-restore' ) ?>
+                        <li><?php echo __("If you want to do a <strong>Local Target System Restore</strong>, leave Url field below empty and click 'Check Connection', you can skip the next steps.", 'xcloner-backup-and-restore') ?>
                         </li>
-                        <li><?php echo __( "If you want to do a <strong>Remote Target System Restore</strong>, please download the restore script from", 'xcloner-backup-and-restore' ) ?>
+                        <li><?php echo __("If you want to do a <strong>Remote Target System Restore</strong>, please download the restore script from", 'xcloner-backup-and-restore') ?>
                             <a href='#'
-                               onclick="window.location=ajaxurl+'?action=download_restore_script&phar=true'"><strong><?php echo __( "here", 'xcloner-backup-and-restore' ) ?></strong></a>
+                               onclick="window.location=ajaxurl+'?action=download_restore_script&phar=true'"><strong><?php echo __("here", 'xcloner-backup-and-restore') ?></strong></a>
                         </li>
                         <li>
-							<?php echo __( "Extract the restore script archive files on your new host", 'xcloner-backup-and-restore' ) ?>
+							<?php echo __("Extract the restore script archive files on your new host", 'xcloner-backup-and-restore') ?>
                         </li>
                         <li>
-							<?php echo __( "Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php", 'xcloner-backup-and-restore' ) ?>
+							<?php echo __("Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php", 'xcloner-backup-and-restore') ?>
                         </li>
                         <li>
-							<?php echo __( "If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.", 'xcloner-backup-and-restore' ) ?>
+							<?php echo __("If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.", 'xcloner-backup-and-restore') ?>
                         </li>
-						<?php if ( is_ssl() ): ?>
+						<?php if (is_ssl()): ?>
                             <li class="warning">
-								<?php echo __( "We have detected your connection to the site as being secure, so your restore script address must start with https://." ) ?>
+								<?php echo __("We have detected your connection to the site as being secure, so your restore script address must start with https://.") ?>
                             </li>
 						<?php endif ?>
 
                     </ul>
 
                     <div class="input-field col l9 s12">
-                        <input value="<?php echo ( is_ssl() ) ? "https://" : "" ?>" id="restore_script_url" type="text"
+                        <input value="<?php echo (is_ssl()) ? "https://" : "" ?>" id="restore_script_url" type="text"
                                class="validate"
                                placeholder="Url to XCloner Restore Script, example http://myddns.com/xcloner/xcloner_restore.php">
                         <label for="restore_script_url"></label>
@@ -59,7 +59,7 @@ 
                     </div>
                     <div class="col l3 s12 right-align">
                         <button class="btn waves-effect waves-light" type="submit" id="validate_url"
-                                name="action"><?php echo __( "Check Connection", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Check Connection", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">send</i>
                         </button>
                     </div>
@@ -68,18 +68,18 @@ 
 
             <li data-step="2" class="backup-upload-step steps">
                 <div class="collapsible-header active"><i
-                            class="material-icons">file_upload</i><?php echo __( "Upload Local Backup Archive To Target Host", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">file_upload</i><?php echo __("Upload Local Backup Archive To Target Host", 'xcloner-backup-and-restore') ?>
                 </div>
                 <div class="collapsible-body row">
-                    <p><?php echo __( "You can skip this step if you want to transfer the archive in some other way, make sure you upload it in the same directory as the restore script from the previous step.", 'xcloner-backup-and-restore' ) ?></p>
+                    <p><?php echo __("You can skip this step if you want to transfer the archive in some other way, make sure you upload it in the same directory as the restore script from the previous step.", 'xcloner-backup-and-restore') ?></p>
                     <div class="input-field col s12 l7">
                         <select id="backup_file" name="backup_file" class="browser-default">
                             <option value="" disabled
-                                    selected><?php echo __( "Please select a local backup archive to upload to target host", 'xcloner-backup-and-restore' ) ?></option>
-							<?php if ( is_array( $backup_list ) ): ?>
-								<?php foreach ( $backup_list as $file ): ?>
+                                    selected><?php echo __("Please select a local backup archive to upload to target host", 'xcloner-backup-and-restore') ?></option>
+							<?php if (is_array($backup_list)): ?>
+								<?php foreach ($backup_list as $file): ?>
                                     <option value="<?php echo $file['basename'] ?>">
-										<?php echo $file['basename'] ?> (<?php echo size_format( $file['size'] ) ?>)
+										<?php echo $file['basename'] ?> (<?php echo size_format($file['size']) ?>)
                                     </option>
 								<?php endforeach ?>
 							<?php endif ?>
@@ -94,18 +94,18 @@ 
                     <div class="col s12 l5 right-align">
                         <div class="toggler">
                             <button class="btn waves-effect waves-light upload-backup normal" type="submit" id=""
-                                    name="action"><?php echo __( "Upload", 'xcloner-backup-and-restore' ) ?>
+                                    name="action"><?php echo __("Upload", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons left">navigate_before</i>
                             </button>
                             <button class="btn waves-effect waves-light red upload-backup cancel" type="submit" id=""
-                                    name="action"><?php echo __( "Cancel", 'xcloner-backup-and-restore' ) ?>
+                                    name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons right">close</i>
                             </button>
                         </div>
                         <button class="btn waves-effect waves-light grey" type="submit"
-                                title="<?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>"
+                                title="<?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>"
                                 id="skip_upload_backup"
-                                name="action"><?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">navigate_next</i>
                         </button>
                     </div>
@@ -114,13 +114,13 @@ 
 
             <li data-step="3" class="restore-remote-backup-step steps active">
                 <div class="collapsible-header"><i
-                            class="material-icons">folder_open</i><?php echo __( "Restore Files Backup Available On Target Location", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">folder_open</i><?php echo __("Restore Files Backup Available On Target Location", 'xcloner-backup-and-restore') ?>
                     <i class="material-icons right" title="Refresh Target Backup Files List"
                        id="refresh_remote_backup_file">cached</i>
 
                     <div class="switch right">
                         <label>
-							<?php echo __( 'Verbose Output', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('Verbose Output', 'xcloner-backup-and-restore') ?>
                             <input type="checkbox" id="toggle_file_restore_display" name="toggle_file_restore_display"
                                    class="" checked value="1">
                             <span class="lever"></span>
@@ -135,11 +135,11 @@ 
                             <div class="col s12">
                                 <a class="btn-floating tooltipped btn-small right" data-html="true" data-position="left"
                                    data-delay="50"
-                                   data-tooltip="<?php echo __( "This is the directory where you would like to restore the backup archive files.<br /> 
-										Please use this with caution when restoring to a live site.", 'xcloner-backup-and-restore' ) ?>"><i
+                                   data-tooltip="<?php echo __("This is the directory where you would like to restore the backup archive files.<br /> 
+										Please use this with caution when restoring to a live site.", 'xcloner-backup-and-restore') ?>"><i
                                             class="material-icons">help_outline</i>
                                 </a>
-                                <h5><?php echo __( "Restore Target Path:", 'xcloner-backup-and-restore' ) ?></h5>
+                                <h5><?php echo __("Restore Target Path:", 'xcloner-backup-and-restore') ?></h5>
                                 <input type="text" name="remote_restore_path" id="remote_restore_path" class="validate"
                                        placeholder="Restore Target Path">
                                 <label></label>
@@ -151,13 +151,13 @@ 
                             <div class="col s12">
                                 <a href="#backup_localhost-2017-04-03_10-58-sql-diff2017-03-22_00-00-5b6c4.tgz"
                                    class="list-backup-content btn-floating tooltipped btn-small right"
-                                   data-tooltip="<?php echo __( 'Click To List The Selected Backup Content', 'xcloner-backup-and-restore' ) ?>">
+                                   data-tooltip="<?php echo __('Click To List The Selected Backup Content', 'xcloner-backup-and-restore') ?>">
                                     <i class="material-icons">folder_open</i>
                                 </a>
-                                <h5><?php echo __( "Restore Backup Archive:", 'xcloner-backup-and-restore' ) ?></h5>
+                                <h5><?php echo __("Restore Backup Archive:", 'xcloner-backup-and-restore') ?></h5>
                                 <select id="remote_backup_file" name="remote_backup_file" class="browser-default">
                                     <option value="" disabled
-                                            selected><?php echo __( "Please select the target backup file to restore", 'xcloner-backup-and-restore' ) ?></option>
+                                            selected><?php echo __("Please select the target backup file to restore", 'xcloner-backup-and-restore') ?></option>
                                 </select>
                                 <label></label>
                             </div>
@@ -166,41 +166,41 @@ 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_all" checked
                                        value="" disabled/>
                                 <label for="filter_files_all" class="tooltipped" data-position="right"
-                                       data-tooltip="<?php echo __( "Restore all backup files. Available only when doing a Remote Target System Restore", 'xcloner-backup-and-restore' ) ?>"><?php echo __( "Restore All Files", "xcloner-backup-and-restore" ) ?></label>
+                                       data-tooltip="<?php echo __("Restore all backup files. Available only when doing a Remote Target System Restore", 'xcloner-backup-and-restore') ?>"><?php echo __("Restore All Files", "xcloner-backup-and-restore") ?></label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_wp_content"
                                        value="/^wp-content\/(.*)/"/>
                                 <label for="filter_files_wp_content" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only wp-content", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only wp-content", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_plugins"
                                        value="/^wp-content\/plugins(.*)/"/>
                                 <label for="filter_files_plugins" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/plugins/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Plugins", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/plugins/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Plugins", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_uploads"
                                        value="/^wp-content\/uploads(.*)/"/>
                                 <label for="filter_files_uploads" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/uploads/ folder only', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Uploads", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/uploads/ folder only', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Uploads", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_themes"
                                        value="/^wp-content\/themes(.*)/"/>
                                 <label for="filter_files_themes" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the files only of the wp-content/themes/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Themes", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the files only of the wp-content/themes/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Themes", "xcloner-backup-and-restore") ?>
                                 </label>
 
                                 <input class="with-gap" name="filter_files" type="radio" id="filter_files_database"
                                        value="/^xcloner-(.*)\/(.*)\.sql/"/>
                                 <label for="filter_files_database" class="tooltipped"
-                                       data-tooltip="<?php echo __( 'Restore the database-sql.sql mysql backup from the xcloner-xxxxx/ folder', 'xcloner-backup-and-restore' ) ?>">
-									<?php echo __( "Only Database Backup", "xcloner-backup-and-restore" ) ?>
+                                       data-tooltip="<?php echo __('Restore the database-sql.sql mysql backup from the xcloner-xxxxx/ folder', 'xcloner-backup-and-restore') ?>">
+									<?php echo __("Only Database Backup", "xcloner-backup-and-restore") ?>
                                 </label>
                             </div>
                         </div>
@@ -216,18 +216,18 @@ 
                     <div class="col s12 l5 right-align">
                         <div class="toggler">
                             <button class="btn waves-effect waves-light restore_remote_backup normal " type="submit"
-                                    id="" name="action"><?php echo __( "Restore", 'xcloner-backup-and-restore' ) ?>
+                                    id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons left">navigate_before</i>
                             </button>
                             <button class="btn waves-effect waves-light red restore_remote_backup cancel" type="submit"
-                                    id="" name="action"><?php echo __( "Cancel", 'xcloner-backup-and-restore' ) ?>
+                                    id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons right">close</i>
                             </button>
                         </div>
                         <button class="btn waves-effect waves-light grey" type="submit"
-                                title="<?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>"
+                                title="<?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>"
                                 id="skip_remote_backup_step"
-                                name="action"><?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">navigate_next</i>
                         </button>
                     </div>
@@ -236,7 +236,7 @@ 
 
             <li data-step="4" class="restore-remote-database-step steps active">
                 <div class="collapsible-header"><i
-                            class="material-icons">list</i><?php echo __( "Restore Target Database - Search and Replace", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">list</i><?php echo __("Restore Target Database - Search and Replace", 'xcloner-backup-and-restore') ?>
                     <i class="material-icons right" title="Refresh Database Backup Files List"
                        id="refresh_database_file">cached</i>
                 </div>
@@ -246,68 +246,68 @@ 
                         <div class="col s12">
                             <a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50"
                                data-html="true"
-                               data-tooltip="<?php echo __( 'Please provide below the mysql connection details for the target host database.<br />For live sites we recommend using a new separate database.', 'xcloner-backup-and-restore' ) ?>"
+                               data-tooltip="<?php echo __('Please provide below the mysql connection details for the target host database.<br />For live sites we recommend using a new separate database.', 'xcloner-backup-and-restore') ?>"
                                data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>
-                            <h5><?php echo __( 'Target Mysql Details', 'xcloner-backup-and-restore' ) ?></h5>
+                            <h5><?php echo __('Target Mysql Details', 'xcloner-backup-and-restore') ?></h5>
                         </div>
                         <div class=" col s12">
                             <div class="input-field col s12 m6">
                                 <input type="text" name="remote_mysql_host" id="remote_mysql_host" class="validate"
                                        placeholder="Target Mysql Hostname">
-                                <label><?php echo __( "Target Mysql Hostname", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Hostname", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                             <div class="input-field  col s12 m6">
                                 <input type="text" name="remote_mysql_db" id="remote_mysql_db" class="validate"
                                        placeholder="Target Mysql Database">
-                                <label><?php echo __( "Target Mysql Database", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Database", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                             <div class="input-field  col s12 m6">
                                 <input type="text" name="remote_mysql_user" id="remote_mysql_user" class="validate"
                                        placeholder="Target Mysql Username">
-                                <label><?php echo __( "Target Mysql Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
 
                             <div class="input-field  col s12 m6">
                                 <input type="text" name="remote_mysql_pass" id="remote_mysql_pass" class="validate"
                                        placeholder="Target Mysql Password">
-                                <label><?php echo __( "Target Mysql Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Target Mysql Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                         </div>
                         <div class="col s12">
                             <a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50"
                                data-html="true"
-                               data-tooltip="<?php echo __( 'I will attempt to replace all mysql backup records matching the provided Source Url with the provided Target Url. <br />Leave blank the Target Url if you would like to skip this option. <br />As a bonus, I will also replace all matching serialized data and fix it\'s parsing.', 'xcloner-backup-and-restore' ) ?>"
+                               data-tooltip="<?php echo __('I will attempt to replace all mysql backup records matching the provided Source Url with the provided Target Url. <br />Leave blank the Target Url if you would like to skip this option. <br />As a bonus, I will also replace all matching serialized data and fix it\'s parsing.', 'xcloner-backup-and-restore') ?>"
                                data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>
-                            <h5><?php echo __( 'Target Mysql Search and Replace', 'xcloner-backup-and-restore' ) ?></h5>
+                            <h5><?php echo __('Target Mysql Search and Replace', 'xcloner-backup-and-restore') ?></h5>
                         </div>
                         <div class="col s12">
                             <div class="input-field col s12 m6 ">
                                 <input type="text" name="wp_home_url" id="wp_home_url" class="validate"
                                        placeholder="WP Home Url" value="<?php echo home_url(); ?>">
-                                <label><?php echo __( "Source Home Url", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("Source Home Url", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
                             <div class="input-field col s12 m6 ">
                                 <input type="text" name="remote_restore_url" id="remote_restore_url" class="validate"
                                        placeholder="Restore Target Url">
-                                <label><?php echo __( "With Target Home Url", 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __("With Target Home Url", 'xcloner-backup-and-restore') ?></label>
                             </div>
 
-							<?php if ( site_url() != home_url() ) : ?>
+							<?php if (site_url() != home_url()) : ?>
                                 <div class="input-field col s12 m6 ">
                                     <input type="text" name="wp_site_url" id="wp_site_url" class="validate"
                                            placeholder="WP Site Url" value="<?php echo site_url(); ?>">
-                                    <label><?php echo __( "Source Site Url", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label><?php echo __("Source Site Url", 'xcloner-backup-and-restore') ?></label>
                                 </div>
 
                                 <div class="input-field col s12 m6 ">
                                     <input type="text" name="remote_restore_site_url" id="remote_restore_site_url"
                                            class="validate" placeholder="Restore Target Url">
-                                    <label><?php echo __( "With Target Site Url", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label><?php echo __("With Target Site Url", 'xcloner-backup-and-restore') ?></label>
                                 </div>
 
 							<?php endif; ?>
@@ -319,7 +319,7 @@ 
                         <div class="input-field row">
                             <select id="remote_database_file" name="remote_database_file" class="browser-default">
                                 <option value="" disabled
-                                        selected><?php echo __( "Please select the target database backup file to restore", 'xcloner-backup-and-restore' ) ?></option>
+                                        selected><?php echo __("Please select the target database backup file to restore", 'xcloner-backup-and-restore') ?></option>
                             </select>
 
                             <label></label>
@@ -331,7 +331,7 @@ 
 
                         <div class="status"></div>
                         <div class="query-box">
-                            <h6><?php echo __( 'Use the field below to fix your mysql query and Retry again the Restore, or replace with # to Skip next', 'xcloner-backup-and-restore' ) ?></h6>
+                            <h6><?php echo __('Use the field below to fix your mysql query and Retry again the Restore, or replace with # to Skip next', 'xcloner-backup-and-restore') ?></h6>
                             <textarea class="query-list" cols="5"></textarea>
                         </div>
                     </div>
@@ -339,20 +339,20 @@ 
                     <div class="col s12 l5 right-align">
                         <div class="toggler">
                             <button class="btn waves-effect waves-light restore_remote_mysqldump normal " type="submit"
-                                    id="" name="action"><?php echo __( "Restore", 'xcloner-backup-and-restore' ) ?>
+                                    id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons left">navigate_before</i>
                             </button>
                             <button class="btn waves-effect waves-light red restore_remote_mysqldump cancel"
                                     type="submit" id=""
-                                    name="action"><?php echo __( "Cancel", 'xcloner-backup-and-restore' ) ?>
+                                    name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore') ?>
                                 <i class="material-icons right">close</i>
                             </button>
                         </div>
 
                         <button class="btn waves-effect waves-light grey" type="submit"
-                                title="<?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>"
+                                title="<?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>"
                                 id="skip_restore_remote_database_step"
-                                name="action"><?php echo __( "Skip Next", 'xcloner-backup-and-restore' ) ?>
+                                name="action"><?php echo __("Skip Next", 'xcloner-backup-and-restore') ?>
                             <i class="material-icons right">navigate_next</i>
                         </button>
 
@@ -363,13 +363,13 @@ 
 
             <li data-step="5" class="restore-finish-step steps active">
                 <div class="collapsible-header"><i
-                            class="material-icons">folder_open</i><?php echo __( "Finishing up...", 'xcloner-backup-and-restore' ) ?>
+                            class="material-icons">folder_open</i><?php echo __("Finishing up...", 'xcloner-backup-and-restore') ?>
                 </div>
                 <div class="collapsible-body row">
 
                     <div class="row">
                         <div class="col s4">
-                            <label><?php echo __( "Update wp-config.php mysql details and update the Target Site Url", 'xcloner-backup-and-restore' ) ?></label>
+                            <label><?php echo __("Update wp-config.php mysql details and update the Target Site Url", 'xcloner-backup-and-restore') ?></label>
                         </div>
 
                         <div class="col s8">
@@ -387,7 +387,7 @@ 
 
                     <div class="row">
                         <div class="col s4">
-                            <label><?php echo __( "Delete Restored Backup Temporary Folder", 'xcloner-backup-and-restore' ) ?></label>
+                            <label><?php echo __("Delete Restored Backup Temporary Folder", 'xcloner-backup-and-restore') ?></label>
                         </div>
                         <div class="col s8">
                             <div class="switch">
@@ -404,7 +404,7 @@ 
 
                     <div class="row">
                         <div class="col s4">
-                            <label><?php echo __( "Delete Restore Script", 'xcloner-backup-and-restore' ) ?></label>
+                            <label><?php echo __("Delete Restore Script", 'xcloner-backup-and-restore') ?></label>
                         </div>
                         <div class="col s8">
                             <div class="switch">
@@ -424,8 +424,8 @@ 
                     </div>
 
                     <div class=" row col s12 center-align" id="xcloner_restore_finish">
-                        <h5><?php echo __( "Thank you for using XCloner.", 'xcloner-backup-and-restore' ) ?></h5>
-                        <h6><?php echo sprintf( __( "We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore' ), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore" target="_blank">Wordpress XCloner forums</a>' ) ?></h6>
+                        <h5><?php echo __("Thank you for using XCloner.", 'xcloner-backup-and-restore') ?></h5>
+                        <h6><?php echo sprintf(__("We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore'), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore" target="_blank">Wordpress XCloner forums</a>') ?></h6>
                         <a class="twitter-follow-button" href="https://twitter.com/thinkovi" data-show-count="false">Follow
                             @thinkovi</a>
                         <script src="//platform.twitter.com/widgets.js" async="" charset="utf-8"></script>
@@ -435,14 +435,14 @@ 
                         <div class="row">
                             <div class="col s6 right-align">
                                 <button class="btn waves-effect waves-light teal" type="submit" id="restore_finish"
-                                        name="action"><?php echo __( "Finish", 'xcloner-backup-and-restore' ) ?>
+                                        name="action"><?php echo __("Finish", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">navigate_next</i>
                                 </button>
                             </div>
 
                             <div id="open_target_site" class="col s6 left-align">
                                 <a disabled="disabled" href="#" class="btn waves-effect waves-light teal" type="button"
-                                   target="_blank"><?php echo __( "Open Target Site", 'xcloner-backup-and-restore' ) ?>
+                                   target="_blank"><?php echo __("Open Target Site", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">navigate_next</i>
                                 </a>
                             </div>
@@ -459,7 +459,7 @@ 
 <!-- List Backup Content Modal-->
 <div id="backup_cotent_modal" class="modal">
     <div class="modal-content">
-        <h4><?php echo sprintf( __( "Listing Backup Content ", 'xcloner-backup-and-restore' ), "" ) ?></h4>
+        <h4><?php echo sprintf(__("Listing Backup Content ", 'xcloner-backup-and-restore'), "") ?></h4>
         <h5 class="backup-name"></h5>
 
         <div class="progress">

admin/partials/xcloner_init_page.php

Spacing +64 added lines, -64 removed lines

@@ -20,12 +20,12 @@ 
 
 $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');
 
 //$xcloner_file_system->cleanup_tmp_directories();
 
-if ( $requirements->check_backup_ready_status() ) {
+if ($requirements->check_backup_ready_status()) {
 	$latest_backup = $xcloner_file_system->get_latest_backup();
 	$xcloner_file_system->backup_storage_cleanup();
 }
@@ -34,15 +34,15 @@ 
 <div class="row">
     <div class="col s12">
         <h5 class="left-align">
-			<?php echo __( 'Backup Dashboard', 'xcloner-backup-and-restore' ) ?>
+			<?php echo __('Backup Dashboard', 'xcloner-backup-and-restore') ?>
         </h5>
     </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' ) ?>
+				<?php echo __('Your latest backup is older than 24 hours, please create a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -50,10 +50,10 @@ 
     </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' ) ?>
+				<?php echo __('You have no backup that I could find, please generate a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -61,10 +61,10 @@ 
     </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' ) ?>
+				<?php echo __('Backup system not ready, please check and fix the issues marked in red', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -87,74 +87,74 @@ 
                     <div class="collapsible-body">
                         <div class="" id="backup-status">
                             <div class="row">
-                                <h5><?php echo __( "Latest Backup", 'xcloner-backup-and-restore' ) ?></h5>
+                                <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 class="title"><?php echo __("Backup Name", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
 											<?php echo $latest_backup['basename'] ?>
                                         </div>
                                         <div class="item">
                                             <div class="title">
-												<?php echo __( "Backup Size", 'xcloner-backup-and-restore' ) ?>:
+												<?php echo __("Backup Size", 'xcloner-backup-and-restore') ?>:
                                             </div>
-											<?php echo size_format( $latest_backup['size'] ) ?>
+											<?php echo size_format($latest_backup['size']) ?>
                                         </div>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Backup Date", 'xcloner-backup-and-restore' ) ?>
+                                            <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: ?>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "No Backup Yet", 'xcloner-backup-and-restore' ) ?></div>
+                                            <div class="title"><?php echo __("No Backup Yet", 'xcloner-backup-and-restore') ?></div>
                                         </div>
 									<?php endif ?>
                                 </blockquote>
                                 <div>
-                                    <h5><?php echo __( "Backup Storage Usage", 'xcloner-backup-and-restore' ) ?></h5>
+                                    <h5><?php echo __("Backup Storage Usage", 'xcloner-backup-and-restore') ?></h5>
                                     <blockquote>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Total Size", 'xcloner-backup-and-restore' ) ?>
+                                            <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>
+                                    <h5><?php echo __("Next Scheduled Backup", 'xcloner-backup-and-restore') ?></h5>
                                     <blockquote>
                                         <div class="item">
 											<?php
-											$list = ( $xcloner_scheduler->get_next_run_schedule() );
+											$list = ($xcloner_scheduler->get_next_run_schedule());
 
-											if ( is_array( $list ) ) {
-												$xcloner_file_system->sort_by( $list, "next_run_time", "asc" );
+											if (is_array($list)) {
+												$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 ) ): ?>
-                                                <div class="title"><?php echo __( "Schedule Name", 'xcloner-backup-and-restore' ) ?>
+											<?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; ?>
                                         </div>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Next Call", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Next Call", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
-											<?php if ( isset( $latest_schedule->next_run_time ) ) {
-												echo date( $date_format . " " . $time_format, $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>
@@ -163,20 +163,20 @@ 
                             </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' ) ?>
+                            <i class="material-icons">bug_report</i><?php echo __('XCloner Debugger', 'xcloner-backup-and-restore') ?>
                             <div class="right">
-                                <a href="#<?php echo $logger_basename = basename( $logger->get_main_logger_url() ) ?>"
+                                <a href="#<?php echo $logger_basename = basename($logger->get_main_logger_url()) ?>"
                                    class="download-logger" title="<?php echo $logger_basename ?>">
                                     <span class="shorten_string"><?php echo $logger_basename ?>&nbsp;&nbsp;&nbsp;</span>
                                 </a>
                             </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 class="console" id="xcloner-console"><?php if ($logger_content) {
+									echo implode("<br />\n", array_reverse($logger_content));
 								} ?></div>
                         </div>
                     </li>
@@ -201,71 +201,71 @@ 
 
         <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
+                    <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
+                    <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
+                    <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' ) ?>
+                    <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' ) ?>)
+                        ( >= <?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' ) ?>
+                    <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' ) ?>)
+                        ( <?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 __('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 __('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 __('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 class="waves-effect waves-light btn system_info_toggle blue darken-1"><i class="material-icons left">list</i><?php echo __('Toggle Additional System Info', 'xcloner-backup-and-restore') ?>
                 </a>
             </div>
         </div>

Braces +5 added lines, -2 removed lines

@@ -110,7 +110,8 @@ 
 											echo date( $date_format . " " . $time_format, $latest_backup['timestamp'] + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
 											?>
                                         </div>
-									<?php else: ?>
+									<?php else {
+	: ?>
                                         <div class="item">
                                             <div class="title"><?php echo __( "No Backup Yet", 'xcloner-backup-and-restore' ) ?></div>
                                         </div>
@@ -123,7 +124,9 @@ 
                                             <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>

admin/partials/xcloner_remote_storage_page.php

Spacing +197 added lines, -197 removed lines

@@ -3,13 +3,13 @@ 
 
 $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();
 ?>
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <form class="remote-storage-form" method="POST">
 
@@ -21,12 +21,12 @@ 
                 <!-- 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" ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -36,121 +36,121 @@ 
                     <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' ) ?>"
+                                <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" ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_hostname") ?>">
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "Ftp Port", 'xcloner-backup-and-restore' ) ?>"
+                                <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 ) ?>">
+                                       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' ) ?>"
+                                <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">
+                                       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' ) ?>"
+                                <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">
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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 ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_transfer_mode", 1))
 									echo "checked" ?> />
-                                <label for="passive"><?php echo __( "Passive", 'xcloner-backup-and-restore' ) ?></label>
+                                <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 ) )
+                                       value="0" <?php if (!get_option("xcloner_ftp_transfer_mode", 1))
 									echo "checked" ?> />
-                                <label for="active"><?php echo __( "Active", 'xcloner-backup-and-restore' ) ?></label>
+                                <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" ) )
+                                       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>
+                                <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" ) )
+                                       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>
+                                <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' ) ?>"
+                                <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 ) ?>">
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>
+                                        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' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -161,12 +161,12 @@ 
                 <!-- 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" ) )
+                                       value="1" <?php if (get_option("xcloner_sftp_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -176,100 +176,100 @@ 
                     <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' ) ?>"
+                                <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" ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_hostname") ?>">
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "SFTP Port", 'xcloner-backup-and-restore' ) ?>"
+                                <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 ) ?>">
+                                       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' ) ?>"
+                                <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">
+                                       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' ) ?>"
+                                <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">
+                                       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' ) ?>"
+                                          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>
+                                          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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>"
+                                <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 ) ?>">
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>
+                                        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' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -281,12 +281,12 @@ 
                 <!-- AWS STORAGE-->
                 <li id="aws">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "S3 Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("S3 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" ) )
+                                       value="1" <?php if (get_option("xcloner_aws_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -301,49 +301,49 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "Key" and "Secret <br />Visit %s to install your own S3 like service.' ), "<a href='https://aws.amazon.com/s3/' target='_blank'>https://aws.amazon.com/s3/</a>", "<a href='https://minio.io/' target='_blank'>https://minio.io/</a>" ) ?>
+									<?php echo sprintf(__('Visit %s and get your "Key" and "Secret <br />Visit %s to install your own S3 like service.'), "<a href='https://aws.amazon.com/s3/' target='_blank'>https://aws.amazon.com/s3/</a>", "<a href='https://minio.io/' target='_blank'>https://minio.io/</a>") ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_key"><?php echo __( "S3 Key", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_key"><?php echo __("S3 Key", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Key", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 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">
+                                       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 __( "S3 Secret", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_secret"><?php echo __("S3 Secret", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Secret", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 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">
+                                       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 __( "S3 Region", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_region"><?php echo __("S3 Region", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <select placeholder="<?php echo __( "example: us-east-1", 'xcloner-backup-and-restore' ) ?>"
+                                <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">
+                                        value="<?php echo get_option("xcloner_aws_region") ?>" autocomplete="off">
                                     <option readonly
-                                            value=""><?php echo __( "Please Select AWS S3 Region or Leave Unselected for Custom Endpoint" ) ?></option>
+                                            value=""><?php echo __("Please Select AWS S3 Region or Leave Unselected for Custom Endpoint") ?></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 ?>
+                                        <option value="<?php echo $key ?>" <?php echo($key == get_option('xcloner_aws_region') ? "selected" : "") ?>><?php echo $region ?>
                                             = <?php echo $key ?></option>
 										<?php
 									}
@@ -354,59 +354,59 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_endpoint"><?php echo __( "S3 EndPoint", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_endpoint"><?php echo __("S3 EndPoint", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 EndPoint, leave blank if you want to use the default Amazon AWS Service", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 EndPoint, leave blank if you want to use the default Amazon AWS Service", 'xcloner-backup-and-restore') ?>"
                                        id="aws_endpoint" type="text" name="xcloner_aws_endpoint" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_endpoint" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_endpoint") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_bucket_name"><?php echo __( "S3 Bucket Name", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_bucket_name"><?php echo __("S3 Bucket Name", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Bucket Name", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 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">
+                                       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_prefix"><?php echo __( "S3 Prefix", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_prefix"><?php echo __("S3 Prefix", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Prefix, use / ending to define a folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Prefix, use / ending to define a folder", 'xcloner-backup-and-restore') ?>"
                                        id="aws_prefix" type="text" name="xcloner_aws_prefix" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_prefix" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_prefix") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_cleanup_days"><?php echo __( "S3 Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_cleanup_days"><?php echo __("S3 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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>
+                                        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' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -418,12 +418,12 @@ 
                 <!-- 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" ) )
+                                       value="1" <?php if (get_option("xcloner_dropbox_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -438,20 +438,20 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "App secret".' ), "<a href='https://www.dropbox.com/developers/apps' target='_blank'>https://www.dropbox.com/developers/apps</a>" ) ?>
+									<?php echo sprintf(__('Visit %s and get your "App secret".'), "<a href='https://www.dropbox.com/developers/apps' target='_blank'>https://www.dropbox.com/developers/apps</a>") ?>
                                 </p>
                             </div>
                         </div>
 
                         <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' ) ?>"
+                                <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" ) ?>"
+                                       value="<?php echo get_option("xcloner_dropbox_access_token") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -459,50 +459,50 @@ 
 
                         <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' ) ?>"
+                                <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" ) ?>"
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>
+                                        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' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -514,12 +514,12 @@ 
                 <!-- 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" ) )
+                                       value="1" <?php if (get_option("xcloner_azure_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -534,19 +534,19 @@ 
                             </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' ) ?>"
+                                <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" ) ?>"
+                                       class="validate" value="<?php echo get_option("xcloner_azure_account_name") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -554,49 +554,49 @@ 
 
                         <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' ) ?>"
+                                <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">
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>
+                                        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' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -608,12 +608,12 @@ 
                 <!-- 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" ) )
+                                       value="1" <?php if (get_option("xcloner_backblaze_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -628,20 +628,20 @@ 
                             </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' ) ?>"
+                                <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" ) ?>"
+                                       value="<?php echo get_option("xcloner_backblaze_account_id") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -649,53 +649,53 @@ 
 
                         <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' ) ?>"
+                                <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" ) ?>"
+                                       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' ) ?>"
+                                <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" ) ?>"
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>
+                                        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' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -707,12 +707,12 @@ 
                 <!-- 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" ) )
+                                       value="1" <?php if (get_option("xcloner_webdav_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -734,74 +734,74 @@ 
 
                         <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' ) ?>"
+                                <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">
+                                       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' ) ?>"
+                                <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">
+                                       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' ) ?>"
+                                <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" ) ?>"
+                                       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' ) ?>"
+                                <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" ) ?>"
+                                       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' ) ?>"
+                                <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" ) ?>">
+                                       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' ) ?>
+                                        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' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -813,13 +813,13 @@ 
                 <!-- 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" ) )
+                                           value="1" <?php if (get_option("xcloner_gdrive_enable"))
 										echo "checked" ?> \>
                                     <span class="lever"></span>
                                     On
@@ -829,7 +829,7 @@ 
                     </div>
                     <div class="collapsible-body">
 
-						<?php if ( $gdrive_construct ) : ?>
+						<?php if ($gdrive_construct) : ?>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
@@ -837,11 +837,11 @@ 
                                 </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="<?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>
@@ -850,25 +850,25 @@ 
 
                             <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' ) ?>"
+                                    <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" ) ?>">
+                                           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' ) ?>"
+                                    <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" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_client_secret") ?>">
                                 </div>
                             </div>
 
@@ -880,72 +880,72 @@ 
                                 <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>
+                                       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" ) ?>">
+                                           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="<?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' ) ?>"
+                                    <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" ) ?>"
+                                           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' ) ?>"
+                                    <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" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_cleanup_days") ?>">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_empty_trash"><?php echo __( "Keeps Deleted Backups in Trash", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash"><?php echo __("Keeps Deleted Backups in Trash", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6 input-field inline">
                                     <input name="xcloner_gdrive_empty_trash" type="radio" value="0"
-                                           id="gdrive_empty_trash_off" <?php if ( ! get_option( "xcloner_gdrive_empty_trash", 0 ) )
+                                           id="gdrive_empty_trash_off" <?php if (!get_option("xcloner_gdrive_empty_trash", 0))
 										echo "checked" ?> />
-                                    <label for="gdrive_empty_trash_off"><?php echo __( "Enabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_off"><?php echo __("Enabled", 'xcloner-backup-and-restore') ?></label>
 
                                     <input name="xcloner_gdrive_empty_trash" type="radio" value="1"
-                                           id="gdrive_empty_trash_on" <?php if ( get_option( "xcloner_gdrive_empty_trash", 0 ) )
+                                           id="gdrive_empty_trash_on" <?php if (get_option("xcloner_gdrive_empty_trash", 0))
 										echo "checked" ?> />
-                                    <label for="gdrive_empty_trash_on"><?php echo __( "Disabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_on"><?php echo __("Disabled", 'xcloner-backup-and-restore') ?></label>
                                 </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' ) ?>
+                                            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' ) ?>
+                                            onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                         <i class="material-icons right">import_export</i>
                                     </button>
                                 </div>
@@ -956,26 +956,26 @@ 
                                 <div class=" col s12">
                                     <div class="center">
 										<?php
-										$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=xcloner-google-drive' ), 'install-plugin_xcloner-google-drive' );
+										$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=xcloner-google-drive'), 'install-plugin_xcloner-google-drive');
 										?>
-                                        <h6><?php echo __( "This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated." ) ?></h6>
-                                        <h6><?php echo __( "PHP 5.5 minimum version is required." ) ?></h6>
+                                        <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' ) ) ?>
+											<?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"
+                                        <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>

Braces +4 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_ftp_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_enable" ) )
+                                       value="1" <?php if ( get_option( "xcloner_ftp_enable" ) ) {
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -340,6 +340,7 @@ 
                                             value=""><?php echo __( "Please Select AWS S3 Region or Leave Unselected for Custom Endpoint" ) ?></option>
 									<?php
 									$aws_regions = $remote_storage->get_aws_regions();
+}
 
 									foreach ( $aws_regions as $key => $region ) {
 										?>
@@ -423,7 +424,7 @@ 
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_dropbox_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_dropbox_enable" ) )
+                                       value="1" <?php if ( get_option( "xcloner_dropbox_enable" ) ) {
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -957,6 +958,7 @@ 
                                     <div class="center">
 										<?php
 										$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=xcloner-google-drive' ), 'install-plugin_xcloner-google-drive' );
+}
 										?>
                                         <h6><?php echo __( "This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated." ) ?></h6>
                                         <h6><?php echo __( "PHP 5.5 minimum version is required." ) ?></h6>

admin/partials/xcloner_console_page.php

Spacing +4 added lines, -4 removed lines

@@ -7,17 +7,17 @@
 <div class="col s12 ">
     <div>
         <h5 class="left-align">
-			<?php echo __( 'XCloner Debugger Dashboard', 'xcloner-backup-and-restore' ) ?>
+			<?php echo __('XCloner Debugger Dashboard', 'xcloner-backup-and-restore') ?>
         </h5>
 
-		<?php if ( $xcloner_settings->get_xcloner_option( 'xcloner_enable_log' ) ) : ?>
+		<?php if ($xcloner_settings->get_xcloner_option('xcloner_enable_log')) : ?>
             <ul class="collapsible xcloner-debugger" data-collapsible="accordion">
                 <li class="active">
                     <div class="collapsible-header active"><i class="material-icons">bug_report</i>XCloner Debugger
                     </div>
                     <div class="collapsible-body">
-                        <div class="console" id="xcloner-console"><?php if ( isset( $logger_content ) ) {
-								echo implode( "<br />\n", $logger_content );
+                        <div class="console" id="xcloner-console"><?php if (isset($logger_content)) {
+								echo implode("<br />\n", $logger_content);
 							} ?></div>
                     </div>
                 </li>

admin/partials/xcloner_scheduled_backups_page.php

Spacing +44 added lines, -44 removed lines

@@ -4,10 +4,10 @@ 
 $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 $available_storages     = $xcloner_remote_storage->get_available_storages();
 ?>
-<?php if ( ! defined( "DISABLE_WP_CRON" ) || ! DISABLE_WP_CRON ): ?>
+<?php if (!defined("DISABLE_WP_CRON") || !DISABLE_WP_CRON): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo sprintf( __( 'We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore' ), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress" ) ?>
+				<?php echo sprintf(__('We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore'), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress") ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -15,32 +15,32 @@ 
     </div>
 <?php endif ?>
 
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <div class="row">
     <table id="scheduled_backups" class="col s12" cellspacing="0" width="100%">
         <thead>
         <tr class="grey lighten-2">
-            <th><?php echo __( 'ID', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Recurrence', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Next Execution', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Remote Storage', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Last Backup', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Status', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="no-sort"><?php echo __( 'Action', 'xcloner-backup-and-restore' ) ?></th>
+            <th><?php echo __('ID', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Recurrence', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Next Execution', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Remote Storage', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Last Backup', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Status', 'xcloner-backup-and-restore') ?></th>
+            <th class="no-sort"><?php echo __('Action', 'xcloner-backup-and-restore') ?></th>
         </tr>
         </thead>
         <tfoot>
         <tr>
-            <th><?php echo __( 'ID', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Recurrence', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Next Execution', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Remote Storage', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Last Backup', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Status', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Action', 'xcloner-backup-and-restore' ) ?></th>
+            <th><?php echo __('ID', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Recurrence', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Next Execution', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Remote Storage', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Last Backup', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Status', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Action', 'xcloner-backup-and-restore') ?></th>
         </tr>
         </tfoot>
         <tbody>
@@ -50,8 +50,8 @@ 
 
 <div class="row">
     <div class="col s12 m6 offset-m6 teal lighten-1" id="server_time">
-        <h2><?php echo __( 'Current Server Time', 'xcloner-backup-and-restore' ) ?>: <span
-                    class="right"><?php echo current_time( 'mysql' ); ?></span></h2>
+        <h2><?php echo __('Current Server Time', 'xcloner-backup-and-restore') ?>: <span
+                    class="right"><?php echo current_time('mysql'); ?></span></h2>
     </div>
 </div>
 
@@ -65,17 +65,17 @@ 
 
             <div class="row">
                 <div class="col s12 m6">
-                    <h4><?php echo __( 'Edit Schedule', 'xcloner-backup-and-restore' ) ?> #<span
+                    <h4><?php echo __('Edit Schedule', 'xcloner-backup-and-restore') ?> #<span
                                 id="schedule_id"></span></h4>
                 </div>
 
                 <div class="col s12 m6 right-align">
                     <div class="switch">
                         <label>
-							<?php echo __( 'Off', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('Off', 'xcloner-backup-and-restore') ?>
                             <input type="checkbox" id="status" name="status" value="1">
                             <span class="lever"></span>
-							<?php echo __( 'On', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('On', 'xcloner-backup-and-restore') ?>
                         </label>
                     </div>
                 </div>
@@ -85,10 +85,10 @@ 
 
             <ul class="nav-tab-wrapper content row">
                 <li><a href="#scheduler_settings"
-                       class="nav-tab col s12 m6 nav-tab-active"><?php echo __( 'Scheduler Settings', 'xcloner-backup-and-restore' ) ?></a>
+                       class="nav-tab col s12 m6 nav-tab-active"><?php echo __('Scheduler Settings', 'xcloner-backup-and-restore') ?></a>
                 </li>
                 <li><a href="#advanced_scheduler_settings"
-                       class="nav-tab col s12 m6"><?php echo __( 'Advanced', 'xcloner-backup-and-restore' ) ?></a></li>
+                       class="nav-tab col s12 m6"><?php echo __('Advanced', 'xcloner-backup-and-restore') ?></a></li>
             </ul>
 
             <div class="nav-tab-wrapper-content">
@@ -97,15 +97,15 @@ 
                     <div class="row">
                         <div class="input-field col s12">
                             <input placeholder="" name="schedule_name" id="schedule_name" type="text" required value="">
-                            <label for="schedule_name"><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="schedule_name"><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></label>
                         </div>
                         <!--<div class="input-field inline col s12 l6">
 						<select id="backup_type" class="" name="backup_type" id="backup_type">
-							<option value=""><?php echo __( "Full Backup", "xcloner-backup-and-restore" ); ?></option>
-							<option value="diff"><?php echo __( "Differential Backups", "xcloner-backup-and-restore" ); ?></option>
-							<option value="full_diff"><?php echo __( "Full Backup + Differential Backups", "xcloner-backup-and-restore" ); ?></option>
+							<option value=""><?php echo __("Full Backup", "xcloner-backup-and-restore"); ?></option>
+							<option value="diff"><?php echo __("Differential Backups", "xcloner-backup-and-restore"); ?></option>
+							<option value="full_diff"><?php echo __("Full Backup + Differential Backups", "xcloner-backup-and-restore"); ?></option>
 						</select>
-						<label for="backup_type"><?php echo __( 'Scheduled Backup Type', 'xcloner-backup-and-restore' ) ?></label>
+						<label for="backup_type"><?php echo __('Scheduled Backup Type', 'xcloner-backup-and-restore') ?></label>
 					</div>-->
                     </div>
 
@@ -114,18 +114,18 @@ 
                             <input placeholder="" name="schedule_start_date" id="schedule_start_date" type="datetime"
                                    value="">
                             <label for="schedule_start_date"
-                                   class="active"><?php echo __( 'Schedule Start At', 'xcloner-backup-and-restore' ) ?>
+                                   class="active"><?php echo __('Schedule Start At', 'xcloner-backup-and-restore') ?>
                                 :</label>
                         </div>
 
                         <div class="input-field col s12 l6">
                             <select name="schedule_frequency" id="schedule_frequency" class="validate" required>
                                 <option value="" disabled
-                                        selected><?php echo __( 'Schedule Recurrence', 'xcloner-backup-and-restore' ) ?></option>
+                                        selected><?php echo __('Schedule Recurrence', 'xcloner-backup-and-restore') ?></option>
 								<?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>
 									<?php
@@ -135,17 +135,17 @@ 
                         </div>
                     </div>
 
-					<?php if ( sizeof( $available_storages ) ): ?>
+					<?php if (sizeof($available_storages)): ?>
                         <div class="row">
                             <div class="input-field col s12 l12">
                                 <select name="schedule_storage" id="schedule_storage" class="validate">
                                     <option value=""
-                                            selected><?php echo __( 'none', 'xcloner-backup-and-restore' ) ?></option>
-									<?php foreach ( $available_storages as $storage => $text ): ?>
+                                            selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
+									<?php foreach ($available_storages as $storage => $text): ?>
                                         <option value="<?php echo $storage ?>"><?php echo $text ?></option>
 									<?php endforeach ?>
                                 </select>
-                                <label><?php echo __( 'Send To Remote Storage ', 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __('Send To Remote Storage ', 'xcloner-backup-and-restore') ?></label>
                             </div>
                         </div>
 					<?php endif ?>
@@ -154,7 +154,7 @@ 
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="email_notification" id="email_notification" type="text"
                                    value="">
-                            <label for="email_notification"><?php echo __( 'Email Notification Address', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="email_notification"><?php echo __('Email Notification Address', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -162,7 +162,7 @@ 
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="diff_start_date" id="diff_start_date" type="text"
                                    class="datepicker_max_today" value="">
-                            <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>
                 </div>
@@ -171,7 +171,7 @@ 
                     <div class="row">
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="backup_name" id="backup_name" type="text" required value="">
-                            <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>
 
@@ -180,7 +180,7 @@ 
                             <textarea id="table_params" name="table_params" class="materialize-textarea"
                                       rows="15"></textarea>
                             <label for="table_params"
-                                   class="active"><?php echo __( 'Included Database Data', 'xcloner-backup-and-restore' ) ?></label>
+                                   class="active"><?php echo __('Included Database Data', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -189,7 +189,7 @@ 
                             <textarea id="excluded_files" name="excluded_files" class="materialize-textarea"
                                       rows="15"></textarea>
                             <label for="excluded_files"
-                                   class="active"><?php echo __( 'Excluded Files', 'xcloner-backup-and-restore' ) ?></label>
+                                   class="active"><?php echo __('Excluded Files', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
                 </div>
@@ -199,7 +199,7 @@ 
 
                 <div class="input-field col s12 ">
                     <button class="right btn waves-effect waves-light" type="submit"
-                            name="action"><?php echo __( 'Save', 'xcloner-backup-and-restore' ) ?>
+                            name="action"><?php echo __('Save', 'xcloner-backup-and-restore') ?>
                         <i class="material-icons right">send</i>
                     </button>
                 </div>