ovidiul / XCloner-Wordpress

includes/class-xcloner.php

Braces +2 added lines, -2 removed lines

@@ -350,7 +350,7 @@ 
 			
 			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else{
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
@@ -452,7 +452,7 @@ 
 		
 		try{
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 	

Spacing +85 added lines, -85 removed lines

@@ -148,15 +148,15 @@ 
 		return $this->xcloner_file_transfer;
 	}
 	
-	public function check_dependencies(){
+	public function check_dependencies() {
 		
 		$backup_storage_path = realpath(__DIR__.DS."..".DS."..".DS."..").DS."backups".DS;
 		
 		define("XCLONER_STORAGE_PATH", realpath($backup_storage_path));
 
-		if(!is_dir($backup_storage_path))
+		if (!is_dir($backup_storage_path))
 		{
-			if(!@mkdir($backup_storage_path))
+			if (!@mkdir($backup_storage_path))
 			{
 				$status = "error";
 				$message = sprintf(__("Unable to create the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -164,7 +164,7 @@ 
 				return;
 			}
 		}	
-		if(!is_writable($backup_storage_path))
+		if (!is_writable($backup_storage_path))
 		{
 			$status = "error";
 			$message = sprintf(__("Unable to write to the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -178,15 +178,15 @@ 
 	public function trigger_message($message, $status = "error", $message_param1 = "", $message_param2 = "", $message_param3 = "")
 	{
 			$message = sprintf(__($message), $message_param1, $message_param2, $message_param3);
-			add_action( 'xcloner_admin_notices', array($this,"trigger_message_notice"), 10, 2);
-			do_action( 'xcloner_admin_notices', $message, $status);
+			add_action('xcloner_admin_notices', array($this, "trigger_message_notice"), 10, 2);
+			do_action('xcloner_admin_notices', $message, $status);
 	}
 	
 	public function trigger_message_notice($message, $status = "success")
 	{
 		?>
 		<div class="notice notice-<?php echo $status?> is-dismissible">
-	        <p><?php _e( $message, 'xcloner-backup-and-restore' ); ?></p>
+	        <p><?php _e($message, 'xcloner-backup-and-restore'); ?></p>
 	    </div>
 		<?php
 	}
@@ -213,79 +213,79 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-i18n.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-xcloner-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-xcloner-admin.php';
 		
 		/**
 		 * The class responsible for debugging XCloner.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-logger.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-logger.php';
 		
 		/**
 		 * The class responsible for defining the admin settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-settings.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-settings.php';
 		
 		/**
 		 * The class responsible for defining the Remote Storage settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-remote-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-remote-storage.php';
 		
 		/**
 		 * The class responsible for implementing the database backup methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-database.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-database.php';
 		
 		/**
 		 * The class responsible for sanitization of users input.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-sanitization.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-sanitization.php';
 		
 		/**
 		 * The class responsible for XCloner system requirements validation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-requirements.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-requirements.php';
 		
 		/**
 		 * The class responsible for XCloner backup archive creation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-archive.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-archive.php';
 		
 		/**
 		 * The class responsible for XCloner API requests.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-api.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-api.php';
 		
 		/**
 		 * The class responsible for the XCloner File System methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-system.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-system.php';
 		
 		/**
 		 * The class responsible for the XCloner File Transfer methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-transfer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-transfer.php';
 		
 		/**
 		 * The class responsible for the XCloner Scheduler methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-scheduler.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-scheduler.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-xcloner-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-xcloner-public.php';
 		
 		$this->loader = new Xcloner_Loader($this);
 
@@ -304,7 +304,7 @@ 
 
 		$plugin_i18n = new Xcloner_i18n();
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 		
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
         //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
@@ -320,11 +320,11 @@ 
 	 */
 	private function define_admin_hooks() {
 	
-		$plugin_admin = new Xcloner_Admin( $this );
+		$plugin_admin = new Xcloner_Admin($this);
 		$this->plugin_admin = $plugin_admin;
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 		
 	}
 	
@@ -333,31 +333,31 @@ 
 	 * 
 	 * @access 	private
 	 */
-	private function define_admin_menu(){
+	private function define_admin_menu() {
 		
 		add_action('admin_menu', array($this->loader, 'xcloner_backup_add_admin_menu'));
 		
 	}
 	
-	private function define_plugin_settings(){
+	private function define_plugin_settings() {
 		/**
 		* register wporg_settings_init to the admin_init action hook
 		*/
 
 		$this->xcloner_settings = new XCloner_Settings($this);
 				
-		if(defined('DOING_CRON') || isset($_POST['hash'])){
+		if (defined('DOING_CRON') || isset($_POST['hash'])) {
 			
-			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
+			if (defined('DOING_CRON') || $_POST['hash'] == "generate_hash") {
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else {
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
 		
-		if(defined('DOING_CRON') || !isset($_POST['hash']))
+		if (defined('DOING_CRON') || !isset($_POST['hash']))
 		{
-			add_action( 'shutdown', function(){
+			add_action('shutdown', function() {
 				$this->xcloner_file_system = new Xcloner_File_System($this);
 				$this->xcloner_file_system->remove_tmp_filesystem();
 			});
@@ -380,7 +380,7 @@ 
 	 */
 	public function pre_auto_update($type, $item, $context)
 	{
-		if(!$type)
+		if (!$type)
 		{
 			return false;
 		}	
@@ -389,10 +389,10 @@ 
 		
 		$content_dir = str_replace(ABSPATH, "", WP_CONTENT_DIR); 
 		$plugins_dir 	= str_replace(ABSPATH, "", WP_PLUGIN_DIR);
-		$langs_dir 		= $content_dir . DS . "languages";
-		$themes_dir 		= $content_dir . DS . "themes";
+		$langs_dir 		= $content_dir.DS."languages";
+		$themes_dir 		= $content_dir.DS."themes";
 						
-		switch ( $type ) {
+		switch ($type) {
 			case 'core':
 				$exclude_files = array(
 									"^(?!(wp-admin|wp-includes|(?!.*\/.*.php)))(.*)$",
@@ -402,7 +402,7 @@ 
 			
 				$dir_array = explode(DS, $plugins_dir);
 				
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -418,7 +418,7 @@ 
 
 				$dir_array = explode(DS, $themes_dir);
 				
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -434,7 +434,7 @@ 
 
 				$dir_array = explode(DS, $langs_dir);
 				
-				foreach($dir_array as $dir)
+				foreach ($dir_array as $dir)
 				{
 					$data .= "\/".$dir;
 					$regex .= $data."$|";
@@ -460,9 +460,9 @@ 
 		$schedule['backup_params']->email_notification = get_option('admin_email');
 		$schedule['backup_params']->backup_name = "backup_pre_auto_update_".$type."_[domain]-[time]-sql";
 		
-		try{
+		try {
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 	
@@ -477,10 +477,10 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Xcloner_Public( $this );
+		$plugin_public = new Xcloner_Public($this);
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 	}
 	
@@ -489,20 +489,20 @@ 
 		$logger = new XCloner_Logger($this, "php_system");
 		$error = error_get_last();
 		
-		if($error['type'] and $logger)
+		if ($error['type'] and $logger)
 		{
-			$logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 	
 	}
 	
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
+	    static $levels = null;
+	    if ($levels === null) {
+	        $levels = [];
 	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+	            if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 	        }
 	    }
 	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -512,52 +512,52 @@ 
 	{
 		//adding the pre-update hook
 		
-		if(is_admin() || defined('DOING_CRON'))
+		if (is_admin() || defined('DOING_CRON'))
 		{
-			$this->xcloner_logger 			= new XCloner_Logger($this, "xcloner_api");
-			$this->xcloner_filesystem 		= new Xcloner_File_System($this);
+			$this->xcloner_logger = new XCloner_Logger($this, "xcloner_api");
+			$this->xcloner_filesystem = new Xcloner_File_System($this);
 			
 			//$this->xcloner_filesystem->set_diff_timestamp_start (strtotime("-15 days"));
 			
-			$this->archive_system 			= new Xcloner_Archive($this);
-			$this->xcloner_database 		= new Xcloner_Database($this);
-			$this->xcloner_scheduler 		= new Xcloner_Scheduler($this);
-			$this->xcloner_remote_storage 	= new Xcloner_Remote_Storage($this);
-			$this->xcloner_file_transfer 	= new Xcloner_File_Transfer($this);
+			$this->archive_system = new Xcloner_Archive($this);
+			$this->xcloner_database = new Xcloner_Database($this);
+			$this->xcloner_scheduler = new Xcloner_Scheduler($this);
+			$this->xcloner_remote_storage = new Xcloner_Remote_Storage($this);
+			$this->xcloner_file_transfer = new Xcloner_File_Transfer($this);
 			
-			$xcloner_api 					= new Xcloner_Api($this);
+			$xcloner_api = new Xcloner_Api($this);
 
-			add_action( 'wp_ajax_get_database_tables_action', 	array($xcloner_api,'get_database_tables_action')  );
-			add_action( 'wp_ajax_get_file_system_action', 		array($xcloner_api,'get_file_system_action')  );
-			add_action( 'wp_ajax_scan_filesystem', 				array($xcloner_api,'scan_filesystem')  );
-			add_action( 'wp_ajax_backup_database', 				array($xcloner_api,'backup_database')  );
-			add_action( 'wp_ajax_backup_files'	, 				array($xcloner_api,'backup_files')  );
-			add_action( 'wp_ajax_save_schedule'	, 				array($xcloner_api,'save_schedule')  );
-			add_action( 'wp_ajax_get_schedule_by_id',	 		array($xcloner_api,'get_schedule_by_id')  );
-			add_action( 'wp_ajax_get_scheduler_list',	 		array($xcloner_api,'get_scheduler_list')  );
-			add_action( 'wp_ajax_delete_schedule_by_id'	, 		array($xcloner_api,'delete_schedule_by_id')  );
-			add_action( 'wp_ajax_delete_backup_by_name'	, 		array($xcloner_api,'delete_backup_by_name')  );
-			add_action( 'wp_ajax_download_backup_by_name', 		array($xcloner_api,'download_backup_by_name')  );
-			add_action( 'wp_ajax_remote_storage_save_status', 	array($xcloner_api,'remote_storage_save_status')  );
-			add_action( 'wp_ajax_upload_backup_to_remote', 		array($xcloner_api,'upload_backup_to_remote')  );
-			add_action( 'wp_ajax_list_backup_files'	,			array($xcloner_api,'list_backup_files')  );
-			add_action( 'wp_ajax_restore_upload_backup'	, 		array($xcloner_api,'restore_upload_backup')  );
-			add_action( 'wp_ajax_download_restore_script', 		array($xcloner_api,'download_restore_script')  );
-			add_action( 'wp_ajax_copy_backup_remote_to_local', 	array($xcloner_api,'copy_backup_remote_to_local')  );
-			add_action( 'wp_ajax_restore_backup', 				array($xcloner_api,'restore_backup')  );
-			add_action( 'admin_notices', 						array($this, 'xcloner_error_admin_notices' ));
+			add_action('wp_ajax_get_database_tables_action', array($xcloner_api, 'get_database_tables_action'));
+			add_action('wp_ajax_get_file_system_action', array($xcloner_api, 'get_file_system_action'));
+			add_action('wp_ajax_scan_filesystem', array($xcloner_api, 'scan_filesystem'));
+			add_action('wp_ajax_backup_database', array($xcloner_api, 'backup_database'));
+			add_action('wp_ajax_backup_files', array($xcloner_api, 'backup_files'));
+			add_action('wp_ajax_save_schedule', array($xcloner_api, 'save_schedule'));
+			add_action('wp_ajax_get_schedule_by_id', array($xcloner_api, 'get_schedule_by_id'));
+			add_action('wp_ajax_get_scheduler_list', array($xcloner_api, 'get_scheduler_list'));
+			add_action('wp_ajax_delete_schedule_by_id', array($xcloner_api, 'delete_schedule_by_id'));
+			add_action('wp_ajax_delete_backup_by_name', array($xcloner_api, 'delete_backup_by_name'));
+			add_action('wp_ajax_download_backup_by_name', array($xcloner_api, 'download_backup_by_name'));
+			add_action('wp_ajax_remote_storage_save_status', array($xcloner_api, 'remote_storage_save_status'));
+			add_action('wp_ajax_upload_backup_to_remote', array($xcloner_api, 'upload_backup_to_remote'));
+			add_action('wp_ajax_list_backup_files', array($xcloner_api, 'list_backup_files'));
+			add_action('wp_ajax_restore_upload_backup', array($xcloner_api, 'restore_upload_backup'));
+			add_action('wp_ajax_download_restore_script', array($xcloner_api, 'download_restore_script'));
+			add_action('wp_ajax_copy_backup_remote_to_local', array($xcloner_api, 'copy_backup_remote_to_local'));
+			add_action('wp_ajax_restore_backup', array($xcloner_api, 'restore_backup'));
+			add_action('admin_notices', array($this, 'xcloner_error_admin_notices'));
             
         }
         
         //Do a pre-update backup of targeted files
-        if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
+        if ($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
         {
 			add_action("pre_auto_update", array($this, "pre_auto_update"), 1, 3);
 		}
 	}
 	
 	function add_plugin_action_links($links, $file) {
-        if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+        if ($file == plugin_basename(dirname(dirname(__FILE__)).'/xcloner.php'))
 		{	
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';
@@ -567,13 +567,13 @@ 
     }
 	
 	public function xcloner_error_admin_notices() {
-			settings_errors( 'xcloner_error_message' );
+			settings_errors('xcloner_error_message');
 		}
 	
 	public function define_cron_hooks()
 	{
 		//registering new schedule intervals
-		add_filter( 'cron_schedules', array($this, 'add_new_intervals'));
+		add_filter('cron_schedules', array($this, 'add_new_intervals'));
 			
 		
 		$xcloner_scheduler = $this->get_xcloner_scheduler();
@@ -654,7 +654,7 @@ 
 	
 		$page = sanitize_key($_GET['page']);
 
-		if($page)
+		if ($page)
 		{
 			$this->display($page);
 		}

includes/class-xcloner-scheduler.php

Doc Comments +3 added lines

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

admin/partials/xcloner_init_page.php

Spacing +48 added lines, -48 removed lines

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

includes/class-xcloner-file-system.php

Spacing +163 added lines, -163 removed lines

@@ -4,19 +4,19 @@ 
 use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
 
-class Xcloner_File_System{
+class Xcloner_File_System {
 	
-	private $excluded_files 			= "";
+	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";
+	private $included_files_handler = "backup_files.csv";
+	private $temp_dir_handler = ".dir";
 	public  $filesystem;
 	public  $tmp_filesystem;
 	public  $storage_filesystem;
 	private $xcloner_settings_append;
 	private $xcloner_container;
-	private $diff_timestamp_start		= "";
+	private $diff_timestamp_start = "";
 	
 	private $logger;
 	private $start_adapter;
@@ -39,47 +39,47 @@ 
 	{
 		$this->xcloner_container = $xcloner_container;
 		
-		$this->logger 				= $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
 		$this->xcloner_settings 	= $xcloner_container->get_xcloner_settings();
 
-		try{
+		try {
 			
-			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(),LOCK_EX, 'SKIP_LINKS');
+			$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_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');
+			$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');
+			$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_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){
+		}catch (Exception $e) {
 			$this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
+		if ($value = get_option('xcloner_directories_to_scan_per_request'))
 			$this->folders_to_process_per_session = $value;
 
 	}
 	
 	public function set_diff_timestamp_start($timestamp = "")
 	{
-		if($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;
@@ -114,12 +114,12 @@ 
 	
 	public function get_storage_filesystem($remote_storage_selection = "")
 	{
-		if($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))
+			if (!method_exists($remote_storage, $method))
 				return false;
 				
 			list($adapter, $filesystem) = $remote_storage->$method();	
@@ -157,7 +157,7 @@ 
 	
 	public function get_start_path_file_info($file)
 	{
-		$info= $this->getMetadataFull('start_adapter', $file);
+		$info = $this->getMetadataFull('start_adapter', $file);
 		return $this->start_filesystem->normalizeFileInfo($info);
 	}
 	
@@ -166,10 +166,10 @@ 
 		return $this->getMetadataFull('storage_adapter', $file);
 	}
 	
-	public function get_included_files_handler($metadata  = 0)
+	public function get_included_files_handler($metadata = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
+		if (!$metadata)
 			return $path;
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
@@ -186,16 +186,16 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 		
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
-		if(isset($new_list[0]))
+		if (isset($new_list[0]))
 			return $new_list[0];
 	}
 	
@@ -203,13 +203,13 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
 		return $new_list;
@@ -220,8 +220,8 @@ 
 		$files = $this->get_backup_archives_list();
 		$total = 0;
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 				$total += $file['size'];
 				
 		return $total;		
@@ -229,7 +229,7 @@ 
 	
 	public function is_part($backup_name)
 	{
-		if(stristr($backup_name, "-part"))
+		if (stristr($backup_name, "-part"))
 			return true;
 		
 		return false;	
@@ -237,7 +237,7 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -246,10 +246,10 @@ 
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->get_storage_filesystem()->getSize($backup_name);
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
+			foreach ($backup_parts as $part_file)
 				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
 		}
 		
@@ -260,12 +260,12 @@ 
 	{
 		$files = array();
 		
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$files[] = $data[0];
@@ -278,12 +278,12 @@ 
 	
 	public function delete_backup_by_name($backup_name, $storage_selection = "")
 	{
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$this->get_storage_filesystem($storage_selection)->delete($data[0]);
@@ -291,7 +291,7 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem($storage_selection)->delete($backup_name))
+		if ($this->get_storage_filesystem($storage_selection)->delete($backup_name))
 			$return = true;
 		else
 			$return = false;
@@ -299,7 +299,7 @@ 
 		return $return;	
 	}
 	
-	public function getMetadataFull($adapter = "storage_adapter" , $path)
+	public function getMetadataFull($adapter = "storage_adapter", $path)
     {
         $location = $this->$adapter->applyPathPrefix($path);
         $spl_info = new SplFileInfo($location);
@@ -313,25 +313,25 @@ 
 		$list = array();
 		
 
-		if(method_exists($this->get_storage_filesystem($storage_selection), "listContents"))
+		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)
+		foreach ($list as $file_info)
 		{
-			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
+			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)
+				foreach ($lines as $line)
+					if ($line)
 					{
 						$data = str_getcsv($line);
-						if(is_array($data)){
+						if (is_array($data)) {
 							$parents[$data[0]] = $file_info['basename'];
 							$file_info['childs'][] = $data;
 							$file_info['size'] += $data[2];
@@ -340,18 +340,18 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
 				$backup_files[$file_info['path']] = $file_info;
 		}
 		
-		foreach($backup_files as $key=>$file_info)
+		foreach ($backup_files as $key=>$file_info)
 		{
-			if(!isset($backup_files[$key]['timestamp']))
+			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']]))
+			if (isset($parents[$file_info['basename']]))
 				$backup_files[$key]['parent'] = $parents[$file_info['basename']];
 		}
 		
@@ -360,40 +360,40 @@ 
 	
 	public function start_file_recursion($init = 0)
 	{
-		if($init)
+		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())){
+		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)
+			foreach ($files as $file)
 			{
-				if($counter < $this->folders_to_process_per_session){
+				if ($counter < $this->folders_to_process_per_session) {
 					$this->build_files_list($file);
 					$counter++;
-				}else{
+				} else {
 					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
 				}
 			}
-		}else{
+		} else {
 			$this->build_files_list();
 		}
 		
-		if($this->scan_finished())
+		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()))
+			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');
@@ -401,13 +401,13 @@ 
 			}
 		
 			//adding a default index.html to the temp xcloner folder
-			if(!$this->get_tmp_filesystem()->has("index.html"))
+			if (!$this->get_tmp_filesystem()->has("index.html"))
 			{
-				$this->get_tmp_filesystem()->write("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)))
+			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');
@@ -425,20 +425,20 @@ 
 		$return = array();
 		
 		$files_list_file = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if(file_exists($files_list_file))
+		if (file_exists($files_list_file))
 			{
 				$return[] = $files_list_file;
 			}
 			
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		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))
+			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))
+			if (file_exists($log_file))
 			{
 				$return[] = $log_file;
 			}
@@ -454,8 +454,8 @@ 
 		
 		$contents = $this->get_tmp_filesystem()->listContents();
 	
-		if(is_array($contents))
-		foreach($contents as $file_info)
+		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());
@@ -465,19 +465,19 @@ 
 	
 	public function cleanup_tmp_directories()
 	{
-		$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false),LOCK_EX|FILE_APPEND, 'SKIP_LINKS');
+		$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)
+		foreach ($contents as $file)
 		{
 			
-			if(preg_match("/.xcloner-(.*)/",$file['path']))
+			if (preg_match("/.xcloner-(.*)/", $file['path']))
 			{
-				if($file['timestamp'] < strtotime("-1days"))
+				if ($file['timestamp'] < strtotime("-1days"))
 				{
 					$tmp_filesystem->deleteDir($file['path']);
 					$this->logger->debug(sprintf("Delete temporary directory %s", $file['path']));
@@ -492,16 +492,16 @@ 
 	{
 		$this->files_counter = 0;
 		
-		if(!$this->storage_filesystem->has("index.html"))	
-			$this->storage_filesystem->write("index.html","");
+		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("index.html"))	
+			$this->tmp_filesystem->write("index.html", "");
 			
-		if($this->tmp_filesystem->has($this->get_included_files_handler()))
+		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()))	
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 	}
 	
@@ -521,20 +521,20 @@ 
 	}
 	
 	public static function is_regex($regex) {
-		return preg_match("/^\^(.*)\$$/i",$regex);
+		return preg_match("/^\^(.*)\$$/i", $regex);
 	}
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
+		if (!is_array($excluded_files))
 		{
 			$excluded_files = array();
 		}
 		
-		foreach($excluded_files as $excl)
+		foreach ($excluded_files as $excl)
 		{
 			
-			if($this->is_regex($excl))
+			if ($this->is_regex($excl))
 			{
 				$this->additional_regex_patterns[] = $excl;
 			}
@@ -560,35 +560,35 @@ 
 		$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 (!$folder) {
 			
 		}
 			
-		try{
+		try {
 			
 			$files = $this->start_filesystem->listContents($folder);
-			foreach($files as $file)
+			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","NOT READABLE"));
+					$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"));
+				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))
+					if ($this->store_file($file))
 					{
 						$this->files_counter++;
 					}
-					if(isset($file['size']))
+					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"));
+				} 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());
 		
@@ -602,9 +602,9 @@ 
 				
 		$start_time = microtime();
 		
-		$data = str_repeat(rand(0,9), 1024*1024); //write 1MB data
+		$data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
 		
-		try{
+		try {
 			$this->tmp_filesystem->write($tmp_file, $data);
 			
 			$end_time = microtime() - $start_time;
@@ -615,7 +615,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
 			$this->logger->error($e->getMessage());
 			
@@ -636,10 +636,10 @@ 
 		
 		$files = $this->storage_filesystem->listContents();
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 			{
-				if(isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
+				if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
 				{
 					$_storage_size += $file['size']; //bytes
 					$_backup_files_list[] = $file;
@@ -647,15 +647,15 @@ 
 			}
 		
 		
-		$this->sort_by($_backup_files_list, "timestamp","asc");
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
 		
 		$_backups_counter = sizeof($_backup_files_list);
 				
-		foreach($_backup_files_list as $file)
+		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	
+			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'];
@@ -663,14 +663,14 @@ 
 			}
 			
 			//processing rule days limit
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp'])
+			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'))
+			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--;
@@ -696,33 +696,33 @@ 
 	
 	}
 	
-	public function process_backup_name($name = "", $max_length=100)
+	public function process_backup_name($name = "", $max_length = 100)
 	{
-		if(!$name)
+		if (!$name)
 			$name = $this->xcloner_settings->get_default_backup_name();
 		
-		foreach($this->backup_name_tags as $tag)
+		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]')
+			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);	
+				$name = str_replace($tag, $domain, $name);	
 			}
 		}
 		
-		if($max_length)
+		if ($max_length)
 			$name = substr($name, 0, $max_length);
 			
 		return $name;	
 	}
 	
-	public function sort_by( &$array, $field, $direction = 'asc')
+	public function sort_by(&$array, $field, $direction = 'asc')
 	{
-		if(strtolower($direction) == "desc" || $direction == SORT_DESC)
+		if (strtolower($direction) == "desc" || $direction == SORT_DESC)
 			$direction = SORT_DESC;
 		else
 			$direction = SORT_ASC;
@@ -742,7 +742,7 @@ 
 	            $tmp = array();
 	            foreach ($data as $key => $row)
 	            {
-					if(is_array($row))
+					if (is_array($row))
 						$tmp[$key] = $row[$field];
 					else
 						$tmp[$key] = $row->$field;
@@ -759,18 +759,18 @@ 
 	
 	private function check_file_diff_time($file)
 	{
-		if($this->get_diff_timestamp_start() != "")
+		if ($this->get_diff_timestamp_start() != "")
 		{
 			$fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
 			$timestamp = $fileMeta->getMTime();
-			if($timestamp < $fileMeta->getCTime())
+			if ($timestamp < $fileMeta->getCTime())
 			{
 				$timestamp = $fileMeta->getCTime();
 			}
 			
-			if($timestamp <= $this->get_diff_timestamp_start())
+			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;
 			}
 		}
 		
@@ -781,37 +781,37 @@ 
 	{
 		$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 ($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))
+			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(!sizeof($this->excluded_files))
+		if (!sizeof($this->excluded_files))
 		{
 			$this->set_excluded_files();
 		}
 						
-		if(is_array($this->excluded_files))
-		foreach($this->excluded_files as $excluded_file_pattern)
+		if (is_array($this->excluded_files))
+		foreach ($this->excluded_files as $excluded_file_pattern)
 		{
-			if($excluded_file_pattern == "/")
+			if ($excluded_file_pattern == "/")
 				$needle = "$";
 			else
 				$needle = "$".$excluded_file_pattern;
 				
-			if(strstr("$".$file['path'], $needle)){
+			if (strstr("$".$file['path'], $needle)) {
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
+		if ($regex = $this->is_excluded_regex($file))
 			return $regex;
 		
-		if($file['type'] == "file")
+		if ($file['type'] == "file")
 		{
 			$check_file_diff_timestamp = $this->check_file_diff_time($file);
-			if($check_file_diff_timestamp)
+			if ($check_file_diff_timestamp)
 			{
 				return $check_file_diff_timestamp;
 			}
@@ -858,32 +858,32 @@ 
 		
 		$regex_patterns = explode(PHP_EOL, $this->xcloner_settings->get_xcloner_option('xcloner_regex_exclude'));
 		
-		if(is_array($this->additional_regex_patterns))
+		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))
+		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)
+			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 (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'] == "/")
+				if ($file['path'] == "/")
 					$needle = "/";
 				else
 					$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;
 				}
 			}
@@ -896,36 +896,36 @@ 
 	{
 		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
 		
-		if(!isset($file['size']))
+		if (!isset($file['size']))
 			$file['size'] = 0;
-		if(!isset($file['visibility']))	
+		if (!isset($file['visibility']))	
 			$file['visibility'] = "private";
 		
-		$csv_filename = str_replace('"','""', $file['path']);
+		$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{
+		if ($file['type'] == "dir") {
+			try {
 				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());	
 			}
 		}
 		
-		if($this->get_diff_timestamp_start())
+		if ($this->get_diff_timestamp_start())
 		{
-			if($file['type'] != "file" && $response = $this->check_file_diff_time($file))
+			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"));
+				$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()))
+		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;
@@ -934,7 +934,7 @@ 
 			
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 		
 			$this->logger->error($e->getMessage());	
 		}
@@ -949,13 +949,13 @@ 
 	
 	public function get_filesystem($system = "")
 	{
-		if($system == "storage_filesystem_append")
+		if ($system == "storage_filesystem_append")
 			return $this->storage_filesystem_append;
-		elseif($system == "tmp_filesystem_append")
+		elseif ($system == "tmp_filesystem_append")
 			return $this->tmp_filesystem_append;
-		elseif($system == "tmp_filesystem")
+		elseif ($system == "tmp_filesystem")
 			return $this->tmp_filesystem;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_filesystem;
 		else
 			return $this->start_filesystem;	
@@ -963,9 +963,9 @@ 
 	
 	public function get_adapter($system)
 	{
-		if($system == "tmp_filesystem")
+		if ($system == "tmp_filesystem")
 			return $this->tmp_adapter;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_adapter;
 		else
 			return $this->start_adapter;	
@@ -973,10 +973,10 @@ 
 	
 	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()))
+		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()))
+		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")));
@@ -986,7 +986,7 @@ 
 	
 	private function calc_to_bytes($mb_size)
 	{
-		return $mb_size*(1024*1024);
+		return $mb_size * (1024 * 1024);
 	}
 	
 }