ovidiul / XCloner-Wordpress

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);
 		
 
 	}
@@ -144,20 +144,20 @@ 
 		$remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 		
 		
-		if(isset($_POST['action']))
+		if (isset($_POST['action']))
 		{
 			$_POST['action'] = $xcloner_sanitization->sanitize_input_as_string($_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);

Braces +77 added lines, -54 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;
 	}
@@ -87,8 +91,9 @@ 
 	
 	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;	
 	}
@@ -97,10 +102,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;	
 	}
@@ -126,8 +132,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);
 		
@@ -147,8 +154,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;
 	}
@@ -157,8 +165,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;
 	}
@@ -167,8 +176,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;
 	}
@@ -177,8 +187,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;
 	}
@@ -201,8 +212,9 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
-			$hash = substr($hash, 0, $strlen);
+		if($strlen) {
+					$hash = substr($hash, 0, $strlen);
+		}
 			
 		return $hash;
 	}
@@ -581,15 +593,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">
@@ -608,15 +623,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">
@@ -652,15 +670,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">
@@ -678,8 +699,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);
@@ -700,8 +722,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);
 	?>

Indentation +266 added lines, -266 removed lines

@@ -209,274 +209,274 @@ 
 	
 	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_enable_pre_update_backup', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_enable_pre_update_backup',
-	        __('Generate Backups before Automatic WP Upgrades','xcloner-backup-and-restore'),
-	        array($this, 'do_form_switch_field'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_enable_pre_update_backup',
+		add_settings_field(
+			'xcloner_enable_pre_update_backup',
+			__('Generate Backups before Automatic WP Upgrades','xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_enable_pre_update_backup',
 				sprintf(__('Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.','xcloner-backup-and-restore'), $this->get_logger_filename())
 				)
 		);	
 		
 		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_diff_backup_recreate_period', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
@@ -491,102 +491,102 @@ 
 	    );*/
 	    
 		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')
 			)
-	    );
+		);
 	    
-	    register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array($this->xcloner_sanitization, "sanitize_input_as_int"));
-	    add_settings_field(
-	        'xcloner_cleanup_delete_after_remote_transfer',
-	        __('Delete Backup After Sending it to Remote Storage','xcloner-backup-and-restore'),
-	        array($this, 'do_form_switch_field'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_delete_after_remote_transfer',
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array($this->xcloner_sanitization, "sanitize_input_as_int"));
+		add_settings_field(
+			'xcloner_cleanup_delete_after_remote_transfer',
+			__('Delete Backup After Sending it to Remote Storage','xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
+			'xcloner_cleanup_settings_page',
+			'xcloner_cleanup_settings_group',
+			array('xcloner_cleanup_delete_after_remote_transfer',
 				__('Remove backups created automatically from local storage after sending the backup to remote storage','xcloner-backup-and-restore')
 			)
-	    );
+		);
 		
 		//REGISTERING THE 'CRON SECTION' FIELDS
 		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
-	    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')
 			)
-	    );
+		);
 	}
 	 
 	
@@ -599,7 +599,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
@@ -614,8 +614,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) : ''; ?>">
@@ -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 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>
@@ -685,8 +685,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 +91 added lines, -91 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,18 +66,18 @@ 
 	public function get_xcloner_tmp_path($suffix = true)
 	{
 		$path = sys_get_temp_dir();
-		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();
 		}
 		
-		if($suffix)
+		if ($suffix)
 		{
 			$path = $path.DS.".".$this->get_xcloner_tmp_path_suffix();
 		}
@@ -87,7 +87,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;	
@@ -95,9 +95,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";
@@ -107,7 +107,7 @@ 
 	
 	public function get_hash()
 	{
-		if(!$this->hash){
+		if (!$this->hash) {
 			$this->set_hash("-".$this->get_server_unique_hash(5));
 		}
 		
@@ -119,17 +119,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;
 	}
@@ -138,7 +138,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;
 	}
@@ -147,7 +147,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
+		if (!$data = get_option('xcloner_mysql_hostname'))
 			$data = $wpdb->dbhost;
 		
 		return $data;
@@ -157,7 +157,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
+		if (!$data = get_option('xcloner_mysql_username'))
 			$data = $wpdb->dbuser;
 		
 		return $data;
@@ -167,7 +167,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
+		if (!$data = get_option('xcloner_mysql_password'))
 			$data = $wpdb->dbpassword;
 		
 		return $data;
@@ -177,7 +177,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
+		if (!$data = get_option('xcloner_mysql_database'))
 			$data = $wpdb->dbname;
 		
 		return $data;
@@ -201,7 +201,7 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
+		if ($strlen)
 			$hash = substr($hash, 0, $strlen);
 			
 		return $hash;
@@ -213,20 +213,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
 	 
 	    
@@ -249,7 +249,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'
 	    );
@@ -277,12 +277,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
 	         )
@@ -291,12 +291,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'
 				)
@@ -305,12 +305,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'
 				)
@@ -319,36 +319,36 @@ 
 	    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_enable_pre_update_backup', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_enable_pre_update_backup',
-	        __('Generate Backups before Automatic WP Upgrades','xcloner-backup-and-restore'),
+	        __('Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_switch_field'),
 	        'xcloner_settings_page',
 	        'xcloner_general_settings_group',
 	        array('xcloner_enable_pre_update_backup',
-				sprintf(__('Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.','xcloner-backup-and-restore'), $this->get_logger_filename())
+				sprintf(__('Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 				)
 		);	
 		
 		register_setting('xcloner_general_settings_group', 'xcloner_regex_exclude', array($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'
 				)
@@ -358,36 +358,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'
 				)
@@ -396,12 +396,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'
 				)
@@ -410,12 +410,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'
 				)
@@ -425,12 +425,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
 	         )
@@ -439,12 +439,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
 	         )
@@ -453,12 +453,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
 	         )
@@ -467,12 +467,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
 	         )
@@ -493,36 +493,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())
 				)
 	    );
 		
@@ -530,48 +530,48 @@ 
 		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')
 			)
 	    );
 	    
 	    register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_delete_after_remote_transfer',
-	        __('Delete Backup After Sending it to Remote Storage','xcloner-backup-and-restore'),
+	        __('Delete Backup After Sending it to Remote Storage', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_switch_field'),
 	        'xcloner_cleanup_settings_page',
 	        'xcloner_cleanup_settings_group',
 	        array('xcloner_cleanup_delete_after_remote_transfer',
-				__('Remove backups created automatically from local storage after sending the backup to remote storage','xcloner-backup-and-restore')
+				__('Remove backups created automatically from local storage after sending the backup to remote storage', 'xcloner-backup-and-restore')
 			)
 	    );
 		
@@ -579,7 +579,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',
@@ -605,20 +605,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>
@@ -632,20 +632,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>
@@ -676,20 +676,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-html="true"  data-position="center" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -702,7 +702,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;
@@ -711,7 +711,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 ">
@@ -724,7 +724,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);
@@ -734,7 +734,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>

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";

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();

Unused Use Statements -6 removed lines

@@ -1,25 +1,19 @@
 <?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 Srmklive\Dropbox\Client\DropboxClient;
 use Srmklive\Dropbox\Adapter\DropboxAdapter;
-
 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;
 

Spacing +53 added lines, -53 removed lines

@@ -23,9 +23,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_",
@@ -135,8 +135,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()
@@ -147,10 +147,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'];
 		}
 		
@@ -159,7 +159,7 @@ 
 	
 	public function save($action = "ftp")
 	{
-		if(!$action)
+		if (!$action)
 		{
 			return false;
 		}
@@ -167,17 +167,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(stripslashes($_POST[$check_field]));
@@ -191,11 +191,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));
 		}
 	}
@@ -206,35 +206,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->has($test_file))
-			throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		if (!$filesystem->has($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;
@@ -242,7 +242,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;
@@ -250,7 +250,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();
@@ -268,22 +268,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;
 				}
 		}
@@ -300,18 +300,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'];
@@ -321,22 +321,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;
 				}
 		}
@@ -350,19 +350,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));
@@ -505,7 +505,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;
 		}
@@ -531,7 +531,7 @@ 
 	{
 		$client = $this->gdrive_construct();
 		
-		if(!$client)
+		if (!$client)
 			return false;
 			
 		return $authUrl = $client->createAuthUrl();
@@ -541,7 +541,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);
@@ -554,7 +554,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>
@@ -579,7 +579,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);
@@ -591,18 +591,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([
@@ -610,12 +610,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

@@ -150,8 +150,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;
@@ -174,11 +175,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(stripslashes($_POST[$check_field]));
 				update_option($check_field, $sanitized_value);
@@ -195,7 +198,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));
 		}
 	}
@@ -206,8 +209,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();
 		
@@ -215,26 +219,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->has($test_file))
-			throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		if(!$filesystem->has($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;
@@ -250,8 +258,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();
 		
@@ -277,14 +286,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;
+					}
 				}
 		}
 		
@@ -300,8 +311,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();
 		
@@ -330,14 +342,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;
+					}
 				}
 		}
 		
@@ -357,10 +371,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'])
 				{
@@ -531,8 +546,9 @@ 
 	{
 		$client = $this->gdrive_construct();
 		
-		if(!$client)
-			return false;
+		if(!$client) {
+					return false;
+		}
 			
 		return $authUrl = $client->createAuthUrl();
 	}
@@ -615,7 +631,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);
 
 	}
 

includes/class-xcloner-loader.php

Spacing +19 added lines, -19 removed lines

@@ -58,19 +58,19 @@ 
 	
 	public function xcloner_backup_add_admin_menu()
 	{
-		if ( function_exists('add_menu_page') )
-			add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'), 'dashicons-backup');
+		if (function_exists('add_menu_page'))
+			add_menu_page(__('Site Backup', 'xcloner-backup-and-restore'), __('Site Backup', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'), 'dashicons-backup');
 
-		if ( function_exists('add_submenu_page') )
+		if (function_exists('add_submenu_page'))
 		{
 			
-			add_submenu_page( 'xcloner_init_page', __('XCloner Dashboard','xcloner-backup-and-restore'), __('Dashboard','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'));
-			add_submenu_page( 'xcloner_init_page', __('XCloner Backup Settings','xcloner-backup-and-restore'), __('Settings','xcloner-backup-and-restore'), 'manage_options', 'xcloner_settings_page', array($this->xcloner_container, 'xcloner_display'));
-			add_submenu_page( 'xcloner_init_page', __('Remote Storage Settings','xcloner-backup-and-restore'), __('Remote Storage','xcloner-backup-and-restore'), 'manage_options', 'xcloner_remote_storage_page', array($this->xcloner_container, 'xcloner_display'));
-			add_submenu_page( 'xcloner_init_page', __('Manage Backups','xcloner-backup-and-restore'), __('Manage Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_manage_backups_page', array($this->xcloner_container, 'xcloner_display'));
-			add_submenu_page( 'xcloner_init_page', __('Scheduled Backups','xcloner-backup-and-restore'), __('Scheduled Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_scheduled_backups_page', array($this->xcloner_container, 'xcloner_display'));
-			add_submenu_page( 'xcloner_init_page', __('Generate Backups','xcloner-backup-and-restore'), __('Generate Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_generate_backups_page', array($this->xcloner_container, 'xcloner_display'));
-			add_submenu_page( 'xcloner_init_page', __('Restore Backups','xcloner-backup-and-restore'), __('Restore Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_restore_page', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('XCloner Dashboard', 'xcloner-backup-and-restore'), __('Dashboard', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('XCloner Backup Settings', 'xcloner-backup-and-restore'), __('Settings', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_settings_page', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('Remote Storage Settings', 'xcloner-backup-and-restore'), __('Remote Storage', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_remote_storage_page', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('Manage Backups', 'xcloner-backup-and-restore'), __('Manage Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_manage_backups_page', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('Scheduled Backups', 'xcloner-backup-and-restore'), __('Scheduled Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_scheduled_backups_page', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('Generate Backups', 'xcloner-backup-and-restore'), __('Generate Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_generate_backups_page', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('Restore Backups', 'xcloner-backup-and-restore'), __('Restore Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_restore_page', array($this->xcloner_container, 'xcloner_display'));
 		}
 	
 	}
@@ -86,8 +86,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1.
 	 */
-	public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->actions = $this->add( $this->actions, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_action($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->actions = $this->add($this->actions, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1
 	 */
-	public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->filters = $this->add( $this->filters, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_filter($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->filters = $this->add($this->filters, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 * @param    int                  $accepted_args    The number of arguments that should be passed to the $callback.
 	 * @return   array                                  The collection of actions and filters registered with WordPress.
 	 */
-	private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) {
+	private function add($hooks, $hook, $component, $callback, $priority, $accepted_args) {
 
 		$hooks[] = array(
 			'hook'          => $hook,
@@ -139,12 +139,12 @@ 
 	 */
 	public function run() {
 
-		foreach ( $this->filters as $hook ) {
-			add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->filters as $hook) {
+			add_filter($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
-		foreach ( $this->actions as $hook ) {
-			add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->actions as $hook) {
+			add_action($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
 	}

Braces +3 added lines, -2 removed lines

@@ -58,8 +58,9 @@
 	
 	public function xcloner_backup_add_admin_menu()
 	{
-		if ( function_exists('add_menu_page') )
-			add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'), 'dashicons-backup');
+		if ( function_exists('add_menu_page') ) {
+					add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'), 'dashicons-backup');
+		}
 
 		if ( function_exists('add_submenu_page') )
 		{

admin/partials/xcloner_manage_backups_page.php

Spacing +53 added lines, -53 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 if(isset($file_info['timestamp'])) echo date("d M, Y H:i", $file_info['timestamp'])?></td>
+		<td><?php if (isset($file_info['timestamp'])) 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 +22 added lines, -11 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): ?>
@@ -118,11 +126,14 @@ 
 			</ul>
 			<?php endif;?>
 		</td>
-		<td><?php if(isset($file_info['timestamp'])) echo date("d M, Y H:i", $file_info['timestamp'])?></td>
+		<td><?php if(isset($file_info['timestamp'])) {
+	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>
+				<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>

restore/xcloner_restore.php

Unused Use Statements -5 removed lines

@@ -65,13 +65,8 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
-
 use splitbrain\PHPArchive\Tar;
-use splitbrain\PHPArchive\Archive;
-use splitbrain\PHPArchive\FileInfo;
-
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
 

Indentation +32 added lines, -32 removed lines

@@ -158,15 +158,15 @@ 
 	}
 	
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 	
 	public function get_logger_filename()
@@ -887,19 +887,19 @@ 
 	}
 	
 	private function return_bytes($val) {
-	    $val = trim($val);
-	    $last = strtolower($val[strlen($val)-1]);
-	    switch($last) {
-	        // The 'G' modifier is available since PHP 5.1.0
-	        case 'g':
-	            $val *= 1024;
-	        case 'm':
-	            $val *= 1024;
-	        case 'k':
-	            $val *= 1024;
-	    }
+		$val = trim($val);
+		$last = strtolower($val[strlen($val)-1]);
+		switch($last) {
+			// The 'G' modifier is available since PHP 5.1.0
+			case 'g':
+				$val *= 1024;
+			case 'm':
+				$val *= 1024;
+			case 'k':
+				$val *= 1024;
+		}
 	
-	    return $val;
+		return $val;
 	}
 	
 	public function is_multipart($backup_name)
@@ -947,7 +947,7 @@ 
 	{
 		$direction = strtolower($direction);
 		
-	    usort($array, create_function('$a, $b', '
+		usort($array, create_function('$a, $b', '
 	        $a = $a["' . $field . '"];
 	        $b = $b["' . $field . '"];
 	
@@ -959,7 +959,7 @@ 
 	        return ($a ' . ($direction == 'desc' ? '>' : '<') .' $b) ? -1 : 1;
 	    '));
 	
-	    return true;
+		return true;
 	}
 		
 	public static function send_response($status = 200, $response)
@@ -999,10 +999,10 @@ 
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
-	              //return $this->unescape_quotes($data);
+				  //return $this->unescape_quotes($data);
 	              
-	              return $data;
-	            }, $query);
+				  return $data;
+				}, $query);
 	}
 	
 	private function unescape_quotes($value) {
@@ -1019,14 +1019,14 @@ 
 	private function has_serialized($s)
 	{
 		if(
-		    stristr($s, '{' ) != false &&
-		    stristr($s, '}' ) != false &&
-		    stristr($s, ';' ) != false &&
-		    stristr($s, ':' ) != false
-		    ){
-		    return true;
+			stristr($s, '{' ) != false &&
+			stristr($s, '}' ) != false &&
+			stristr($s, ';' ) != false &&
+			stristr($s, ':' ) != false
+			){
+			return true;
 		}else{
-		    return false;
+			return false;
 		}
 
 	}

Braces +113 added lines, -87 removed lines

@@ -45,11 +45,10 @@ 
 {
 	
 	require_once($file);
-}
-elseif(file_exists("vendor.phar") and extension_loaded('phar'))
+} elseif(file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
-}else{	
+} else{	
 	
 	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
 	
@@ -87,7 +86,7 @@ 
 try{
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch(Exception $e){
+} catch(Exception $e){
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -191,7 +190,7 @@ 
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
+			} else{
 				throw new Exception($method ." does not exists");
 				}
 		}
@@ -205,13 +204,15 @@ 
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
-				$fp = fopen($target_file, "wb+");
-			else
-				$fp = fopen($target_file, "ab+");	
+			if(!$_POST['start']) {
+							$fp = fopen($target_file, "wb+");
+			} else {
+							$fp = fopen($target_file, "ab+");
+			}
 			
-			if(!$fp)
-				throw new Exception("Unable to open $target_file file for writing");
+			if(!$fp) {
+							throw new Exception("Unable to open $target_file file for writing");
+			}
 			
 			fseek($fp, $_POST['start']);
 			
@@ -221,18 +222,20 @@ 
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
 				
 				@unlink($_FILES['blob']['tmp_name']);
-			}elseif(isset($_POST['blob'])){
+			} elseif(isset($_POST['blob'])){
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
-			}else{
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
+			} else{
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -256,10 +259,11 @@ 
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
-			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
-		else
-			$mysqli->query("SET NAMES utf8;");
+		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file']) {
+					$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
+		} else {
+					$mysqli->query("SET NAMES utf8;");
+		}
 			
 		return $mysqli;	
 	}
@@ -284,8 +288,9 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if(!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		if(!file_exists($mysql_backup_file)) {
+					throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		}
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -317,16 +322,18 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if(substr($line, 0, 1) == "#")
-					continue;
+				if(substr($line, 0, 1) == "#") {
+									continue;
+				}
 				
 				//check if line is empty	
-				if($line == "\n" or trim($line) == "")
-					continue;
+				if($line == "\n" or trim($line) == "") {
+									continue;
+				}
 					
-				if(substr($line, strlen($line)-2, strlen($line)) == ";\n")
-					$query .= $line;
-				else{
+				if(substr($line, strlen($line)-2, strlen($line)) == ";\n") {
+									$query .= $line;
+				} else{
 					$query .= $line;
 					continue;
 				}
@@ -385,7 +392,7 @@ 
 		if(!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else{
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -437,7 +444,7 @@ 
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
@@ -465,15 +472,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -590,19 +598,22 @@ 
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if(isset($matches[1]))
-				$table_prefix = $matches[1];
-			else
-				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			if(isset($matches[1])) {
+							$table_prefix = $matches[1];
+			} else {
+							throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			}
+		} else {
+					throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 		}
-		else
-			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
-			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'")) {
+					throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		}
 		
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
-			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'")) {
+					throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		}
 		
 		return true;
 	}
@@ -629,8 +640,9 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if(!file_put_contents($wp_config, $content))
-			throw new Exception("Could not write updated config data to ".$wp_config);
+		if(!file_put_contents($wp_config, $content)) {
+					throw new Exception("Could not write updated config data to ".$wp_config);
+		}
 		
 		chmod($wp_config, $file_perms);
 		
@@ -671,10 +683,11 @@ 
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
 							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i",$file['timestamp']);
 							
-							if($hash and $hash == $matches[1])
-								$mysqldump_list[$file['path']]['selected'] = "selected";
-							else
-								$mysqldump_list[$file['path']]['selected'] = "";	
+							if($hash and $hash == $matches[1]) {
+															$mysqldump_list[$file['path']]['selected'] = "selected";
+							} else {
+															$mysqldump_list[$file['path']]['selected'] = "";
+							}
 						}
 					}
 				}
@@ -689,13 +702,15 @@ 
 	
 	private function get_hash_from_backup($backup_file)
 	{
-		if(!$backup_file)
-			return false;
+		if(!$backup_file) {
+					return false;
+		}
 			
 		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file)-10, strlen($backup_file)), $matches)	;
 		
-		if($result and isset($matches[1]))
-			return ($matches[1]);
+		if($result and isset($matches[1])) {
+					return ($matches[1]);
+		}
 		
 		return false;
 	}
@@ -715,10 +730,11 @@ 
 			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->filesystem->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach($lines as $line) {
+									if($line)
 					{
 						$data = str_getcsv($line);
+				}
 						if(is_array($data)){
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
@@ -728,20 +744,22 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
-				$backup_files[$file_info['path']] = $file_info;
+			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions)) {
+							$backup_files[$file_info['path']] = $file_info;
+			}
 		}
 		
 		$new_list = array();
 		
 		foreach($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else{
+			if(isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			} else{
 				
-				if($local_backup_file and ($file_info['basename'] == $local_backup_file))
-					$file_info['selected'] = 'selected';
+				if($local_backup_file and ($file_info['basename'] == $local_backup_file)) {
+									$file_info['selected'] = 'selected';
+				}
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
 					
@@ -782,8 +800,9 @@ 
 		$backup_archive = new Tar();
 		if($this->is_multipart($backup_file))
 		{
-			if(!$return['part'])
-				$return['processed'] += $this->filesystem->getSize($backup_file);
+			if(!$return['part']) {
+							$return['processed'] += $this->filesystem->getSize($backup_file);
+			}
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];	
@@ -803,12 +822,13 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
-		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
+		if(isset($data['start'])) {
+				//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
+		}
 			$return['start'] = $data['start'];
-		}else{
+		} else{
 			
 			$return['processed'] += $start;
 			
@@ -818,14 +838,16 @@ 
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}
 		
-		if($return['finished'])
-			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		if($return['finished']) {
+					$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		}
 		
 		$return['backup_file'] = $backup_file;
 		
@@ -854,8 +876,7 @@ 
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
 			$return['remote_mysql_db'] 		= $wpdb->dbname;
-		}
-		else{
+		} else{
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -869,11 +890,13 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if(!file_put_contents($tmp_file, "++"))
-			throw new Exception("Could not write to new host");
+		if(!file_put_contents($tmp_file, "++")) {
+					throw new Exception("Could not write to new host");
+		}
 		
-		if(!unlink($tmp_file))
-			throw new Exception("Could not delete temporary file from new host");
+		if(!unlink($tmp_file)) {
+					throw new Exception("Could not delete temporary file from new host");
+		}
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
@@ -904,8 +927,9 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -916,8 +940,9 @@ 
 		if($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
-				$backup_size += $this->filesystem->getSize($part_file);
+			foreach($backup_parts as $part_file) {
+							$backup_size += $this->filesystem->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -974,7 +999,7 @@ 
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif($status != 200 and $status != 418)
+		} elseif($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -995,8 +1020,9 @@ 
 		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function ($m) {
 				  $data = "";
 				  	
-				  if(!isset($m[3]))
-					$m[3] = "";
+				  if(!isset($m[3])) {
+				  					$m[3] = "";
+				  }
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
 	              //return $this->unescape_quotes($data);
@@ -1025,7 +1051,7 @@ 
 		    stristr($s, ':' ) != false
 		    ){
 		    return true;
-		}else{
+		} else{
 		    return false;
 		}
 

Doc Comments +12 added lines

@@ -580,6 +580,9 @@ 
 		
 	}
 	
+	/**
+	 * @param mysqli $mysqli
+	 */
 	private function update_wp_url($wp_path, $url, $mysqli)
 	{
 		$wp_config = $wp_path.DS."wp-config.php";
@@ -886,6 +889,9 @@ 
 		$this->send_response(200, $return);
 	}
 	
+	/**
+	 * @param string $val
+	 */
 	private function return_bytes($val) {
 	    $val = trim($val);
 	    $last = strtolower($val[strlen($val)-1]);
@@ -943,6 +949,9 @@ 
 		return $files;
 	}
 	
+	/**
+	 * @param string $field
+	 */
 	private function sort_by( &$array, $field, $direction = 'asc')
 	{
 		$direction = strtolower($direction);
@@ -988,6 +997,9 @@ 
 	 * Serialize fix methods below for mysql query lines
 	 */ 
 	 
+	/**
+	 * @return string
+	 */
 	function do_serialized_fix($query)
 	{
 		$query = str_replace(array("\\n","\\r","\\'"), array("","","\""), ($query));

Spacing +190 added lines, -190 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-if(!defined('AUTH_KEY'))
+if (!defined('AUTH_KEY'))
 {
 	define('AUTH_KEY', '');
 }
 
-if(!defined("DS"))
+if (!defined("DS"))
 {
 	define("DS", DIRECTORY_SEPARATOR);
 }
 
-if(!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
+if (!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
 {	
-	if(!AUTH_KEY)
+	if (!AUTH_KEY)
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, AUTH_KEY not set!");
 			exit;
 	}
 	
-	if(!isset($_REQUEST['hash']))
+	if (!isset($_REQUEST['hash']))
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, sent HASH is empty!");
 			exit;
 	}
 	
-	if($_REQUEST['hash'] != AUTH_KEY)
+	if ($_REQUEST['hash'] != AUTH_KEY)
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, AUTH_KEY doesn't match the sent HASH!");
 			exit;
@@ -32,28 +32,28 @@ 
 }
 
 //check minimum PHP version
-if(version_compare(phpversion(), Xcloner_Restore::xcloner_minimum_version, '<'))
+if (version_compare(phpversion(), Xcloner_Restore::xcloner_minimum_version, '<'))
 {
-	Xcloner_Restore::send_response(500, sprintf(("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"),Xcloner_Restore::xcloner_minimum_version, phpversion()) );
+	Xcloner_Restore::send_response(500, sprintf(("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"), Xcloner_Restore::xcloner_minimum_version, phpversion()));
 	exit;
 
 }
 
-$file = dirname( __DIR__ )  . DS.'vendor'.DS.'autoload.php';
+$file = dirname(__DIR__).DS.'vendor'.DS.'autoload.php';
 
-if(file_exists($file))
+if (file_exists($file))
 {
 	
 	require_once($file);
 }
-elseif(file_exists("vendor.phar") and extension_loaded('phar'))
+elseif (file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
-}else{	
+} else {	
 	
-	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
+	$file = dirname(__FILE__).DS.'vendor'.DS.'autoload.php';
 	
-	if(!file_exists($file))
+	if (!file_exists($file))
 	{
 		Xcloner_Restore::send_response("404", "File $file does not exists, please extract the vendor.tgz archive on the server or enable PHP Phar module!");
 		exit;
@@ -78,16 +78,16 @@ 
 
 //do not modify below
 $that = "";
-if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 {
 	$that = $this;
 }
 $xcloner_restore = new Xcloner_Restore($that);
 
-try{
+try {
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch(Exception $e){
+}catch (Exception $e) {
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -96,10 +96,10 @@ 
 	
 	const 	xcloner_minimum_version = "5.4.0";
 	
-	private $backup_archive_extensions 		= array("zip", "tar", "tgz", "tar.gz", "gz", "csv");
-	private $process_files_limit 			= 150;
-	private $process_files_limit_list 		= 350;
-	private $process_mysql_records_limit 	= 250;
+	private $backup_archive_extensions = array("zip", "tar", "tgz", "tar.gz", "gz", "csv");
+	private $process_files_limit = 150;
+	private $process_files_limit_list = 350;
+	private $process_mysql_records_limit = 250;
 	private $adapter;
 	private $filesystem;
 	private $logger;
@@ -111,12 +111,12 @@ 
 	{
 		register_shutdown_function(array($this, 'exception_handler'));
 
-		if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+		if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 		{
 			$dir = $parent_api->get_xcloner_container()->get_xcloner_settings()->get_xcloner_store_path();
 		}
 		
-		if(!isset($dir) || !$dir){
+		if (!isset($dir) || !$dir) {
 			$dir = dirname(__FILE__);
 		}
 		
@@ -124,7 +124,7 @@ 
 		
 		$this->backup_storage_dir = $dir;
 		
-		$this->adapter = new Local($dir ,LOCK_EX, 'SKIP_LINKS');
+		$this->adapter = new Local($dir, LOCK_EX, 'SKIP_LINKS');
 		$this->filesystem = new Filesystem($this->adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -133,15 +133,15 @@ 
 		
 		$logger_path = $this->get_logger_filename();
 		
-		if(!is_writeable($logger_path) and !touch($logger_path))
+		if (!is_writeable($logger_path) and !touch($logger_path))
 		{
 			$logger_path = "php://stderr";
 		}
 		
 		$this->logger->pushHandler(new StreamHandler($logger_path, Logger::DEBUG));
 		
-		if(isset($_POST['API_ID'])){
-			$this->logger->info("Processing ajax request ID ".substr(filter_input(INPUT_POST, 'API_ID', FILTER_SANITIZE_STRING), 0 , 15));
+		if (isset($_POST['API_ID'])) {
+			$this->logger->info("Processing ajax request ID ".substr(filter_input(INPUT_POST, 'API_ID', FILTER_SANITIZE_STRING), 0, 15));
 		}
 
 	}
@@ -150,20 +150,20 @@ 
 		
 		$error = error_get_last();
 		
-		if($error['type'] and $this->logger)
+		if ($error['type'] and $this->logger)
 		{
-			$this->logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$this->logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 	
 	}
 	
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
+	    static $levels = null;
+	    if ($levels === null) {
+	        $levels = [];
 	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+	            if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 	        }
 	    }
 	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -171,14 +171,14 @@ 
 	
 	public function get_logger_filename()
 	{
-		$filename = $this->backup_storage_dir .DS. "xcloner_restore.log";
+		$filename = $this->backup_storage_dir.DS."xcloner_restore.log";
 		
 		return $filename;
 	}
 	
 	public function init()
 	{
-		if(isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
+		if (isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
 		{
 			$method = filter_input(INPUT_POST, 'xcloner_action', FILTER_SANITIZE_STRING);
 			
@@ -186,13 +186,13 @@ 
 			
 			$method .= "_action";
 			
-			if(method_exists($this, $method))
+			if (method_exists($this, $method))
 			{
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
-				throw new Exception($method ." does not exists");
+			} else {
+				throw new Exception($method." does not exists");
 				}
 		}
 		
@@ -201,38 +201,38 @@ 
 	
 	public function write_file_action()
 	{
-		if(isset($_POST['file']))
+		if (isset($_POST['file']))
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
+			if (!$_POST['start'])
 				$fp = fopen($target_file, "wb+");
 			else
 				$fp = fopen($target_file, "ab+");	
 			
-			if(!$fp)
+			if (!$fp)
 				throw new Exception("Unable to open $target_file file for writing");
 			
 			fseek($fp, $_POST['start']);
 			
-			if(isset($_FILES['blob']))
+			if (isset($_FILES['blob']))
 			{
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using FILES blob', filesize($_FILES['blob']['tmp_name']), $target_file, $_POST['start']));
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
 				
 				@unlink($_FILES['blob']['tmp_name']);
-			}elseif(isset($_POST['blob'])){
+			}elseif (isset($_POST['blob'])) {
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
-			}else{
+			} else {
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -243,20 +243,20 @@ 
 		
 	}
 	
-	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db )
+	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db)
 	{
 		$this->logger->info(sprintf('Connecting to mysql database %s with %s@%s', $remote_mysql_db, $remote_mysql_user, $remote_mysql_host));
 
 		$mysqli = new mysqli($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 
 		if ($mysqli->connect_error) {
-			throw new Exception('Connect Error (' . $mysqli->connect_errno . ') '
+			throw new Exception('Connect Error ('.$mysqli->connect_errno.') '
 				. $mysqli->connect_error);
 		}
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
+		if (isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
 			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
 		else
 			$mysqli->query("SET NAMES utf8;");
@@ -266,15 +266,15 @@ 
 	
 	public function restore_mysql_backup_action()
 	{
-		$mysqldump_file 	= filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
-		$remote_path 		= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
+		$mysqldump_file = filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
+		$remote_path = filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
 		$remote_mysql_user 	= filter_input(INPUT_POST, 'remote_mysql_user', FILTER_SANITIZE_STRING);
 		$remote_mysql_pass 	= filter_input(INPUT_POST, 'remote_mysql_pass', FILTER_SANITIZE_STRING);
-		$remote_mysql_db 	= filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
+		$remote_mysql_db = filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
 		$remote_mysql_host 	= filter_input(INPUT_POST, 'remote_mysql_host', FILTER_SANITIZE_STRING);
-		$execute_query 		= trim(stripslashes($_POST['query']));
-		$error_line			= filter_input(INPUT_POST, 'error_line', FILTER_SANITIZE_NUMBER_INT);
-		$start			 	= filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
+		$execute_query = trim(stripslashes($_POST['query']));
+		$error_line = filter_input(INPUT_POST, 'error_line', FILTER_SANITIZE_NUMBER_INT);
+		$start = filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
 		
 		$wp_home_url 		= filter_input(INPUT_POST, 'wp_home_url', FILTER_SANITIZE_STRING);
 		$remote_restore_url = filter_input(INPUT_POST, 'remote_restore_url', FILTER_SANITIZE_STRING);
@@ -284,8 +284,8 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if(!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		if (!file_exists($mysql_backup_file))
+			throw new Exception(sprintf("Mysql backup file %s does not exists", $mysql_backup_file));
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -299,7 +299,7 @@ 
 		}*/
 		
 		{
-			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db );
+			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 		}
 		
 		$line_count = 0;
@@ -309,7 +309,7 @@ 
 		$return['backup_size']	= filesize($mysql_backup_file);
 		
 		$fp = fopen($mysql_backup_file, "r");
-		if($fp)
+		if ($fp)
 		{
 			$this->logger->info(sprintf("Opening mysql dump file %s at position %s.", $mysql_backup_file, $start));
 			fseek($fp, $start);
@@ -317,49 +317,49 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if(substr($line, 0, 1) == "#")
+				if (substr($line, 0, 1) == "#")
 					continue;
 				
 				//check if line is empty	
-				if($line == "\n" or trim($line) == "")
+				if ($line == "\n" or trim($line) == "")
 					continue;
 					
-				if(substr($line, strlen($line)-2, strlen($line)) == ";\n")
+				if (substr($line, strlen($line) - 2, strlen($line)) == ";\n")
 					$query .= $line;
-				else{
+				else {
 					$query .= $line;
 					continue;
 				}
 				
-				if($execute_query)
+				if ($execute_query)
 				{
-					$query  = (($execute_query));
+					$query = (($execute_query));
 					$execute_query = "";
 				}	
 				
 				//Doing serialized url replace here
 				
-				if($wp_site_url and $wp_home_url and strlen($wp_home_url) < strlen($wp_site_url))
+				if ($wp_site_url and $wp_home_url and strlen($wp_home_url) < strlen($wp_site_url))
 				{
-					list($wp_home_url,$wp_site_url) 			= array($wp_site_url,$wp_home_url);
-					list($remote_restore_url,$restore_site_url) = array($restore_site_url,$remote_restore_url);
+					list($wp_home_url, $wp_site_url) = array($wp_site_url, $wp_home_url);
+					list($remote_restore_url, $restore_site_url) = array($restore_site_url, $remote_restore_url);
 					
 				}
 				
-				if($wp_home_url and $remote_restore_url and strpos($query, $wp_home_url) !== false)
+				if ($wp_home_url and $remote_restore_url and strpos($query, $wp_home_url) !== false)
 				{
 					$query = $this->url_replace($wp_home_url, $remote_restore_url, $query);
 				}
 				
-				if($wp_site_url and $restore_site_url and strpos($query, $wp_site_url) !== false)
+				if ($wp_site_url and $restore_site_url and strpos($query, $wp_site_url) !== false)
 				{
 					$query = $this->url_replace($wp_site_url, $restore_site_url, $query);
 				}
 				
-				if(!$mysqli->query($query) && !stristr($mysqli->error,"Duplicate entry"))
+				if (!$mysqli->query($query) && !stristr($mysqli->error, "Duplicate entry"))
 				{
 					//$return['error_line'] = $line_count;
-					$return['start'] = ftell($fp)-strlen($line);
+					$return['start'] = ftell($fp) - strlen($line);
 					$return['query_error'] = true;
 					$return['query'] = $query;
 					$return['message'] = sprintf("Mysql Error: %s\n", $mysqli->error);
@@ -380,12 +380,12 @@ 
 		
 		$return['start'] = ftell($fp);
 		
-		$this->logger->info(sprintf("Executed %s queries of size %s bytes", $line_count, ($return['start']-$start)));
+		$this->logger->info(sprintf("Executed %s queries of size %s bytes", $line_count, ($return['start'] - $start)));
 		
-		if(!feof($fp))
+		if (!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else {
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -400,12 +400,12 @@ 
 		$query = str_replace($search, $replace, $query);
 		$original_query = $query;
 		
-		if($this->has_serialized($query))
+		if ($this->has_serialized($query))
 		{
 			$this->logger->info(sprintf("Query contains serialized data, doing serialized size fix"), array("QUERY_REPLACE"));
 			$query = $this->do_serialized_fix($query);
 			
-			if(!$query)
+			if (!$query)
 			{
 				$this->logger->info(sprintf("Serialization probably failed here..."), array("QUERY_REPLACE"));
 				$query = $original_query;
@@ -421,37 +421,37 @@ 
 		$backup_parts = array();
 		
 		$source_backup_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
-		$start 				= (int)filter_input(INPUT_POST, 'start', FILTER_SANITIZE_STRING);
-		$return['part'] 	= (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_STRING);
+		$start = (int)filter_input(INPUT_POST, 'start', FILTER_SANITIZE_STRING);
+		$return['part'] = (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_STRING);
 		
 		$backup_file = $source_backup_file;
 		
-		if($this->is_multipart($backup_file))
+		if ($this->is_multipart($backup_file))
 		{
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];
 		}
 		
-		try{
+		try {
 			$tar = new Tar();
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch(Exception $e)
+		}catch (Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$this->send_response(200, $return);
 		}
 		
-		$return['files'] 		= array();
-		$return['finished'] 	= 1;
-		$return['total_size'] 	= filesize($this->backup_storage_dir.DS.$backup_file);
+		$return['files'] = array();
+		$return['finished'] = 1;
+		$return['total_size'] = filesize($this->backup_storage_dir.DS.$backup_file);
 		$i = 0;
 		
-		if(isset($data['extracted_files']) and is_array($data['extracted_files']))
+		if (isset($data['extracted_files']) and is_array($data['extracted_files']))
 		{
-			foreach($data['extracted_files'] as $file)
+			foreach ($data['extracted_files'] as $file)
 			{
 				$return['files'][$i]['path'] = $file->getPath();
 				$return['files'][$i]['size'] = $file->getSize();
@@ -461,18 +461,18 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
-			if($this->is_multipart($source_backup_file))
+		} else {
+			if ($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
+				if ($return['part'] < sizeof($backup_parts))	
 					$return['finished'] = 0;
 				
 			}
@@ -490,28 +490,28 @@ 
 		
 		$remote_mysql_user 	= filter_input(INPUT_POST, 'remote_mysql_user', FILTER_SANITIZE_STRING);
 		$remote_mysql_pass 	= filter_input(INPUT_POST, 'remote_mysql_pass', FILTER_SANITIZE_STRING);
-		$remote_mysql_db 	= filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
+		$remote_mysql_db = filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
 		$remote_mysql_host 	= filter_input(INPUT_POST, 'remote_mysql_host', FILTER_SANITIZE_STRING);
 		
-		$update_remote_site_url			 	= filter_input(INPUT_POST, 'update_remote_site_url', FILTER_SANITIZE_NUMBER_INT);
-		$delete_restore_script			 	= filter_input(INPUT_POST, 'delete_restore_script', FILTER_SANITIZE_NUMBER_INT);
-		$delete_backup_temporary_folder		= filter_input(INPUT_POST, 'delete_backup_temporary_folder', FILTER_SANITIZE_NUMBER_INT);
+		$update_remote_site_url = filter_input(INPUT_POST, 'update_remote_site_url', FILTER_SANITIZE_NUMBER_INT);
+		$delete_restore_script = filter_input(INPUT_POST, 'delete_restore_script', FILTER_SANITIZE_NUMBER_INT);
+		$delete_backup_temporary_folder = filter_input(INPUT_POST, 'delete_backup_temporary_folder', FILTER_SANITIZE_NUMBER_INT);
 				
-		if($update_remote_site_url)
+		if ($update_remote_site_url)
 		{
-			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db );
+			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 			$this->update_wp_config($remote_path, $remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 			$this->update_wp_url($remote_path, $remote_restore_url, $mysqli);
 		}
 		
-		if($delete_backup_temporary_folder)
+		if ($delete_backup_temporary_folder)
 		{
 			$this->delete_backup_temporary_folder($remote_path);
 		}
 		
-		if(!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
+		if (!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
 		{
-			if($delete_restore_script)
+			if ($delete_restore_script)
 			{
 				$this->delete_self();
 			}
@@ -523,7 +523,7 @@ 
 	
 	private function delete_backup_temporary_folder($remote_path)
 	{
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -531,13 +531,13 @@ 
 		$mysqldump_list = array();
 		$list = $this->target_filesystem->listContents();
 		
-		foreach($list as $file)
+		foreach ($list as $file)
 		{
 			$matches = array();
 			
-			if($file['type'] == "dir")
+			if ($file['type'] == "dir")
 			{
-				if(preg_match("/xcloner-(\w*)/", $file['basename'], $matches)){
+				if (preg_match("/xcloner-(\w*)/", $file['basename'], $matches)) {
 					$this->logger->info(sprintf('Deleting temporary folder %s', $file['path']));
 					$this->target_filesystem->deleteDir($file['path']);
 				}
@@ -550,29 +550,29 @@ 
 	
 	private function delete_self()
 	{
-		if($this->filesystem->has("vendor.phar"))
+		if ($this->filesystem->has("vendor.phar"))
 		{
 			$this->logger->info(sprintf('Deleting vendor.phar'));
 			$this->filesystem->delete("vendor.phar");
 		}
-		if($this->filesystem->has("vendor"))
+		if ($this->filesystem->has("vendor"))
 		{
 			$this->logger->info(sprintf('Deleting vendor folder'));
 			$this->filesystem->deleteDir("vendor");
 		}
-		if($this->filesystem->has("xcloner_restore.php"))
+		if ($this->filesystem->has("xcloner_restore.php"))
 		{
 			$this->logger->info(sprintf('Deleting xcloner_restore.php'));
 			$this->filesystem->delete("xcloner_restore.php");
 		}
 		
-		if($this->filesystem->has("xcloner_restore.log"))
+		if ($this->filesystem->has("xcloner_restore.log"))
 		{
 			$this->logger->info(sprintf('Deleting xcloner_restore.log'));
 			$this->filesystem->delete("xcloner_restore.log");
 		}
 		
-		if($this->filesystem->has($this->get_logger_filename()))
+		if ($this->filesystem->has($this->get_logger_filename()))
 		{
 			$this->logger->info(sprintf('Deleting logger file %s', $this->get_logger_filename()));
 			$this->filesystem->delete($this->get_logger_filename());
@@ -586,11 +586,11 @@ 
 		
 		$this->logger->info(sprintf('Updating site url to %s', $url));
 		
-		if(file_exists($wp_config))
+		if (file_exists($wp_config))
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if(isset($matches[1]))
+			if (isset($matches[1]))
 				$table_prefix = $matches[1];
 			else
 				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
@@ -598,10 +598,10 @@ 
 		else
 			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
 			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
 		
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
 			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
 		
 		return true;
@@ -611,7 +611,7 @@ 
 	{
 		$wp_config = $remote_path.DS."wp-config.php";
 		
-		if(!file_exists($wp_config))
+		if (!file_exists($wp_config))
 		{
 			throw new Exception("Could not find the wp-config.php in ".$remote_path);
 		}
@@ -629,7 +629,7 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if(!file_put_contents($wp_config, $content))
+		if (!file_put_contents($wp_config, $content))
 			throw new Exception("Could not write updated config data to ".$wp_config);
 		
 		chmod($wp_config, $file_perms);
@@ -645,7 +645,7 @@ 
 	
 		$hash = $this->get_hash_from_backup($source_backup_file);	
 		
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -653,25 +653,25 @@ 
 		$mysqldump_list = array();
 		$list = $this->target_filesystem->listContents();
 		
-		foreach($list as $file)
+		foreach ($list as $file)
 		{
 			$matches = array();
 			
-			if($file['type'] == "dir")
+			if ($file['type'] == "dir")
 			{
-				if(preg_match("/xcloner-(\w*)/", $file['basename'], $matches))
+				if (preg_match("/xcloner-(\w*)/", $file['basename'], $matches))
 				{
 					$files = $this->target_filesystem->listContents($file['basename']);
-					foreach($files as $file)
+					foreach ($files as $file)
 					{
-						if($file['extension'] == "sql")
+						if ($file['extension'] == "sql")
 						{
 							$this->logger->info(sprintf('Found %s mysql backup file', $file['path']));
 							$mysqldump_list[$file['path']]['path'] = $file['path'];
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
-							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i",$file['timestamp']);
+							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i", $file['timestamp']);
 							
-							if($hash and $hash == $matches[1])
+							if ($hash and $hash == $matches[1])
 								$mysqldump_list[$file['path']]['selected'] = "selected";
 							else
 								$mysqldump_list[$file['path']]['selected'] = "";	
@@ -681,7 +681,7 @@ 
 			}	
 		}
 		
-		$this->sort_by($mysqldump_list, 'timestamp','desc');
+		$this->sort_by($mysqldump_list, 'timestamp', 'desc');
 		$return['files'] = $mysqldump_list;
 		
 		$this->send_response(200, $return);
@@ -689,12 +689,12 @@ 
 	
 	private function get_hash_from_backup($backup_file)
 	{
-		if(!$backup_file)
+		if (!$backup_file)
 			return false;
 			
-		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file)-10, strlen($backup_file)), $matches)	;
+		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file) - 10, strlen($backup_file)), $matches);
 		
-		if($result and isset($matches[1]))
+		if ($result and isset($matches[1]))
 			return ($matches[1]);
 		
 		return false;
@@ -708,18 +708,18 @@ 
 		$backup_files = array();
 		$parents = array();
 		
-		foreach($list as $file_info)
+		foreach ($list as $file_info)
 		{
 			$data = array();
 			
-			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->filesystem->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach ($lines as $line)
+					if ($line)
 					{
 						$data = str_getcsv($line);
-						if(is_array($data)){
+						if (is_array($data)) {
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
 							$file_info['size'] += $data[2];
@@ -728,19 +728,19 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
 				$backup_files[$file_info['path']] = $file_info;
 		}
 		
 		$new_list = array();
 		
-		foreach($backup_files as $key=>$file_info)
+		foreach ($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
+			if (isset($parents[$file_info['path']]))
 				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else{
+			else {
 				
-				if($local_backup_file and ($file_info['basename'] == $local_backup_file))
+				if ($local_backup_file and ($file_info['basename'] == $local_backup_file))
 					$file_info['selected'] = 'selected';
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
@@ -750,7 +750,7 @@ 
 				
 		}
 		
-		$this->sort_by($new_list, "timestamp","desc");
+		$this->sort_by($new_list, "timestamp", "desc");
 		
 		$return['files'] = $new_list;
 		
@@ -760,15 +760,15 @@ 
 	
 	public function restore_backup_to_path_action()
 	{
-		$source_backup_file 	= filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
-		$remote_path 			= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
+		$source_backup_file = filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
+		$remote_path = filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
 		$include_filter_files 	= filter_input(INPUT_POST, 'filter_files', FILTER_SANITIZE_STRING);
 		$exclude_filter_files 	= "";
-		$start 					= filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
-		$return['part'] 		= (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_NUMBER_INT);
+		$start = filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
+		$return['part'] = (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_NUMBER_INT);
 		$return['processed'] 	= (int)filter_input(INPUT_POST, 'processed', FILTER_SANITIZE_NUMBER_INT);
 				
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -780,9 +780,9 @@ 
 		$return['total_size'] = $this->get_backup_size($backup_file);
 		
 		$backup_archive = new Tar();
-		if($this->is_multipart($backup_file))
+		if ($this->is_multipart($backup_file))
 		{
-			if(!$return['part'])
+			if (!$return['part'])
 				$return['processed'] += $this->filesystem->getSize($backup_file);
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
@@ -790,41 +790,41 @@ 
 		}	
 		
 		$this->logger->info(sprintf('Opening backup archive %s at position %s', $backup_file, $start));
-		$backup_archive->open($this->backup_storage_dir .DS. $backup_file, $start);
+		$backup_archive->open($this->backup_storage_dir.DS.$backup_file, $start);
 
-		$data = $backup_archive->extract($remote_path, '',$exclude_filter_files,$include_filter_files, $this->process_files_limit);
+		$data = $backup_archive->extract($remote_path, '', $exclude_filter_files, $include_filter_files, $this->process_files_limit);
 		
-		if(isset($data['extracted_files']))
+		if (isset($data['extracted_files']))
 		{
-			foreach($data['extracted_files'] as $spl_fileinfo)
+			foreach ($data['extracted_files'] as $spl_fileinfo)
 			{
 				$this->logger->info(sprintf('Extracted %s file', $spl_fileinfo->getPath()));
 				$return['extracted_files'][] = $spl_fileinfo->getPath()." (".$spl_fileinfo->getSize()." bytes)";
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
 			$return['start'] = $data['start'];
-		}else{
+		} else {
 			
 			$return['processed'] += $start;
 			
-			if($this->is_multipart($source_backup_file))
+			if ($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
+				if ($return['part'] < sizeof($backup_parts))	
 					$return['finished'] = 0;
 				
 			}
 		}
 		
-		if($return['finished'])
+		if ($return['finished'])
 			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
 		
 		$return['backup_file'] = $backup_file;
@@ -838,24 +838,24 @@ 
 		
 		$restore_script_url = filter_input(INPUT_POST, 'restore_script_url', FILTER_SANITIZE_STRING);
 		
-		$pathinfo = pathinfo( __FILE__);
+		$pathinfo = pathinfo(__FILE__);
 		
 		$suffix = "";
 		$return['remote_mysql_host'] 	= "localhost";
 		$return['remote_mysql_user'] 	= "";
 		$return['remote_mysql_pass'] 	= "";
-		$return['remote_mysql_db'] 		= "";
+		$return['remote_mysql_db'] = "";
 		
-		if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+		if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 		{
 			$return['dir'] = realpath(get_home_path().DS.$suffix);
-			$return['restore_script_url']  	= get_site_url();
+			$return['restore_script_url'] = get_site_url();
 			$return['remote_mysql_host'] 	= $wpdb->dbhost;
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
-			$return['remote_mysql_db'] 		= $wpdb->dbname;
+			$return['remote_mysql_db'] = $wpdb->dbname;
 		}
-		else{
+		else {
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -869,17 +869,17 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if(!file_put_contents($tmp_file, "++"))
+		if (!file_put_contents($tmp_file, "++"))
 			throw new Exception("Could not write to new host");
 		
-		if(!unlink($tmp_file))
+		if (!unlink($tmp_file))
 			throw new Exception("Could not delete temporary file from new host");
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
 
 		$return['max_upload_size'] = min($max_upload, $max_post); // bytes
-		$return['status']		= true;
+		$return['status'] = true;
 		
 		$this->logger->info(sprintf('Current filesystem max upload size is %s bytes', $return['max_upload_size']));
 		
@@ -888,8 +888,8 @@ 
 	
 	private function return_bytes($val) {
 	    $val = trim($val);
-	    $last = strtolower($val[strlen($val)-1]);
-	    switch($last) {
+	    $last = strtolower($val[strlen($val) - 1]);
+	    switch ($last) {
 	        // The 'G' modifier is available since PHP 5.1.0
 	        case 'g':
 	            $val *= 1024;
@@ -904,7 +904,7 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -913,10 +913,10 @@ 
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->filesystem->getSize($backup_name);
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
+			foreach ($backup_parts as $part_file)
 				$backup_size += $this->filesystem->getSize($part_file);
 		}
 		
@@ -927,12 +927,12 @@ 
 	{
 		$files = array();
 		
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->filesystem->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$files[] = $data[0];
@@ -943,20 +943,20 @@ 
 		return $files;
 	}
 	
-	private function sort_by( &$array, $field, $direction = 'asc')
+	private function sort_by(&$array, $field, $direction = 'asc')
 	{
 		$direction = strtolower($direction);
 		
 	    usort($array, create_function('$a, $b', '
-	        $a = $a["' . $field . '"];
-	        $b = $b["' . $field . '"];
+	        $a = $a["' . $field.'"];
+	        $b = $b["' . $field.'"];
 	
 	        if ($a == $b)
 	        {
 	            return 0;
 	        }
 	
-	        return ($a ' . ($direction == 'desc' ? '>' : '<') .' $b) ? -1 : 1;
+	        return ($a ' . ($direction == 'desc' ? '>' : '<').' $b) ? -1 : 1;
 	    '));
 	
 	    return true;
@@ -970,11 +970,11 @@ 
 		$return['status'] = $status;
 		$return['statusText'] = $response;
 		
-		if(isset($response['error']) && $response['error'])
+		if (isset($response['error']) && $response['error'])
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif($status != 200 and $status != 418)
+		}elseif ($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -990,12 +990,12 @@ 
 	 
 	function do_serialized_fix($query)
 	{
-		$query = str_replace(array("\\n","\\r","\\'"), array("","","\""), ($query));
+		$query = str_replace(array("\\n", "\\r", "\\'"), array("", "", "\""), ($query));
 		
-		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function ($m) {
+		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function($m) {
 				  $data = "";
 				  	
-				  if(!isset($m[3]))
+				  if (!isset($m[3]))
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
@@ -1010,22 +1010,22 @@ 
 	}
 	
 	private function unescape_mysql($value) {
-		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z",  "\'", '\"'),
-						   array("\\",   "\0",  "\n",  "\r",  "\x1a", "'", '"'), 
+		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z", "\'", '\"'),
+						   array("\\", "\0", "\n", "\r", "\x1a", "'", '"'), 
 						   $value);
 	}	
 	
 	
 	private function has_serialized($s)
 	{
-		if(
-		    stristr($s, '{' ) != false &&
-		    stristr($s, '}' ) != false &&
-		    stristr($s, ';' ) != false &&
-		    stristr($s, ':' ) != false
-		    ){
+		if (
+		    stristr($s, '{') != false &&
+		    stristr($s, '}') != false &&
+		    stristr($s, ';') != false &&
+		    stristr($s, ':') != false
+		    ) {
 		    return true;
-		}else{
+		} else {
 		    return false;
 		}
 

includes/class-xcloner-activator.php

Spacing +22 added lines, -22 removed lines

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

Braces +39 added lines, -26 removed lines

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

xcloner.php

Braces +3 added lines, -2 removed lines

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

Spacing +20 added lines, -20 removed lines

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