ovidiul / XCloner-Wordpress

admin/partials/xcloner_console_page.php

Braces +4 added lines, -1 removed lines

@@ -33,7 +33,10 @@
 			<li class="active">
 				<div class="collapsible-header active"><i class="material-icons">bug_report</i>XCloner Debugger</div>
 				<div class="collapsible-body">
-					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
+					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) {
+	echo implode("<br />\n", $logger_content);
+}
+?></div>
 				</div>
 			</li>
 		</ul>

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-$xcloner_settings 	= $this->get_xcloner_container()->get_xcloner_settings();
-$logger				= $this->get_xcloner_container()->get_xcloner_logger();
-$logger_content 	= $logger->getLastDebugLines();
+$xcloner_settings = $this->get_xcloner_container()->get_xcloner_settings();
+$logger = $this->get_xcloner_container()->get_xcloner_logger();
+$logger_content = $logger->getLastDebugLines();
 ?>
 <div class="col s12 ">
 	<div>
@@ -10,12 +10,12 @@ 
 				<?php echo __('XCloner Debugger Dashboard', 'xcloner-backup-and-restore') ?>
 		</h5>
 		
-		<?php if($xcloner_settings->get_xcloner_option('xcloner_enable_log')) :?>
+		<?php if ($xcloner_settings->get_xcloner_option('xcloner_enable_log')) :?>
 		<ul class="collapsible xcloner-debugger" data-collapsible="accordion">
 			<li class="active">
 				<div class="collapsible-header active"><i class="material-icons">bug_report</i>XCloner Debugger</div>
 				<div class="collapsible-body">
-					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
+					<div class="console" id="xcloner-console"><?php if (isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
 				</div>
 			</li>
 		</ul>
@@ -28,6 +28,6 @@ 
 				}, 2000);*/
 			})
 		</script>
-		<?php endif;?>
+		<?php endif; ?>
 	</div>
 </div>

admin/class-xcloner-admin.php

Braces +9 added lines, -7 removed lines

@@ -61,8 +61,9 @@ 
 	 */
 	public function enqueue_styles($hook) {
 		
-		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner"))
-			return;
+		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner")) {
+					return;
+		}
 
 		/**
 		 * This function is provided for demonstration purposes only.
@@ -93,8 +94,9 @@ 
 	 */
 	public function enqueue_scripts($hook) {
 
-		if(!stristr($hook, "page_".$this->plugin_name))
-			return;
+		if(!stristr($hook, "page_".$this->plugin_name)) {
+					return;
+		}
 			
 		/**
 		 * This function is provided for demonstration purposes only.
@@ -234,15 +236,15 @@ 
 					settings_fields('xcloner_general_settings_group');
 					do_settings_sections('xcloner_settings_page');
 					
-				}elseif( $active_tab == 'mysql_options' ) {
+				} elseif( $active_tab == 'mysql_options' ) {
 					
 					settings_fields('xcloner_mysql_settings_group');
 					do_settings_sections('xcloner_mysql_settings_page');
-				}elseif( $active_tab == 'system_options' ) {
+				} elseif( $active_tab == 'system_options' ) {
 					
 					settings_fields('xcloner_system_settings_group');
 					do_settings_sections('xcloner_system_settings_page');
-				}elseif( $active_tab == 'cleanup_options' ) {
+				} elseif( $active_tab == 'cleanup_options' ) {
 					
 					settings_fields('xcloner_cleanup_settings_group');
 					do_settings_sections('xcloner_cleanup_settings_page');

Doc Comments -2 removed lines

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

Indentation +17 added lines, -17 removed lines

@@ -221,28 +221,28 @@ 
 		
 		// add error/update messages
  
-	    // check if the user have submitted the settings
-	    // wordpress will add the "settings-updated" $_GET parameter to the url
-	    if (isset($_GET['settings-updated'])) {
-	        // add settings saved message with the class of "updated"
-	        add_settings_error('wporg_messages', 'wporg_message', __('Settings Saved', 'wporg'), 'updated');
-	    }
+		// check if the user have submitted the settings
+		// wordpress will add the "settings-updated" $_GET parameter to the url
+		if (isset($_GET['settings-updated'])) {
+			// add settings saved message with the class of "updated"
+			add_settings_error('wporg_messages', 'wporg_message', __('Settings Saved', 'wporg'), 'updated');
+		}
 	 
-	    // show error/update messages
-	    settings_errors('wporg_messages');
-	    ?>
+		// show error/update messages
+		settings_errors('wporg_messages');
+		?>
 	   
 	    <?php
 			$xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 			
-            if( isset( $_GET[ 'tab' ] ) ) {
-                $active_tab = $xcloner_sanitization->sanitize_input_as_string($_GET[ 'tab' ]);
-            } // end if
-            else{
+			if( isset( $_GET[ 'tab' ] ) ) {
+				$active_tab = $xcloner_sanitization->sanitize_input_as_string($_GET[ 'tab' ]);
+			} // end if
+			else{
 				$active_tab = "general_options";
 			}
             
-        ?>
+		?>
         <h1><?= esc_html(get_admin_page_title()); ?></h1>
          
         <ul class="nav-tab-wrapper row">
@@ -276,9 +276,9 @@ 
 					do_settings_sections('xcloner_cleanup_settings_page');
 				}
 
-	            // output save settings button
-	            submit_button('Save Settings');
-	            ?>
+				// output save settings button
+				submit_button('Save Settings');
+				?>
 	        </form>
 
 	    </div>

Spacing +36 added lines, -36 removed lines

@@ -48,11 +48,11 @@ 
 	 * @param      string    $plugin_name       The name of this plugin.
 	 * @param      string    $version    The version of this plugin.
 	 */
-	public function __construct( Xcloner $xcloner_container) {
+	public function __construct(Xcloner $xcloner_container) {
 
-		$this->plugin_name 			= $xcloner_container->get_plugin_name();
-		$this->version				= $xcloner_container->get_version();
-		$this->xcloner_container 	= $xcloner_container;
+		$this->plugin_name = $xcloner_container->get_plugin_name();
+		$this->version = $xcloner_container->get_version();
+		$this->xcloner_container = $xcloner_container;
 	}
 	
 	public function get_xcloner_container()
@@ -67,7 +67,7 @@ 
 	 */
 	public function enqueue_styles($hook) {
 		
-		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner"))
+		if (!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option'] == "com_cloner"))
 			return;
 
 		/**
@@ -82,13 +82,13 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name."_materialize", plugin_dir_url( __FILE__ ) . 'css/materialize.min.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_materialize.clockpicker", plugin_dir_url( __FILE__ ) . 'css/materialize.clockpicker.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_materialize.icons", '//fonts.googleapis.com/icon?family=Material+Icons', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_jquery.datatables", plugin_dir_url( __FILE__ ) . 'css/jquery.dataTables.min.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_jquery.datatables.responsive", plugin_dir_url( __FILE__ ) . 'css/responsive.dataTables.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_jstree", dirname(plugin_dir_url( __FILE__ )) . '/vendor/vakata/jstree/dist/themes/default/style.min.css', array(), '3.3', 'all' );
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/xcloner-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name."_materialize", plugin_dir_url(__FILE__).'css/materialize.min.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_materialize.clockpicker", plugin_dir_url(__FILE__).'css/materialize.clockpicker.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_materialize.icons", '//fonts.googleapis.com/icon?family=Material+Icons', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jquery.datatables", plugin_dir_url(__FILE__).'css/jquery.dataTables.min.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jquery.datatables.responsive", plugin_dir_url(__FILE__).'css/responsive.dataTables.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jstree", dirname(plugin_dir_url(__FILE__)).'/vendor/vakata/jstree/dist/themes/default/style.min.css', array(), '3.3', 'all');
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/xcloner-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -99,7 +99,7 @@ 
 	 */
 	public function enqueue_scripts($hook) {
 
-		if(!stristr($hook, "page_".$this->plugin_name))
+		if (!stristr($hook, "page_".$this->plugin_name))
 			return;
 			
 		/**
@@ -117,17 +117,17 @@ 
 		add_thickbox();
 		wp_enqueue_script('plugin-install');
 		wp_enqueue_script('updates');
-		wp_enqueue_script( $this->plugin_name."_materialize", plugin_dir_url( __FILE__ ) . 'js/materialize.min.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_materialize.clockpicker", plugin_dir_url( __FILE__ ) . 'js/materialize.clockpicker.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_jquery.datatables", plugin_dir_url( __FILE__ ) . 'js/jquery.dataTables.min.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_jquery.datatables.respnsive", plugin_dir_url( __FILE__ ) . 'js/dataTables.responsive.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_vakata", dirname(plugin_dir_url( __FILE__ )) . '/vendor/vakata/jstree/dist/jstree.min.js', array( 'jquery' ), '3.3', false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-backup-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-backup-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-scheduler-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-scheduler-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-restore-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-restore-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-manage-backups-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-manage-backups-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-remote-storage-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-remote-storage-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/xcloner-admin.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script($this->plugin_name."_materialize", plugin_dir_url(__FILE__).'js/materialize.min.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_materialize.clockpicker", plugin_dir_url(__FILE__).'js/materialize.clockpicker.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_jquery.datatables", plugin_dir_url(__FILE__).'js/jquery.dataTables.min.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_jquery.datatables.respnsive", plugin_dir_url(__FILE__).'js/dataTables.responsive.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_vakata", dirname(plugin_dir_url(__FILE__)).'/vendor/vakata/jstree/dist/jstree.min.js', array('jquery'), '3.3', false);
+		wp_enqueue_script($this->plugin_name."_xcloner-backup-class", plugin_dir_url(__FILE__).'js/xcloner-backup-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-scheduler-class", plugin_dir_url(__FILE__).'js/xcloner-scheduler-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-restore-class", plugin_dir_url(__FILE__).'js/xcloner-restore-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-manage-backups-class", plugin_dir_url(__FILE__).'js/xcloner-manage-backups-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-remote-storage-class", plugin_dir_url(__FILE__).'js/xcloner-remote-storage-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/xcloner-admin.js', array('jquery'), $this->version, false);
 		
 
 	}
@@ -145,19 +145,19 @@ 
 		
 		$_POST['action'] = $xcloner_sanitization->sanitize_input_as_string($_POST['action']);
 		
-		if(isset($_POST['action']))
+		if (isset($_POST['action']))
 		{
 			$remote_storage->save($_POST['action']);
 		}
 		
-		if(isset($_POST['authentification_code']) && $_POST['authentification_code'] != "")
+		if (isset($_POST['authentification_code']) && $_POST['authentification_code'] != "")
 		{
 			$_POST['authentification_code'] = $xcloner_sanitization->sanitize_input_as_string($_POST['authentification_code']);
 			
 			$remote_storage->set_access_token($_POST['authentification_code']);
 		}
 			
-		if(isset($_POST['connection_check']) && $_POST['connection_check'])
+		if (isset($_POST['connection_check']) && $_POST['connection_check'])
 		{
 			$remote_storage->check($_POST['action']);
 		}
@@ -170,7 +170,7 @@ 
 	{
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 		
-		if(!$requirements->check_backup_ready_status())
+		if (!$requirements->check_backup_ready_status())
 		{
 			require_once("partials/xcloner_init_page.php");
 			return false;
@@ -202,7 +202,7 @@ 
 	{
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 		
-		if(!$requirements->check_backup_ready_status())
+		if (!$requirements->check_backup_ready_status())
 		{
 			require_once("partials/xcloner_init_page.php");
 			return false;
@@ -235,10 +235,10 @@ 
 	    <?php
 			$xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 			
-            if( isset( $_GET[ 'tab' ] ) ) {
-                $active_tab = $xcloner_sanitization->sanitize_input_as_string($_GET[ 'tab' ]);
+            if (isset($_GET['tab'])) {
+                $active_tab = $xcloner_sanitization->sanitize_input_as_string($_GET['tab']);
             } // end if
-            else{
+            else {
 				$active_tab = "general_options";
 			}
             
@@ -257,20 +257,20 @@ 
 	        <form action="options.php" method="post">
 	            <?php
 				
-				if( $active_tab == 'general_options' ) {
+				if ($active_tab == 'general_options') {
 					
 					settings_fields('xcloner_general_settings_group');
 					do_settings_sections('xcloner_settings_page');
 					
-				}elseif( $active_tab == 'mysql_options' ) {
+				}elseif ($active_tab == 'mysql_options') {
 					
 					settings_fields('xcloner_mysql_settings_group');
 					do_settings_sections('xcloner_mysql_settings_page');
-				}elseif( $active_tab == 'system_options' ) {
+				}elseif ($active_tab == 'system_options') {
 					
 					settings_fields('xcloner_system_settings_group');
 					do_settings_sections('xcloner_system_settings_page');
-				}elseif( $active_tab == 'cleanup_options' ) {
+				}elseif ($active_tab == 'cleanup_options') {
 					
 					settings_fields('xcloner_cleanup_settings_group');
 					do_settings_sections('xcloner_cleanup_settings_page');

includes/class-xcloner-settings.php

Doc Comments +3 added lines

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

Indentation +250 added lines, -250 removed lines

@@ -202,348 +202,348 @@ 
 	
 	public function settings_init()
 	{
-	    global $wpdb;
-	    $this->xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
+		global $wpdb;
+		$this->xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 	    
-	    //ADDING MISSING OPTIONS
-	    if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
+		//ADDING MISSING OPTIONS
+		if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
 			add_option( 'xcloner_mysql_settings_page' );
 		} // end if
 		
-	    if( false == get_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' ) ) {  
+		if( false == get_option( 'xcloner_system_settings_page' ) ) {  
 			add_option( 'xcloner_system_settings_page' );
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
+		if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
 			add_option( 'xcloner_cleanup_settings_page' );
 		} // end if
 	 
 	    
-	    //ADDING SETTING SECTIONS
-	    //GENERAL section
-	    add_settings_section(
-	        'xcloner_general_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_settings_page'
-	    );
-	    //MYSQL section
-	    add_settings_section(
-	        'xcloner_mysql_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_mysql_settings_page'
-	    );
+		//ADDING SETTING SECTIONS
+		//GENERAL section
+		add_settings_section(
+			'xcloner_general_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_settings_page'
+		);
+		//MYSQL section
+		add_settings_section(
+			'xcloner_mysql_settings_group',
+			__(' '),
+			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'),
-	        'xcloner_system_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'),
+			'xcloner_system_settings_page'
+		);
 	    
-	    //CLEANUP section
-	    add_settings_section(
-	        'xcloner_cleanup_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_cleanup_settings_page'
-	    );
+		//CLEANUP section
+		add_settings_section(
+			'xcloner_cleanup_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_cleanup_settings_page'
+		);
 	    
 		
 		//CRON section
-	    add_settings_section(
-	        'xcloner_cron_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_cron_settings_page'
-	    );
+		add_settings_section(
+			'xcloner_cron_settings_group',
+			__(' '),
+			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($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'),
-	        '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'), 
-	         0,
-	         9
-	         )
-	    );
+		add_settings_field(
+			'xcloner_backup_compression_level',
+		   __('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'), 
+			 0,
+			 9
+			 )
+		);
 	    
-	    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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_start_path',
+		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'),
+			'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'),
 				$this->get_xcloner_start_path(),
 				//'disabled'
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_store_path',
+		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'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_store_path',
 				__('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($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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_enable_log',
+		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'),
+			'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())
 				)
 		);	
 		
 		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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_regex_exclude',
+		add_settings_field(
+			'xcloner_regex_exclude',
+			__('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'),
 				//$this->get_xcloner_store_path(), 
 				//'disabled'
 				)
-	    );
+		);
 	 
 		//REGISTERING THE 'MYSQL SECTION' FIELDS
 		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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_enable_mysql_backup',
+		add_settings_field(
+			'xcloner_enable_mysql_backup',
+			__('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')
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('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'),
+			'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())
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_hostname',
+		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'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_hostname',
 				__('Wordpress mysql hostname','xcloner-backup-and-restore'),
 				$this->get_db_hostname(),
 				'disabled'
 				)
-	    );
+		);
 
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_username',
+		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'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_username',
 				__('Wordpress mysql username','xcloner-backup-and-restore'),
 				$this->get_db_username(),
 				'disabled'
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_database',
+		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'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_database',
 				__('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($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'),
-	        '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'), 
-	         0,
-	         1024
-	         )
-	    );
+		//REGISTERING THE 'SYSTEM SECTION' FIELDS
+		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'),
+			'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'), 
+			 0,
+			 1024
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         0,
-	         1000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_files_to_process_per_request',
+		   __('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'), 
+			 0,
+			 1000
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         0,
-	         1000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_directories_to_scan_per_request',
+		   __('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'), 
+			 0,
+			 1000
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         0,
-	         100000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_database_records_per_request',
+		   __('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'), 
+			 0,
+			 100000
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         )
-	    );
+		add_settings_field(
+			'xcloner_exclude_files_larger_than_mb',
+		   __('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'), 
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         )
-	    );
+		add_settings_field(
+			'xcloner_split_backup_limit',
+		   __('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'), 
+			 )
+		);
 	    
-	    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'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('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'),
+			'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())
 				)
-	    );
+		);
 		
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
 		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'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_retention_limit_days',
+		add_settings_field(
+			'xcloner_cleanup_retention_limit_days',
+			__('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')
 			)
-	    );
+		);
 	    
 		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'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_retention_limit_archives',
+		add_settings_field(
+			'xcloner_cleanup_retention_limit_archives',
+			__('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')
 			)
-	    );
+		);
 	    
 		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'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_capacity_limit',
+		add_settings_field(
+			'xcloner_cleanup_capacity_limit',
+			__('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')
 			)
-	    );
+		);
 		
 		//REGISTERING THE 'CRON SECTION' FIELDS
 		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'),
-	        'xcloner_cron_settings_page',
-	        'xcloner_cron_settings_group',
-	        array('xcloner_cron_frequency',
+		add_settings_field(
+			'xcloner_cron_frequency',
+			__('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')
 			)
-	    );
+		);
 	}
 	 
 	
@@ -556,7 +556,7 @@ 
 	// section content cb
 	public function xcloner_settings_section_cb()
 	{
-	    //echo '<p>WPOrg Section Introduction.</p>';
+		//echo '<p>WPOrg Section Introduction.</p>';
 	}
 	 
 	// text field content cb
@@ -571,8 +571,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// 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?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
@@ -598,8 +598,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// 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?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
@@ -641,8 +641,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// 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?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">

Spacing +86 added lines, -86 removed lines

@@ -4,14 +4,14 @@ 
 {
 	private $logger_file = "xcloner_main_%s.log";
 	private $logger_file_hash = "xcloner%s.log";
-	private $hash ;
+	private $hash;
 	private $xcloner_sanitization;
 	private $xcloner_container;
 	
 	public function __construct(Xcloner $xcloner_container, $hash = "")
 	{
 		$this->xcloner_container = $xcloner_container;
-		if(isset($hash))
+		if (isset($hash))
 			$this->set_hash($hash);
 	}
 	
@@ -22,7 +22,7 @@ 
 	
 	public function get_logger_filename($include_hash = 0)
 	{
-		if($include_hash)
+		if ($include_hash)
 			$filename = sprintf($this->logger_file_hash, $this->get_hash()); 
 		else
 			$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
@@ -32,7 +32,7 @@ 
 	
 	public function get_xcloner_start_path()
 	{
-		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
+		if (!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
 			$path = realpath(ABSPATH);
 		else
 			$path = get_option('xcloner_start_path');
@@ -49,7 +49,7 @@ 
 	
 	public function get_xcloner_store_path()
 	{
-		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_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');
@@ -66,13 +66,13 @@ 
 	public function get_xcloner_tmp_path()
 	{
 		$path = sys_get_temp_dir().DS.".".$this->get_xcloner_tmp_path_suffix();
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			@mkdir($path);
 			@chmod($path, 0777);
 		}
 		
-		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
+		if (!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
 			$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
 		
 		return $path;
@@ -80,7 +80,7 @@ 
 	
 	public function get_enable_mysql_backup()
 	{
-		if(get_option('xcloner_enable_mysql_backup'))
+		if (get_option('xcloner_enable_mysql_backup'))
 			return true;
 		
 		return false;	
@@ -88,9 +88,9 @@ 
 	
 	public function get_backup_extension_name($ext = "")
 	{
-		if(!$ext)
+		if (!$ext)
 		{
-			if(get_option('xcloner_backup_compression_level'))
+			if (get_option('xcloner_backup_compression_level'))
 				$ext = ".tgz";
 			else
 				$ext = ".tar";
@@ -100,7 +100,7 @@ 
 	
 	public function get_hash()
 	{
-		if(!$this->hash){
+		if (!$this->hash) {
 			$this->set_hash("-".$this->get_server_unique_hash(5));
 		}
 		
@@ -112,17 +112,17 @@ 
 	{
 		$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))
+		if (substr($hash, 0, 1) != "-" and strlen($hash))
 			$hash = "-".$hash;
 			
-		$this->hash = substr( $hash, 0, 6);
+		$this->hash = substr($hash, 0, 6);
 		
 		return $this;
 	}
@@ -131,7 +131,7 @@ 
 	{
 		$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 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
+		if (!$data = get_option('xcloner_mysql_hostname'))
 			$data = $wpdb->dbhost;
 		
 		return $data;
@@ -150,7 +150,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
+		if (!$data = get_option('xcloner_mysql_username'))
 			$data = $wpdb->dbuser;
 		
 		return $data;
@@ -160,7 +160,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
+		if (!$data = get_option('xcloner_mysql_password'))
 			$data = $wpdb->dbpassword;
 		
 		return $data;
@@ -170,7 +170,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
+		if (!$data = get_option('xcloner_mysql_database'))
 			$data = $wpdb->dbname;
 		
 		return $data;
@@ -194,7 +194,7 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
+		if ($strlen)
 			$hash = substr($hash, 0, $strlen);
 			
 		return $hash;
@@ -206,20 +206,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
 	 
 	    
@@ -242,7 +242,7 @@ 
 	    //SYSTEM section
 	    add_settings_section(
 	        'xcloner_system_settings_group',
-	        __('These are advanced options recommended for developers!','xcloner-backup-and-restore'),
+	        __('These are advanced options recommended for developers!', 'xcloner-backup-and-restore'),
 	        array($this, 'xcloner_settings_section_cb'),
 	        'xcloner_system_settings_page'
 	    );
@@ -270,12 +270,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -284,12 +284,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -298,12 +298,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -312,24 +312,24 @@ 
 	    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'),
+	        __('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_regex_exclude', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_regex_exclude',
-	        __('Regex Exclude Files','xcloner-backup-and-restore'),
+	        __('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'
 				)
@@ -339,36 +339,36 @@ 
 		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'),
+	        __('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');
 	    add_settings_field(
 	        'xcloner_backup_only_wp_tables',
-	        __('Backup only WP tables','xcloner-backup-and-restore'),
+	        __('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($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_mysql_hostname',
-	        __('Mysql Hostname','xcloner-backup-and-restore'),
+	        __('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'
 				)
@@ -377,12 +377,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -391,12 +391,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -406,12 +406,12 @@ 
 	    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'),
+	       __('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
 	         )
@@ -420,12 +420,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -434,12 +434,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -448,12 +448,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -462,36 +462,36 @@ 
 		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'),
+	       __('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($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_split_backup_limit',
-	       __('Split Backup Archive Limit (MB)','xcloner-backup-and-restore'),
+	       __('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');
 	    add_settings_field(
 	        'xcloner_force_tmp_path_site_root',
-	        __('Force Temporary Path Within XCloner Storage','xcloner-backup-and-restore'),
+	        __('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())
 				)
 	    );
 		
@@ -499,36 +499,36 @@ 
 		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'),
+	        __('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($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_retention_limit_archives',
-	        __('Cleanup by Quantity','xcloner-backup-and-restore'),
+	        __('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($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_capacity_limit',
-	        __('Cleanup by Capacity(MB)','xcloner-backup-and-restore'),
+	        __('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')
 			)
 	    );
 		
@@ -536,7 +536,7 @@ 
 		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
 	    add_settings_field(
 	        'xcloner_cron_frequency',
-	        __('Cron frequency','xcloner-backup-and-restore'),
+	        __('Cron frequency', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_cron_settings_page',
 	        'xcloner_cron_settings_group',
@@ -562,20 +562,20 @@ 
 	// text field content cb
 	public function do_form_text_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		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?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
+	          <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) : ''; ?>">
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="left" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -589,20 +589,20 @@ 
 	// textarea field content cb
 	public function do_form_textarea_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		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?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
+	          <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>
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="center" data-html="true" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -632,20 +632,20 @@ 
 	// number field content cb
 	public function do_form_number_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		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?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
+	          <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) : ''; ?>">
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="center" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -658,7 +658,7 @@ 
 	
 	public function do_form_range_field($params)
 	{
-		if(!isset($params['4']))
+		if (!isset($params['4']))
 			$params[4] = 0;
 			
 		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
@@ -667,7 +667,7 @@ 
 		<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?>" id="<?php echo $fieldname?>" min="<?php echo $range_start?>" max="<?php echo $range_end?>" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>" />
+			      <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) : ''; ?>" />
 			    </p>
 			</div>
 			<div class="col s2 m2 ">
@@ -680,7 +680,7 @@ 
 	
 	public function do_form_switch_field($params)
 	{
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;
 		list($fieldname, $label, $disabled) = $params;
 		$value = get_option($fieldname);
@@ -690,7 +690,7 @@ 
 			<div class="switch">
 				<label>
 				  Off
-				  <input <?php echo ($disabled)?"disabled":""?> type="checkbox" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>">
+				  <input <?php echo ($disabled) ? "disabled" : ""?> type="checkbox" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>">
 				  <span class="lever"></span>
 				  On
 				</label>

Braces +80 added lines, -56 removed lines

@@ -11,8 +11,9 @@ 
 	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);
+		}
 	}
 	
 	private function get_xcloner_container()
@@ -22,20 +23,22 @@ 
 	
 	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));
+		if($include_hash) {
+					$filename = sprintf($this->logger_file_hash, $this->get_hash());
+		} else {
+					$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);
-		else
-			$path = get_option('xcloner_start_path');
+		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path'))) {
+					$path = realpath(ABSPATH);
+		} else {
+					$path = get_option('xcloner_start_path');
+		}
 		
 		return $path;
 	}
@@ -49,10 +52,11 @@ 
 	
 	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);
-		else
-			$path = get_option('xcloner_store_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');
+		}
 		
 		return $path;
 	}
@@ -72,16 +76,18 @@ 
 			@chmod($path, 0777);
 		}
 		
-		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
-			$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
+		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root')) {
+					$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
+		}
 		
 		return $path;
 	}
 	
 	public function get_enable_mysql_backup()
 	{
-		if(get_option('xcloner_enable_mysql_backup'))
-			return true;
+		if(get_option('xcloner_enable_mysql_backup')) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -90,10 +96,11 @@ 
 	{
 		if(!$ext)
 		{
-			if(get_option('xcloner_backup_compression_level'))
-				$ext = ".tgz";
-			else
-				$ext = ".tar";
+			if(get_option('xcloner_backup_compression_level')) {
+							$ext = ".tgz";
+			} else {
+							$ext = ".tar";
+			}
 		}	
 		return ($this->get_hash()).$ext;	
 	}
@@ -119,8 +126,9 @@ 
 	
 	public function set_hash($hash = "")
 	{
-		if(substr($hash, 0, 1) != "-" and strlen($hash))
-			$hash = "-".$hash;
+		if(substr($hash, 0, 1) != "-" and strlen($hash)) {
+					$hash = "-".$hash;
+		}
 			
 		$this->hash = substr( $hash, 0, 6);
 		
@@ -140,8 +148,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
-			$data = $wpdb->dbhost;
+		if(!$data = get_option('xcloner_mysql_hostname')) {
+					$data = $wpdb->dbhost;
+		}
 		
 		return $data;
 	}
@@ -150,8 +159,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
-			$data = $wpdb->dbuser;
+		if(!$data = get_option('xcloner_mysql_username')) {
+					$data = $wpdb->dbuser;
+		}
 		
 		return $data;
 	}
@@ -160,8 +170,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
-			$data = $wpdb->dbpassword;
+		if(!$data = get_option('xcloner_mysql_password')) {
+					$data = $wpdb->dbpassword;
+		}
 		
 		return $data;
 	}
@@ -170,8 +181,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
-			$data = $wpdb->dbname;
+		if(!$data = get_option('xcloner_mysql_database')) {
+					$data = $wpdb->dbname;
+		}
 		
 		return $data;
 	}
@@ -194,8 +206,9 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
-			$hash = substr($hash, 0, $strlen);
+		if($strlen) {
+					$hash = substr($hash, 0, $strlen);
+		}
 			
 		return $hash;
 	}
@@ -562,15 +575,18 @@ 
 	// text field content cb
 	public function do_form_text_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -589,15 +605,18 @@ 
 	// textarea field content cb
 	public function do_form_textarea_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -632,15 +651,18 @@ 
 	// number field content cb
 	public function do_form_number_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -658,8 +680,9 @@ 
 	
 	public function do_form_range_field($params)
 	{
-		if(!isset($params['4']))
-			$params[4] = 0;
+		if(!isset($params['4'])) {
+					$params[4] = 0;
+		}
 			
 		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
 		$value = get_option($fieldname);
@@ -680,8 +703,9 @@ 
 	
 	public function do_form_switch_field($params)
 	{
-		if(!isset($params['2']))
-			$params[2] = 0;
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 		list($fieldname, $label, $disabled) = $params;
 		$value = get_option($fieldname);
 	?>

includes/class-xcloner-remote-storage.php

Doc Comments +3 added lines

@@ -198,6 +198,9 @@
 		}
 	}
 	
+	/**
+	 * @param string $storage_type
+	 */
 	public function verify_filesystem($storage_type)
 	{
 		$method = "get_".$storage_type."_filesystem";

Unused Use Statements -7 removed lines

@@ -1,23 +1,16 @@
 <?php
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-
 use League\Flysystem\Adapter\Ftp as Adapter;
-
 use League\Flysystem\Sftp\SftpAdapter;
-
 use League\Flysystem\Dropbox\DropboxAdapter;
 use Dropbox\Client;
-
 use MicrosoftAzure\Storage\Common\ServicesBuilder;
 use League\Flysystem\Azure\AzureAdapter;
-
 use Aws\S3\S3Client;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
-
 use Mhetreramesh\Flysystem\BackblazeAdapter;
 use ChrisWhite\B2\Client as B2Client;
-
 use Sabre\DAV\Client as SabreClient;
 use League\Flysystem\WebDAV\WebDAVAdapter;
 

Indentation +31 added lines, -31 removed lines

@@ -385,9 +385,9 @@ 
 		}
 		
 		$endpoint = sprintf(
-		    'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
-		    get_option("xcloner_azure_account_name"),
-		    get_option("xcloner_azure_api_key")
+			'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
+			get_option("xcloner_azure_account_name"),
+			get_option("xcloner_azure_api_key")
 		);
 		
 		$blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint);
@@ -431,12 +431,12 @@ 
 		
 		
 		$client = new S3Client([
-		    'credentials' => [
-		        'key'    => get_option("xcloner_aws_key"),
-		        'secret' => get_option("xcloner_aws_secret")
-		    ],
-		    'region' => get_option("xcloner_aws_region"),
-		    'version' => 'latest',
+			'credentials' => [
+				'key'    => get_option("xcloner_aws_key"),
+				'secret' => get_option("xcloner_aws_secret")
+			],
+			'region' => get_option("xcloner_aws_region"),
+			'version' => 'latest',
 		]);
 		
 		$adapter = new AwsS3Adapter($client, get_option("xcloner_aws_bucket_name"));
@@ -599,9 +599,9 @@ 
 		{
 			$query = sprintf('mimeType = \'application/vnd.google-apps.folder\' and \'%s\' in parents and name contains \'%s\'', $parent, $dir);
 			$response = $service->files->listFiles([
-	                'pageSize' => 1,
-	                'q' => $query
-	            ]);
+					'pageSize' => 1,
+					'q' => $query
+				]);
 			
 			if(sizeof($response))
 			{
@@ -630,16 +630,16 @@ 
 		$this->logger->info(sprintf("Creating the FTP remote storage connection"), array(""));
 		
 		$adapter = new Adapter([
-		    'host' => get_option("xcloner_ftp_hostname"),
-		    'username' => get_option("xcloner_ftp_username"),
-		    'password' => get_option("xcloner_ftp_password"),
-		
-		    /** optional config settings */
-		    'port' => get_option("xcloner_ftp_port", 21),
-		    'root' => get_option("xcloner_ftp_path"),
-		    'passive' => get_option("xcloner_ftp_transfer_mode"),
-		    'ssl' => get_option("xcloner_ftp_ssl_mode"),
-		    'timeout' => get_option("xcloner_ftp_timeout", 30),
+			'host' => get_option("xcloner_ftp_hostname"),
+			'username' => get_option("xcloner_ftp_username"),
+			'password' => get_option("xcloner_ftp_password"),
+		
+			/** optional config settings */
+			'port' => get_option("xcloner_ftp_port", 21),
+			'root' => get_option("xcloner_ftp_path"),
+			'passive' => get_option("xcloner_ftp_transfer_mode"),
+			'ssl' => get_option("xcloner_ftp_ssl_mode"),
+			'timeout' => get_option("xcloner_ftp_timeout", 30),
 		]);
 		
 		$adapter->connect();
@@ -656,15 +656,15 @@ 
 		$this->logger->info(sprintf("Creating the SFTP remote storage connection"), array(""));
 		
 		$adapter = new SftpAdapter([
-		    'host' => get_option("xcloner_sftp_hostname"),
-		    'username' => get_option("xcloner_sftp_username"),
-		    'password' => get_option("xcloner_sftp_password"),
-		
-		    /** optional config settings */
-		    'port' => get_option("xcloner_sftp_port", 22),
-		    'root' => get_option("xcloner_sftp_path"),
-		    'privateKey' => get_option("xcloner_sftp_private_key"),
-		    'timeout' => get_option("xcloner_ftp_timeout", 30),
+			'host' => get_option("xcloner_sftp_hostname"),
+			'username' => get_option("xcloner_sftp_username"),
+			'password' => get_option("xcloner_sftp_password"),
+		
+			/** optional config settings */
+			'port' => get_option("xcloner_sftp_port", 22),
+			'root' => get_option("xcloner_sftp_path"),
+			'privateKey' => get_option("xcloner_sftp_private_key"),
+			'timeout' => get_option("xcloner_ftp_timeout", 30),
 		]);
 		
 		$adapter->connect();

Spacing +53 added lines, -53 removed lines

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

Braces +50 added lines, -34 removed lines

@@ -148,8 +148,9 @@ 
 		foreach($this->storage_fields as $storage=>$data)
 		{
 			$check_field = $this->storage_fields["option_prefix"].$storage."_enable";
-			if(get_option($check_field))
-				$return[$storage] = $data['text'];
+			if(get_option($check_field)) {
+							$return[$storage] = $data['text'];
+			}
 		}
 		
 		return $return;
@@ -172,11 +173,13 @@ 
 				$check_field = $this->storage_fields["option_prefix"].$field;
 				$sanitize_method = "sanitize_input_as_".$validation;
 				
-				if(!isset($_POST[$check_field]))
-					$_POST[$check_field] = 0;
+				if(!isset($_POST[$check_field])) {
+									$_POST[$check_field] = 0;
+				}
 				
-				if(!method_exists($this->xcloner_sanitization, $sanitize_method))
-					$sanitize_method = "sanitize_input_as_string";
+				if(!method_exists($this->xcloner_sanitization, $sanitize_method)) {
+									$sanitize_method = "sanitize_input_as_string";
+				}
 					
 				$sanitized_value = $this->xcloner_sanitization->$sanitize_method($_POST[$check_field]);
 				update_option($check_field, $sanitized_value);
@@ -193,7 +196,7 @@ 
 			$this->verify_filesystem($action);
 			$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", ucfirst($action));
 			$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));	
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", ucfirst($action));
 		}
 	}
@@ -204,8 +207,9 @@ 
 		
 		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem", strtoupper($storage_type)));	
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 		
 		list($adapter, $filesystem) = $this->$method();
 		
@@ -213,26 +217,30 @@ 
 		
 		if($storage_type == "gdrive")
 		{
-			if(!is_array($filesystem->listContents()))
-				throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+			if(!is_array($filesystem->listContents())) {
+							throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+			}
 			$this->logger->debug(sprintf("I can list data from remote storage %s", strtoupper($storage_type)));	
 			
 			return true;
 		}
 			
 		//testing write access
-		if(!$filesystem->write($test_file, "data"))
-			throw new Exception(__("Could not write data",'xcloner-backup-and-restore'));
+		if(!$filesystem->write($test_file, "data")) {
+					throw new Exception(__("Could not write data",'xcloner-backup-and-restore'));
+		}
 		$this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));	
 		
 		//testing read access
-		if(!$filesystem->read($test_file))
-			throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		if(!$filesystem->read($test_file)) {
+					throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		}
 		$this->logger->debug(sprintf("I can read data to remote storage %s", strtoupper($storage_type)));		
 		
 		//delete test file
-		if(!$filesystem->delete($test_file))
-			throw new Exception(__("Could not delete data",'xcloner-backup-and-restore'));
+		if(!$filesystem->delete($test_file)) {
+					throw new Exception(__("Could not delete data",'xcloner-backup-and-restore'));
+		}
 		$this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));		
 		
 		return true;
@@ -248,8 +256,9 @@ 
 			
 		$method = "get_".$storage."_filesystem";	
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 			
 		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 		
@@ -275,14 +284,16 @@ 
 		if($this->xcloner_file_system->is_multipart($file))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if(is_array($parts)) {
+							foreach($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $part_file, strtoupper($storage)), array(""));
+			}
 					
 					$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($part_file);
-					if(!$remote_storage_filesystem->writeStream($part_file, $backup_file_stream))
-						return false;
+					if(!$remote_storage_filesystem->writeStream($part_file, $backup_file_stream)) {
+											return false;
+					}
 				}
 		}
 		
@@ -298,8 +309,9 @@ 
 		
 		$target_filename = $file;
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 			
 		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 		
@@ -328,14 +340,16 @@ 
 		if($this->xcloner_file_system->is_multipart($target_filename))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file, $storage);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if(is_array($parts)) {
+							foreach($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $part_file, strtoupper($storage)), array(""));
+			}
 					
 					$backup_file_stream = $remote_storage_filesystem->readStream($part_file);
-					if(!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file, $backup_file_stream))
-						return false;
+					if(!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file, $backup_file_stream)) {
+											return false;
+					}
 				}
 		}
 		
@@ -355,10 +369,11 @@ 
 			
 			$current_timestamp = strtotime("-".$expire_days." days");
 			
-			if(is_array($files))
-			foreach($files as $file)
+			if(is_array($files)) {
+						foreach($files as $file)
 			{
 				$file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
+			}
 				
 				if($current_timestamp >= $file['timestamp'])
 				{
@@ -524,8 +539,9 @@ 
 	{
 		$client = $this->gdrive_construct();
 		
-		if(!$client)
-			return false;
+		if(!$client) {
+					return false;
+		}
 			
 		return $authUrl = $client->createAuthUrl();
 	}
@@ -608,7 +624,7 @@ 
 				foreach ($response as $obj) {
 					$folderID =  $obj->getId();
 				}
-			}else{
+			} else{
 				$this->xcloner->trigger_message(sprintf(__("Could not find folder ID by name %s", 'xcloner-backup-and-restore'), $folderID), "error");
 			}
 		}

public/class-xcloner-public.php

Doc Comments -2 removed lines

@@ -44,8 +44,6 @@
 	 * Initialize the class and set its properties.
 	 *
 	 * @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 +5 added lines, -5 removed lines

@@ -47,10 +47,10 @@ 
 	 * @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();
+		$this->plugin_name = $xcloner_container->get_plugin_name();
+		$this->version = $xcloner_container->get_version();
 
 	}
 
@@ -73,7 +73,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');
 
 	}
 
@@ -96,7 +96,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);
 
 	}
 

xcloner.php

Spacing +19 added lines, -19 removed lines

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

Braces +3 added lines, -2 removed lines

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

admin/partials/xcloner_remote_storage_page.php

Spacing +136 added lines, -136 removed lines

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

Braces +8 added lines, -3 removed lines

@@ -3,8 +3,9 @@ 
 
 $gdrive_auth_url = "";
 
-if(method_exists($remote_storage, "get_gdrive_auth_url"))
+if(method_exists($remote_storage, "get_gdrive_auth_url")) {
 	$gdrive_auth_url = $remote_storage->get_gdrive_auth_url();
+}
 
 $gdrive_construct = $remote_storage->gdrive_construct();
 ?>
@@ -25,7 +26,8 @@ 
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) {
+	echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -286,6 +288,7 @@ 
 							<option readonly value=""><?php echo __("Please Select AWS Region")?></option>
 							<?php 							
 							$aws_regions = $remote_storage->get_aws_regions();
+}
 							
 							foreach($aws_regions as $key=>$region){
 								?>
@@ -339,7 +342,8 @@ 
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) {
+	echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -767,6 +771,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_init_page.php

Spacing +48 added lines, -48 removed lines

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

Braces +19 added lines, -10 removed lines

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

admin/partials/xcloner_manage_backups_page.php

Spacing +52 added lines, -52 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-$xcloner_file_system 		= $this->get_xcloner_container()->get_xcloner_filesystem();
-$xcloner_sanitization 		= $this->get_xcloner_container()->get_xcloner_sanitization();
-$xcloner_remote_storage 	= $this->get_xcloner_container()->get_xcloner_remote_storage();
-$storage_selection 			= "";
+$xcloner_file_system = $this->get_xcloner_container()->get_xcloner_filesystem();
+$xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
+$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+$storage_selection = "";
 
-if(isset($_GET['storage_selection']) and $_GET['storage_selection'])
+if (isset($_GET['storage_selection']) and $_GET['storage_selection'])
 {
 	$storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
 }
@@ -21,18 +21,18 @@ 
 	<div class="col s12 m6 l9">
 		<h1><?= esc_html(get_admin_page_title()); ?></h1>
 	</div>	
-	<?php if(sizeof($available_storages)):?>
+	<?php if (sizeof($available_storages)):?>
 		<div class="col s12 m6 l3 remote-storage-selection">
 				<select name="storage_selection" id="storage_selection" class="validate" required >
 					
-					<?php if($storage_selection):?>
+					<?php if ($storage_selection):?>
 						<option value="" selected><?php echo __('Change To Local Storage...', 'xcloner-backup-and-restore') ?></option>
 					<?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) echo "selected"?>><?php echo $text?></option>
+					<?php foreach ($available_storages as $storage=>$text):?>
+						<option value="<?php echo $storage?>"<?php if ($storage == $storage_selection) echo "selected"?>><?php echo $text?></option>
 					<?php endforeach?>
 				</select>
 	<?php endif?>
@@ -47,10 +47,10 @@ 
 				  <label for="select_all">&nbsp;</label>
 				</p> 
 		  </th>
-		  <th data-field="id"><?php echo __("Backup Name",'xcloner-backup-and-restore')?></th>
-		  <th data-field="name"><?php echo __("Created Time",'xcloner-backup-and-restore')?></th>
-		  <th data-field="name"><?php echo __("Size",'xcloner-backup-and-restore')?></th>
-		  <th class="no-sort" data-field="price"><?php echo __("Action",'xcloner-backup-and-restore')?></th>
+		  <th data-field="id"><?php echo __("Backup Name", 'xcloner-backup-and-restore')?></th>
+		  <th data-field="name"><?php echo __("Created Time", 'xcloner-backup-and-restore')?></th>
+		  <th data-field="name"><?php echo __("Size", 'xcloner-backup-and-restore')?></th>
+		  <th class="no-sort" data-field="price"><?php echo __("Action", 'xcloner-backup-and-restore')?></th>
 		  
 	  </tr>
 	</thead>
@@ -60,20 +60,20 @@ 
       
 <?php 
 $i = 0;
-foreach($backup_list as $file_info):?>
+foreach ($backup_list as $file_info):?>
 <?php 
-	if($storage_selection == "gdrive")
+	if ($storage_selection == "gdrive")
 		$file_info['path'] = $file_info['filename'].".".$file_info['extension'];
 	$file_exists_on_local_storage = true;
 	
-	if($storage_selection)
+	if ($storage_selection)
 	{
-		if(!$xcloner_file_system->get_storage_filesystem()->has($file_info['path']))
+		if (!$xcloner_file_system->get_storage_filesystem()->has($file_info['path']))
 			$file_exists_on_local_storage = false;
 	}
 
 ?>
-<?php if(!isset($file_info['parent'])):?>	
+<?php if (!isset($file_info['parent'])):?>	
 	
 	<tr>
 		<td class="checkbox">
@@ -84,55 +84,55 @@ 
 		</td>
 		<td>
 			<span class=""><?php echo $file_info['path']?></span>
-			<?php if(!$file_exists_on_local_storage): ?>
-				<a href="#" title="<?php echo __("File does not exists on local storage","xcloner-backup-and-restore")?>"><i class="material-icons backup_warning">warning</i></a>
+			<?php if (!$file_exists_on_local_storage): ?>
+				<a href="#" title="<?php echo __("File does not exists on local storage", "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>
 			<ul class="multipart">
-			<?php foreach($file_info['childs'] as $child):?>
+			<?php foreach ($file_info['childs'] as $child):?>
 				<li>
 					<?php echo $child[0]?> (<?php echo size_format($child[2])?>) 
 					<?php
 					$child_exists_on_local_storage = true;
-					if($storage_selection)
+					if ($storage_selection)
 					{
-						if(!$xcloner_file_system->get_storage_filesystem()->has($child[0]))
+						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 class="material-icons backup_warning">warning</i></a>
+					<?php if (!$child_exists_on_local_storage): ?>
+						<a href="#" title="<?php echo __("File does not exists on local storage", "xcloner-backup-and-restore")?>"><i class="material-icons backup_warning">warning</i></a>
 					<?php endif?>
-					<?php if(!$storage_selection) :?>
-						<a href="#<?php echo $child[0];?>" class="download" 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 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 class="material-icons">file_upload</i></a>
+					<?php if (!$storage_selection) :?>
+						<a href="#<?php echo $child[0]; ?>" class="download" 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 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 class="material-icons">file_upload</i></a>
 					<?php endif?>
 				</li>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</ul>
-			<?php endif;?>
+			<?php endif; ?>
 		</td>
 		<td><?php echo date("d M, Y 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" title="<?php echo __('Download Backup','xcloner-backup-and-restore')?>"><i class="material-icons">file_download</i></a>
+			<?php if (!$storage_selection):?>
+				<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>
 
-				<?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 class="material-icons">cloud_upload</i></a>
+				<?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 class="material-icons">cloud_upload</i></a>
 				<?php endif?>
-				<a href="#<?php echo $file_info['basename']?>" class="list-backup-content" title="<?php echo __('List Backup Content','xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
-			 <?php endif;?>
+				<a href="#<?php echo $file_info['basename']?>" class="list-backup-content" title="<?php echo __('List Backup Content', 'xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
+			 <?php endif; ?>
 			 	
-			<a href="#<?php echo $file_info['basename']?>" class="delete" title="<?php echo __('Delete Backup','xcloner-backup-and-restore')?>"><i class="material-icons">delete</i></a>
-			<?php if($storage_selection and !$file_exists_on_local_storage):?>
-				<a href="#<?php echo $file_info['basename'];?>" class="copy-remote-to-local" title="<?php echo __('Push Backup To Local Storage','xcloner-backup-and-restore')?>"><i class="material-icons">file_upload</i></a>
+			<a href="#<?php echo $file_info['basename']?>" class="delete" title="<?php echo __('Delete Backup', 'xcloner-backup-and-restore')?>"><i class="material-icons">delete</i></a>
+			<?php if ($storage_selection and !$file_exists_on_local_storage):?>
+				<a href="#<?php echo $file_info['basename']; ?>" class="copy-remote-to-local" title="<?php echo __('Push Backup To Local Storage', 'xcloner-backup-and-restore')?>"><i class="material-icons">file_upload</i></a>
 			<?php endif?>	
 			
 		</td>
@@ -145,12 +145,12 @@ 
 	</tbody>
 </table>
 
-<a class="waves-effect waves-light btn delete-all"><i class="material-icons left">delete</i><?php echo __("Delete",'xcloner-backup-and-restore')?></a>
+<a class="waves-effect waves-light btn delete-all"><i class="material-icons left">delete</i><?php echo __("Delete", 'xcloner-backup-and-restore')?></a>
 
 <!-- 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">
@@ -163,14 +163,14 @@ 
 <!-- Local Transfer Modal-->
 <div id="local_storage_upload_modal" class="modal">
 	<div class="modal-content">
-		<h4><?php echo sprintf(__("Transfer Remote Backup To Local Storage",'xcloner-backup-and-restore'), "")?></h4>
+		<h4><?php echo sprintf(__("Transfer Remote Backup To Local Storage", 'xcloner-backup-and-restore'), "")?></h4>
 		<h5 class="backup-name"></h5>
 		
 		<div class="row status">
 			<div class="progress">
 				<div class="indeterminate"></div>
 			</div>
-			<?php echo __("Uploading backup to the local storage filesystem...",'xcloner-backup-and-restore')?> <span class="status-text"></span>
+			<?php echo __("Uploading backup to the local storage filesystem...", 'xcloner-backup-and-restore')?> <span class="status-text"></span>
 		</div>
 	</div>	
 </div>
@@ -180,17 +180,17 @@ 
 	<form method="POST" class="remote-storage-form">
 	<input type="hidden" name="file" class="backup_name">	  
 	<div class="modal-content">
-	  <h4><?php echo __("Remote Storage Transfer",'xcloner-backup-and-restore')?></h4>
+	  <h4><?php echo __("Remote Storage Transfer", 'xcloner-backup-and-restore')?></h4>
 	  <p>
-	  <?php if(sizeof($available_storages)):?>
+	  <?php if (sizeof($available_storages)):?>
 			<div class="row">
 				<div class="col s12 label">
-					<label><?php echo sprintf(__('Send %s to remote storage','xcloner-backup-and-restore'), "<span class='backup_name'></span>") ?></label>
+					<label><?php echo sprintf(__('Send %s to remote storage', 'xcloner-backup-and-restore'), "<span class='backup_name'></span>") ?></label>
 				</div>
 				<div class="input-field col s8 m10">
 					<select name="transfer_storage" id="transfer_storage" class="validate" required >
 						<option value="" selected><?php echo __('please select...', 'xcloner-backup-and-restore') ?></option>
-						<?php foreach($available_storages as $storage=>$text):?>
+						<?php foreach ($available_storages as $storage=>$text):?>
 							<option value="<?php echo $storage?>"><?php echo $text?></option>
 						<?php endforeach?>
 						</select>
@@ -201,7 +201,7 @@ 
 				</div>
 			</div>
 			<div class="row status">
-				<?php echo __("Uploading backup to the selected remote storage...",'xcloner-backup-and-restore')?> <span class="status-text"></span>
+				<?php echo __("Uploading backup to the selected remote storage...", 'xcloner-backup-and-restore')?> <span class="status-text"></span>
 				<div class="progress">
 					<div class="indeterminate"></div>
 				</div>

Braces +17 added lines, -9 removed lines

@@ -27,12 +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) echo "selected"?>><?php echo $text?></option>
+						<option value="<?php echo $storage?>"<?php if($storage == $storage_selection) {
+	echo "selected"?>><?php echo $text?></option>
 					<?php endforeach?>
 				</select>
 	<?php endif?>
@@ -60,16 +64,19 @@ 
       
 <?php 
 $i = 0;
+}
 foreach($backup_list as $file_info):?>
 <?php 
-	if($storage_selection == "gdrive")
-		$file_info['path'] = $file_info['filename'].".".$file_info['extension'];
+	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(!$xcloner_file_system->get_storage_filesystem()->has($file_info['path'])) {
+					$file_exists_on_local_storage = false;
+		}
 	}
 
 ?>
@@ -100,8 +107,9 @@ 
 					$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;
+						if(!$xcloner_file_system->get_storage_filesystem()->has($child[0])) {
+													$child_exists_on_local_storage = false;
+						}
 					}
 					?>
 					<?php if(!$child_exists_on_local_storage): ?>