ovidiul / XCloner-Wordpress

admin/class-xcloner-admin.php

Doc Comments -2 removed lines

@@ -47,8 +47,6 @@
 	 *
 	 * @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 ) {
 

Spacing +68 added lines, -68 removed lines

@@ -50,7 +50,7 @@ 
 	 * @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();
@@ -66,9 +66,9 @@ 
 	 *
 	 * @since    1.0.0
 	 */
-	public function enqueue_styles( $hook ) {
+	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;
 		}
 
@@ -84,13 +84,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,9 +99,9 @@ 
 	 *
 	 * @since    1.0.0
 	 */
-	public function enqueue_scripts( $hook ) {
+	public function enqueue_scripts($hook) {
 
-		if ( ! stristr( $hook, "page_" . $this->plugin_name ) ) {
+		if (!stristr($hook, "page_".$this->plugin_name)) {
 			return;
 		}
 
@@ -118,25 +118,25 @@ 
 		 */
 
 		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('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);
 
 
 	}
 
 	public function xcloner_init_page() {
-		require_once( "partials/xcloner_init_page.php" );
+		require_once("partials/xcloner_init_page.php");
 
 	}
 
@@ -145,70 +145,70 @@ 
 		$remote_storage       = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
 
-		if ( isset( $_POST['action'] ) ) {
-			$_POST['action'] = $xcloner_sanitization->sanitize_input_as_string( $_POST['action'] );
-			$remote_storage->save( $_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'] != "" ) {
-			$_POST['authentification_code'] = $xcloner_sanitization->sanitize_input_as_string( $_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'] );
+			$remote_storage->set_access_token($_POST['authentification_code']);
 		}
 
-		if ( isset( $_POST['connection_check'] ) && $_POST['connection_check'] ) {
-			$remote_storage->check( $_POST['action'] );
+		if (isset($_POST['connection_check']) && $_POST['connection_check']) {
+			$remote_storage->check($_POST['action']);
 		}
 
-		require_once( "partials/xcloner_remote_storage_page.php" );
+		require_once("partials/xcloner_remote_storage_page.php");
 
 	}
 
 	public function xcloner_scheduled_backups_page() {
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 
-		if ( ! $requirements->check_backup_ready_status() ) {
-			require_once( "partials/xcloner_init_page.php" );
+		if (!$requirements->check_backup_ready_status()) {
+			require_once("partials/xcloner_init_page.php");
 
 			return false;
 		}
 
-		require_once( "partials/xcloner_scheduled_backups_page.php" );
+		require_once("partials/xcloner_scheduled_backups_page.php");
 
 	}
 
 	public function xcloner_manage_backups_page() {
-		require_once( "partials/xcloner_manage_backups_page.php" );
+		require_once("partials/xcloner_manage_backups_page.php");
 
 	}
 
 	public function xcloner_debugger_page() {
-		require_once( "partials/xcloner_console_page.php" );
+		require_once("partials/xcloner_console_page.php");
 
 	}
 
 	public function xcloner_restore_page() {
-		require_once( "partials/xcloner_restore_page.php" );
+		require_once("partials/xcloner_restore_page.php");
 
 	}
 
 	public function xcloner_generate_backups_page() {
 		$requirements = $this->xcloner_container->get_xcloner_requirements();
 
-		if ( ! $requirements->check_backup_ready_status() ) {
-			require_once( "partials/xcloner_init_page.php" );
+		if (!$requirements->check_backup_ready_status()) {
+			require_once("partials/xcloner_init_page.php");
 
 			return false;
 		}
 
-		require_once( "partials/xcloner_generate_backups_page.php" );
+		require_once("partials/xcloner_generate_backups_page.php");
 
 		return;
 	}
 
 	public function xcloner_settings_page() {
 		// check user capabilities
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if (!current_user_can('manage_options')) {
 			return;
 		}
 
@@ -216,40 +216,40 @@ 
 
 		// check if the user have submitted the settings
 		// wordpress will add the "settings-updated" $_GET parameter to the url
-		if ( isset( $_GET['settings-updated'] ) ) {
+		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' );
+			add_settings_error('wporg_messages', 'wporg_message', __('Settings Saved', 'wporg'), 'updated');
 		}
 
 		// show error/update messages
-		settings_errors( 'wporg_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'] );
+		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>
+        <h1><?= esc_html(get_admin_page_title()); ?></h1>
 
         <ul class="nav-tab-wrapper row">
             <li><a href="?page=xcloner_settings_page&tab=general_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'general_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'General Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'general_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('General Options', 'xcloner-backup-and-restore') ?></a>
             </li>
             <li><a href="?page=xcloner_settings_page&tab=mysql_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'mysql_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'Mysql Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'mysql_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('Mysql Options', 'xcloner-backup-and-restore') ?></a>
             </li>
             <li><a href="?page=xcloner_settings_page&tab=system_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'system_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'System Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'system_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('System Options', 'xcloner-backup-and-restore') ?></a>
             </li>
             <li><a href="?page=xcloner_settings_page&tab=cleanup_options"
-                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'cleanup_options' ? 'nav-tab-active' : ''; ?>"><?php echo __( 'Cleanup Options', 'xcloner-backup-and-restore' ) ?></a>
+                   class="nav-tab col s12 m3 l2 <?php echo $active_tab == 'cleanup_options' ? 'nav-tab-active' : ''; ?>"><?php echo __('Cleanup Options', 'xcloner-backup-and-restore') ?></a>
             </li>
         </ul>
 
@@ -258,27 +258,27 @@ 
             <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' );
+					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' ) {
+					settings_fields('xcloner_mysql_settings_group');
+					do_settings_sections('xcloner_mysql_settings_page');
+				} elseif ($active_tab == 'system_options') {
 
-					settings_fields( 'xcloner_system_settings_group' );
-					do_settings_sections( 'xcloner_system_settings_page' );
-				} elseif ( $active_tab == 'cleanup_options' ) {
+					settings_fields('xcloner_system_settings_group');
+					do_settings_sections('xcloner_system_settings_page');
+				} elseif ($active_tab == 'cleanup_options') {
 
-					settings_fields( 'xcloner_cleanup_settings_group' );
-					do_settings_sections( 'xcloner_cleanup_settings_page' );
+					settings_fields('xcloner_cleanup_settings_group');
+					do_settings_sections('xcloner_cleanup_settings_page');
 				}
 
 				// output save settings button
-				submit_button( 'Save Settings' );
+				submit_button('Save Settings');
 				?>
             </form>
 

includes/class-xcloner-api.php

Unused Use Statements -5 removed lines

@@ -28,13 +28,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\Zip;
-use splitbrain\PHPArchive\Archive;
-use splitbrain\PHPArchive\FileInfo;
 
 
 /**

Indentation +889 added lines, -889 removed lines

@@ -43,905 +43,905 @@ 
 class Xcloner_Api
 {
 
-    private $xcloner_database;
-    private $xcloner_settings;
-    private $xcloner_file_system;
-    private $xcloner_requirements;
-    private $xcloner_sanitization;
-    private $archive_system;
-    private $form_params;
-    private $logger;
-    private $xcloner_container;
-
-    /**
-     * XCloner_Api construct class
-     *
-     * @param Xcloner $xcloner_container [description]
-     */
-    public function __construct(Xcloner $xcloner_container)
-    {
-        global $wpdb;
-
-        if (WP_DEBUG) {
-            error_reporting(0);
-        }
-
-        if (ob_get_length()) {
-            ob_end_clean();
-        }
-        ob_start();
-
-        $wpdb->show_errors = false;
-
-        $this->xcloner_container = $xcloner_container;
-
-        $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_api");
-        $this->xcloner_file_system = $xcloner_container->get_xcloner_filesystem();
-        $this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
-        $this->xcloner_requirements = $xcloner_container->get_xcloner_requirements();
-        $this->archive_system = $xcloner_container->get_archive_system();
-        $this->xcloner_database = $xcloner_container->get_xcloner_database();
-        $this->xcloner_scheduler = $xcloner_container->get_xcloner_scheduler();
-
-        if (isset($_POST['API_ID'])) {
-            $this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
-                    0, 15));
-        }
-
-    }
-
-    /**
-     * Get XCloner Container
-     * @return XCloner return the XCloner container
-     */
-    public function get_xcloner_container()
-    {
-        return $this->xcloner_container;
-    }
-
-    /**
-     * Check if user has access to this class
-     * @return die() returns die() if user is not allowed
-     * @link http://www.wordpress.org
-     */
-    private function check_access()
-    {
-        if (function_exists('current_user_can') && !current_user_can('manage_options')) {
-            die("Not allowed access here!");
-        }
-    }
-
-    /**
-     * Initialize the database connection
-     */
-    public function init_db()
-    {
-        return;
-
-
-        $data['dbHostname'] = $this->xcloner_settings->get_db_hostname();
-        $data['dbUsername'] = $this->xcloner_settings->get_db_username();
-        $data['dbPassword'] = $this->xcloner_settings->get_db_password();
-        $data['dbDatabase'] = $this->xcloner_settings->get_db_database();
-
-
-        $data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
-        $data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
-        $data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
-
-        try {
-            $this->xcloner_database->init($data);
-
-        } catch (Exception $e) {
-
-            $this->send_response($e->getMessage());
-            $this->logger->error($e->getMessage());
-
-        }
-
-        return $this->xcloner_database;
-
-
-    }
-
-    /*
+	private $xcloner_database;
+	private $xcloner_settings;
+	private $xcloner_file_system;
+	private $xcloner_requirements;
+	private $xcloner_sanitization;
+	private $archive_system;
+	private $form_params;
+	private $logger;
+	private $xcloner_container;
+
+	/**
+	 * XCloner_Api construct class
+	 *
+	 * @param Xcloner $xcloner_container [description]
+	 */
+	public function __construct(Xcloner $xcloner_container)
+	{
+		global $wpdb;
+
+		if (WP_DEBUG) {
+			error_reporting(0);
+		}
+
+		if (ob_get_length()) {
+			ob_end_clean();
+		}
+		ob_start();
+
+		$wpdb->show_errors = false;
+
+		$this->xcloner_container = $xcloner_container;
+
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_api");
+		$this->xcloner_file_system = $xcloner_container->get_xcloner_filesystem();
+		$this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
+		$this->xcloner_requirements = $xcloner_container->get_xcloner_requirements();
+		$this->archive_system = $xcloner_container->get_archive_system();
+		$this->xcloner_database = $xcloner_container->get_xcloner_database();
+		$this->xcloner_scheduler = $xcloner_container->get_xcloner_scheduler();
+
+		if (isset($_POST['API_ID'])) {
+			$this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
+					0, 15));
+		}
+
+	}
+
+	/**
+	 * Get XCloner Container
+	 * @return XCloner return the XCloner container
+	 */
+	public function get_xcloner_container()
+	{
+		return $this->xcloner_container;
+	}
+
+	/**
+	 * Check if user has access to this class
+	 * @return die() returns die() if user is not allowed
+	 * @link http://www.wordpress.org
+	 */
+	private function check_access()
+	{
+		if (function_exists('current_user_can') && !current_user_can('manage_options')) {
+			die("Not allowed access here!");
+		}
+	}
+
+	/**
+	 * Initialize the database connection
+	 */
+	public function init_db()
+	{
+		return;
+
+
+		$data['dbHostname'] = $this->xcloner_settings->get_db_hostname();
+		$data['dbUsername'] = $this->xcloner_settings->get_db_username();
+		$data['dbPassword'] = $this->xcloner_settings->get_db_password();
+		$data['dbDatabase'] = $this->xcloner_settings->get_db_database();
+
+
+		$data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		$data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
+		$data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
+
+		try {
+			$this->xcloner_database->init($data);
+
+		} catch (Exception $e) {
+
+			$this->send_response($e->getMessage());
+			$this->logger->error($e->getMessage());
+
+		}
+
+		return $this->xcloner_database;
+
+
+	}
+
+	/*
      * Save Schedule API
      */
-    public function save_schedule()
-    {
-        global $wpdb;
-
-        $this->check_access();
-
-        $scheduler = $this->xcloner_scheduler;
-        $params = array();
-        $schedule = array();
-        $response = array();
-
-        if (isset($_POST['data'])) {
-            $params = json_decode(stripslashes($_POST['data']));
-        }
-
-        $this->process_params($params);
-
-        if (isset($_POST['id'])) {
-
-            $this->form_params['backup_params']['backup_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_name']);
-            $this->form_params['backup_params']['email_notification'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['email_notification']);
-            if ($_POST['diff_start_date']) {
-                $this->form_params['backup_params']['diff_start_date'] = strtotime($this->xcloner_sanitization->sanitize_input_as_string($_POST['diff_start_date']));
-            } else {
-                $this->form_params['backup_params']['diff_start_date'] = "";
-            }
-            $this->form_params['backup_params']['schedule_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_name']);
-            $this->form_params['backup_params']['start_at'] = strtotime($_POST['schedule_start_date']);
-            $this->form_params['backup_params']['schedule_frequency'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_frequency']);
-            $this->form_params['backup_params']['schedule_storage'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_storage']);
-            $this->form_params['database'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['table_params'])));
-            $this->form_params['excluded_files'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['excluded_files'])));
-
-            //$this->form_params['backup_params']['backup_type'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_type']);
-
-            $tables = explode(PHP_EOL, $this->form_params['database']);
-            $return = array();
-
-            foreach ($tables as $table) {
-                $table = str_replace("\r", "", $table);
-                $data = explode(".", $table);
-                if (isset($data[1])) {
-                    $return[$data[0]][] = $data[1];
-                }
-            }
-
-            $this->form_params['database'] = ($return);
-
-            $excluded_files = explode(PHP_EOL, $this->form_params['excluded_files']);
-            $return = array();
-
-            foreach ($excluded_files as $file) {
-                $file = str_replace("\r", "", $file);
-                if ($file) {
-                    $return[] = $file;
-                }
-            }
-
-            $this->form_params['excluded_files'] = ($return);
-
-            $schedule['start_at'] = $this->form_params['backup_params']['start_at'];
-
-            if (!isset($_POST['status'])) {
-                $schedule['status'] = 0;
-            } else {
-                $schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
-            }
-        } else {
-
-            $schedule['status'] = 1;
-            $schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
-                " " . $this->form_params['backup_params']['schedule_start_time']);
-
-            if ($schedule['start_at'] <= time()) {
-                $schedule['start_at'] = "";
-            }
-        }
-
-        if (!$schedule['start_at']) {
-            $schedule['start_at'] = date('Y-m-d H:i:s', time());
-        } else {
-            $schedule['start_at'] = date('Y-m-d H:i:s',
-                $schedule['start_at'] - (get_option('gmt_offset') * HOUR_IN_SECONDS));
-        }
-
-        $schedule['name'] = $this->form_params['backup_params']['schedule_name'];
-        $schedule['recurrence'] = $this->form_params['backup_params']['schedule_frequency'];
-        if (!isset($this->form_params['backup_params']['schedule_storage'])) {
-            $this->form_params['backup_params']['schedule_storage'] = "";
-        }
-        $schedule['remote_storage'] = $this->form_params['backup_params']['schedule_storage'];
-        //$schedule['backup_type'] = $this->form_params['backup_params']['backup_type'];
-        $schedule['params'] = json_encode($this->form_params);
-
-        if (!isset($_POST['id'])) {
-            $wpdb->insert(
-                $wpdb->prefix . 'xcloner_scheduler',
-                $schedule,
-                array(
-                    '%s',
-                    '%s'
-                )
-            );
-        } else {
-            $wpdb->update(
-                $wpdb->prefix . 'xcloner_scheduler',
-                $schedule,
-                array('id' => $_POST['id']),
-                array(
-                    '%s',
-                    '%s'
-                )
-            );
-        }
-        if (isset($_POST['id'])) {
-            $scheduler->update_cron_hook($_POST['id']);
-        }
-
-        if ($wpdb->last_error) {
-            $response['error'] = 1;
-            $response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/
-            ;
-
-        }
-
-        $scheduler->update_wp_cron_hooks();
-        $response['finished'] = 1;
-
-        $this->send_response($response);
-    }
-
-    /*
+	public function save_schedule()
+	{
+		global $wpdb;
+
+		$this->check_access();
+
+		$scheduler = $this->xcloner_scheduler;
+		$params = array();
+		$schedule = array();
+		$response = array();
+
+		if (isset($_POST['data'])) {
+			$params = json_decode(stripslashes($_POST['data']));
+		}
+
+		$this->process_params($params);
+
+		if (isset($_POST['id'])) {
+
+			$this->form_params['backup_params']['backup_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_name']);
+			$this->form_params['backup_params']['email_notification'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['email_notification']);
+			if ($_POST['diff_start_date']) {
+				$this->form_params['backup_params']['diff_start_date'] = strtotime($this->xcloner_sanitization->sanitize_input_as_string($_POST['diff_start_date']));
+			} else {
+				$this->form_params['backup_params']['diff_start_date'] = "";
+			}
+			$this->form_params['backup_params']['schedule_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_name']);
+			$this->form_params['backup_params']['start_at'] = strtotime($_POST['schedule_start_date']);
+			$this->form_params['backup_params']['schedule_frequency'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_frequency']);
+			$this->form_params['backup_params']['schedule_storage'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['schedule_storage']);
+			$this->form_params['database'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['table_params'])));
+			$this->form_params['excluded_files'] = (stripslashes($this->xcloner_sanitization->sanitize_input_as_raw($_POST['excluded_files'])));
+
+			//$this->form_params['backup_params']['backup_type'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_type']);
+
+			$tables = explode(PHP_EOL, $this->form_params['database']);
+			$return = array();
+
+			foreach ($tables as $table) {
+				$table = str_replace("\r", "", $table);
+				$data = explode(".", $table);
+				if (isset($data[1])) {
+					$return[$data[0]][] = $data[1];
+				}
+			}
+
+			$this->form_params['database'] = ($return);
+
+			$excluded_files = explode(PHP_EOL, $this->form_params['excluded_files']);
+			$return = array();
+
+			foreach ($excluded_files as $file) {
+				$file = str_replace("\r", "", $file);
+				if ($file) {
+					$return[] = $file;
+				}
+			}
+
+			$this->form_params['excluded_files'] = ($return);
+
+			$schedule['start_at'] = $this->form_params['backup_params']['start_at'];
+
+			if (!isset($_POST['status'])) {
+				$schedule['status'] = 0;
+			} else {
+				$schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
+			}
+		} else {
+
+			$schedule['status'] = 1;
+			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
+				" " . $this->form_params['backup_params']['schedule_start_time']);
+
+			if ($schedule['start_at'] <= time()) {
+				$schedule['start_at'] = "";
+			}
+		}
+
+		if (!$schedule['start_at']) {
+			$schedule['start_at'] = date('Y-m-d H:i:s', time());
+		} else {
+			$schedule['start_at'] = date('Y-m-d H:i:s',
+				$schedule['start_at'] - (get_option('gmt_offset') * HOUR_IN_SECONDS));
+		}
+
+		$schedule['name'] = $this->form_params['backup_params']['schedule_name'];
+		$schedule['recurrence'] = $this->form_params['backup_params']['schedule_frequency'];
+		if (!isset($this->form_params['backup_params']['schedule_storage'])) {
+			$this->form_params['backup_params']['schedule_storage'] = "";
+		}
+		$schedule['remote_storage'] = $this->form_params['backup_params']['schedule_storage'];
+		//$schedule['backup_type'] = $this->form_params['backup_params']['backup_type'];
+		$schedule['params'] = json_encode($this->form_params);
+
+		if (!isset($_POST['id'])) {
+			$wpdb->insert(
+				$wpdb->prefix . 'xcloner_scheduler',
+				$schedule,
+				array(
+					'%s',
+					'%s'
+				)
+			);
+		} else {
+			$wpdb->update(
+				$wpdb->prefix . 'xcloner_scheduler',
+				$schedule,
+				array('id' => $_POST['id']),
+				array(
+					'%s',
+					'%s'
+				)
+			);
+		}
+		if (isset($_POST['id'])) {
+			$scheduler->update_cron_hook($_POST['id']);
+		}
+
+		if ($wpdb->last_error) {
+			$response['error'] = 1;
+			$response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/
+			;
+
+		}
+
+		$scheduler->update_wp_cron_hooks();
+		$response['finished'] = 1;
+
+		$this->send_response($response);
+	}
+
+	/*
      *
      * Backup Files API
      *
      */
-    public function backup_files()
-    {
-        $this->check_access();
-
-        $params = json_decode(stripslashes($_POST['data']));
-
-        $init = (int)$_POST['init'];
-
-        if ($params === null) {
-            die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
-        }
-
-        $this->process_params($params);
-
-        $return['finished'] = 1;
-
-        //$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'], $this->form_params['extra'], $init);
-        try {
-            $return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
-                $this->form_params['extra'], $init);
-        } catch (Exception $e) {
-            $return = array();
-            $return['error'] = true;
-            $return['status'] = 500;
-            $return['error_message'] = $e->getMessage();
-
-            return $this->send_response($return, $hash = 1);
-        }
-
-        if ($return['finished']) {
-            $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-            if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
-                $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
-            }
-        }
-
-        $data = $return;
-
-        //check if backup is finished
-        if ($return['finished']) {
-            if (isset($this->form_params['backup_params']['email_notification']) and $to = $this->form_params['backup_params']['email_notification']) {
-                try {
-                    $from = "";
-                    $subject = "";
-                    $additional['lines_total'] = $return['extra']['lines_total'];
-                    $this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
-                        $this->form_params, "", $additional);
-                } catch (Exception $e) {
-                    $this->logger->error($e->getMessage());
-                }
-            }
-            $this->xcloner_file_system->remove_tmp_filesystem();
-        }
-
-        return $this->send_response($data, $hash = 1);
-    }
-
-    /*
+	public function backup_files()
+	{
+		$this->check_access();
+
+		$params = json_decode(stripslashes($_POST['data']));
+
+		$init = (int)$_POST['init'];
+
+		if ($params === null) {
+			die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
+		}
+
+		$this->process_params($params);
+
+		$return['finished'] = 1;
+
+		//$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'], $this->form_params['extra'], $init);
+		try {
+			$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
+				$this->form_params['extra'], $init);
+		} catch (Exception $e) {
+			$return = array();
+			$return['error'] = true;
+			$return['status'] = 500;
+			$return['error_message'] = $e->getMessage();
+
+			return $this->send_response($return, $hash = 1);
+		}
+
+		if ($return['finished']) {
+			$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
+			if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
+				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+			}
+		}
+
+		$data = $return;
+
+		//check if backup is finished
+		if ($return['finished']) {
+			if (isset($this->form_params['backup_params']['email_notification']) and $to = $this->form_params['backup_params']['email_notification']) {
+				try {
+					$from = "";
+					$subject = "";
+					$additional['lines_total'] = $return['extra']['lines_total'];
+					$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
+						$this->form_params, "", $additional);
+				} catch (Exception $e) {
+					$this->logger->error($e->getMessage());
+				}
+			}
+			$this->xcloner_file_system->remove_tmp_filesystem();
+		}
+
+		return $this->send_response($data, $hash = 1);
+	}
+
+	/*
      *
      * Backup Database API
      *
      */
-    public function backup_database()
-    {
-        $this->check_access();
+	public function backup_database()
+	{
+		$this->check_access();
 
-        $params = json_decode(stripslashes($_POST['data']));
+		$params = json_decode(stripslashes($_POST['data']));
 
-        $init = (int)$_POST['init'];
+		$init = (int)$_POST['init'];
 
-        if ($params === null) {
-            die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
-        }
+		if ($params === null) {
+			die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
+		}
 
-        $this->process_params($params);
+		$this->process_params($params);
 
-        //$xcloner_database = $this->init_db();
-        $return = $this->xcloner_database->start_database_recursion($this->form_params['database'],
-            $this->form_params['extra'], $init);
+		//$xcloner_database = $this->init_db();
+		$return = $this->xcloner_database->start_database_recursion($this->form_params['database'],
+			$this->form_params['extra'], $init);
 
-        if (isset($return['error']) and $return['error']) {
-            $data['finished'] = 1;
-        } else {
-            $data['finished'] = $return['finished'];
-        }
+		if (isset($return['error']) and $return['error']) {
+			$data['finished'] = 1;
+		} else {
+			$data['finished'] = $return['finished'];
+		}
 
-        $data['extra'] = $return;
+		$data['extra'] = $return;
 
-        return $this->send_response($data, $hash = 1);
-    }
+		return $this->send_response($data, $hash = 1);
+	}
 
-    /*
+	/*
      *
      * Scan Filesystem API
      *
      */
-    public function scan_filesystem()
-    {
-        $this->check_access();
+	public function scan_filesystem()
+	{
+		$this->check_access();
 
-        $params = json_decode(stripslashes($_POST['data']));
-        $init = (int)$_POST['init'];
+		$params = json_decode(stripslashes($_POST['data']));
+		$init = (int)$_POST['init'];
 
-        if ($params === null) {
-            die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
-        }
+		if ($params === null) {
+			die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
+		}
 
-        $hash = $this->process_params($params);
+		$hash = $this->process_params($params);
 
-        $this->xcloner_file_system->set_excluded_files($this->form_params['excluded_files']);
+		$this->xcloner_file_system->set_excluded_files($this->form_params['excluded_files']);
 
-        $return = $this->xcloner_file_system->start_file_recursion($init);
+		$return = $this->xcloner_file_system->start_file_recursion($init);
 
-        $data["finished"] = !$return;
-        $data["total_files_num"] = $this->xcloner_file_system->get_scanned_files_num();
-        $data["last_logged_file"] = $this->xcloner_file_system->last_logged_file();
-        $data["total_files_size"] = sprintf("%.2f",
-            $this->xcloner_file_system->get_scanned_files_total_size() / (1024 * 1024));
+		$data["finished"] = !$return;
+		$data["total_files_num"] = $this->xcloner_file_system->get_scanned_files_num();
+		$data["last_logged_file"] = $this->xcloner_file_system->last_logged_file();
+		$data["total_files_size"] = sprintf("%.2f",
+			$this->xcloner_file_system->get_scanned_files_total_size() / (1024 * 1024));
 
-        return $this->send_response($data, $hash = 1);
-    }
+		return $this->send_response($data, $hash = 1);
+	}
 
-    /*
+	/*
      *
      * Process params sent by the user
      *
      */
-    private function process_params($params)
-    {
-        if (isset($params->hash)) {
-            $this->xcloner_settings->set_hash($params->hash);
-        }
-
-        $this->form_params['extra'] = array();
-        $this->form_params['backup_params'] = array();
-
-        $this->form_params['database'] = array();
-
-        if (isset($params->backup_params)) {
-            foreach ($params->backup_params as $param) {
-                $this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
-                $this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
-                    'POST',
-                    'fields filter'
-                ));
-            }
-        }
-
-        $this->form_params['database'] = array();
-
-        if (isset($params->table_params)) {
-            foreach ($params->table_params as $param) {
-                $this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
-                $this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
-                    'POST',
-                    'database filter'
-                ));
-            }
-        }
-
-        $this->form_params['excluded_files'] = array();
-        if (isset($params->files_params)) {
-            foreach ($params->files_params as $param) {
-                $this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
-            }
-
-            $unique_exclude_files = array();
-
-            foreach ($params->files_params as $key => $param) {
-                if (!in_array($param->parent, $this->form_params['excluded_files'])) {
-                    //$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
-                    $unique_exclude_files[] = $param->id;
-                    $this->logger->debug("Adding file filter " . $param->id . "\n", array(
-                        'POST',
-                        'exclude files filter'
-                    ));
-                }
-            }
-            $this->form_params['excluded_files'] = (array)$unique_exclude_files;
-
-        }
-
-        //$this->form_params['excluded_files'] =  array_merge($this->form_params['excluded_files'], $this->exclude_files_by_default);
-
-        if (isset($params->extra)) {
-            foreach ($params->extra as $key => $value) {
-                $this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
-            }
-        }
-
-        if (isset($this->form_params['backup_params']['diff_start_date']) and $this->form_params['backup_params']['diff_start_date']) {
-            $this->form_params['backup_params']['diff_start_date'] = strtotime($this->form_params['backup_params']['diff_start_date']);
-            $this->xcloner_file_system->set_diff_timestamp_start($this->form_params['backup_params']['diff_start_date']);
-        }
-
-        return $this->xcloner_settings->get_hash();
-    }
-
-    /*
+	private function process_params($params)
+	{
+		if (isset($params->hash)) {
+			$this->xcloner_settings->set_hash($params->hash);
+		}
+
+		$this->form_params['extra'] = array();
+		$this->form_params['backup_params'] = array();
+
+		$this->form_params['database'] = array();
+
+		if (isset($params->backup_params)) {
+			foreach ($params->backup_params as $param) {
+				$this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
+				$this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
+					'POST',
+					'fields filter'
+				));
+			}
+		}
+
+		$this->form_params['database'] = array();
+
+		if (isset($params->table_params)) {
+			foreach ($params->table_params as $param) {
+				$this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
+				$this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
+					'POST',
+					'database filter'
+				));
+			}
+		}
+
+		$this->form_params['excluded_files'] = array();
+		if (isset($params->files_params)) {
+			foreach ($params->files_params as $param) {
+				$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
+			}
+
+			$unique_exclude_files = array();
+
+			foreach ($params->files_params as $key => $param) {
+				if (!in_array($param->parent, $this->form_params['excluded_files'])) {
+					//$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
+					$unique_exclude_files[] = $param->id;
+					$this->logger->debug("Adding file filter " . $param->id . "\n", array(
+						'POST',
+						'exclude files filter'
+					));
+				}
+			}
+			$this->form_params['excluded_files'] = (array)$unique_exclude_files;
+
+		}
+
+		//$this->form_params['excluded_files'] =  array_merge($this->form_params['excluded_files'], $this->exclude_files_by_default);
+
+		if (isset($params->extra)) {
+			foreach ($params->extra as $key => $value) {
+				$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
+			}
+		}
+
+		if (isset($this->form_params['backup_params']['diff_start_date']) and $this->form_params['backup_params']['diff_start_date']) {
+			$this->form_params['backup_params']['diff_start_date'] = strtotime($this->form_params['backup_params']['diff_start_date']);
+			$this->xcloner_file_system->set_diff_timestamp_start($this->form_params['backup_params']['diff_start_date']);
+		}
+
+		return $this->xcloner_settings->get_hash();
+	}
+
+	/*
      *
      * Get file list for tree view API
      *
      */
-    public function get_file_system_action()
-    {
-        $this->check_access();
-
-        $folder = $this->xcloner_sanitization->sanitize_input_as_relative_path($_POST['id']);
-
-        $data = array();
-
-        if ($folder == "#") {
-
-            $folder = "/";
-            $data[] = array(
-                'id' => $folder,
-                'parent' => '#',
-                'text' => $this->xcloner_settings->get_xcloner_start_path(),
-                //'children' => true,
-                'state' => array('selected' => false, 'opened' => true),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
-            );
-        }
-
-        try {
-            $files = $this->xcloner_file_system->list_directory($folder);
-        } catch (Exception $e) {
-
-            print $e->getMessage();
-            $this->logger->error($e->getMessage());
-
-            return;
-        }
-
-        $type = array();
-        foreach ($files as $key => $row) {
-            $type[$key] = $row['type'];
-        }
-        array_multisort($type, SORT_ASC, $files);
-
-        foreach ($files as $file) {
-            $children = false;
-            $text = $file['basename'];
-
-            if ($file['type'] == "dir") {
-                $children = true;
-            } else {
-                $text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
-            }
-
-            if ($this->xcloner_file_system->is_excluded($file)) {
-                $selected = true;
-            } else {
-                $selected = false;
-            }
-
-            $data[] = array(
-                'id' => $file['path'],
-                'parent' => $folder,
-                'text' => $text,
-                //'title' => "test",
-                'children' => $children,
-                'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
-                        0, 1)) . ".png"
-            );
-        }
-
-
-        return $this->send_response($data, 0);
-    }
-
-    /*
+	public function get_file_system_action()
+	{
+		$this->check_access();
+
+		$folder = $this->xcloner_sanitization->sanitize_input_as_relative_path($_POST['id']);
+
+		$data = array();
+
+		if ($folder == "#") {
+
+			$folder = "/";
+			$data[] = array(
+				'id' => $folder,
+				'parent' => '#',
+				'text' => $this->xcloner_settings->get_xcloner_start_path(),
+				//'children' => true,
+				'state' => array('selected' => false, 'opened' => true),
+				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
+			);
+		}
+
+		try {
+			$files = $this->xcloner_file_system->list_directory($folder);
+		} catch (Exception $e) {
+
+			print $e->getMessage();
+			$this->logger->error($e->getMessage());
+
+			return;
+		}
+
+		$type = array();
+		foreach ($files as $key => $row) {
+			$type[$key] = $row['type'];
+		}
+		array_multisort($type, SORT_ASC, $files);
+
+		foreach ($files as $file) {
+			$children = false;
+			$text = $file['basename'];
+
+			if ($file['type'] == "dir") {
+				$children = true;
+			} else {
+				$text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
+			}
+
+			if ($this->xcloner_file_system->is_excluded($file)) {
+				$selected = true;
+			} else {
+				$selected = false;
+			}
+
+			$data[] = array(
+				'id' => $file['path'],
+				'parent' => $folder,
+				'text' => $text,
+				//'title' => "test",
+				'children' => $children,
+				'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
+				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
+						0, 1)) . ".png"
+			);
+		}
+
+
+		return $this->send_response($data, 0);
+	}
+
+	/*
      *
      * Get databases/tables list for frontend tree display API
      *
      */
-    public function get_database_tables_action()
-    {
-        $this->check_access();
-
-        $database = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['id']);
-
-        $data = array();
-
-        $xcloner_backup_only_wp_tables = $this->xcloner_settings->get_xcloner_option('xcloner_backup_only_wp_tables');
-
-        if ($database == "#") {
-            try {
-                $return = $this->xcloner_database->get_all_databases();
-            } catch (Exception $e) {
-                $this->logger->error($e->getMessage());
-            }
-
-            foreach ($return as $database) {
-                if ($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database()) {
-                    continue;
-                }
-
-                $state = array();
-
-                if ($database['name'] == $this->xcloner_settings->get_db_database()) {
-                    $state['selected'] = true;
-                    if ($database['num_tables'] < 25) {
-                        $state['opened'] = false;
-                    }
-                }
-
-                $data[] = array(
-                    'id' => $database['name'],
-                    'parent' => '#',
-                    'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
-                    'children' => true,
-                    'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
-                );
-            }
-
-        } else {
-
-            try {
-                $return = $this->xcloner_database->list_tables($database, "", 1);
-            } catch (Exception $e) {
-                $this->logger->error($e->getMessage());
-            }
-
-            foreach ($return as $table) {
-                $state = array();
-
-                if ($xcloner_backup_only_wp_tables and !stristr($table['name'],
-                        $this->xcloner_settings->get_table_prefix())) {
-                    continue;
-                }
-
-                if (isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database()) {
-                    $state = array('selected' => true);
-                }
-
-                $data[] = array(
-                    'id' => $database . "." . $table['name'],
-                    'parent' => $database,
-                    'text' => $table['name'] . " (" . (int)$table['records'] . ")",
-                    'children' => false,
-                    'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
-                );
-            }
-        }
-
-        return $this->send_response($data, 0);
-    }
-
-    /*
+	public function get_database_tables_action()
+	{
+		$this->check_access();
+
+		$database = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['id']);
+
+		$data = array();
+
+		$xcloner_backup_only_wp_tables = $this->xcloner_settings->get_xcloner_option('xcloner_backup_only_wp_tables');
+
+		if ($database == "#") {
+			try {
+				$return = $this->xcloner_database->get_all_databases();
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage());
+			}
+
+			foreach ($return as $database) {
+				if ($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database()) {
+					continue;
+				}
+
+				$state = array();
+
+				if ($database['name'] == $this->xcloner_settings->get_db_database()) {
+					$state['selected'] = true;
+					if ($database['num_tables'] < 25) {
+						$state['opened'] = false;
+					}
+				}
+
+				$data[] = array(
+					'id' => $database['name'],
+					'parent' => '#',
+					'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
+					'children' => true,
+					'state' => $state,
+					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
+				);
+			}
+
+		} else {
+
+			try {
+				$return = $this->xcloner_database->list_tables($database, "", 1);
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage());
+			}
+
+			foreach ($return as $table) {
+				$state = array();
+
+				if ($xcloner_backup_only_wp_tables and !stristr($table['name'],
+						$this->xcloner_settings->get_table_prefix())) {
+					continue;
+				}
+
+				if (isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database()) {
+					$state = array('selected' => true);
+				}
+
+				$data[] = array(
+					'id' => $database . "." . $table['name'],
+					'parent' => $database,
+					'text' => $table['name'] . " (" . (int)$table['records'] . ")",
+					'children' => false,
+					'state' => $state,
+					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
+				);
+			}
+		}
+
+		return $this->send_response($data, 0);
+	}
+
+	/*
      *
      * Get schedule by id API
      *
      */
-    public function get_schedule_by_id()
-    {
-        $this->check_access();
+	public function get_schedule_by_id()
+	{
+		$this->check_access();
 
-        $schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
-        $scheduler = $this->xcloner_scheduler;
-        $data = $scheduler->get_schedule_by_id($schedule_id);
+		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
+		$scheduler = $this->xcloner_scheduler;
+		$data = $scheduler->get_schedule_by_id($schedule_id);
 
-        $data['start_at'] = date("Y-m-d H:i",
-            strtotime($data['start_at']) + (get_option('gmt_offset') * HOUR_IN_SECONDS));
-        if (isset($data['backup_params']->diff_start_date) && $data['backup_params']->diff_start_date != "") {
-            $data['backup_params']->diff_start_date = date("Y-m-d", ($data['backup_params']->diff_start_date));
-        }
+		$data['start_at'] = date("Y-m-d H:i",
+			strtotime($data['start_at']) + (get_option('gmt_offset') * HOUR_IN_SECONDS));
+		if (isset($data['backup_params']->diff_start_date) && $data['backup_params']->diff_start_date != "") {
+			$data['backup_params']->diff_start_date = date("Y-m-d", ($data['backup_params']->diff_start_date));
+		}
 
-        return $this->send_response($data);
-    }
+		return $this->send_response($data);
+	}
 
-    /*
+	/*
      *
      * Get Schedule list API
      *
      */
-    public function get_scheduler_list()
-    {
-        $this->check_access();
+	public function get_scheduler_list()
+	{
+		$this->check_access();
 
-        $scheduler = $this->xcloner_scheduler;
-        $data = $scheduler->get_scheduler_list();
-        $return['data'] = array();
+		$scheduler = $this->xcloner_scheduler;
+		$data = $scheduler->get_scheduler_list();
+		$return['data'] = array();
 
-        foreach ($data as $res) {
-            $action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
+		foreach ($data as $res) {
+			$action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
 					<a href=\"#" . $res->id . "\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
-            if ($res->status) {
-                $status = '<i class="material-icons active status">timer</i>';
-            } else {
-                $status = '<i class="material-icons status inactive">timer_off</i>';
-            }
-
-            $next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
-
-            $next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
-
-            $remote_storage = $res->remote_storage;
-
-            if (!$next_run_time >= time()) {
-                $next_run = " ";
-            }
-
-            if (trim($next_run)) {
-                $date_text = date(get_option('date_format') . " " . get_option('time_format'),
-                    $next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
-
-                if ($next_run_time >= time()) {
-                    $next_run = "in " . human_time_diff($next_run_time, time());
-                } else {
-                    $next_run = __("executed", 'xcloner-backup-and-restore');
-                }
-
-                $next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
-                //$next_run .=" ($date_text)";
-            }
-
-            $backup_text = "";
-            $backup_size = "";
-            $backup_time = "";
-
-            if ($res->last_backup) {
-                if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
-                    $metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
-                    $backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
-                    $backup_time = date(get_option('date_format') . " " . get_option('time_format'),
-                        $metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
-                }
-
-                $backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
-            }
-
-            $schedules = wp_get_schedules();
-
-            if (isset($schedules[$res->recurrence])) {
-                $res->recurrence = $schedules[$res->recurrence]['display'];
-            }
-
-            $return['data'][] = array(
-                $res->id,
-                $res->name,
-                $res->recurrence,/*$res->start_at,*/
-                $next_run,
-                $remote_storage,
-                $backup_text,
-                $status,
-                $action
-            );
-        }
-
-        return $this->send_response($return, 0);
-    }
-
-    /*
+			if ($res->status) {
+				$status = '<i class="material-icons active status">timer</i>';
+			} else {
+				$status = '<i class="material-icons status inactive">timer_off</i>';
+			}
+
+			$next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
+
+			$next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
+
+			$remote_storage = $res->remote_storage;
+
+			if (!$next_run_time >= time()) {
+				$next_run = " ";
+			}
+
+			if (trim($next_run)) {
+				$date_text = date(get_option('date_format') . " " . get_option('time_format'),
+					$next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
+
+				if ($next_run_time >= time()) {
+					$next_run = "in " . human_time_diff($next_run_time, time());
+				} else {
+					$next_run = __("executed", 'xcloner-backup-and-restore');
+				}
+
+				$next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
+				//$next_run .=" ($date_text)";
+			}
+
+			$backup_text = "";
+			$backup_size = "";
+			$backup_time = "";
+
+			if ($res->last_backup) {
+				if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
+					$metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
+					$backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
+					$backup_time = date(get_option('date_format') . " " . get_option('time_format'),
+						$metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
+				}
+
+				$backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
+			}
+
+			$schedules = wp_get_schedules();
+
+			if (isset($schedules[$res->recurrence])) {
+				$res->recurrence = $schedules[$res->recurrence]['display'];
+			}
+
+			$return['data'][] = array(
+				$res->id,
+				$res->name,
+				$res->recurrence,/*$res->start_at,*/
+				$next_run,
+				$remote_storage,
+				$backup_text,
+				$status,
+				$action
+			);
+		}
+
+		return $this->send_response($return, 0);
+	}
+
+	/*
      *
      * Delete Schedule by ID API
      *
      */
-    public function delete_schedule_by_id()
-    {
-        $this->check_access();
+	public function delete_schedule_by_id()
+	{
+		$this->check_access();
 
-        $schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
-        $scheduler = $this->xcloner_scheduler;
-        $data['finished'] = $scheduler->delete_schedule_by_id($schedule_id);
+		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
+		$scheduler = $this->xcloner_scheduler;
+		$data['finished'] = $scheduler->delete_schedule_by_id($schedule_id);
 
-        return $this->send_response($data);
-    }
+		return $this->send_response($data);
+	}
 
-    /*
+	/*
      *
      * Delete backup by name from the storage path
      *
      */
-    public function delete_backup_by_name()
-    {
-        $this->check_access();
+	public function delete_backup_by_name()
+	{
+		$this->check_access();
 
-        $backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_POST['name']);
-        $storage_selection = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_selection']);
+		$backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_POST['name']);
+		$storage_selection = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_selection']);
 
-        $data['finished'] = $this->xcloner_file_system->delete_backup_by_name($backup_name, $storage_selection);
+		$data['finished'] = $this->xcloner_file_system->delete_backup_by_name($backup_name, $storage_selection);
 
-        return $this->send_response($data);
-    }
+		return $this->send_response($data);
+	}
 
-    public function list_backup_files()
-    {
-        $this->check_access();
+	public function list_backup_files()
+	{
+		$this->check_access();
 
-        $backup_parts = array();
+		$backup_parts = array();
 
-        $source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
-        $return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+		$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
+		$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
 
-        $backup_file = $source_backup_file;
+		$backup_file = $source_backup_file;
 
-        if ($this->xcloner_file_system->is_multipart($backup_file)) {
-            $backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
-            $backup_file = $backup_parts[$return['part']];
-        }
+		if ($this->xcloner_file_system->is_multipart($backup_file)) {
+			$backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
+			$backup_file = $backup_parts[$return['part']];
+		}
 
-        try {
-            $tar = new Tar();
-            $tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
+		try {
+			$tar = new Tar();
+			$tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
 
-            $data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
-        } catch (Exception $e) {
-            $return['error'] = true;
-            $return['message'] = $e->getMessage();
-            $this->send_response($return, 0);
-        }
+			$data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
+		} catch (Exception $e) {
+			$return['error'] = true;
+			$return['message'] = $e->getMessage();
+			$this->send_response($return, 0);
+		}
 
-        $return['files'] = array();
-        $return['finished'] = 1;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
-        $i = 0;
+		$return['files'] = array();
+		$return['finished'] = 1;
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$i = 0;
 
-        if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
-            foreach ($data['extracted_files'] as $file) {
-                $return['files'][$i]['path'] = $file->getPath();
-                $return['files'][$i]['size'] = $file->getSize();
-                $return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
-                    $file->getMtime());
+		if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
+			foreach ($data['extracted_files'] as $file) {
+				$return['files'][$i]['path'] = $file->getPath();
+				$return['files'][$i]['size'] = $file->getSize();
+				$return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
+					$file->getMtime());
 
-                $i++;
-            }
-        }
+				$i++;
+			}
+		}
 
-        if (isset($data['start'])) {
-            $return['start'] = $data['start'];
-            $return['finished'] = 0;
-        } else {
-            if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
-                $return['start'] = 0;
+		if (isset($data['start'])) {
+			$return['start'] = $data['start'];
+			$return['finished'] = 0;
+		} else {
+			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
+				$return['start'] = 0;
 
-                ++$return['part'];
+				++$return['part'];
 
-                if ($return['part'] < sizeof($backup_parts)) {
-                    $return['finished'] = 0;
-                }
+				if ($return['part'] < sizeof($backup_parts)) {
+					$return['finished'] = 0;
+				}
 
-            }
-        }
+			}
+		}
 
-        $this->send_response($return, 0);
-    }
+		$this->send_response($return, 0);
+	}
 
-    /*
+	/*
      * Copy remote backup to local storage
      */
-    public function copy_backup_remote_to_local()
-    {
+	public function copy_backup_remote_to_local()
+	{
 
-        $this->check_access();
+		$this->check_access();
 
-        $backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
+		$backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
 
-        $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+		$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-        $return = array();
+		$return = array();
 
-        try {
-            if (method_exists($xcloner_remote_storage, "copy_backup_remote_to_local")) {
-                $return = call_user_func_array(array(
-                    $xcloner_remote_storage,
-                    "copy_backup_remote_to_local"
-                ), array($backup_file, $storage_type));
-            }
-        } catch (Exception $e) {
+		try {
+			if (method_exists($xcloner_remote_storage, "copy_backup_remote_to_local")) {
+				$return = call_user_func_array(array(
+					$xcloner_remote_storage,
+					"copy_backup_remote_to_local"
+				), array($backup_file, $storage_type));
+			}
+		} catch (Exception $e) {
 
-            $return['error'] = 1;
-            $return['message'] = $e->getMessage();
-        }
+			$return['error'] = 1;
+			$return['message'] = $e->getMessage();
+		}
 
-        if (!$return) {
-            $return['error'] = 1;
-            $return['message'] = "Upload failed, please check the error log for more information!";
-        }
+		if (!$return) {
+			$return['error'] = 1;
+			$return['message'] = "Upload failed, please check the error log for more information!";
+		}
 
 
-        $this->send_response($return, 0);
+		$this->send_response($return, 0);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Upload backup to remote API
      *
      */
-    public function upload_backup_to_remote()
-    {
-        $this->check_access();
+	public function upload_backup_to_remote()
+	{
+		$this->check_access();
 
-        $backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
+		$backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
 
-        $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+		$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-        $return = array();
+		$return = array();
 
-        try {
-            if (method_exists($xcloner_remote_storage, "upload_backup_to_storage")) {
-                $return = call_user_func_array(array(
-                    $xcloner_remote_storage,
-                    "upload_backup_to_storage"
-                ), array($backup_file, $storage_type));
-            }
-        } catch (Exception $e) {
+		try {
+			if (method_exists($xcloner_remote_storage, "upload_backup_to_storage")) {
+				$return = call_user_func_array(array(
+					$xcloner_remote_storage,
+					"upload_backup_to_storage"
+				), array($backup_file, $storage_type));
+			}
+		} catch (Exception $e) {
 
-            $return['error'] = 1;
-            $return['message'] = $e->getMessage();
-        }
+			$return['error'] = 1;
+			$return['message'] = $e->getMessage();
+		}
 
-        if (!$return) {
-            $return['error'] = 1;
-            $return['message'] = "Upload failed, please check the error log for more information!";
-        }
+		if (!$return) {
+			$return['error'] = 1;
+			$return['message'] = "Upload failed, please check the error log for more information!";
+		}
 
 
-        $this->send_response($return, 0);
+		$this->send_response($return, 0);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Remote Storage Status Save
      *
      */
-    public function remote_storage_save_status()
-    {
-        $this->check_access();
+	public function remote_storage_save_status()
+	{
+		$this->check_access();
 
-        $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+		$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-        $return['finished'] = $xcloner_remote_storage->change_storage_status($_POST['id'], $_POST['value']);
+		$return['finished'] = $xcloner_remote_storage->change_storage_status($_POST['id'], $_POST['value']);
 
-        $this->send_response($return, 0);
-    }
+		$this->send_response($return, 0);
+	}
 
 
-    public function download_restore_script()
-    {
-        $this->check_access();
+	public function download_restore_script()
+	{
+		$this->check_access();
 
-        @ob_end_clean();
+		@ob_end_clean();
 
-        $adapter = new Local(dirname(__DIR__), LOCK_EX, 'SKIP_LINKS');
-        $xcloner_plugin_filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$adapter = new Local(dirname(__DIR__), LOCK_EX, 'SKIP_LINKS');
+		$xcloner_plugin_filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        /* Generate PHAR FILE
+		/* Generate PHAR FILE
         $file = 'restore/vendor.built';
 
         if(file_exists($file))
@@ -957,178 +957,178 @@ 
         $phar2->setStub($phar2->createDefaultStub('vendor/autoload.php', 'vendor/autoload.php'));
          * */
 
-        $tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
+		$tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
 
-        $tar = new Tar();
-        $tar->create($tmp_file);
+		$tar = new Tar();
+		$tar->create($tmp_file);
 
-        $tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
-        //$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
+		$tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
+		//$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 
-        $files = $xcloner_plugin_filesystem->listContents("vendor/", true);
-        foreach ($files as $file) {
-            $tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
-        }
+		$files = $xcloner_plugin_filesystem->listContents("vendor/", true);
+		foreach ($files as $file) {
+			$tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
+		}
 
-        $content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
-        $content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
+		$content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
+		$content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
 
-        $tar->addData("xcloner_restore.php", $content);
+		$tar->addData("xcloner_restore.php", $content);
 
-        $tar->close();
+		$tar->close();
 
-        if (file_exists($tmp_file)) {
-            header('Content-Description: File Transfer');
-            header('Content-Type: application/octet-stream');
-            header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
-            header('Expires: 0');
-            header('Cache-Control: must-revalidate');
-            header('Pragma: public');
-            header('Content-Length: ' . filesize($tmp_file));
-            readfile($tmp_file);
+		if (file_exists($tmp_file)) {
+			header('Content-Description: File Transfer');
+			header('Content-Type: application/octet-stream');
+			header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			header('Content-Length: ' . filesize($tmp_file));
+			readfile($tmp_file);
 
-        }
+		}
 
-        @unlink($tmp_file);
-        exit;
-    }
+		@unlink($tmp_file);
+		exit;
+	}
 
-    /*
+	/*
      *
      * Download backup by Name from the Storage Path
      *
      */
-    public function download_backup_by_name()
-    {
-        $this->check_access();
+	public function download_backup_by_name()
+	{
+		$this->check_access();
 
-        @ob_end_clean();
+		@ob_end_clean();
 
-        $backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_GET['name']);
+		$backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_GET['name']);
 
 
-        $metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($backup_name);
-        $read_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($backup_name);
+		$metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($backup_name);
+		$read_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($backup_name);
 
 
-        header('Pragma: public');
-        header('Expires: 0');
-        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-        header('Cache-Control: private', false);
-        header('Content-Transfer-Encoding: binary');
-        header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
-        header('Content-Type: application/octet-stream');
-        header('Content-Length: ' . $metadata['size']);
+		header('Pragma: public');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Cache-Control: private', false);
+		header('Content-Transfer-Encoding: binary');
+		header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
+		header('Content-Type: application/octet-stream');
+		header('Content-Length: ' . $metadata['size']);
 
-        @ob_end_clean();
+		@ob_end_clean();
 
-        $chunkSize = 1024 * 1024;
-        while (!feof($read_stream)) {
-            $buffer = fread($read_stream, $chunkSize);
-            echo $buffer;
-        }
-        fclose($read_stream);
-        exit;
+		$chunkSize = 1024 * 1024;
+		while (!feof($read_stream)) {
+			$buffer = fread($read_stream, $chunkSize);
+			echo $buffer;
+		}
+		fclose($read_stream);
+		exit;
 
-    }
+	}
 
-    /*
+	/*
      * Restore upload backup
      */
-    public function restore_upload_backup()
-    {
-        $this->check_access();
+	public function restore_upload_backup()
+	{
+		$this->check_access();
 
-        $return['part'] = 0;
-        $return['total_parts'] = 0;
-        $return['uploaded_size'] = 0;
-        $is_multipart = 0;
+		$return['part'] = 0;
+		$return['total_parts'] = 0;
+		$return['uploaded_size'] = 0;
+		$is_multipart = 0;
 
-        $file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
-        $hash = $this->xcloner_sanitization->sanitize_input_as_string($_POST['hash']);
+		$file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
+		$hash = $this->xcloner_sanitization->sanitize_input_as_string($_POST['hash']);
 
-        if (isset($_POST['part'])) {
-            $return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
-        }
+		if (isset($_POST['part'])) {
+			$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+		}
 
-        if (isset($_POST['uploaded_size'])) {
-            $return['uploaded_size'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['uploaded_size']);
-        }
+		if (isset($_POST['uploaded_size'])) {
+			$return['uploaded_size'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['uploaded_size']);
+		}
 
-        $start = $this->xcloner_sanitization->sanitize_input_as_string($_POST['start']);
-        $target_url = $this->xcloner_sanitization->sanitize_input_as_string($_POST['target_url']);
+		$start = $this->xcloner_sanitization->sanitize_input_as_string($_POST['start']);
+		$target_url = $this->xcloner_sanitization->sanitize_input_as_string($_POST['target_url']);
 
-        $return['total_size'] = $this->xcloner_file_system->get_backup_size($file);
+		$return['total_size'] = $this->xcloner_file_system->get_backup_size($file);
 
-        if ($this->xcloner_file_system->is_multipart($file)) {
-            $backup_parts = $this->xcloner_file_system->get_multipart_files($file);
+		if ($this->xcloner_file_system->is_multipart($file)) {
+			$backup_parts = $this->xcloner_file_system->get_multipart_files($file);
 
-            $return['total_parts'] = sizeof($backup_parts) + 1;
+			$return['total_parts'] = sizeof($backup_parts) + 1;
 
-            if ($return['part'] and isset($backup_parts[$return['part'] - 1])) {
-                $file = $backup_parts[$return['part'] - 1];
-            }
+			if ($return['part'] and isset($backup_parts[$return['part'] - 1])) {
+				$file = $backup_parts[$return['part'] - 1];
+			}
 
-            $is_multipart = 1;
-        }
+			$is_multipart = 1;
+		}
 
-        try {
+		try {
 
-            $xcloner_file_transfer = $this->get_xcloner_container()->get_xcloner_file_transfer();
-            $xcloner_file_transfer->set_target($target_url);
-            $return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
+			$xcloner_file_transfer = $this->get_xcloner_container()->get_xcloner_file_transfer();
+			$xcloner_file_transfer->set_target($target_url);
+			$return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $return = array();
-            $return['error'] = true;
-            $return['status'] = 500;
-            $return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
-            $this->send_response($return, 0);
+			$return = array();
+			$return['error'] = true;
+			$return['status'] = 500;
+			$return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
+			$this->send_response($return, 0);
 
-        }
+		}
 
-        $return['status'] = 200;
+		$return['status'] = 200;
 
-        //we have finished the upload
-        if (!$return['start'] and $is_multipart) {
-            $return['part']++;
-            $return['uploaded_size'] += $this->xcloner_file_system->get_storage_filesystem()->getSize($file);
-        }
+		//we have finished the upload
+		if (!$return['start'] and $is_multipart) {
+			$return['part']++;
+			$return['uploaded_size'] += $this->xcloner_file_system->get_storage_filesystem()->getSize($file);
+		}
 
-        $this->send_response($return, 0);
-    }
+		$this->send_response($return, 0);
+	}
 
-    /*
+	/*
      * Restore backup
      */
-    public function restore_backup()
-    {
-        $this->check_access();
+	public function restore_backup()
+	{
+		$this->check_access();
 
-        define("XCLONER_PLUGIN_ACCESS", 1);
-        include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
+		define("XCLONER_PLUGIN_ACCESS", 1);
+		include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
 
-        return;
-    }
+		return;
+	}
 
-    /*
+	/*
      *
      * Send the json response back
      *
      */
-    private function send_response($data, $attach_hash = 1)
-    {
+	private function send_response($data, $attach_hash = 1)
+	{
 
-        if ($attach_hash and null !== $this->xcloner_settings->get_hash()) {
-            $data['hash'] = $this->xcloner_settings->get_hash();
-        }
+		if ($attach_hash and null !== $this->xcloner_settings->get_hash()) {
+			$data['hash'] = $this->xcloner_settings->get_hash();
+		}
 
-        if (ob_get_length()) {
-            ob_clean();
-        }
-        wp_send_json($data);
+		if (ob_get_length()) {
+			ob_clean();
+		}
+		wp_send_json($data);
 
-        die();
-    }
+		die();
+	}
 }

Spacing +53 added lines, -53 removed lines

@@ -85,7 +85,7 @@ 
         $this->xcloner_scheduler = $xcloner_container->get_xcloner_scheduler();
 
         if (isset($_POST['API_ID'])) {
-            $this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
+            $this->logger->info("Processing ajax request ID ".substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
                     0, 15));
         }
 
@@ -127,13 +127,13 @@ 
 
 
         $data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
-        $data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
-        $data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
+        $data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS.".database";
+        $data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS."database-sql.sql";
 
         try {
             $this->xcloner_database->init($data);
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $this->send_response($e->getMessage());
             $this->logger->error($e->getMessage());
@@ -218,8 +218,8 @@ 
         } else {
 
             $schedule['status'] = 1;
-            $schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
-                " " . $this->form_params['backup_params']['schedule_start_time']);
+            $schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'].
+                " ".$this->form_params['backup_params']['schedule_start_time']);
 
             if ($schedule['start_at'] <= time()) {
                 $schedule['start_at'] = "";
@@ -244,7 +244,7 @@ 
 
         if (!isset($_POST['id'])) {
             $wpdb->insert(
-                $wpdb->prefix . 'xcloner_scheduler',
+                $wpdb->prefix.'xcloner_scheduler',
                 $schedule,
                 array(
                     '%s',
@@ -253,7 +253,7 @@ 
             );
         } else {
             $wpdb->update(
-                $wpdb->prefix . 'xcloner_scheduler',
+                $wpdb->prefix.'xcloner_scheduler',
                 $schedule,
                 array('id' => $_POST['id']),
                 array(
@@ -304,7 +304,7 @@ 
         try {
             $return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
                 $this->form_params['extra'], $init);
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $return = array();
             $return['error'] = true;
             $return['status'] = 500;
@@ -331,7 +331,7 @@ 
                     $additional['lines_total'] = $return['extra']['lines_total'];
                     $this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
                         $this->form_params, "", $additional);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $this->logger->error($e->getMessage());
                 }
             }
@@ -425,7 +425,7 @@ 
         if (isset($params->backup_params)) {
             foreach ($params->backup_params as $param) {
                 $this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
-                $this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
+                $this->logger->debug("Adding form parameter ".$param->name.".".$param->value."\n", array(
                     'POST',
                     'fields filter'
                 ));
@@ -437,7 +437,7 @@ 
         if (isset($params->table_params)) {
             foreach ($params->table_params as $param) {
                 $this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
-                $this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
+                $this->logger->debug("Adding database filter ".$param->parent.".".$param->id."\n", array(
                     'POST',
                     'database filter'
                 ));
@@ -456,7 +456,7 @@ 
                 if (!in_array($param->parent, $this->form_params['excluded_files'])) {
                     //$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
                     $unique_exclude_files[] = $param->id;
-                    $this->logger->debug("Adding file filter " . $param->id . "\n", array(
+                    $this->logger->debug("Adding file filter ".$param->id."\n", array(
                         'POST',
                         'exclude files filter'
                     ));
@@ -504,13 +504,13 @@ 
                 'text' => $this->xcloner_settings->get_xcloner_start_path(),
                 //'children' => true,
                 'state' => array('selected' => false, 'opened' => true),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
+                'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-root.png"
             );
         }
 
         try {
             $files = $this->xcloner_file_system->list_directory($folder);
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             print $e->getMessage();
             $this->logger->error($e->getMessage());
@@ -531,7 +531,7 @@ 
             if ($file['type'] == "dir") {
                 $children = true;
             } else {
-                $text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
+                $text .= " (".$this->xcloner_requirements->file_format_size($file['size']).")";
             }
 
             if ($this->xcloner_file_system->is_excluded($file)) {
@@ -547,8 +547,8 @@ 
                 //'title' => "test",
                 'children' => $children,
                 'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
-                'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
-                        0, 1)) . ".png"
+                'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-".strtolower(substr($file['type'],
+                        0, 1)).".png"
             );
         }
 
@@ -574,7 +574,7 @@ 
         if ($database == "#") {
             try {
                 $return = $this->xcloner_database->get_all_databases();
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
 
@@ -595,10 +595,10 @@ 
                 $data[] = array(
                     'id' => $database['name'],
                     'parent' => '#',
-                    'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
+                    'text' => $database['name']." (".(int)$database['num_tables'].")",
                     'children' => true,
                     'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
+                    'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/database-icon.png"
                 );
             }
 
@@ -606,7 +606,7 @@ 
 
             try {
                 $return = $this->xcloner_database->list_tables($database, "", 1);
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
 
@@ -623,12 +623,12 @@ 
                 }
 
                 $data[] = array(
-                    'id' => $database . "." . $table['name'],
+                    'id' => $database.".".$table['name'],
                     'parent' => $database,
-                    'text' => $table['name'] . " (" . (int)$table['records'] . ")",
+                    'text' => $table['name']." (".(int)$table['records'].")",
                     'children' => false,
                     'state' => $state,
-                    'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
+                    'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/table-icon.png"
                 );
             }
         }
@@ -672,17 +672,17 @@ 
         $return['data'] = array();
 
         foreach ($data as $res) {
-            $action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
-					<a href=\"#" . $res->id . "\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
+            $action = "<a href=\"#".$res->id."\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
+					<a href=\"#" . $res->id."\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
             if ($res->status) {
                 $status = '<i class="material-icons active status">timer</i>';
             } else {
                 $status = '<i class="material-icons status inactive">timer_off</i>';
             }
 
-            $next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
+            $next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
 
-            $next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
+            $next_run = date(get_option('date_format')." ".get_option('time_format'), $next_run_time);
 
             $remote_storage = $res->remote_storage;
 
@@ -691,16 +691,16 @@ 
             }
 
             if (trim($next_run)) {
-                $date_text = date(get_option('date_format') . " " . get_option('time_format'),
+                $date_text = date(get_option('date_format')." ".get_option('time_format'),
                     $next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 
                 if ($next_run_time >= time()) {
-                    $next_run = "in " . human_time_diff($next_run_time, time());
+                    $next_run = "in ".human_time_diff($next_run_time, time());
                 } else {
                     $next_run = __("executed", 'xcloner-backup-and-restore');
                 }
 
-                $next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
+                $next_run = "<a href='#' title='".$date_text."'>".$next_run."</a>";
                 //$next_run .=" ($date_text)";
             }
 
@@ -712,11 +712,11 @@ 
                 if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
                     $metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
                     $backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
-                    $backup_time = date(get_option('date_format') . " " . get_option('time_format'),
+                    $backup_time = date(get_option('date_format')." ".get_option('time_format'),
                         $metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
                 }
 
-                $backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
+                $backup_text = "<span title='".$backup_time."' class='shorten_string'>".$res->last_backup." (".$backup_size.")</span>";
             }
 
             $schedules = wp_get_schedules();
@@ -728,7 +728,7 @@ 
             $return['data'][] = array(
                 $res->id,
                 $res->name,
-                $res->recurrence,/*$res->start_at,*/
+                $res->recurrence, /*$res->start_at,*/
                 $next_run,
                 $remote_storage,
                 $backup_text,
@@ -792,10 +792,10 @@ 
 
         try {
             $tar = new Tar();
-            $tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
+            $tar->open($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file, $start);
 
             $data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $return['error'] = true;
             $return['message'] = $e->getMessage();
             $this->send_response($return, 0);
@@ -803,14 +803,14 @@ 
 
         $return['files'] = array();
         $return['finished'] = 1;
-        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+        $return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
         $i = 0;
 
         if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
             foreach ($data['extracted_files'] as $file) {
                 $return['files'][$i]['path'] = $file->getPath();
                 $return['files'][$i]['size'] = $file->getSize();
-                $return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
+                $return['files'][$i]['mtime'] = date(get_option('date_format')." ".get_option('time_format'),
                     $file->getMtime());
 
                 $i++;
@@ -858,7 +858,7 @@ 
                     "copy_backup_remote_to_local"
                 ), array($backup_file, $storage_type));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return['error'] = 1;
             $return['message'] = $e->getMessage();
@@ -897,7 +897,7 @@ 
                     "upload_backup_to_storage"
                 ), array($backup_file, $storage_type));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return['error'] = 1;
             $return['message'] = $e->getMessage();
@@ -957,21 +957,21 @@ 
         $phar2->setStub($phar2->createDefaultStub('vendor/autoload.php', 'vendor/autoload.php'));
          * */
 
-        $tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
+        $tmp_file = $this->xcloner_settings->get_xcloner_tmp_path().DS."xcloner-restore.tgz";
 
         $tar = new Tar();
         $tar->create($tmp_file);
 
-        $tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
+        $tar->addFile(dirname(__DIR__)."/restore/vendor.build.txt", "vendor.phar");
         //$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 
         $files = $xcloner_plugin_filesystem->listContents("vendor/", true);
         foreach ($files as $file) {
-            $tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
+            $tar->addFile(dirname(__DIR__).DS.$file['path'], $file['path']);
         }
 
-        $content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
-        $content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
+        $content = file_get_contents(dirname(__DIR__)."/restore/xcloner_restore.php");
+        $content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '".md5(AUTH_KEY)."');", $content);
 
         $tar->addData("xcloner_restore.php", $content);
 
@@ -980,11 +980,11 @@ 
         if (file_exists($tmp_file)) {
             header('Content-Description: File Transfer');
             header('Content-Type: application/octet-stream');
-            header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
+            header('Content-Disposition: attachment; filename="'.basename($tmp_file).'"');
             header('Expires: 0');
             header('Cache-Control: must-revalidate');
             header('Pragma: public');
-            header('Content-Length: ' . filesize($tmp_file));
+            header('Content-Length: '.filesize($tmp_file));
             readfile($tmp_file);
 
         }
@@ -1016,9 +1016,9 @@ 
         header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
         header('Cache-Control: private', false);
         header('Content-Transfer-Encoding: binary');
-        header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
+        header('Content-Disposition: attachment; filename="'.$metadata['path'].'";');
         header('Content-Type: application/octet-stream');
-        header('Content-Length: ' . $metadata['size']);
+        header('Content-Length: '.$metadata['size']);
 
         @ob_end_clean();
 
@@ -1078,12 +1078,12 @@ 
             $xcloner_file_transfer->set_target($target_url);
             $return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $return = array();
             $return['error'] = true;
             $return['status'] = 500;
-            $return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
+            $return['message'] = "CURL communication error with the restore host. ".$e->getMessage();
             $this->send_response($return, 0);
 
         }
@@ -1107,7 +1107,7 @@ 
         $this->check_access();
 
         define("XCLONER_PLUGIN_ACCESS", 1);
-        include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
+        include_once(dirname(__DIR__).DS."restore".DS."xcloner_restore.php");
 
         return;
     }

includes/class-xcloner-archive.php

Doc Comments +21 added lines

@@ -213,6 +213,10 @@ 
      *
      * @return bool
      */
+
+    /**
+     * @param string $error_message
+     */
     public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
     {
 
@@ -251,6 +255,11 @@ 
      *
      * @return bool
      */
+
+    /**
+     * @param string $from
+     * @param string $subject
+     */
     public function send_notification(
         $to,
         $from,
@@ -339,6 +348,10 @@ 
      * Incremental Backup method
      *
      */
+
+    /**
+     * @param integer $init
+     */
     public function start_incremental_backup($backup_params, $extra_params, $init)
     {
         $return = array();
@@ -576,6 +589,10 @@ 
      * Write multipart file components
      *
      */
+
+    /**
+     * @param string $path
+     */
     private function write_multipart_file($path)
     {
         $path = $this->get_archive_name_with_extension();
@@ -636,6 +653,10 @@ 
      * Add file to archive
      *
      */
+
+    /**
+     * @param integer $append
+     */
     public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
     {
 

Indentation +513 added lines, -513 removed lines

@@ -36,171 +36,171 @@ 
  */
 class Xcloner_Archive extends Tar
 {
-    /**
-     * Process file size per API request
-     * @var float|int
-     */
-    private $file_size_per_request_limit = 52428800; //50MB = 52428800; 1MB = 1048576
-    /**
-     * Files count to process per API request
-     * @var int
-     */
-    private $files_to_process_per_request = 250; //block of 512 bytes
-    /**
-     * Compression level, 0-uncompressed, 9-maximum compression
-     * @var int
-     */
-    private $compression_level = 0; //0-9 , 0 uncompressed
-    /**
-     * Split backup size limit
-     * Create a new backup archive file once the set size is reached
-     * @var float|int
-     */
-    private $xcloner_split_backup_limit = 2048; //2048MB
-    /**
-     * Number of processed bytes
-     * @var int
-     */
-    private $processed_size_bytes = 0;
-
-    /**
-     * Archive name
-     * @var string
-     */
-    private $archive_name;
-    /**
-     * @var Tar
-     */
-    private $backup_archive;
-    /**
-     * @var Xcloner_File_System
-     */
-    private $filesystem;
-    /**
-     * @var Xcloner_Logger
-     */
-    private $logger;
-    /**
-     * @var Xcloner_Settings
-     */
-    private $xcloner_settings;
-
-    /**
-     * [__construct description]
-     * @param Xcloner $xcloner_container XCloner Container
-     * @param string $archive_name Achive Name
-     */
-    public function __construct(Xcloner $xcloner_container, $archive_name = "")
-    {
-        $this->filesystem = $xcloner_container->get_xcloner_filesystem();
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
-        $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-
-        if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request')) {
-            $this->file_size_per_request_limit = $value * 1024 * 1024;
-        } //MB
-
-        if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request')) {
-            $this->files_to_process_per_request = $value;
-        }
+	/**
+	 * Process file size per API request
+	 * @var float|int
+	 */
+	private $file_size_per_request_limit = 52428800; //50MB = 52428800; 1MB = 1048576
+	/**
+	 * Files count to process per API request
+	 * @var int
+	 */
+	private $files_to_process_per_request = 250; //block of 512 bytes
+	/**
+	 * Compression level, 0-uncompressed, 9-maximum compression
+	 * @var int
+	 */
+	private $compression_level = 0; //0-9 , 0 uncompressed
+	/**
+	 * Split backup size limit
+	 * Create a new backup archive file once the set size is reached
+	 * @var float|int
+	 */
+	private $xcloner_split_backup_limit = 2048; //2048MB
+	/**
+	 * Number of processed bytes
+	 * @var int
+	 */
+	private $processed_size_bytes = 0;
+
+	/**
+	 * Archive name
+	 * @var string
+	 */
+	private $archive_name;
+	/**
+	 * @var Tar
+	 */
+	private $backup_archive;
+	/**
+	 * @var Xcloner_File_System
+	 */
+	private $filesystem;
+	/**
+	 * @var Xcloner_Logger
+	 */
+	private $logger;
+	/**
+	 * @var Xcloner_Settings
+	 */
+	private $xcloner_settings;
+
+	/**
+	 * [__construct description]
+	 * @param Xcloner $xcloner_container XCloner Container
+	 * @param string $archive_name Achive Name
+	 */
+	public function __construct(Xcloner $xcloner_container, $archive_name = "")
+	{
+		$this->filesystem = $xcloner_container->get_xcloner_filesystem();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request')) {
+			$this->file_size_per_request_limit = $value * 1024 * 1024;
+		} //MB
+
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request')) {
+			$this->files_to_process_per_request = $value;
+		}
 
-        if ($value = get_option('xcloner_backup_compression_level')) {
-            $this->compression_level = $value;
-        }
+		if ($value = get_option('xcloner_backup_compression_level')) {
+			$this->compression_level = $value;
+		}
 
-        if ($value = get_option('xcloner_split_backup_limit')) {
-            $this->xcloner_split_backup_limit = $value;
-        }
+		if ($value = get_option('xcloner_split_backup_limit')) {
+			$this->xcloner_split_backup_limit = $value;
+		}
 
-        $this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
+		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
 
-        if (isset($archive_name) && $archive_name) {
-            $this->set_archive_name($archive_name);
-        }
-    }
+		if (isset($archive_name) && $archive_name) {
+			$this->set_archive_name($archive_name);
+		}
+	}
 
-    /*
+	/*
      * Rename backup archive
      *
      * @param string $old_name
      * @param string $new_name
      *
      */
-    public function rename_archive($old_name, $new_name)
-    {
-        $this->logger->info(sprintf("Renaming backup archive %s to %s", $old_name, $new_name));
-        $storage_filesystem = $this->filesystem->get_storage_filesystem();
-        $storage_filesystem->rename($old_name, $new_name);
-    }
-
-    /*
+	public function rename_archive($old_name, $new_name)
+	{
+		$this->logger->info(sprintf("Renaming backup archive %s to %s", $old_name, $new_name));
+		$storage_filesystem = $this->filesystem->get_storage_filesystem();
+		$storage_filesystem->rename($old_name, $new_name);
+	}
+
+	/*
      *
      * Set the backup archive name
      *
      */
-    public function set_archive_name($name = "", $part = 0)
-    {
+	public function set_archive_name($name = "", $part = 0)
+	{
 
-        $this->archive_name = $this->filesystem->process_backup_name($name);
+		$this->archive_name = $this->filesystem->process_backup_name($name);
 
-        if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start()) {
-            //$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
-            $new_name = $this->archive_name;
+		if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start()) {
+			//$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
+			$new_name = $this->archive_name;
 
-            if (!stristr($new_name, "-diff")) {
-                $new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
-            }
+			if (!stristr($new_name, "-diff")) {
+				$new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+			}
 
-            $this->archive_name = $new_name;
+			$this->archive_name = $new_name;
 
-        }
+		}
 
-        if (isset($part) and $part) {
-            $new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
-            if (!stristr($new_name, "-part")) {
-                $new_name = $this->archive_name . "-part" . $part;
-            }
+		if (isset($part) and $part) {
+			$new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+			if (!stristr($new_name, "-part")) {
+				$new_name = $this->archive_name . "-part" . $part;
+			}
 
-            $this->archive_name = $new_name;
-        }
+			$this->archive_name = $new_name;
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /*
+	/*
      *
      * Returns the backup archive name
      *
      * @return string archive name
      */
-    public function get_archive_name()
-    {
-        return $this->archive_name;
-    }
+	public function get_archive_name()
+	{
+		return $this->archive_name;
+	}
 
-    /*
+	/*
      *
      * Returns the multipart naming for the backup archive
      *
      * @return string multi-part backup name
      */
-    public function get_archive_name_multipart()
-    {
-        $new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-        return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
-    }
+	public function get_archive_name_multipart()
+	{
+		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
+		return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+	}
 
-    /*
+	/*
      *
      * Returns the full backup name including extension
      *
      */
-    public function get_archive_name_with_extension()
-    {
-        return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
-    }
+	public function get_archive_name_with_extension()
+	{
+		return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+	}
 
-    /*
+	/*
      *
      * Send notification error by E-Mail
      *
@@ -213,31 +213,31 @@ 
      *
      * @return bool
      */
-    public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
-    {
+	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
+	{
 
-        $body = "";
-        $body .= sprintf(__("Backup Site Url: %s"), get_site_url());
-        $body .= "<br /><>";
+		$body = "";
+		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
+		$body .= "<br /><>";
 
-        $body .= sprintf(__("Error Message: %s"), $error_message);
+		$body .= sprintf(__("Error Message: %s"), $error_message);
 
-        $this->logger->info(sprintf("Sending backup error notification to %s", $to));
+		$this->logger->info(sprintf("Sending backup error notification to %s", $to));
 
-        $admin_email = get_option("admin_email");
+		$admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8');
+		$headers = array('Content-Type: text/html; charset=UTF-8');
 
-        if ($admin_email and $from) {
-            $headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
-        }
+		if ($admin_email and $from) {
+			$headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+		}
 
-        $return = wp_mail($to, $subject, $body, $headers);
+		$return = wp_mail($to, $subject, $body, $headers);
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Send backup archive notfication by E-Mail
      *
@@ -251,480 +251,480 @@ 
      *
      * @return bool
      */
-    public function send_notification(
-        $to,
-        $from,
-        $subject,
-        $backup_name,
-        $params,
-        $error_message = "",
-        $additional = array()
-    ) {
-        if (!$from) {
-            $from = "XCloner Backup";
-        }
+	public function send_notification(
+		$to,
+		$from,
+		$subject,
+		$backup_name,
+		$params,
+		$error_message = "",
+		$additional = array()
+	) {
+		if (!$from) {
+			$from = "XCloner Backup";
+		}
 
-        if (($error_message)) {
-            return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
-        }
+		if (($error_message)) {
+			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
+		}
 
-        $params = (array)$params;
+		$params = (array)$params;
 
-        if (!$subject) {
-            $subject = sprintf(__("New backup generated %s"), $backup_name);
-        }
+		if (!$subject) {
+			$subject = sprintf(__("New backup generated %s"), $backup_name);
+		}
 
-        $body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
-        $body .= "<br /><br />";
+		$body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
+		$body .= "<br /><br />";
 
-        if (isset($additional['lines_total'])) {
-            $body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
-            $body .= "<br /><br />";
-        }
+		if (isset($additional['lines_total'])) {
+			$body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
+			$body .= "<br /><br />";
+		}
 
-        $backup_parts = $this->filesystem->get_multipart_files($backup_name);
+		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 
-        if (!$backups_counter = sizeof($backup_parts)) {
-            $backups_counter = 1;
-        }
+		if (!$backups_counter = sizeof($backup_parts)) {
+			$backups_counter = 1;
+		}
 
-        $body .= sprintf(__("Backup Parts: %s"), $backups_counter);
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
+		$body .= "<br />";
 
-        if (sizeof($backup_parts)) {
-            $body .= implode("<br />", $backup_parts);
-            $body .= "<br />";
-        }
+		if (sizeof($backup_parts)) {
+			$body .= implode("<br />", $backup_parts);
+			$body .= "<br />";
+		}
 
-        $body .= "<br />";
+		$body .= "<br />";
 
-        $body .= sprintf(__("Backup Site Url: %s"), get_site_url());
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
+		$body .= "<br />";
 
-        if (isset($params['backup_params']->backup_comments)) {
-            $body .= __("Backup Comments: ") . $params['backup_params']->backup_comments;
-            $body .= "<br /><br />";
-        }
+		if (isset($params['backup_params']->backup_comments)) {
+			$body .= __("Backup Comments: ") . $params['backup_params']->backup_comments;
+			$body .= "<br /><br />";
+		}
 
-        if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $body .= __("Latest 50 Log Lines: ") . "<br />" . implode("<br />\n",
-                                                                        $this->logger->getLastDebugLines(50));
-        }
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+			$body .= __("Latest 50 Log Lines: ") . "<br />" . implode("<br />\n",
+																		$this->logger->getLastDebugLines(50));
+		}
 
-        $attachments = $this->filesystem->get_backup_attachments();
+		$attachments = $this->filesystem->get_backup_attachments();
 
-        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "info.tgz";
+		$attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "info.tgz";
 
-        $tar = new Tar();
-        $tar->create($attachments_archive);
+		$tar = new Tar();
+		$tar->create($attachments_archive);
 
-        foreach ($attachments as $key => $file) {
-            $tar->addFile($file, basename($file));
-        }
-        $tar->close();
+		foreach ($attachments as $key => $file) {
+			$tar->addFile($file, basename($file));
+		}
+		$tar->close();
 
-        $this->logger->info(sprintf("Sending backup notification to %s", $to));
+		$this->logger->info(sprintf("Sending backup notification to %s", $to));
 
-        $admin_email = get_option("admin_email");
+		$admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: ' . $from . ' <' . $admin_email . '>');
+		$headers = array('Content-Type: text/html; charset=UTF-8', 'From: ' . $from . ' <' . $admin_email . '>');
 
-        $return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
+		$return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Incremental Backup method
      *
      */
-    public function start_incremental_backup($backup_params, $extra_params, $init)
-    {
-        $return = array();
+	public function start_incremental_backup($backup_params, $extra_params, $init)
+	{
+		$return = array();
 
-        if (!isset($extra_params['backup_part'])) {
-            $extra_params['backup_part'] = 0;
-        }
+		if (!isset($extra_params['backup_part'])) {
+			$extra_params['backup_part'] = 0;
+		}
 
-        $return['extra']['backup_part'] = $extra_params['backup_part'];
+		$return['extra']['backup_part'] = $extra_params['backup_part'];
 
-        if (isset($extra_params['backup_archive_name'])) {
-            $this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
-        } else {
-            $this->set_archive_name($backup_params['backup_name']);
-        }
+		if (isset($extra_params['backup_archive_name'])) {
+			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
+		} else {
+			$this->set_archive_name($backup_params['backup_name']);
+		}
 
-        if (!$this->get_archive_name()) {
-            $this->set_archive_name();
-        }
+		if (!$this->get_archive_name()) {
+			$this->set_archive_name();
+		}
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
 
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-        if ($init) {
-            $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
+		if ($init) {
+			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+			$this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
 
-            $return['extra']['backup_init'] = 1;
+			$return['extra']['backup_init'] = 1;
 
-        } else {
-            $this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
+		} else {
+			$this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
+			$this->backup_archive->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
 
-            $return['extra']['backup_init'] = 0;
+			$return['extra']['backup_init'] = 0;
 
-        }
+		}
 
-        $return['extra']['backup_archive_name'] = $this->get_archive_name();
-        $return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
+		$return['extra']['backup_archive_name'] = $this->get_archive_name();
+		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 
-        if (!isset($extra_params['start_at_line'])) {
-            $extra_params['start_at_line'] = 0;
-        }
+		if (!isset($extra_params['start_at_line'])) {
+			$extra_params['start_at_line'] = 0;
+		}
 
-        if (!isset($extra_params['start_at_byte'])) {
-            $extra_params['start_at_byte'] = 0;
-        }
+		if (!isset($extra_params['start_at_byte'])) {
+			$extra_params['start_at_byte'] = 0;
+		}
 
-        if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
-            $this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
-                $this->filesystem->get_included_files_handler()));
+		if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
+			$this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
+				$this->filesystem->get_included_files_handler()));
 
-            $return['finished'] = 1;
-            return $return;
-        }
+			$return['finished'] = 1;
+			return $return;
+		}
 
-        $included_files_handler = $this->filesystem->get_included_files_handler(1);
+		$included_files_handler = $this->filesystem->get_included_files_handler(1);
 
-        $file = new SplFileObject($included_files_handler);
+		$file = new SplFileObject($included_files_handler);
 
-        $file->seek(PHP_INT_MAX);
+		$file->seek(PHP_INT_MAX);
 
-        $return['extra']['lines_total'] = ($file->key() - 1);
+		$return['extra']['lines_total'] = ($file->key() - 1);
 
-        //we skip the first CSV line with headers
-        if (!$extra_params['start_at_line']) {
-            $file->seek(1);
-        } else {
-            $file->seek($extra_params['start_at_line'] + 1);
-        }
+		//we skip the first CSV line with headers
+		if (!$extra_params['start_at_line']) {
+			$file->seek(1);
+		} else {
+			$file->seek($extra_params['start_at_line'] + 1);
+		}
 
-        $this->processed_size_bytes = 0;
+		$this->processed_size_bytes = 0;
 
-        $counter = 0;
+		$counter = 0;
 
-        $start_byte = $extra_params['start_at_byte'];
+		$start_byte = $extra_params['start_at_byte'];
 
-        $byte_limit = 0;
+		$byte_limit = 0;
 
-        while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
-            $current_line_str = $file->current();
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
+			$current_line_str = $file->current();
 
-            $line = str_getcsv($current_line_str);
+			$line = str_getcsv($current_line_str);
 
-            $relative_path = stripslashes($line[0]);
+			$relative_path = stripslashes($line[0]);
 
-            $start_filesystem = "start_filesystem";
+			$start_filesystem = "start_filesystem";
 
-            if (isset($line[4])) {
-                $start_filesystem = $line[4];
-            }
+			if (isset($line[4])) {
+				$start_filesystem = $line[4];
+			}
 
-            //$adapter = $this->filesystem->get_adapter($start_filesystem);
+			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 
-            if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
-                if ($relative_path != "") {
-                    $this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
-                        $relative_path));
-                }
+			if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
+				if ($relative_path != "") {
+					$this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
+						$relative_path));
+				}
 
-                $extra_params['start_at_line']++;
-                $file->next();
-                continue;
-            }
+				$extra_params['start_at_line']++;
+				$file->next();
+				continue;
+			}
 
-            $file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
+			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 
-            if (!isset($file_info['size'])) {
-                $file_info['size'] = 0;
-            }
+			if (!isset($file_info['size'])) {
+				$file_info['size'] = 0;
+			}
 
-            if ($start_filesystem == "tmp_filesystem") {
-                $file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
-            }
+			if ($start_filesystem == "tmp_filesystem") {
+				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
+			}
 
-            $byte_limit = (int)$this->file_size_per_request_limit / 512;
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 
-            $append = 0;
+			$append = 0;
 
-            if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
-                $append = 1;
-            }
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
+				$append = 1;
+			}
 
-            if (!isset($return['extra']['backup_size'])) {
-                $return['extra']['backup_size'] = 0;
-            }
+			if (!isset($return['extra']['backup_size'])) {
+				$return['extra']['backup_size'] = 0;
+			}
 
-            $return['extra']['backup_size'] = $archive_info->getSize();
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            $estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
+			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 
-            //we create a new backup part if we reach the Split Achive Limit
-            if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
-                $this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
-                    $this->xcloner_split_backup_limit, $estimated_new_size));
-                list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
+			//we create a new backup part if we reach the Split Achive Limit
+			if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
+				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
+					$this->xcloner_split_backup_limit, $estimated_new_size));
+				list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
 
-                if ($file_info['size'] > $this->xcloner_split_backup_limit) {
-                    $this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
-                        $file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
-                    $extra_params['start_at_line']++;
-                }
+				if ($file_info['size'] > $this->xcloner_split_backup_limit) {
+					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
+						$file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
+					$extra_params['start_at_line']++;
+				}
 
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = 0;
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = 0;
 
-                $return['finished'] = 0;
+				$return['finished'] = 0;
 
-                return $return;
-            }
+				return $return;
+			}
 
-            list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
-                $append, $start_filesystem);
-            $this->processed_size_bytes += $bytes_wrote;
+			list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
+				$append, $start_filesystem);
+			$this->processed_size_bytes += $bytes_wrote;
 
-            //echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-            $return['extra']['backup_size'] = $archive_info->getSize();
+			//echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            if ($last_position > 0) {
-                $start_byte = $last_position;
-            } else {
-                $extra_params['start_at_line']++;
-                $file->next();
-                $start_byte = 0;
-                $counter++;
-            }
+			if ($last_position > 0) {
+				$start_byte = $last_position;
+			} else {
+				$extra_params['start_at_line']++;
+				$file->next();
+				$start_byte = 0;
+				$counter++;
+			}
 
-            if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
-                clearstatcache();
-                $return['extra']['backup_size'] = $archive_info->getSize();
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
+				clearstatcache();
+				$return['extra']['backup_size'] = $archive_info->getSize();
 
-                $return['finished'] = 0;
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = $last_position;
-                $this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
-                    $this->file_size_per_request_limit));
-                return $return;
-            }
-        }
+				$return['finished'] = 0;
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = $last_position;
+				$this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
+					$this->file_size_per_request_limit));
+				return $return;
+			}
+		}
 
-        if (!$file->eof()) {
-            clearstatcache();
-            $return['extra']['backup_size'] = $archive_info->getSize();
+		if (!$file->eof()) {
+			clearstatcache();
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            $return['finished'] = 0;
-            $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-            $return['extra']['start_at_byte'] = $last_position;
-            $this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
-                $this->files_to_process_per_request));
+			$return['finished'] = 0;
+			$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+			$return['extra']['start_at_byte'] = $last_position;
+			$this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
+				$this->files_to_process_per_request));
 
-            return $return;
-        }
+			return $return;
+		}
 
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
 
-        /**
-         * XCloner HOOK backup_archive_finished.
-         *
-         * This will get triggered when a backup archive is finished writing.
-         */
-        //do_action('backup_archive_finished', $this->backup_archive, $this);
+		/**
+		 * XCloner HOOK backup_archive_finished.
+		 *
+		 * This will get triggered when a backup archive is finished writing.
+		 */
+		//do_action('backup_archive_finished', $this->backup_archive, $this);
 
-        //updating archive_info
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		//updating archive_info
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-        if ($return['extra']['backup_part']) {
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+		if ($return['extra']['backup_part']) {
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
+		$return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
 
-        if (isset($file_info)) {
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-        }
+		if (isset($file_info)) {
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+		}
 
-        clearstatcache();
-        $return['extra']['backup_size'] = $archive_info->getSize();
+		clearstatcache();
+		$return['extra']['backup_size'] = $archive_info->getSize();
 
-        $return['finished'] = 1;
-        return $return;
-    }
+		$return['finished'] = 1;
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Write multipart file components
      *
      */
-    private function write_multipart_file($path)
-    {
-        $path = $this->get_archive_name_with_extension();
+	private function write_multipart_file($path)
+	{
+		$path = $this->get_archive_name_with_extension();
 
-        $file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
-        //print_r($file_info);
-        $line = '"' . $file['path'] . '","' . $file['timestamp'] . '","' . $file['size'] . '"' . PHP_EOL;
+		$file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
+		//print_r($file_info);
+		$line = '"' . $file['path'] . '","' . $file['timestamp'] . '","' . $file['size'] . '"' . PHP_EOL;
 
 
-        $this->filesystem->get_filesystem("storage_filesystem_append")
-            ->write($this->get_archive_name_multipart(), $line);
-    }
+		$this->filesystem->get_filesystem("storage_filesystem_append")
+			->write($this->get_archive_name_multipart(), $line);
+	}
 
-    /*
+	/*
      *
      * Create a new backup part
      *
      */
-    private function create_new_backup_part($part = 0)
-    {
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
-
-        if (!$part) {
-            $old_name = $this->get_archive_name_with_extension();
-            $this->set_archive_name($this->get_archive_name(), ++$part);
-            $this->rename_archive($old_name, $this->get_archive_name_with_extension());
-
-            if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
-                $this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
-            }
-
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-
-        } else {
-            $this->logger->info(sprintf("Creating new multipart info file %s",
-                $this->get_archive_name_with_extension()));
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+	private function create_new_backup_part($part = 0)
+	{
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
+
+		if (!$part) {
+			$old_name = $this->get_archive_name_with_extension();
+			$this->set_archive_name($this->get_archive_name(), ++$part);
+			$this->rename_archive($old_name, $this->get_archive_name_with_extension());
+
+			if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
+				$this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
+			}
+
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+
+		} else {
+			$this->logger->info(sprintf("Creating new multipart info file %s",
+				$this->get_archive_name_with_extension()));
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $this->set_archive_name($this->get_archive_name(), ++$part);
+		$this->set_archive_name($this->get_archive_name(), ++$part);
 
-        $this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
+		$this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
-        $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		$this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
 
-        return array($archive_info, $part);
+		return array($archive_info, $part);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Add file to archive
      *
      */
-    public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
-    {
-
-        $start_adapter = $this->filesystem->get_adapter($filesystem);
-        $start_filesystem = $this->filesystem->get_adapter($filesystem);
-
-        if (!$file_info['path']) {
-            return;
-        }
-
-        if (isset($file_info['archive_prefix_path'])) {
-            $file_info['target_path'] = $file_info['archive_prefix_path'] . "/" . $file_info['path'];
-        } else {
-            $file_info['target_path'] = $file_info['path'];
-        }
-
-        $last_position = $start_at_byte;
-
-        //$start_adapter = $this->filesystem->get_start_adapter();
-
-        if (!$append) {
-            $bytes_wrote = $file_info['size'];
-            $this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
-                $file_info['target_path'], $this->get_archive_name_with_extension()));
-            $this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
-                $file_info['target_path']);
-        } else {
-            $tmp_file = md5($file_info['path']);
-
-            //we isolate file to tmp if we are at byte 0, the starting point of file reading
-            if (!$start_at_byte) {
-                $this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
-                    $file_info['path'], $tmp_file));
-                $file_stream = $start_filesystem->readStream($file_info['path']);
-
-                if (is_resource($file_stream['stream'])) {
-                    $this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
-                }
-            }
-
-            if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
-                $is_tmp = 1;
-                $last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
-                                                        ->applyPathPrefix($tmp_file),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            } else {
-                $is_tmp = 0;
-                $last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            }
-
-
-            if ($last_position == -1) {
-                $bytes_wrote = $file_info['size'] - $start_at_byte;
-            } else {
-                $bytes_wrote = $last_position - $start_at_byte;
-            }
+	public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
+	{
 
+		$start_adapter = $this->filesystem->get_adapter($filesystem);
+		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 
-            if ($is_tmp) {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
-                    $bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
-            } else {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
-                    $bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
-            }
+		if (!$file_info['path']) {
+			return;
+		}
 
-            //we delete here the isolated tmp file
-            if ($last_position == -1) {
-                if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
-                    $this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
-                    $this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
-                }
-            }
+		if (isset($file_info['archive_prefix_path'])) {
+			$file_info['target_path'] = $file_info['archive_prefix_path'] . "/" . $file_info['path'];
+		} else {
+			$file_info['target_path'] = $file_info['path'];
+		}
 
-        }
+		$last_position = $start_at_byte;
+
+		//$start_adapter = $this->filesystem->get_start_adapter();
+
+		if (!$append) {
+			$bytes_wrote = $file_info['size'];
+			$this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
+				$file_info['target_path'], $this->get_archive_name_with_extension()));
+			$this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
+				$file_info['target_path']);
+		} else {
+			$tmp_file = md5($file_info['path']);
+
+			//we isolate file to tmp if we are at byte 0, the starting point of file reading
+			if (!$start_at_byte) {
+				$this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
+					$file_info['path'], $tmp_file));
+				$file_stream = $start_filesystem->readStream($file_info['path']);
+
+				if (is_resource($file_stream['stream'])) {
+					$this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
+				}
+			}
+
+			if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
+				$is_tmp = 1;
+				$last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
+														->applyPathPrefix($tmp_file),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			} else {
+				$is_tmp = 0;
+				$last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			}
+
+
+			if ($last_position == -1) {
+				$bytes_wrote = $file_info['size'] - $start_at_byte;
+			} else {
+				$bytes_wrote = $last_position - $start_at_byte;
+			}
+
+
+			if ($is_tmp) {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
+					$bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
+			} else {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
+					$bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
+			}
+
+			//we delete here the isolated tmp file
+			if ($last_position == -1) {
+				if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
+					$this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
+					$this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
+				}
+			}
 
-        return array($bytes_wrote, $last_position);
-    }
+		}
 
-    /**
-     * Open a TAR archive and put the file cursor at the end for data appending
-     *
-     * If $file is empty, the tar file will be created in memory
-     *
-     * @param string $file
-     * @throws ArchiveIOException
-     */
-    /*
+		return array($bytes_wrote, $last_position);
+	}
+
+	/**
+	 * Open a TAR archive and put the file cursor at the end for data appending
+	 *
+	 * If $file is empty, the tar file will be created in memory
+	 *
+	 * @param string $file
+	 * @throws ArchiveIOException
+	 */
+	/*
     public function openForAppend($file = '')
     {
         $this->file   = $file;
@@ -754,17 +754,17 @@ 
     }
     */
 
-    /**
-     * Append data to a file to the current TAR archive using an existing file in the filesystem
-     *
-     * @param string $file path to the original file
-     * @param int $start starting reading position in file
-     * @param int $end end position in reading multiple with 512
-     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with
-     * all meta data, empty to take from original
-     * @throws ArchiveIOException
-     */
-    /*
+	/**
+	 * Append data to a file to the current TAR archive using an existing file in the filesystem
+	 *
+	 * @param string $file path to the original file
+	 * @param int $start starting reading position in file
+	 * @param int $end end position in reading multiple with 512
+	 * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with
+	 * all meta data, empty to take from original
+	 * @throws ArchiveIOException
+	 */
+	/*
      * public function appendFileData($file, $fileinfo = '', $start = 0, $limit = 0)
     {
 		$end = $start+($limit*512);
@@ -820,15 +820,15 @@ 
         return $last_position;
     }*/
 
-    /**
-     * Adds a file to a TAR archive by appending it's data
-     *
-     * @param string $archive name of the archive file
-     * @param string $file name of the file to read data from
-     * @param string $start start position from where to start reading data
-     * @throws ArchiveIOException
-     */
-    /*public function addFileToArchive($archive, $file, $start = 0)
+	/**
+	 * Adds a file to a TAR archive by appending it's data
+	 *
+	 * @param string $archive name of the archive file
+	 * @param string $file name of the file to read data from
+	 * @param string $start start position from where to start reading data
+	 * @throws ArchiveIOException
+	 */
+	/*public function addFileToArchive($archive, $file, $start = 0)
     {
         $this->openForAppend($archive);
         return $start = $this->appendFileData($file, $start, $this->file_size_per_request_limit);

Spacing +15 added lines, -15 removed lines

@@ -148,7 +148,7 @@ 
             $new_name = $this->archive_name;
 
             if (!stristr($new_name, "-diff")) {
-                $new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+                $new_name = $this->archive_name."-diff".date("Y-m-d_H-i", $diff_timestamp_start);
             }
 
             $this->archive_name = $new_name;
@@ -156,9 +156,9 @@ 
         }
 
         if (isset($part) and $part) {
-            $new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+            $new_name = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
             if (!stristr($new_name, "-part")) {
-                $new_name = $this->archive_name . "-part" . $part;
+                $new_name = $this->archive_name."-part".$part;
             }
 
             $this->archive_name = $new_name;
@@ -187,7 +187,7 @@ 
     public function get_archive_name_multipart()
     {
         $new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-        return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+        return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
     }
 
     /*
@@ -197,7 +197,7 @@ 
      */
     public function get_archive_name_with_extension()
     {
-        return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+        return $this->archive_name.$this->xcloner_settings->get_backup_extension_name();
     }
 
     /*
@@ -229,7 +229,7 @@ 
         $headers = array('Content-Type: text/html; charset=UTF-8');
 
         if ($admin_email and $from) {
-            $headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+            $headers[] = 'From: '.$from.' <'.$admin_email.'>';
         }
 
         $return = wp_mail($to, $subject, $body, $headers);
@@ -302,18 +302,18 @@ 
         $body .= "<br />";
 
         if (isset($params['backup_params']->backup_comments)) {
-            $body .= __("Backup Comments: ") . $params['backup_params']->backup_comments;
+            $body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
             $body .= "<br /><br />";
         }
 
         if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $body .= __("Latest 50 Log Lines: ") . "<br />" . implode("<br />\n",
+            $body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n",
                                                                         $this->logger->getLastDebugLines(50));
         }
 
         $attachments = $this->filesystem->get_backup_attachments();
 
-        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "info.tgz";
+        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path().DS."info.tgz";
 
         $tar = new Tar();
         $tar->create($attachments_archive);
@@ -327,7 +327,7 @@ 
 
         $admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: ' . $from . ' <' . $admin_email . '>');
+        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
 
         $return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 
@@ -367,14 +367,14 @@ 
         if ($init) {
             $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+            $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
             $return['extra']['backup_init'] = 1;
 
         } else {
             $this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
+            $this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
 
             $return['extra']['backup_init'] = 0;
 
@@ -582,7 +582,7 @@ 
 
         $file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
         //print_r($file_info);
-        $line = '"' . $file['path'] . '","' . $file['timestamp'] . '","' . $file['size'] . '"' . PHP_EOL;
+        $line = '"'.$file['path'].'","'.$file['timestamp'].'","'.$file['size'].'"'.PHP_EOL;
 
 
         $this->filesystem->get_filesystem("storage_filesystem_append")
@@ -625,7 +625,7 @@ 
         $this->backup_archive = new Tar();
         $this->backup_archive->setCompression($this->compression_level);
         $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
-        $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+        $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
         return array($archive_info, $part);
 
@@ -647,7 +647,7 @@ 
         }
 
         if (isset($file_info['archive_prefix_path'])) {
-            $file_info['target_path'] = $file_info['archive_prefix_path'] . "/" . $file_info['path'];
+            $file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
         } else {
             $file_info['target_path'] = $file_info['path'];
         }

includes/class-xcloner-file-system.php

Doc Comments +12 added lines

@@ -207,6 +207,9 @@ 
         return $this->start_filesystem->normalizeFileInfo($info);
     }
 
+    /**
+     * @param string $file
+     */
     public function get_storage_path_file_info($file)
     {
         return $this->getMetadataFull('storage_adapter', $file);
@@ -284,6 +287,9 @@ 
         return $total;
     }
 
+    /**
+     * @param string $backup_name
+     */
     public function is_part($backup_name)
     {
         if (stristr($backup_name, "-part")) {
@@ -741,6 +747,9 @@ 
 
     }
 
+    /**
+     * @param string $tmp_file
+     */
     public function estimate_reading_time($tmp_file)
     {
         $this->logger->debug(sprintf(("Estimating file system reading time")));
@@ -781,6 +790,9 @@ 
         return $name;
     }
 
+    /**
+     * @param string $field
+     */
     public function sort_by(&$array, $field, $direction = 'asc')
     {
         if (strtolower($direction) == "desc" || $direction == SORT_DESC) {

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
 
 /**

Indentation +957 added lines, -957 removed lines

@@ -37,848 +37,848 @@ 
 class Xcloner_File_System
 {
 
-    private $excluded_files = "";
-    private $additional_regex_patterns = array();
-    private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
-    private $included_files_handler = "backup_files.csv";
-    private $temp_dir_handler = ".dir";
-    public $filesystem;
-    public $tmp_filesystem;
-    public $storage_filesystem;
-    private $xcloner_container;
-    private $diff_timestamp_start = "";
-
-    private $logger;
-    private $start_adapter;
-    private $tmp_adapter;
-    private $storage_adapter;
-    private $xcloner_settings;
-    private $start_filesystem;
-    private $tmp_filesystem_append;
-    private $storage_filesystem_append;
-
-    private $files_counter;
-    private $files_size;
-    private $last_logged_file;
-    private $folders_to_process_per_session = 25;
-    private $backup_archive_extensions = array("tar", "tgz", "tar.gz", "gz", "csv");
-    private $backup_name_tags = array('[time]', '[hostname]', '[domain]');
-
-    /**
-     * Xcloner_File_System constructor.
-     * @param Xcloner $xcloner_container
-     * @param string $hash
-     */
-    public function __construct(Xcloner $xcloner_container, $hash = "")
-    {
-        $this->xcloner_container = $xcloner_container;
-
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
-        $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-
-        try {
-
-            $this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->start_filesystem = new Filesystem($this->start_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-            $adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
-            $this->tmp_filesystem_append = new Filesystem($adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->storage_filesystem = new Filesystem($adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND,
-                'SKIP_LINKS');
-            $this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-        } catch (Exception $e) {
-            $this->logger->error("Filesystem Initialization Error: " . $e->getMessage());
-        }
-
-
-        if ($value = get_option('xcloner_directories_to_scan_per_request')) {
-            $this->folders_to_process_per_session = $value;
-        }
-
-    }
-
-    /**
-     * Set differential timestamp date
-     * @param string $timestamp
-     */
-    public function set_diff_timestamp_start($timestamp = "")
-    {
-        if ($timestamp) {
-            $this->logger->info(sprintf("Setting Differential Timestamp To %s", date("Y-m-d", $timestamp)), array(
-                "FILESYSTEM",
-                "DIFF"
-            ));
-            $this->diff_timestamp_start = $timestamp;
-        }
-    }
-
-    /**
-     * Gets the differential timestamp date
-     * @return string
-     */
-    public function get_diff_timestamp_start()
-    {
-        return $this->diff_timestamp_start;
-    }
-
-    private function get_xcloner_container()
-    {
-        return $this->xcloner_container;
-    }
-
-    public function set_hash($hash)
-    {
-        $this->xcloner_settings->set_hash($hash);
-    }
-
-    public function get_hash($hash)
-    {
-        $this->xcloner_settings->get_hash();
-    }
-
-    public function get_tmp_filesystem()
-    {
-        return $this->tmp_filesystem;
-    }
-
-    public function get_storage_filesystem($remote_storage_selection = "")
-    {
-        if ($remote_storage_selection != "") {
-            $remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
-            $method = "get_" . $remote_storage_selection . "_filesystem";
-
-            if (!method_exists($remote_storage, $method)) {
-                return false;
-            }
-
-            list($adapter, $filesystem) = $remote_storage->$method();
-
-            return $filesystem;
-        }
-
-        return $this->storage_filesystem;
-    }
-
-    public function get_tmp_filesystem_adapter()
-    {
-        return $this->tmp_adapter;
-    }
-
-    public function get_tmp_filesystem_append()
-    {
-        return $this->tmp_filesystem_append;
-    }
-
-    public function get_start_adapter()
-    {
-        return $this->start_adapter;
-    }
-
-    public function get_start_filesystem()
-    {
-        return $this->start_filesystem;
-    }
-
-    public function get_logger()
-    {
-        return $this->logger;
-    }
-
-    public function get_start_path_file_info($file)
-    {
-        $info = $this->getMetadataFull('start_adapter', $file);
-
-        return $this->start_filesystem->normalizeFileInfo($info);
-    }
-
-    public function get_storage_path_file_info($file)
-    {
-        return $this->getMetadataFull('storage_adapter', $file);
-    }
-
-    public function get_included_files_handler($metadata = 0)
-    {
-        $path = $this->included_files_handler;
-        if (!$metadata) {
-            return $path;
-        }
-
-        $spl_info = $this->getMetadataFull('tmp_adapter', $path);
-
-        return $spl_info;
-
-    }
-
-    public function get_temp_dir_handler()
-    {
-        return $this->temp_dir_handler;
-    }
-
-    public function get_latest_backup()
-    {
-        $files = $this->get_backup_archives_list();
-
-        if (is_array($files)) {
-            $this->sort_by($files, "timestamp", "desc");
-        }
-
-        $new_list = array();
-
-        foreach ($files as $key => $file) {
-            if (!isset($file['parent'])) {
-                $new_list[] = ($files[$key]);
-            }
-        }
-
-        if (isset($new_list[0])) {
-            return $new_list[0];
-        }
-    }
-
-    public function get_latest_backups()
-    {
-        $files = $this->get_backup_archives_list();
-
-        if (is_array($files)) {
-            $this->sort_by($files, "timestamp", "desc");
-        }
-
-        $new_list = array();
-
-        foreach ($files as $key => $file) {
-            if (!isset($file['parent'])) {
-                $new_list[] = ($files[$key]);
-            }
-        }
-
-        return $new_list;
-    }
-
-    public function get_storage_usage()
-    {
-        $files = $this->get_backup_archives_list();
-        $total = 0;
-
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                $total += $file['size'];
-            }
-        }
-
-        return $total;
-    }
-
-    public function is_part($backup_name)
-    {
-        if (stristr($backup_name, "-part")) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function is_multipart($backup_name)
-    {
-        if (stristr($backup_name, "-multipart")) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function get_backup_size($backup_name)
-    {
-        $backup_size = $this->get_storage_filesystem()->getSize($backup_name);
-        if ($this->is_multipart($backup_name)) {
-            $backup_parts = $this->get_multipart_files($backup_name);
-            foreach ($backup_parts as $part_file) {
-                $backup_size += $this->get_storage_filesystem()->getSize($part_file);
-            }
-        }
-
-        return $backup_size;
-    }
-
-    public function get_multipart_files($backup_name, $storage_selection = "")
-    {
-        $files = array();
-
-        if ($this->is_multipart($backup_name)) {
-            $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-            foreach ($lines as $line) {
-                if ($line) {
-                    $data = str_getcsv($line);
-                    $files[] = $data[0];
-                }
-            }
-        }
-
-        return $files;
-    }
-
-    public function delete_backup_by_name($backup_name, $storage_selection = "")
-    {
-        if ($this->is_multipart($backup_name)) {
-            $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-            foreach ($lines as $line) {
-                if ($line) {
-                    $data = str_getcsv($line);
-                    $this->get_storage_filesystem($storage_selection)->delete($data[0]);
-                }
-            }
-        }
-
-        if ($this->get_storage_filesystem($storage_selection)->delete($backup_name)) {
-            $return = true;
-        } else {
-            $return = false;
-        }
-
-        return $return;
-    }
-
-    public function getMetadataFull($adapter = "storage_adapter", $path)
-    {
-        $location = $this->$adapter->applyPathPrefix($path);
-        $spl_info = new SplFileInfo($location);
-
-        return ($spl_info);
-    }
-
-
-    public function get_backup_archives_list($storage_selection = "")
-    {
-        $list = array();
-
-
-        if (method_exists($this->get_storage_filesystem($storage_selection), "listContents")) {
-            $list = $this->get_storage_filesystem($storage_selection)->listContents();
-        }
-
-        $backup_files = array();
-        $parents = array();
-
-        foreach ($list as $file_info) {
-            if (isset($file_info['extension']) and $file_info['extension'] == "csv") {
-                $data = array();
-
-                $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($file_info['path']));
-                foreach ($lines as $line) {
-                    if ($line) {
-                        $data = str_getcsv($line);
-                        if (is_array($data)) {
-                            $parents[$data[0]] = $file_info['basename'];
-                            $file_info['childs'][] = $data;
-                            $file_info['size'] += $data[2];
-                        }
-                    }
-                }
-
-            }
-
-            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;
-            }
-        }
-
-        foreach ($backup_files as $key => $file_info) {
-            if (!isset($backup_files[$key]['timestamp'])) {
-                //$backup_files[$key]['timestamp'] = $this->get_storage_filesystem($storage_selection)->getTimestamp($file_info['path']);
-            }
-
-            if (isset($parents[$file_info['basename']])) {
-                $backup_files[$key]['parent'] = $parents[$file_info['basename']];
-            }
-        }
-
-        return $backup_files;
-    }
-
-    public function start_file_recursion($init = 0)
-    {
-        if ($init) {
-            $this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"),
-                $this->xcloner_settings->get_xcloner_start_path()));
-            $this->do_system_init();
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            //.dir exists, we presume we have files to iterate
-            $content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
-            $files = array_filter(explode("\n", $content));
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-
-            $counter = 0;
-            foreach ($files as $file) {
-                if ($counter < $this->folders_to_process_per_session) {
-                    $this->build_files_list($file);
-                    $counter++;
-                } else {
-                    $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
-                }
-            }
-        } else {
-            $this->build_files_list();
-        }
-
-        if ($this->scan_finished()) {
-            $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
-            $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-            $this->files_counter++;
-
-            //adding included dump file to the included files list
-            if ($this->get_tmp_filesystem()->has($this->get_included_files_handler())) {
-                $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
-                $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-                $this->files_counter++;
-            }
-
-            //adding a default index.html to the temp xcloner folder
-            if (!$this->get_tmp_filesystem()->has("index.html")) {
-                $this->get_tmp_filesystem()->write("index.html", "");
-            }
-
-            //adding the default log file
-            if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1))) {
-                $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
-                $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-                $this->files_counter++;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    public function get_backup_attachments()
-    {
-        $return = array();
-
-        $files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
-        if (file_exists($files_list_file)) {
-            $return[] = $files_list_file;
-        }
-
-        if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $log_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->xcloner_settings->get_logger_filename(1);
-            if (!file_exists($log_file)) {
-                $log_file = $this->xcloner_settings->get_xcloner_store_path() . DS . $this->xcloner_settings->get_logger_filename();
-            }
-
-            if (file_exists($log_file)) {
-                $return[] = $log_file;
-            }
-        }
-
-        return $return;
-    }
-
-    public function remove_tmp_filesystem()
-    {
-        //delete the temporary folder
-        $this->logger->debug(sprintf("Deleting the temporary storage folder %s",
-            $this->xcloner_settings->get_xcloner_tmp_path()));
-
-        $contents = $this->get_tmp_filesystem()->listContents();
-
-        if (is_array($contents)) {
-            foreach ($contents as $file_info) {
-                $this->get_tmp_filesystem()->delete($file_info['path']);
-            }
-        }
-
-        @rmdir($this->xcloner_settings->get_xcloner_tmp_path());
-
-        return;
-    }
-
-    public function cleanup_tmp_directories()
-    {
-        $adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
-        $tmp_filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
-
-        $contents = $tmp_filesystem->listContents();
-
-        foreach ($contents as $file) {
-
-            if (preg_match("/.xcloner-(.*)/", $file['path'])) {
-                if ($file['timestamp'] < strtotime("-1days")) {
-                    $tmp_filesystem->deleteDir($file['path']);
-                    $this->logger->debug(sprintf("Delete temporary directory %s", $file['path']));
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private function do_system_init()
-    {
-        $this->files_counter = 0;
-
-        if (!$this->storage_filesystem->has("index.html")) {
-            $this->storage_filesystem->write("index.html", "");
-        }
-
-        if (!$this->tmp_filesystem->has("index.html")) {
-            $this->tmp_filesystem->write("index.html", "");
-        }
-
-        if ($this->tmp_filesystem->has($this->get_included_files_handler())) {
-            $this->tmp_filesystem->delete($this->get_included_files_handler());
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-        }
-    }
-
-    public function get_scanned_files_num()
-    {
-        return $this->files_counter;
-    }
-
-    public function get_scanned_files_total_size()
-    {
-        return $this->files_size;
-    }
-
-    public function last_logged_file()
-    {
-        return $this->last_logged_file;
-    }
-
-    public static function is_regex($regex)
-    {
-        return preg_match("/^\^(.*)\$$/i", $regex);
-    }
+	private $excluded_files = "";
+	private $additional_regex_patterns = array();
+	private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
+	private $included_files_handler = "backup_files.csv";
+	private $temp_dir_handler = ".dir";
+	public $filesystem;
+	public $tmp_filesystem;
+	public $storage_filesystem;
+	private $xcloner_container;
+	private $diff_timestamp_start = "";
+
+	private $logger;
+	private $start_adapter;
+	private $tmp_adapter;
+	private $storage_adapter;
+	private $xcloner_settings;
+	private $start_filesystem;
+	private $tmp_filesystem_append;
+	private $storage_filesystem_append;
+
+	private $files_counter;
+	private $files_size;
+	private $last_logged_file;
+	private $folders_to_process_per_session = 25;
+	private $backup_archive_extensions = array("tar", "tgz", "tar.gz", "gz", "csv");
+	private $backup_name_tags = array('[time]', '[hostname]', '[domain]');
+
+	/**
+	 * Xcloner_File_System constructor.
+	 * @param Xcloner $xcloner_container
+	 * @param string $hash
+	 */
+	public function __construct(Xcloner $xcloner_container, $hash = "")
+	{
+		$this->xcloner_container = $xcloner_container;
+
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+
+		try {
+
+			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->start_filesystem = new Filesystem($this->start_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+			$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
+			$this->tmp_filesystem_append = new Filesystem($adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->storage_filesystem = new Filesystem($adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND,
+				'SKIP_LINKS');
+			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+		} catch (Exception $e) {
+			$this->logger->error("Filesystem Initialization Error: " . $e->getMessage());
+		}
+
+
+		if ($value = get_option('xcloner_directories_to_scan_per_request')) {
+			$this->folders_to_process_per_session = $value;
+		}
+
+	}
+
+	/**
+	 * Set differential timestamp date
+	 * @param string $timestamp
+	 */
+	public function set_diff_timestamp_start($timestamp = "")
+	{
+		if ($timestamp) {
+			$this->logger->info(sprintf("Setting Differential Timestamp To %s", date("Y-m-d", $timestamp)), array(
+				"FILESYSTEM",
+				"DIFF"
+			));
+			$this->diff_timestamp_start = $timestamp;
+		}
+	}
+
+	/**
+	 * Gets the differential timestamp date
+	 * @return string
+	 */
+	public function get_diff_timestamp_start()
+	{
+		return $this->diff_timestamp_start;
+	}
+
+	private function get_xcloner_container()
+	{
+		return $this->xcloner_container;
+	}
+
+	public function set_hash($hash)
+	{
+		$this->xcloner_settings->set_hash($hash);
+	}
+
+	public function get_hash($hash)
+	{
+		$this->xcloner_settings->get_hash();
+	}
+
+	public function get_tmp_filesystem()
+	{
+		return $this->tmp_filesystem;
+	}
+
+	public function get_storage_filesystem($remote_storage_selection = "")
+	{
+		if ($remote_storage_selection != "") {
+			$remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+			$method = "get_" . $remote_storage_selection . "_filesystem";
+
+			if (!method_exists($remote_storage, $method)) {
+				return false;
+			}
+
+			list($adapter, $filesystem) = $remote_storage->$method();
+
+			return $filesystem;
+		}
+
+		return $this->storage_filesystem;
+	}
+
+	public function get_tmp_filesystem_adapter()
+	{
+		return $this->tmp_adapter;
+	}
+
+	public function get_tmp_filesystem_append()
+	{
+		return $this->tmp_filesystem_append;
+	}
+
+	public function get_start_adapter()
+	{
+		return $this->start_adapter;
+	}
+
+	public function get_start_filesystem()
+	{
+		return $this->start_filesystem;
+	}
+
+	public function get_logger()
+	{
+		return $this->logger;
+	}
+
+	public function get_start_path_file_info($file)
+	{
+		$info = $this->getMetadataFull('start_adapter', $file);
+
+		return $this->start_filesystem->normalizeFileInfo($info);
+	}
+
+	public function get_storage_path_file_info($file)
+	{
+		return $this->getMetadataFull('storage_adapter', $file);
+	}
+
+	public function get_included_files_handler($metadata = 0)
+	{
+		$path = $this->included_files_handler;
+		if (!$metadata) {
+			return $path;
+		}
+
+		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
+
+		return $spl_info;
+
+	}
+
+	public function get_temp_dir_handler()
+	{
+		return $this->temp_dir_handler;
+	}
+
+	public function get_latest_backup()
+	{
+		$files = $this->get_backup_archives_list();
+
+		if (is_array($files)) {
+			$this->sort_by($files, "timestamp", "desc");
+		}
+
+		$new_list = array();
+
+		foreach ($files as $key => $file) {
+			if (!isset($file['parent'])) {
+				$new_list[] = ($files[$key]);
+			}
+		}
+
+		if (isset($new_list[0])) {
+			return $new_list[0];
+		}
+	}
+
+	public function get_latest_backups()
+	{
+		$files = $this->get_backup_archives_list();
+
+		if (is_array($files)) {
+			$this->sort_by($files, "timestamp", "desc");
+		}
+
+		$new_list = array();
+
+		foreach ($files as $key => $file) {
+			if (!isset($file['parent'])) {
+				$new_list[] = ($files[$key]);
+			}
+		}
+
+		return $new_list;
+	}
+
+	public function get_storage_usage()
+	{
+		$files = $this->get_backup_archives_list();
+		$total = 0;
+
+		if (is_array($files)) {
+			foreach ($files as $file) {
+				$total += $file['size'];
+			}
+		}
+
+		return $total;
+	}
+
+	public function is_part($backup_name)
+	{
+		if (stristr($backup_name, "-part")) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function is_multipart($backup_name)
+	{
+		if (stristr($backup_name, "-multipart")) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function get_backup_size($backup_name)
+	{
+		$backup_size = $this->get_storage_filesystem()->getSize($backup_name);
+		if ($this->is_multipart($backup_name)) {
+			$backup_parts = $this->get_multipart_files($backup_name);
+			foreach ($backup_parts as $part_file) {
+				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			}
+		}
+
+		return $backup_size;
+	}
+
+	public function get_multipart_files($backup_name, $storage_selection = "")
+	{
+		$files = array();
+
+		if ($this->is_multipart($backup_name)) {
+			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
+			foreach ($lines as $line) {
+				if ($line) {
+					$data = str_getcsv($line);
+					$files[] = $data[0];
+				}
+			}
+		}
+
+		return $files;
+	}
+
+	public function delete_backup_by_name($backup_name, $storage_selection = "")
+	{
+		if ($this->is_multipart($backup_name)) {
+			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
+			foreach ($lines as $line) {
+				if ($line) {
+					$data = str_getcsv($line);
+					$this->get_storage_filesystem($storage_selection)->delete($data[0]);
+				}
+			}
+		}
+
+		if ($this->get_storage_filesystem($storage_selection)->delete($backup_name)) {
+			$return = true;
+		} else {
+			$return = false;
+		}
+
+		return $return;
+	}
+
+	public function getMetadataFull($adapter = "storage_adapter", $path)
+	{
+		$location = $this->$adapter->applyPathPrefix($path);
+		$spl_info = new SplFileInfo($location);
+
+		return ($spl_info);
+	}
+
+
+	public function get_backup_archives_list($storage_selection = "")
+	{
+		$list = array();
+
+
+		if (method_exists($this->get_storage_filesystem($storage_selection), "listContents")) {
+			$list = $this->get_storage_filesystem($storage_selection)->listContents();
+		}
+
+		$backup_files = array();
+		$parents = array();
+
+		foreach ($list as $file_info) {
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv") {
+				$data = array();
+
+				$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($file_info['path']));
+				foreach ($lines as $line) {
+					if ($line) {
+						$data = str_getcsv($line);
+						if (is_array($data)) {
+							$parents[$data[0]] = $file_info['basename'];
+							$file_info['childs'][] = $data;
+							$file_info['size'] += $data[2];
+						}
+					}
+				}
+
+			}
+
+			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;
+			}
+		}
+
+		foreach ($backup_files as $key => $file_info) {
+			if (!isset($backup_files[$key]['timestamp'])) {
+				//$backup_files[$key]['timestamp'] = $this->get_storage_filesystem($storage_selection)->getTimestamp($file_info['path']);
+			}
+
+			if (isset($parents[$file_info['basename']])) {
+				$backup_files[$key]['parent'] = $parents[$file_info['basename']];
+			}
+		}
+
+		return $backup_files;
+	}
+
+	public function start_file_recursion($init = 0)
+	{
+		if ($init) {
+			$this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"),
+				$this->xcloner_settings->get_xcloner_start_path()));
+			$this->do_system_init();
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			//.dir exists, we presume we have files to iterate
+			$content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
+			$files = array_filter(explode("\n", $content));
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+
+			$counter = 0;
+			foreach ($files as $file) {
+				if ($counter < $this->folders_to_process_per_session) {
+					$this->build_files_list($file);
+					$counter++;
+				} else {
+					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
+				}
+			}
+		} else {
+			$this->build_files_list();
+		}
+
+		if ($this->scan_finished()) {
+			$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
+			$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+			$this->files_counter++;
+
+			//adding included dump file to the included files list
+			if ($this->get_tmp_filesystem()->has($this->get_included_files_handler())) {
+				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
+				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+				$this->files_counter++;
+			}
+
+			//adding a default index.html to the temp xcloner folder
+			if (!$this->get_tmp_filesystem()->has("index.html")) {
+				$this->get_tmp_filesystem()->write("index.html", "");
+			}
+
+			//adding the default log file
+			if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1))) {
+				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
+				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+				$this->files_counter++;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	public function get_backup_attachments()
+	{
+		$return = array();
+
+		$files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
+		if (file_exists($files_list_file)) {
+			$return[] = $files_list_file;
+		}
+
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+			$log_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->xcloner_settings->get_logger_filename(1);
+			if (!file_exists($log_file)) {
+				$log_file = $this->xcloner_settings->get_xcloner_store_path() . DS . $this->xcloner_settings->get_logger_filename();
+			}
+
+			if (file_exists($log_file)) {
+				$return[] = $log_file;
+			}
+		}
+
+		return $return;
+	}
+
+	public function remove_tmp_filesystem()
+	{
+		//delete the temporary folder
+		$this->logger->debug(sprintf("Deleting the temporary storage folder %s",
+			$this->xcloner_settings->get_xcloner_tmp_path()));
+
+		$contents = $this->get_tmp_filesystem()->listContents();
+
+		if (is_array($contents)) {
+			foreach ($contents as $file_info) {
+				$this->get_tmp_filesystem()->delete($file_info['path']);
+			}
+		}
+
+		@rmdir($this->xcloner_settings->get_xcloner_tmp_path());
+
+		return;
+	}
+
+	public function cleanup_tmp_directories()
+	{
+		$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
+		$tmp_filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
+
+		$contents = $tmp_filesystem->listContents();
+
+		foreach ($contents as $file) {
+
+			if (preg_match("/.xcloner-(.*)/", $file['path'])) {
+				if ($file['timestamp'] < strtotime("-1days")) {
+					$tmp_filesystem->deleteDir($file['path']);
+					$this->logger->debug(sprintf("Delete temporary directory %s", $file['path']));
+				}
+			}
+		}
+
+		return true;
+	}
+
+	private function do_system_init()
+	{
+		$this->files_counter = 0;
+
+		if (!$this->storage_filesystem->has("index.html")) {
+			$this->storage_filesystem->write("index.html", "");
+		}
+
+		if (!$this->tmp_filesystem->has("index.html")) {
+			$this->tmp_filesystem->write("index.html", "");
+		}
+
+		if ($this->tmp_filesystem->has($this->get_included_files_handler())) {
+			$this->tmp_filesystem->delete($this->get_included_files_handler());
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
+	}
+
+	public function get_scanned_files_num()
+	{
+		return $this->files_counter;
+	}
+
+	public function get_scanned_files_total_size()
+	{
+		return $this->files_size;
+	}
+
+	public function last_logged_file()
+	{
+		return $this->last_logged_file;
+	}
+
+	public static function is_regex($regex)
+	{
+		return preg_match("/^\^(.*)\$$/i", $regex);
+	}
 
-    public function set_excluded_files($excluded_files = array())
-    {
-        if (!is_array($excluded_files)) {
-            $excluded_files = array();
-        }
+	public function set_excluded_files($excluded_files = array())
+	{
+		if (!is_array($excluded_files)) {
+			$excluded_files = array();
+		}
 
-        foreach ($excluded_files as $excl) {
+		foreach ($excluded_files as $excl) {
 
-            if ($this->is_regex($excl)) {
-                $this->additional_regex_patterns[] = $excl;
-            }
-        }
+			if ($this->is_regex($excl)) {
+				$this->additional_regex_patterns[] = $excl;
+			}
+		}
 
-        $this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
+		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
 
-        return $this->excluded_files;
-    }
+		return $this->excluded_files;
+	}
 
-    public function get_excluded_files()
-    {
-        return $this->excluded_files_by_default;
-    }
+	public function get_excluded_files()
+	{
+		return $this->excluded_files_by_default;
+	}
 
-    public function list_directory($path)
-    {
-        return $this->start_filesystem->listContents($path);
-    }
+	public function list_directory($path)
+	{
+		return $this->start_filesystem->listContents($path);
+	}
 
-    public function build_files_list($folder = "")
-    {
-        $this->logger->debug(sprintf(("Building the files system list")));
+	public function build_files_list($folder = "")
+	{
+		$this->logger->debug(sprintf(("Building the files system list")));
 
-        //if we start with the root folder(empty value), we initializa the file system
-        if (!$folder) {
+		//if we start with the root folder(empty value), we initializa the file system
+		if (!$folder) {
 
-        }
+		}
 
-        try {
+		try {
 
-            $files = $this->start_filesystem->listContents($folder);
-            foreach ($files as $file) {
-                if (!is_readable($this->xcloner_settings->get_xcloner_start_path() . DS . $file['path'])) {
-                    $this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"),
-                        $file['path']), array(
-                        "FILESYSTEM SCAN",
-                        "NOT READABLE"
-                    ));
-                } elseif (!$matching_pattern = $this->is_excluded($file)) {
-                    $this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array(
-                        "FILESYSTEM SCAN",
-                        "INCLUDE"
-                    ));
-                    $file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
-                    if ($this->store_file($file)) {
-                        $this->files_counter++;
-                    }
-                    if (isset($file['size'])) {
-                        $this->files_size += $file['size'];
-                    }
-
-                } else {
-                    $this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"),
-                        $file['path'], $matching_pattern), array(
-                        "FILESYSTEM SCAN",
-                        "EXCLUDE"
-                    ));
-                }
-            }
+			$files = $this->start_filesystem->listContents($folder);
+			foreach ($files as $file) {
+				if (!is_readable($this->xcloner_settings->get_xcloner_start_path() . DS . $file['path'])) {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"),
+						$file['path']), array(
+						"FILESYSTEM SCAN",
+						"NOT READABLE"
+					));
+				} elseif (!$matching_pattern = $this->is_excluded($file)) {
+					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array(
+						"FILESYSTEM SCAN",
+						"INCLUDE"
+					));
+					$file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
+					if ($this->store_file($file)) {
+						$this->files_counter++;
+					}
+					if (isset($file['size'])) {
+						$this->files_size += $file['size'];
+					}
+
+				} else {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"),
+						$file['path'], $matching_pattern), array(
+						"FILESYSTEM SCAN",
+						"EXCLUDE"
+					));
+				}
+			}
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $this->logger->error($e->getMessage());
+			$this->logger->error($e->getMessage());
 
-        }
+		}
 
-    }
+	}
 
-    public function estimate_read_write_time()
-    {
-        $tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
+	public function estimate_read_write_time()
+	{
+		$tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
 
-        $start_time = microtime(true);
+		$start_time = microtime(true);
 
-        $data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
+		$data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
 
-        try {
-            $this->tmp_filesystem->write($tmp_file, $data);
+		try {
+			$this->tmp_filesystem->write($tmp_file, $data);
 
-            $end_time = microtime(true) - $start_time;
+			$end_time = microtime(true) - $start_time;
 
-            $return['writing_time'] = $end_time;
+			$return['writing_time'] = $end_time;
 
-            $return['reading_time'] = $this->estimate_reading_time($tmp_file);
+			$return['reading_time'] = $this->estimate_reading_time($tmp_file);
 
-            $this->tmp_filesystem->delete($tmp_file);
+			$this->tmp_filesystem->delete($tmp_file);
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $this->logger->error($e->getMessage());
+			$this->logger->error($e->getMessage());
 
-        }
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    public function backup_storage_cleanup()
-    {
-        $this->logger->info(sprintf(("Cleaning the backup storage on matching rules")));
+	public function backup_storage_cleanup()
+	{
+		$this->logger->info(sprintf(("Cleaning the backup storage on matching rules")));
 
-        $_storage_size = 0;
-        $_backup_files_list = array();
+		$_storage_size = 0;
+		$_backup_files_list = array();
 
-        //rule date limit
-        $current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
+		//rule date limit
+		$current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
 
-        $files = $this->storage_filesystem->listContents();
+		$files = $this->storage_filesystem->listContents();
 
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions)) {
-                    $_storage_size += $file['size']; //bytes
-                    $_backup_files_list[] = $file;
-                }
-            }
-        }
+		if (is_array($files)) {
+			foreach ($files as $file) {
+				if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions)) {
+					$_storage_size += $file['size']; //bytes
+					$_backup_files_list[] = $file;
+				}
+			}
+		}
 
 
-        $this->sort_by($_backup_files_list, "timestamp", "asc");
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
 
-        $_backups_counter = sizeof($_backup_files_list);
+		$_backups_counter = sizeof($_backup_files_list);
 
-        foreach ($_backup_files_list as $file) {
-            //processing rule folder capacity
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
-            {
-                $this->storage_filesystem->delete($file['path']);
-                $_storage_size -= $file['size'];
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "STORAGE SIZE LIMIT",
-                    $_storage_size . " >= " . $set_storage_limit
-                ));
-            }
-
-            //processing rule days limit
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp']) {
-                $this->storage_filesystem->delete($file['path']);
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "RETENTION LIMIT TIMESTAMP",
-                    $file['timestamp'] . " =< " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
-                ));
-            }
-
-            //processing backup countert limit
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')) {
-                $this->storage_filesystem->delete($file['path']);
-                $_backups_counter--;
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "BACKUP QUANTITY LIMIT",
-                    $_backups_counter . " >= " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
-                ));
-            }
+		foreach ($_backup_files_list as $file) {
+			//processing rule folder capacity
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
+				$_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
+			{
+				$this->storage_filesystem->delete($file['path']);
+				$_storage_size -= $file['size'];
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"STORAGE SIZE LIMIT",
+					$_storage_size . " >= " . $set_storage_limit
+				));
+			}
+
+			//processing rule days limit
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp']) {
+				$this->storage_filesystem->delete($file['path']);
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"RETENTION LIMIT TIMESTAMP",
+					$file['timestamp'] . " =< " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
+				));
+			}
+
+			//processing backup countert limit
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')) {
+				$this->storage_filesystem->delete($file['path']);
+				$_backups_counter--;
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"BACKUP QUANTITY LIMIT",
+					$_backups_counter . " >= " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
+				));
+			}
 
 
-        }
+		}
 
-    }
+	}
 
-    public function estimate_reading_time($tmp_file)
-    {
-        $this->logger->debug(sprintf(("Estimating file system reading time")));
+	public function estimate_reading_time($tmp_file)
+	{
+		$this->logger->debug(sprintf(("Estimating file system reading time")));
 
-        $start_time = microtime(true);
+		$start_time = microtime(true);
 
-        if ($this->tmp_filesystem->has($tmp_file)) {
-            $this->tmp_filesystem->read($tmp_file);
-        }
-
-        $end_time = microtime(true) - $start_time;
-
-        return $end_time;
-
-    }
-
-    public function process_backup_name($name = "", $max_length = 100)
-    {
-        if (!$name) {
-            $name = $this->xcloner_settings->get_default_backup_name();
-        }
-
-        foreach ($this->backup_name_tags as $tag) {
-            if ($tag == '[time]') {
-                $name = str_replace($tag, date("Y-m-d_H-i"), $name);
-            } elseif ($tag == '[hostname]') {
-                $name = str_replace($tag, gethostname(), $name);
-            } elseif ($tag == '[domain]') {
-                $domain = parse_url(admin_url(), PHP_URL_HOST);
-                $name = str_replace($tag, $domain, $name);
-            }
-        }
-
-        if ($max_length) {
-            $name = substr($name, 0, $max_length);
-        }
-
-        return $name;
-    }
-
-    public function sort_by(&$array, $field, $direction = 'asc')
-    {
-        if (strtolower($direction) == "desc" || $direction == SORT_DESC) {
-            $direction = SORT_DESC;
-        } else {
-            $direction = SORT_ASC;
-        }
-
-        $array = $this->array_orderby($array, $field, $direction);
-
-        return true;
-    }
-
-    private function array_orderby()
-    {
-        $args = func_get_args();
-        $data = array_shift($args);
-
-        foreach ($args as $n => $field) {
-            if (is_string($field)) {
-                $tmp = array();
-                foreach ($data as $key => $row) {
-                    if (is_array($row)) {
-                        $tmp[$key] = $row[$field];
-                    } else {
-                        $tmp[$key] = $row->$field;
-                    }
-                }
-                $args[$n] = $tmp;
-            }
-        }
-        $args[] = &$data;
-
-        call_user_func_array('array_multisort', $args);
-
-        return array_pop($args);
-    }
-
-    private function check_file_diff_time($file)
-    {
-        if ($this->get_diff_timestamp_start() != "") {
-            $fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
-            $timestamp = $fileMeta->getMTime();
-            if ($timestamp < $fileMeta->getCTime()) {
-                $timestamp = $fileMeta->getCTime();
-            }
-
-            if ($timestamp <= $this->get_diff_timestamp_start()) {
-                return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
-            }
-        }
-
-        return false;
-    }
-
-    public function is_excluded($file)
-    {
-        $this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
-
-        if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb')) {
-            if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
-                return "> " . $xcloner_exclude_files_larger_than_mb . "MB";
-            }
-        }
-
-        if (!is_array($this->excluded_files) || !sizeof($this->excluded_files)) {
-            $this->set_excluded_files();
-        }
-
-        if (is_array($this->excluded_files)) {
-            foreach ($this->excluded_files as $excluded_file_pattern) {
-                if ($excluded_file_pattern == "/") {
-                    $needle = "$";
-                } else {
-                    $needle = "$" . $excluded_file_pattern;
-                }
-
-                if (strstr("$" . $file['path'], $needle)) {
-                    return $excluded_file_pattern;
-                }
-            }
-        }
-
-        if ($regex = $this->is_excluded_regex($file)) {
-            return $regex;
-        }
-
-        if ($file['type'] == "file") {
-            $check_file_diff_timestamp = $this->check_file_diff_time($file);
-            if ($check_file_diff_timestamp) {
-                return $check_file_diff_timestamp;
-            }
-        }
-
-        return false;
-    }
-
-    /*REGEX examples
+		if ($this->tmp_filesystem->has($tmp_file)) {
+			$this->tmp_filesystem->read($tmp_file);
+		}
+
+		$end_time = microtime(true) - $start_time;
+
+		return $end_time;
+
+	}
+
+	public function process_backup_name($name = "", $max_length = 100)
+	{
+		if (!$name) {
+			$name = $this->xcloner_settings->get_default_backup_name();
+		}
+
+		foreach ($this->backup_name_tags as $tag) {
+			if ($tag == '[time]') {
+				$name = str_replace($tag, date("Y-m-d_H-i"), $name);
+			} elseif ($tag == '[hostname]') {
+				$name = str_replace($tag, gethostname(), $name);
+			} elseif ($tag == '[domain]') {
+				$domain = parse_url(admin_url(), PHP_URL_HOST);
+				$name = str_replace($tag, $domain, $name);
+			}
+		}
+
+		if ($max_length) {
+			$name = substr($name, 0, $max_length);
+		}
+
+		return $name;
+	}
+
+	public function sort_by(&$array, $field, $direction = 'asc')
+	{
+		if (strtolower($direction) == "desc" || $direction == SORT_DESC) {
+			$direction = SORT_DESC;
+		} else {
+			$direction = SORT_ASC;
+		}
+
+		$array = $this->array_orderby($array, $field, $direction);
+
+		return true;
+	}
+
+	private function array_orderby()
+	{
+		$args = func_get_args();
+		$data = array_shift($args);
+
+		foreach ($args as $n => $field) {
+			if (is_string($field)) {
+				$tmp = array();
+				foreach ($data as $key => $row) {
+					if (is_array($row)) {
+						$tmp[$key] = $row[$field];
+					} else {
+						$tmp[$key] = $row->$field;
+					}
+				}
+				$args[$n] = $tmp;
+			}
+		}
+		$args[] = &$data;
+
+		call_user_func_array('array_multisort', $args);
+
+		return array_pop($args);
+	}
+
+	private function check_file_diff_time($file)
+	{
+		if ($this->get_diff_timestamp_start() != "") {
+			$fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
+			$timestamp = $fileMeta->getMTime();
+			if ($timestamp < $fileMeta->getCTime()) {
+				$timestamp = $fileMeta->getCTime();
+			}
+
+			if ($timestamp <= $this->get_diff_timestamp_start()) {
+				return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
+			}
+		}
+
+		return false;
+	}
+
+	public function is_excluded($file)
+	{
+		$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
+
+		if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb')) {
+			if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
+				return "> " . $xcloner_exclude_files_larger_than_mb . "MB";
+			}
+		}
+
+		if (!is_array($this->excluded_files) || !sizeof($this->excluded_files)) {
+			$this->set_excluded_files();
+		}
+
+		if (is_array($this->excluded_files)) {
+			foreach ($this->excluded_files as $excluded_file_pattern) {
+				if ($excluded_file_pattern == "/") {
+					$needle = "$";
+				} else {
+					$needle = "$" . $excluded_file_pattern;
+				}
+
+				if (strstr("$" . $file['path'], $needle)) {
+					return $excluded_file_pattern;
+				}
+			}
+		}
+
+		if ($regex = $this->is_excluded_regex($file)) {
+			return $regex;
+		}
+
+		if ($file['type'] == "file") {
+			$check_file_diff_timestamp = $this->check_file_diff_time($file);
+			if ($check_file_diff_timestamp) {
+				return $check_file_diff_timestamp;
+			}
+		}
+
+		return false;
+	}
+
+	/*REGEX examples
      *
     * exclude all except .php file
     * PATTERN: ^(.*)\.(.+)$(?<!(php))
@@ -910,163 +910,163 @@ 
     * exclude the backup folders
     * PATTERN: (^|^\/)(wp-content\/backups|administrator\/backups)(.*)$";
     */
-    private function is_excluded_regex($file)
-    {
-        //$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
-
-        $regex_patterns = explode(PHP_EOL, $this->xcloner_settings->get_xcloner_option('xcloner_regex_exclude'));
-
-        if (is_array($this->additional_regex_patterns)) {
-            $regex_patterns = array_merge($regex_patterns, $this->additional_regex_patterns);
-        }
-
-        //print_r($regex_patterns);exit;
-
-        if (is_array($regex_patterns)) {
-            //$this->excluded_files = array();
-            //$this->excluded_files[] ="(.*)\.(git)(.*)$";
-            //$this->excluded_files[] ="wp-content\/backups(.*)$";
-
-            foreach ($regex_patterns as $excluded_file_pattern) {
-
-                if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1,
-                        strlen($excluded_file_pattern)) == "\r") {
-                    $excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
-                }
-
-                if ($file['path'] == "/") {
-                    $needle = "/";
-                } else {
-                    $needle = "/" . $file['path'];
-                }
-                //echo $needle."---".$excluded_file_pattern."---\n";
-
-                if (@preg_match("/(^|^\/)" . $excluded_file_pattern . "/i", $needle)) {
-                    return $excluded_file_pattern;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public function store_file($file, $storage = 'start_filesystem')
-    {
-        $this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
-
-        if (!isset($file['size'])) {
-            $file['size'] = 0;
-        }
-        if (!isset($file['visibility'])) {
-            $file['visibility'] = "private";
-        }
-
-        $csv_filename = str_replace('"', '""', $file['path']);
-
-        $line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
-
-        $this->last_logged_file = $file['path'];
-
-        if ($file['type'] == "dir") {
-            try {
-                $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path'] . "\n");
-            } catch (Exception $e) {
-                $this->logger->error($e->getMessage());
-            }
-        }
-
-        if ($this->get_diff_timestamp_start()) {
-            if ($file['type'] != "file" && $response = $this->check_file_diff_time($file)) {
-                $this->logger->info(sprintf("Directory %s archiving skipped on differential backup %s", $file['path'],
-                    $response), array(
-                    "FILESYSTEM SCAN",
-                    "DIR DIFF"
-                ));
-
-                return false;
-            }
-        }
-
-        try {
-            if (!$this->tmp_filesystem_append->has($this->get_included_files_handler())) {
-                //adding fix for UTF-8 CSV preview
-                $start_line = "\xEF\xBB\xBF" . '"Filename","Timestamp","Size","Visibility","Storage"' . PHP_EOL;
-                $this->tmp_filesystem_append->write($this->get_included_files_handler(), $start_line);
-            }
-
-            $this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
-
-        } catch (Exception $e) {
-
-            $this->logger->error($e->getMessage());
-        }
-
-        return true;
-    }
-
-    public function get_fileystem_handler()
-    {
-        return $this;
-    }
-
-    public function get_filesystem($system = "")
-    {
-        if ($system == "storage_filesystem_append") {
-            return $this->storage_filesystem_append;
-        } elseif ($system == "tmp_filesystem_append") {
-            return $this->tmp_filesystem_append;
-        } elseif ($system == "tmp_filesystem") {
-            return $this->tmp_filesystem;
-        } elseif ($system == "storage_filesystem") {
-            return $this->storage_filesystem;
-        } else {
-            return $this->start_filesystem;
-        }
-    }
-
-    public function get_adapter($system)
-    {
-        if ($system == "tmp_filesystem") {
-            return $this->tmp_adapter;
-        } elseif ($system == "storage_filesystem") {
-            return $this->storage_adapter;
-        } else {
-            return $this->start_adapter;
-        }
-    }
-
-    /**
-     * File scan finished
-     * Method called when file scan is finished
-     *
-     * @return bool
-     */
-    private function scan_finished()
-    {
-        if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) &&
-            $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
-            return false;
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-        }
-
-        $this->logger->debug(sprintf(("File scan finished")));
-
-        return true;
-    }
-
-    /**
-     * Calculate bytes from MB value
-     *
-     * @param int $mb_size
-     *
-     * @return float|int
-     */
-    private function calc_to_bytes($mb_size)
-    {
-        return $mb_size * (1024 * 1024);
-    }
+	private function is_excluded_regex($file)
+	{
+		//$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
+
+		$regex_patterns = explode(PHP_EOL, $this->xcloner_settings->get_xcloner_option('xcloner_regex_exclude'));
+
+		if (is_array($this->additional_regex_patterns)) {
+			$regex_patterns = array_merge($regex_patterns, $this->additional_regex_patterns);
+		}
+
+		//print_r($regex_patterns);exit;
+
+		if (is_array($regex_patterns)) {
+			//$this->excluded_files = array();
+			//$this->excluded_files[] ="(.*)\.(git)(.*)$";
+			//$this->excluded_files[] ="wp-content\/backups(.*)$";
+
+			foreach ($regex_patterns as $excluded_file_pattern) {
+
+				if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1,
+						strlen($excluded_file_pattern)) == "\r") {
+					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
+				}
+
+				if ($file['path'] == "/") {
+					$needle = "/";
+				} else {
+					$needle = "/" . $file['path'];
+				}
+				//echo $needle."---".$excluded_file_pattern."---\n";
+
+				if (@preg_match("/(^|^\/)" . $excluded_file_pattern . "/i", $needle)) {
+					return $excluded_file_pattern;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	public function store_file($file, $storage = 'start_filesystem')
+	{
+		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
+
+		if (!isset($file['size'])) {
+			$file['size'] = 0;
+		}
+		if (!isset($file['visibility'])) {
+			$file['visibility'] = "private";
+		}
+
+		$csv_filename = str_replace('"', '""', $file['path']);
+
+		$line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
+
+		$this->last_logged_file = $file['path'];
+
+		if ($file['type'] == "dir") {
+			try {
+				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path'] . "\n");
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage());
+			}
+		}
+
+		if ($this->get_diff_timestamp_start()) {
+			if ($file['type'] != "file" && $response = $this->check_file_diff_time($file)) {
+				$this->logger->info(sprintf("Directory %s archiving skipped on differential backup %s", $file['path'],
+					$response), array(
+					"FILESYSTEM SCAN",
+					"DIR DIFF"
+				));
+
+				return false;
+			}
+		}
+
+		try {
+			if (!$this->tmp_filesystem_append->has($this->get_included_files_handler())) {
+				//adding fix for UTF-8 CSV preview
+				$start_line = "\xEF\xBB\xBF" . '"Filename","Timestamp","Size","Visibility","Storage"' . PHP_EOL;
+				$this->tmp_filesystem_append->write($this->get_included_files_handler(), $start_line);
+			}
+
+			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
+
+		} catch (Exception $e) {
+
+			$this->logger->error($e->getMessage());
+		}
+
+		return true;
+	}
+
+	public function get_fileystem_handler()
+	{
+		return $this;
+	}
+
+	public function get_filesystem($system = "")
+	{
+		if ($system == "storage_filesystem_append") {
+			return $this->storage_filesystem_append;
+		} elseif ($system == "tmp_filesystem_append") {
+			return $this->tmp_filesystem_append;
+		} elseif ($system == "tmp_filesystem") {
+			return $this->tmp_filesystem;
+		} elseif ($system == "storage_filesystem") {
+			return $this->storage_filesystem;
+		} else {
+			return $this->start_filesystem;
+		}
+	}
+
+	public function get_adapter($system)
+	{
+		if ($system == "tmp_filesystem") {
+			return $this->tmp_adapter;
+		} elseif ($system == "storage_filesystem") {
+			return $this->storage_adapter;
+		} else {
+			return $this->start_adapter;
+		}
+	}
+
+	/**
+	 * File scan finished
+	 * Method called when file scan is finished
+	 *
+	 * @return bool
+	 */
+	private function scan_finished()
+	{
+		if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) &&
+			$this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
+			return false;
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
+
+		$this->logger->debug(sprintf(("File scan finished")));
+
+		return true;
+	}
+
+	/**
+	 * Calculate bytes from MB value
+	 *
+	 * @param int $mb_size
+	 *
+	 * @return float|int
+	 */
+	private function calc_to_bytes($mb_size)
+	{
+		return $mb_size * (1024 * 1024);
+	}
 
 }

Spacing +29 added lines, -29 removed lines

@@ -102,8 +102,8 @@ 
             $this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
                 'disable_asserts' => true,
             ]));
-        } catch (Exception $e) {
-            $this->logger->error("Filesystem Initialization Error: " . $e->getMessage());
+        }catch (Exception $e) {
+            $this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
         }
 
 
@@ -161,7 +161,7 @@ 
     {
         if ($remote_storage_selection != "") {
             $remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
-            $method = "get_" . $remote_storage_selection . "_filesystem";
+            $method = "get_".$remote_storage_selection."_filesystem";
 
             if (!method_exists($remote_storage, $method)) {
                 return false;
@@ -431,7 +431,7 @@ 
                     $this->build_files_list($file);
                     $counter++;
                 } else {
-                    $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
+                    $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
                 }
             }
         } else {
@@ -472,15 +472,15 @@ 
     {
         $return = array();
 
-        $files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
+        $files_list_file = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
         if (file_exists($files_list_file)) {
             $return[] = $files_list_file;
         }
 
         if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $log_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->xcloner_settings->get_logger_filename(1);
+            $log_file = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
             if (!file_exists($log_file)) {
-                $log_file = $this->xcloner_settings->get_xcloner_store_path() . DS . $this->xcloner_settings->get_logger_filename();
+                $log_file = $this->xcloner_settings->get_xcloner_store_path().DS.$this->xcloner_settings->get_logger_filename();
             }
 
             if (file_exists($log_file)) {
@@ -614,7 +614,7 @@ 
 
             $files = $this->start_filesystem->listContents($folder);
             foreach ($files as $file) {
-                if (!is_readable($this->xcloner_settings->get_xcloner_start_path() . DS . $file['path'])) {
+                if (!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path'])) {
                     $this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"),
                         $file['path']), array(
                         "FILESYSTEM SCAN",
@@ -642,7 +642,7 @@ 
                 }
             }
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -652,7 +652,7 @@ 
 
     public function estimate_read_write_time()
     {
-        $tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
+        $tmp_file = ".xcloner".substr(md5(time()), 0, 5);
 
         $start_time = microtime(true);
 
@@ -669,7 +669,7 @@ 
 
             $this->tmp_filesystem->delete($tmp_file);
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -686,7 +686,7 @@ 
         $_backup_files_list = array();
 
         //rule date limit
-        $current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
+        $current_timestamp = strtotime("-".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')." days");
 
         $files = $this->storage_filesystem->listContents();
 
@@ -711,18 +711,18 @@ 
             {
                 $this->storage_filesystem->delete($file['path']);
                 $_storage_size -= $file['size'];
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+                $this->logger->info("Deleting backup ".$file['path']." matching rule", array(
                     "STORAGE SIZE LIMIT",
-                    $_storage_size . " >= " . $set_storage_limit
+                    $_storage_size." >= ".$set_storage_limit
                 ));
             }
 
             //processing rule days limit
             if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp']) {
                 $this->storage_filesystem->delete($file['path']);
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+                $this->logger->info("Deleting backup ".$file['path']." matching rule", array(
                     "RETENTION LIMIT TIMESTAMP",
-                    $file['timestamp'] . " =< " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
+                    $file['timestamp']." =< ".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
                 ));
             }
 
@@ -730,9 +730,9 @@ 
             if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')) {
                 $this->storage_filesystem->delete($file['path']);
                 $_backups_counter--;
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+                $this->logger->info("Deleting backup ".$file['path']." matching rule", array(
                     "BACKUP QUANTITY LIMIT",
-                    $_backups_counter . " >= " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
+                    $_backups_counter." >= ".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
                 ));
             }
 
@@ -829,7 +829,7 @@ 
             }
 
             if ($timestamp <= $this->get_diff_timestamp_start()) {
-                return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
+                return " file DIFF timestamp ".$timestamp." < ".$this->diff_timestamp_start;
             }
         }
 
@@ -842,7 +842,7 @@ 
 
         if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb')) {
             if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
-                return "> " . $xcloner_exclude_files_larger_than_mb . "MB";
+                return "> ".$xcloner_exclude_files_larger_than_mb."MB";
             }
         }
 
@@ -855,10 +855,10 @@ 
                 if ($excluded_file_pattern == "/") {
                     $needle = "$";
                 } else {
-                    $needle = "$" . $excluded_file_pattern;
+                    $needle = "$".$excluded_file_pattern;
                 }
 
-                if (strstr("$" . $file['path'], $needle)) {
+                if (strstr("$".$file['path'], $needle)) {
                     return $excluded_file_pattern;
                 }
             }
@@ -937,11 +937,11 @@ 
                 if ($file['path'] == "/") {
                     $needle = "/";
                 } else {
-                    $needle = "/" . $file['path'];
+                    $needle = "/".$file['path'];
                 }
                 //echo $needle."---".$excluded_file_pattern."---\n";
 
-                if (@preg_match("/(^|^\/)" . $excluded_file_pattern . "/i", $needle)) {
+                if (@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)) {
                     return $excluded_file_pattern;
                 }
             }
@@ -963,14 +963,14 @@ 
 
         $csv_filename = str_replace('"', '""', $file['path']);
 
-        $line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
+        $line = '"'.($csv_filename).'","'.$file['timestamp'].'","'.$file['size'].'","'.$file['visibility'].'","'.$storage.'"'.PHP_EOL;
 
         $this->last_logged_file = $file['path'];
 
         if ($file['type'] == "dir") {
             try {
-                $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path'] . "\n");
-            } catch (Exception $e) {
+                $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
+            }catch (Exception $e) {
                 $this->logger->error($e->getMessage());
             }
         }
@@ -990,13 +990,13 @@ 
         try {
             if (!$this->tmp_filesystem_append->has($this->get_included_files_handler())) {
                 //adding fix for UTF-8 CSV preview
-                $start_line = "\xEF\xBB\xBF" . '"Filename","Timestamp","Size","Visibility","Storage"' . PHP_EOL;
+                $start_line = "\xEF\xBB\xBF".'"Filename","Timestamp","Size","Visibility","Storage"'.PHP_EOL;
                 $this->tmp_filesystem_append->write($this->get_included_files_handler(), $start_line);
             }
 
             $this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 
-        } catch (Exception $e) {
+        }catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
         }

Braces +3 added lines, -1 removed lines

@@ -707,9 +707,11 @@
         foreach ($_backup_files_list as $file) {
             //processing rule folder capacity
             if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
+                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit'))) {
+            	//bytes
             {
                 $this->storage_filesystem->delete($file['path']);
+            }
                 $_storage_size -= $file['size'];
                 $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
                     "STORAGE SIZE LIMIT",

includes/class-xcloner-file-transfer.php

Doc Comments +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function get_target()
     {
@@ -141,7 +141,7 @@ 
     }
 
     /**
-     * @param $filename
+     * @param string $filename
      * @param string $mimetype
      * @param string $postname
      *

Indentation +99 added lines, -99 removed lines

@@ -29,136 +29,136 @@
 class Xcloner_File_Transfer extends Xcloner_File_System
 {
 
-    /**
-     * Target url web address of the restore script
-     * @var string
-     */
-    private $target_url;
-    /**
-     * Transfer data limit in bytes
-     * @var int
-     */
-    private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
+	/**
+	 * Target url web address of the restore script
+	 * @var string
+	 */
+	private $target_url;
+	/**
+	 * Transfer data limit in bytes
+	 * @var int
+	 */
+	private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
 
 
-    /**
-     * @param $target_url
-     *
-     * @return mixed
-     */
-    public function set_target($target_url)
-    {
-        return $this->target_url = $target_url;
-    }
+	/**
+	 * @param $target_url
+	 *
+	 * @return mixed
+	 */
+	public function set_target($target_url)
+	{
+		return $this->target_url = $target_url;
+	}
 
-    /**
-     * @return mixed
-     */
-    public function get_target()
-    {
-        return $this->target_url;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function get_target()
+	{
+		return $this->target_url;
+	}
 
 
-    /**
-     * @param $file
-     * @param int $start
-     * @param string $hash
-     *
-     * @return bool|int
-     * @throws Exception
-     */
-    public function transfer_file($file, $start = 0, $hash = "")
-    {
-        if (!$this->target_url) {
-            throw new Exception("Please setup a target url for upload");
-        }
+	/**
+	 * @param $file
+	 * @param int $start
+	 * @param string $hash
+	 *
+	 * @return bool|int
+	 * @throws Exception
+	 */
+	public function transfer_file($file, $start = 0, $hash = "")
+	{
+		if (!$this->target_url) {
+			throw new Exception("Please setup a target url for upload");
+		}
 
 
-        $fp = $this->get_storage_filesystem()->readStream($file);
+		$fp = $this->get_storage_filesystem()->readStream($file);
 
-        fseek($fp, $start, SEEK_SET);
+		fseek($fp, $start, SEEK_SET);
 
-        $binary_data = fread($fp, $this->transfer_limit);
+		$binary_data = fread($fp, $this->transfer_limit);
 
-        $tmp_filename = "xcloner_upload_" . substr(md5(time()), 0, 5);
+		$tmp_filename = "xcloner_upload_" . substr(md5(time()), 0, 5);
 
-        $this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
+		$this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
 
-        $tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
+		$tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
 
-        $send_array = array();
+		$send_array = array();
 
-        $send_array['file'] = $file;
-        $send_array['start'] = $start;
-        $send_array['xcloner_action'] = "write_file";
-        $send_array['hash'] = $hash;
-        #$send_array['blob'] 	= $binary_data;
-        $send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
+		$send_array['file'] = $file;
+		$send_array['start'] = $start;
+		$send_array['xcloner_action'] = "write_file";
+		$send_array['hash'] = $hash;
+		#$send_array['blob'] 	= $binary_data;
+		$send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
 
-        //$data = http_build_query($send_array);
+		//$data = http_build_query($send_array);
 
-        $this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
-            $this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
+		$this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
+			$this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
 
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->target_url);
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $this->target_url);
 
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
-        curl_setopt($ch, CURLOPT_VERBOSE, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
+		curl_setopt($ch, CURLOPT_VERBOSE, true);
 
-        $original_result = curl_exec($ch);
+		$original_result = curl_exec($ch);
 
-        $this->get_tmp_filesystem()->delete($tmp_filename);
+		$this->get_tmp_filesystem()->delete($tmp_filename);
 
-        $result = json_decode($original_result);
+		$result = json_decode($original_result);
 
-        if (!$result) {
-            throw new Exception("We have received no valid response from the remote host, original message: " . $original_result);
-        }
+		if (!$result) {
+			throw new Exception("We have received no valid response from the remote host, original message: " . $original_result);
+		}
 
-        if ($result->status != 200) {
-            throw new Exception($result->response);
-        }
+		if ($result->status != 200) {
+			throw new Exception($result->response);
+		}
 
-        if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
-            $this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
-                $file, $this->target_url, ftell($fp)));
-            $this->remove_tmp_filesystem();
+		if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
+			$this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
+				$file, $this->target_url, ftell($fp)));
+			$this->remove_tmp_filesystem();
 
-            return false;
-        }
+			return false;
+		}
 
-        return ftell($fp);
-    }
+		return ftell($fp);
+	}
 
-    /**
-     * @param $filename
-     * @param string $mimetype
-     * @param string $postname
-     *
-     * @return CURLFile|string
-     */
-    private function curl_file_create($filename, $mimetype = '', $postname = '')
-    {
-        if (!function_exists('curl_file_create')) {
+	/**
+	 * @param $filename
+	 * @param string $mimetype
+	 * @param string $postname
+	 *
+	 * @return CURLFile|string
+	 */
+	private function curl_file_create($filename, $mimetype = '', $postname = '')
+	{
+		if (!function_exists('curl_file_create')) {
 
-            return "@$filename;filename="
-                . ($postname ?: basename($filename))
-                . ($mimetype ? ";type=$mimetype" : '');
+			return "@$filename;filename="
+				. ($postname ?: basename($filename))
+				. ($mimetype ? ";type=$mimetype" : '');
 
-        } else {
+		} else {
 
-            return curl_file_create($filename, $mimetype, $postname);
+			return curl_file_create($filename, $mimetype, $postname);
 
-        }
-    }
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 
         $binary_data = fread($fp, $this->transfer_limit);
 
-        $tmp_filename = "xcloner_upload_" . substr(md5(time()), 0, 5);
+        $tmp_filename = "xcloner_upload_".substr(md5(time()), 0, 5);
 
         $this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
 
@@ -122,7 +122,7 @@ 
         $result = json_decode($original_result);
 
         if (!$result) {
-            throw new Exception("We have received no valid response from the remote host, original message: " . $original_result);
+            throw new Exception("We have received no valid response from the remote host, original message: ".$original_result);
         }
 
         if ($result->status != 200) {

includes/class-xcloner-remote-storage.php

Doc Comments +3 added lines

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

Unused Use Statements -7 removed lines

@@ -28,23 +28,16 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-
 use League\Flysystem\Adapter\Ftp as Adapter;
-
 use League\Flysystem\Sftp\SftpAdapter;
-
 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 BackblazeB2\Client as B2Client;
-
 use Sabre\DAV\Client as SabreClient;
 use League\Flysystem\WebDAV\WebDAVAdapter;
 

Indentation +44 added lines, -44 removed lines

@@ -170,60 +170,60 @@
 
 		foreach($this->storage_fields as $main_key=>$array){
 
-		    if(is_array($array)) {
-                foreach ($array as $key => $type) {
+			if(is_array($array)) {
+				foreach ($array as $key => $type) {
 
-                    if( $type == "raw") {
-                        add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
-                            function ($value) {
+					if( $type == "raw") {
+						add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
+							function ($value) {
 
-                                return $this->simple_crypt($value, 'e');
+								return $this->simple_crypt($value, 'e');
 
-                            }, 10, 1);
+							}, 10, 1);
 
-                        add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
+						add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
 
-                            return $this->simple_crypt($value, 'd');
+							return $this->simple_crypt($value, 'd');
 
-                        }, 10, 1);
-                    }
+						}, 10, 1);
+					}
 
-                }
-            }
-        }
+				}
+			}
+		}
 
 	}
 
-    /**
-     * Encrypts and Decrypt a string based on openssl lib
-     *
-     * @param $string
-     * @param string $action
-     * @return string
-     */
-    private function simple_crypt( $string, $action = 'e' ) {
-        // you may change these values to your own
-        $secret_key = NONCE_KEY;
-        $secret_iv = NONCE_SALT;
-
-        $output = $string;
-        $encrypt_method = "AES-256-CBC";
-        $key = hash( 'sha256', $secret_key );
-        $iv = substr( hash( 'sha256', $secret_iv ), 0, 16 );
-
-        if( $action == 'e' && function_exists('openssl_encrypt')) {
-            $output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) );
-        }
-        else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
-            $decrypt = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv );
-            if($decrypt) {
-                //we check if decrypt was succesful
-                $output = $decrypt;
-            }
-        }
-
-        return $output;
-    }
+	/**
+	 * Encrypts and Decrypt a string based on openssl lib
+	 *
+	 * @param $string
+	 * @param string $action
+	 * @return string
+	 */
+	private function simple_crypt( $string, $action = 'e' ) {
+		// you may change these values to your own
+		$secret_key = NONCE_KEY;
+		$secret_iv = NONCE_SALT;
+
+		$output = $string;
+		$encrypt_method = "AES-256-CBC";
+		$key = hash( 'sha256', $secret_key );
+		$iv = substr( hash( 'sha256', $secret_iv ), 0, 16 );
+
+		if( $action == 'e' && function_exists('openssl_encrypt')) {
+			$output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) );
+		}
+		else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
+			$decrypt = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv );
+			if($decrypt) {
+				//we check if decrypt was succesful
+				$output = $decrypt;
+			}
+		}
+
+		return $output;
+	}
 
 	private function get_xcloner_container() {
 		return $this->xcloner_container;

Spacing +240 added lines, -240 removed lines

@@ -162,26 +162,26 @@ 
 	private $logger;
 	private $xcloner;
 
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 		$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->logger               = $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
 		$this->xcloner              = $xcloner_container;
 
-		foreach($this->storage_fields as $main_key=>$array){
+		foreach ($this->storage_fields as $main_key=>$array) {
 
-		    if(is_array($array)) {
+		    if (is_array($array)) {
                 foreach ($array as $key => $type) {
 
-                    if( $type == "raw") {
-                        add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
-                            function ($value) {
+                    if ($type == "raw") {
+                        add_filter("pre_update_option_".$this->storage_fields['option_prefix'].$key,
+                            function($value) {
 
                                 return $this->simple_crypt($value, 'e');
 
                             }, 10, 1);
 
-                        add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
+                        add_filter("option_".$this->storage_fields['option_prefix'].$key, function($value) {
 
                             return $this->simple_crypt($value, 'd');
 
@@ -201,22 +201,22 @@ 
      * @param string $action
      * @return string
      */
-    private function simple_crypt( $string, $action = 'e' ) {
+    private function simple_crypt($string, $action = 'e') {
         // you may change these values to your own
         $secret_key = NONCE_KEY;
         $secret_iv = NONCE_SALT;
 
         $output = $string;
         $encrypt_method = "AES-256-CBC";
-        $key = hash( 'sha256', $secret_key );
-        $iv = substr( hash( 'sha256', $secret_iv ), 0, 16 );
+        $key = hash('sha256', $secret_key);
+        $iv = substr(hash('sha256', $secret_iv), 0, 16);
 
-        if( $action == 'e' && function_exists('openssl_encrypt')) {
-            $output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) );
+        if ($action == 'e' && function_exists('openssl_encrypt')) {
+            $output = base64_encode(openssl_encrypt($string, $encrypt_method, $key, 0, $iv));
         }
-        else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
-            $decrypt = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv );
-            if($decrypt) {
+        else if ($action == 'd' && function_exists('openssl_decrypt') && base64_decode($string)) {
+            $decrypt = openssl_decrypt(base64_decode($string), $encrypt_method, $key, 0, $iv);
+            if ($decrypt) {
                 //we check if decrypt was succesful
                 $output = $decrypt;
             }
@@ -231,118 +231,118 @@ 
 
 	public function get_available_storages() {
 		$return = array();
-		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'];
+		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'];
 			}
 		}
 
 		return $return;
 	}
 
-	public function save( $action = "ftp" ) {
-		if ( ! $action ) {
+	public function save($action = "ftp") {
+		if (!$action) {
 			return false;
 		}
 
-		$storage = $this->xcloner_sanitization->sanitize_input_as_string( $action );
-		$this->logger->debug( sprintf( "Saving the remote storage %s options", strtoupper( $action ) ) );
+		$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 ] ) ) {
-			foreach ( $this->storage_fields[ $storage ] as $field => $validation ) {
-				$check_field     = $this->storage_fields["option_prefix"] . $field;
-				$sanitize_method = "sanitize_input_as_" . $validation;
+		if (is_array($this->storage_fields[$storage])) {
+			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 ] ) ) {
-					$_POST[ $check_field ] = 0;
+				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 ] ) );
-				update_option( $check_field, $sanitized_value );
+				$sanitized_value = $this->xcloner_sanitization->$sanitize_method(stripslashes($_POST[$check_field]));
+				update_option($check_field, $sanitized_value);
 			}
 
-			$this->xcloner->trigger_message( __( "%s storage settings saved.", 'xcloner-backup-and-restore' ), "success", $this->storage_fields[ $action ]['text'] );
+			$this->xcloner->trigger_message(__("%s storage settings saved.", 'xcloner-backup-and-restore'), "success", $this->storage_fields[$action]['text']);
 		}
 
 	}
 
-	public function check( $action = "ftp" ) {
+	public function check($action = "ftp") {
 		try {
-			$this->verify_filesystem( $action );
-			$this->xcloner->trigger_message( __( "%s connection is valid.", 'xcloner-backup-and-restore' ), "success", $this->storage_fields[ $action ]['text'] );
-			$this->logger->debug( sprintf( "Connection to remote storage %s is valid", strtoupper( $action ) ) );
-		} catch ( Exception $e ) {
-			$this->xcloner->trigger_message( "%s connection error: " . $e->getMessage(), "error", $this->storage_fields[ $action ]['text'] );
+			$this->verify_filesystem($action);
+			$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", $this->storage_fields[$action]['text']);
+			$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));
+		}catch (Exception $e) {
+			$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", $this->storage_fields[$action]['text']);
 		}
 	}
 
-	public function verify_filesystem( $storage_type ) {
-		$method = "get_" . $storage_type . "_filesystem";
+	public function verify_filesystem($storage_type) {
+		$method = "get_".$storage_type."_filesystem";
 
-		$this->logger->info( sprintf( "Checking validity of the remote storage %s filesystem", strtoupper( $storage_type ) ) );
+		$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();
+		list($adapter, $filesystem) = $this->$method();
 
-		$test_file = substr( ".xcloner_" . md5( time() ), 0, 15 );
+		$test_file = substr(".xcloner_".md5(time()), 0, 15);
 
-		if ( $storage_type == "gdrive" ) {
-			if ( ! is_array( $filesystem->listContents() ) ) {
-				throw new Exception( __( "Could not read data", 'xcloner-backup-and-restore' ) );
+		if ($storage_type == "gdrive") {
+			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 ) ) );
+			$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 ) ) );
+		$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 ) ) );
+		$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 ) ) );
+		$this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));
 
 		return true;
 	}
 
-	public function upload_backup_to_storage( $file, $storage ) {
-		if ( ! $this->xcloner_file_system->get_storage_filesystem()->has( $file ) ) {
-			$this->logger->info( sprintf( "File not found %s in local storage", $file ) );
+	public function upload_backup_to_storage($file, $storage) {
+		if (!$this->xcloner_file_system->get_storage_filesystem()->has($file)) {
+			$this->logger->info(sprintf("File not found %s in local storage", $file));
 
 			return false;
 		}
 
-		$method = "get_" . $storage . "_filesystem";
+		$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();
+		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 
 		//doing remote storage cleaning here
-		$this->clean_remote_storage( $storage, $remote_storage_filesystem );
+		$this->clean_remote_storage($storage, $remote_storage_filesystem);
 
-		$this->logger->info( sprintf( "Transferring backup %s to remote storage %s", $file, strtoupper( $storage ) ), array( "" ) );
+		$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $file, strtoupper($storage)), array(""));
 
 		/*if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
 		{
@@ -350,104 +350,104 @@ 
 			return false;
 		}*/
 
-		$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream( $file );
+		$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($file);
 
-		if ( ! $remote_storage_filesystem->writeStream( $file, $backup_file_stream ) ) {
-			$this->logger->info( sprintf( "Could not transfer file %s", $file ) );
+		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 ) ) {
-			$parts = $this->xcloner_file_system->get_multipart_files( $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( "" ) );
+		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) {
+					$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 ) ) {
+					$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;
 					}
 				}
 			}
 		}
 
-		$this->logger->info( sprintf( "Upload done, disconnecting from remote storage %s", strtoupper( $storage ) ) );
+		$this->logger->info(sprintf("Upload done, disconnecting from remote storage %s", strtoupper($storage)));
 
 		return true;
 
 	}
 
-	public function copy_backup_remote_to_local( $file, $storage ) {
-		$method = "get_" . $storage . "_filesystem";
+	public function copy_backup_remote_to_local($file, $storage) {
+		$method = "get_".$storage."_filesystem";
 
 		$target_filename = $file;
 
-		if ( ! method_exists( $this, $method ) ) {
+		if (!method_exists($this, $method)) {
 			return false;
 		}
 
-		list( $remote_storage_adapter, $remote_storage_filesystem ) = $this->$method();
+		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 
-		if ( ! $remote_storage_filesystem->has( $file ) ) {
-			$this->logger->info( sprintf( "File not found %s in remote storage %s", $file, strtoupper( $storage ) ) );
+		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" ) {
-			$metadata        = $remote_storage_filesystem->getMetadata( $file );
-			$target_filename = $metadata['filename'] . "." . $metadata['extension'];
+		if ($storage == "gdrive") {
+			$metadata        = $remote_storage_filesystem->getMetadata($file);
+			$target_filename = $metadata['filename'].".".$metadata['extension'];
 		}
 
-		$this->logger->info( sprintf( "Transferring backup %s to local storage from %s storage", $file, strtoupper( $storage ) ), array( "" ) );
+		$this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $file, strtoupper($storage)), array(""));
 
-		$backup_file_stream = $remote_storage_filesystem->readStream( $file );
+		$backup_file_stream = $remote_storage_filesystem->readStream($file);
 
-		if ( ! $this->xcloner_file_system->get_storage_filesystem()->writeStream( $target_filename, $backup_file_stream ) ) {
-			$this->logger->info( sprintf( "Could not transfer file %s", $file ) );
+		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 ) ) {
-			$parts = $this->xcloner_file_system->get_multipart_files( $file, $storage );
-			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( "" ) );
+		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) {
+					$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 ) ) {
+					$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;
 					}
 				}
 			}
 		}
 
-		$this->logger->info( sprintf( "Upload done, disconnecting from remote storage %s", strtoupper( $storage ) ) );
+		$this->logger->info(sprintf("Upload done, disconnecting from remote storage %s", strtoupper($storage)));
 
 		return true;
 
 	}
 
-	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 ) ) {
-			$this->logger->info( sprintf( "Doing %s remote storage cleanup for %s days limit", strtoupper( $storage ), $expire_days ) );
+	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)) {
+			$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" );
+			$current_timestamp = strtotime("-".$expire_days." days");
 
-			if ( is_array( $files ) ) {
-				foreach ( $files as $file ) {
-					$file['timestamp'] = $remote_storage_filesystem->getTimestamp( $file['path'] );
+			if (is_array($files)) {
+				foreach ($files as $file) {
+					$file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
 
-					if ( $current_timestamp >= $file['timestamp'] ) {
-						$remote_storage_filesystem->delete( $file['path'] );
-						$this->logger->info( "Deleting remote file " . $file['path'] . " matching rule", array(
+					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
-						) );
+							$file['timestamp']." =< ".$expire_days
+						));
 					}
 
 				}
@@ -456,153 +456,153 @@ 
 	}
 
 	public function get_azure_filesystem() {
-		$this->logger->info( sprintf( "Creating the AZURE BLOB remote storage connection" ), array( "" ) );
+		$this->logger->info(sprintf("Creating the AZURE BLOB remote storage connection"), array(""));
 
-		if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
-			throw new Exception( "AZURE BLOB requires PHP 5.6 to be installed!" );
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("AZURE BLOB requires PHP 5.6 to be installed!");
 		}
 
-		if ( ! class_exists( 'XmlWriter' ) ) {
-			throw new Exception( "AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!" );
+		if (!class_exists('XmlWriter')) {
+			throw new Exception("AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!");
 		}
 
 		$endpoint = sprintf(
 			'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
-			get_option( "xcloner_azure_account_name" ),
-			get_option( "xcloner_azure_api_key" )
+			get_option("xcloner_azure_account_name"),
+			get_option("xcloner_azure_api_key")
 		);
 
-		$blobRestProxy = ServicesBuilder::getInstance()->createBlobService( $endpoint );
+		$blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint);
 
-		$adapter = new AzureAdapter( $blobRestProxy, get_option( "xcloner_azure_container" ) );
+		$adapter = new AzureAdapter($blobRestProxy, get_option("xcloner_azure_container"));
 
-		$filesystem = new Filesystem( $adapter, new Config( [
+		$filesystem = new Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
 	public function get_dropbox_filesystem() {
-		$this->logger->info( sprintf( "Creating the DROPBOX remote storage connection" ), array( "" ) );
+		$this->logger->info(sprintf("Creating the DROPBOX remote storage connection"), array(""));
 
-		if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
-			throw new Exception( "DROPBOX requires PHP 5.6 to be installed!" );
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("DROPBOX requires PHP 5.6 to be installed!");
 		}
 
-		$client  = new DropboxClient( get_option( "xcloner_dropbox_access_token" ) );
-		$adapter = new DropboxAdapter( $client, get_option( "xcloner_dropbox_prefix" ) );
+		$client  = new DropboxClient(get_option("xcloner_dropbox_access_token"));
+		$adapter = new DropboxAdapter($client, get_option("xcloner_dropbox_prefix"));
 
-		$filesystem = new Filesystem( $adapter, new Config( [
+		$filesystem = new Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
 	public function get_aws_filesystem() {
-		$this->logger->info( sprintf( "Creating the S3 remote storage connection" ), array( "" ) );
+		$this->logger->info(sprintf("Creating the S3 remote storage connection"), array(""));
 
-		if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
-			throw new Exception( "S3 class requires PHP 5.6 to be installed!" );
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("S3 class requires PHP 5.6 to be installed!");
 		}
 
-		if ( ! class_exists( 'XmlWriter' ) ) {
-			throw new Exception( "AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!" );
+		if (!class_exists('XmlWriter')) {
+			throw new Exception("AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!");
 		}
 
 
 		$credentials = array(
 			'credentials' => array(
-				'key'    => get_option( "xcloner_aws_key" ),
-				'secret' => get_option( "xcloner_aws_secret" )
+				'key'    => get_option("xcloner_aws_key"),
+				'secret' => get_option("xcloner_aws_secret")
 			),
-			'region'      => get_option( "xcloner_aws_region" ),
+			'region'      => get_option("xcloner_aws_region"),
 			'version'     => 'latest',
 		);
 
-		if ( get_option( 'xcloner_aws_endpoint' ) != "" && ! get_option( "xcloner_aws_region" ) ) {
+		if (get_option('xcloner_aws_endpoint') != "" && !get_option("xcloner_aws_region")) {
 
-			$credentials['endpoint'] = get_option( 'xcloner_aws_endpoint' );
+			$credentials['endpoint'] = get_option('xcloner_aws_endpoint');
 			#$credentials['use_path_style_endpoint'] = true;
 			#$credentials['bucket_endpoint'] = false;
 
 
 		}
 
-		$client = new S3Client( $credentials );
+		$client = new S3Client($credentials);
 
-		$adapter    = new AwsS3Adapter( $client, get_option( "xcloner_aws_bucket_name" ), get_option( "xcloner_aws_prefix" ) );
-		$filesystem = new Filesystem( $adapter, new Config( [
+		$adapter    = new AwsS3Adapter($client, get_option("xcloner_aws_bucket_name"), get_option("xcloner_aws_prefix"));
+		$filesystem = new Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
 	public function get_backblaze_filesystem() {
-		$this->logger->info( sprintf( "Creating the BACKBLAZE remote storage connection" ), array( "" ) );
+		$this->logger->info(sprintf("Creating the BACKBLAZE remote storage connection"), array(""));
 
-		if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
-			throw new Exception( "BACKBLAZE API requires PHP 5.6 to be installed!" );
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("BACKBLAZE API requires PHP 5.6 to be installed!");
 		}
 
 
-		$client  = new B2Client( get_option( "xcloner_backblaze_account_id" ), get_option( "xcloner_backblaze_application_key" ) );
-		$adapter = new BackblazeAdapter( $client, get_option( "xcloner_backblaze_bucket_name" ) );
+		$client  = new B2Client(get_option("xcloner_backblaze_account_id"), get_option("xcloner_backblaze_application_key"));
+		$adapter = new BackblazeAdapter($client, get_option("xcloner_backblaze_bucket_name"));
 
-		$filesystem = new Filesystem( $adapter, new Config( [
+		$filesystem = new Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
 	public function get_webdav_filesystem() {
-		$this->logger->info( sprintf( "Creating the WEBDAV remote storage connection" ), array( "" ) );
+		$this->logger->info(sprintf("Creating the WEBDAV remote storage connection"), array(""));
 
-		if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
-			throw new Exception( "WEBDAV API requires PHP 5.6 to be installed!" );
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("WEBDAV API requires PHP 5.6 to be installed!");
 		}
 
 		$settings = array(
-			'baseUri'  => get_option( "xcloner_webdav_url" ),
-			'userName' => get_option( "xcloner_webdav_username" ),
-			'password' => get_option( "xcloner_webdav_password" ),
+			'baseUri'  => get_option("xcloner_webdav_url"),
+			'userName' => get_option("xcloner_webdav_username"),
+			'password' => get_option("xcloner_webdav_password"),
 			//'proxy' => 'locahost:8888',
 		);
 
 
-		$client     = new SabreClient( $settings );
-		$adapter    = new WebDAVAdapter( $client, get_option( "xcloner_webdav_target_folder" ) );
-		$filesystem = new Filesystem( $adapter, new Config( [
+		$client     = new SabreClient($settings);
+		$adapter    = new WebDAVAdapter($client, get_option("xcloner_webdav_target_folder"));
+		$filesystem = new Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
 
 	public function gdrive_construct() {
 
 		//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;
 		}
 
 		//require_once(__DIR__ . "/../../xcloner-google-drive/vendor/autoload.php");
 
 		$client = new \Google_Client();
-		$client->setApplicationName( $this->gdrive_app_name );
-		$client->setClientId( get_option( "xcloner_gdrive_client_id" ) );
-		$client->setClientSecret( get_option( "xcloner_gdrive_client_secret" ) );
+		$client->setApplicationName($this->gdrive_app_name);
+		$client->setClientId(get_option("xcloner_gdrive_client_id"));
+		$client->setClientSecret(get_option("xcloner_gdrive_client_secret"));
 
 		//$redirect_uri = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']."?page=xcloner_remote_storage_page&action=set_gdrive_code";
 		$redirect_uri = "urn:ietf:wg:oauth:2.0:oob";
 
-		$client->setRedirectUri( $redirect_uri ); //urn:ietf:wg:oauth:2.0:oob
-		$client->addScope( "https://www.googleapis.com/auth/drive" );
-		$client->setAccessType( 'offline' );
+		$client->setRedirectUri($redirect_uri); //urn:ietf:wg:oauth:2.0:oob
+		$client->addScope("https://www.googleapis.com/auth/drive");
+		$client->setAccessType('offline');
 
 		return $client;
 	}
@@ -610,30 +610,30 @@ 
 	public function get_gdrive_auth_url() {
 		$client = $this->gdrive_construct();
 
-		if ( ! $client ) {
+		if (!$client) {
 			return false;
 		}
 
 		return $authUrl = $client->createAuthUrl();
 	}
 
-	public function set_access_token( $code ) {
+	public function set_access_token($code) {
 		$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 );
+			$this->logger->error($error_msg);
 
 			return false;
 		}
 
-		$token = $client->fetchAccessTokenWithAuthCode( $code );
-		$client->setAccessToken( $token );
+		$token = $client->fetchAccessTokenWithAuthCode($code);
+		$client->setAccessToken($token);
 
-		update_option( "xcloner_gdrive_access_token", $token['access_token'] );
-		update_option( "xcloner_gdrive_refresh_token", $token['refresh_token'] );
+		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>
@@ -649,23 +649,23 @@ 
 	 */
 	public function get_gdrive_filesystem() {
 
-		if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
-			throw new Exception( "Google Drive API requires PHP 5.6 to be installed!" );
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("Google Drive API requires PHP 5.6 to be installed!");
 		}
 
-		$this->logger->info( sprintf( "Creating the Google Drive remote storage connection" ), array( "" ) );
+		$this->logger->info(sprintf("Creating the Google Drive remote storage connection"), array(""));
 
 		$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 );
-			throw new Exception( $error_msg );
+			$this->logger->error($error_msg);
+			throw new Exception($error_msg);
 		}
 
-		$client->refreshToken( get_option( "xcloner_gdrive_refresh_token" ) );
+		$client->refreshToken(get_option("xcloner_gdrive_refresh_token"));
 
-		$service = new \Google_Service_Drive( $client );
+		$service = new \Google_Service_Drive($client);
 
 		/*if( get_option("xcloner_gdrive_empty_trash",0) ){
 			$this->logger->info(sprintf("Doing a Google Drive emptyTrash call"), array(""));
@@ -673,102 +673,102 @@ 
 		}*/
 
 		$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" );
+		$folderID = get_option("xcloner_gdrive_target_folder");
 
-		$tmp = parse_url( $folderID );
+		$tmp = parse_url($folderID);
 
-		if ( isset( $tmp['query'] ) ) {
-			$folderID = str_replace( "id=", "", $tmp['query'] );
+		if (isset($tmp['query'])) {
+			$folderID = str_replace("id=", "", $tmp['query']);
 		}
 
-		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( [
+		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([
 				'pageSize' => 1,
 				'q'        => $query
-			] );
+			]);
 
-			if ( sizeof( $response ) ) {
-				foreach ( $response as $obj ) {
+			if (sizeof($response)) {
+				foreach ($response as $obj) {
 					$folderID = $obj->getId();
 				}
 			} else {
-				$this->xcloner->trigger_message( sprintf( __( "Could not find folder ID by name %s", 'xcloner-backup-and-restore' ), $folderID ), "error" );
+				$this->xcloner->trigger_message(sprintf(__("Could not find folder ID by name %s", 'xcloner-backup-and-restore'), $folderID), "error");
 			}
 		}
 
-		$this->logger->info( sprintf( "Using target folder with ID %s on the remote storage", $folderID ) );
+		$this->logger->info(sprintf("Using target folder with ID %s on the remote storage", $folderID));
 
-		if ( class_exists( 'XCloner_Google_Drive_Adapter' ) ) {
-			$adapter = new XCloner_Google_Drive_Adapter( $service, $folderID );
+		if (class_exists('XCloner_Google_Drive_Adapter')) {
+			$adapter = new XCloner_Google_Drive_Adapter($service, $folderID);
 		} else {
-			$adapter = new \Hypweb\Flysystem\GoogleDrive\GoogleDriveAdapter( $service, $folderID );
+			$adapter = new \Hypweb\Flysystem\GoogleDrive\GoogleDriveAdapter($service, $folderID);
 		}
 
-		$filesystem = new \League\Flysystem\Filesystem( $adapter, new Config( [
+		$filesystem = new \League\Flysystem\Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
 	public function get_ftp_filesystem() {
-		$this->logger->info( sprintf( "Creating the FTP remote storage connection" ), array( "" ) );
+		$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" ),
+		$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 ),
-		] );
+			'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();
 
-		$filesystem = new Filesystem( $adapter, new Config( [
+		$filesystem = new Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
 	public function get_sftp_filesystem() {
-		$this->logger->info( sprintf( "Creating the SFTP remote storage connection" ), array( "" ) );
+		$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" ),
+		$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 ),
-		] );
+			'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();
 
-		$filesystem = new Filesystem( $adapter, new Config( [
+		$filesystem = new Filesystem($adapter, new Config([
 			'disable_asserts' => true,
-		] ) );
+		]));
 
-		return array( $adapter, $filesystem );
+		return array($adapter, $filesystem);
 	}
 
-	public function change_storage_status( $field, $value ) {
-		$field = $this->xcloner_sanitization->sanitize_input_as_string( $field );
-		$value = $this->xcloner_sanitization->sanitize_input_as_int( $value );
+	public function change_storage_status($field, $value) {
+		$field = $this->xcloner_sanitization->sanitize_input_as_string($field);
+		$value = $this->xcloner_sanitization->sanitize_input_as_int($value);
 
-		return update_option( $field, $value );
+		return update_option($field, $value);
 	}
 
 	public function get_aws_regions() {

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
 
         if( $action == 'e' && function_exists('openssl_encrypt')) {
             $output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) );
-        }
-        else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
+        } else if( $action == 'd' && function_exists('openssl_decrypt') && base64_decode( $string )){
             $decrypt = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv );
             if($decrypt) {
                 //we check if decrypt was succesful

includes/class-xcloner-scheduler.php

Doc Comments +3 added lines

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

Spacing +110 added lines, -110 removed lines

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

includes/class-xcloner-settings.php

Doc Comments +3 added lines

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

Spacing +228 added lines, -228 removed lines

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

public/class-xcloner-public.php

Doc Comments -2 removed lines

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

Spacing +3 added lines, -3 removed lines

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