ovidiul / XCloner-Wordpress

phar-generate.php

Braces +4 added lines, -2 removed lines

@@ -1,12 +1,14 @@
 <?php
 
-if(!isset($argv))
+if(!isset($argv)) {
 	die('Access denied from web.');
+}
 
 $file = 'restore/vendor.phar';	
 
-if(file_exists($file))
+if(file_exists($file)) {
 	unlink($file);
+}
 $phar2 = new Phar($file, 0, 'vendor.phar');
 
 // add all files in the project, only include php files

includes/class-xcloner-sanitization.php

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		
 		try{
 			$option = Util::normalizePath($path);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			add_settings_error('xcloner_error_message', '', __($e->getMessage()), 'error');
 		}
 		

includes/class-xcloner-activator.php

Braces +39 added lines, -26 removed lines

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

includes/class-xcloner-settings.php

Braces +80 added lines, -56 removed lines

@@ -8,26 +8,29 @@ 
 	
 	public function __construct($hash = "")
 	{
-		if(isset($hash))
-			$this->set_hash($hash);
+		if(isset($hash)) {
+					$this->set_hash($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));
+		if($include_hash) {
+					$filename = sprintf($this->logger_file_hash, $this->get_hash());
+		} else {
+					$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
+		}
 		
 		return $filename;
 	}
 	
 	public function get_xcloner_start_path()
 	{
-		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
-			$path = realpath(ABSPATH);
-		else
-			$path = get_option('xcloner_start_path');
+		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path'))) {
+					$path = realpath(ABSPATH);
+		} else {
+					$path = get_option('xcloner_start_path');
+		}
 		
 		return $path;
 	}
@@ -41,10 +44,11 @@ 
 	
 	public function get_xcloner_store_path()
 	{
-		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path')))
-			$path = realpath(XCLONER_STORAGE_PATH);
-		else
-			$path = get_option('xcloner_store_path');
+		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path'))) {
+					$path = realpath(XCLONER_STORAGE_PATH);
+		} else {
+					$path = get_option('xcloner_store_path');
+		}
 		
 		return $path;
 	}
@@ -64,16 +68,18 @@ 
 			@chmod($path, 0777);
 		}
 		
-		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
-			$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
+		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root')) {
+					$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
+		}
 		
 		return $path;
 	}
 	
 	public function get_enable_mysql_backup()
 	{
-		if(get_option('xcloner_enable_mysql_backup'))
-			return true;
+		if(get_option('xcloner_enable_mysql_backup')) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -82,10 +88,11 @@ 
 	{
 		if(!$ext)
 		{
-			if(get_option('xcloner_backup_compression_level'))
-				$ext = ".tgz";
-			else
-				$ext = ".tar";
+			if(get_option('xcloner_backup_compression_level')) {
+							$ext = ".tgz";
+			} else {
+							$ext = ".tar";
+			}
 		}	
 		return ($this->get_hash()).$ext;	
 	}
@@ -111,8 +118,9 @@ 
 	
 	public function set_hash($hash = "")
 	{
-		if(substr($hash, 0, 1) != "-" and strlen($hash))
-			$hash = "-".$hash;
+		if(substr($hash, 0, 1) != "-" and strlen($hash)) {
+					$hash = "-".$hash;
+		}
 			
 		$this->hash = substr( $hash, 0, 6);
 		
@@ -132,8 +140,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
-			$data = $wpdb->dbhost;
+		if(!$data = get_option('xcloner_mysql_hostname')) {
+					$data = $wpdb->dbhost;
+		}
 		
 		return $data;
 	}
@@ -142,8 +151,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
-			$data = $wpdb->dbuser;
+		if(!$data = get_option('xcloner_mysql_username')) {
+					$data = $wpdb->dbuser;
+		}
 		
 		return $data;
 	}
@@ -152,8 +162,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
-			$data = $wpdb->dbpassword;
+		if(!$data = get_option('xcloner_mysql_password')) {
+					$data = $wpdb->dbpassword;
+		}
 		
 		return $data;
 	}
@@ -162,8 +173,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
-			$data = $wpdb->dbname;
+		if(!$data = get_option('xcloner_mysql_database')) {
+					$data = $wpdb->dbname;
+		}
 		
 		return $data;
 	}
@@ -186,8 +198,9 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
-			$hash = substr($hash, 0, $strlen);
+		if($strlen) {
+					$hash = substr($hash, 0, $strlen);
+		}
 			
 		return $hash;
 	}
@@ -554,15 +567,18 @@ 
 	// text field content cb
 	public function do_form_text_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -581,15 +597,18 @@ 
 	// textarea field content cb
 	public function do_form_textarea_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -624,15 +643,18 @@ 
 	// number field content cb
 	public function do_form_number_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -650,8 +672,9 @@ 
 	
 	public function do_form_range_field($params)
 	{
-		if(!isset($params['4']))
-			$params[4] = 0;
+		if(!isset($params['4'])) {
+					$params[4] = 0;
+		}
 			
 		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
 		$value = get_option($fieldname);
@@ -672,8 +695,9 @@ 
 	
 	public function do_form_switch_field($params)
 	{
-		if(!isset($params['2']))
-			$params[2] = 0;
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 		list($fieldname, $label, $disabled) = $params;
 		$value = get_option($fieldname);
 	?>

includes/class-xcloner-api.php

Braces +111 added lines, -85 removed lines

@@ -27,8 +27,9 @@ 
 		global $wpdb;
 		
 		error_reporting(0);
-		if( ob_get_length() )
-			ob_end_clean();
+		if( ob_get_length() ) {
+					ob_end_clean();
+		}
 		ob_start();
 		
 		$wpdb->show_errors		= false;
@@ -38,10 +39,11 @@ 
 		//generating the hash suffix for tmp xcloner store folder
 		if(isset($_POST['hash'])){
 			
-			if($_POST['hash'] == "generate_hash")
-				$this->xcloner_settings->generate_new_hash();
-			else
-				$this->xcloner_settings->set_hash($_POST['hash']);
+			if($_POST['hash'] == "generate_hash") {
+							$this->xcloner_settings->generate_new_hash();
+			} else {
+							$this->xcloner_settings->set_hash($_POST['hash']);
+			}
 		}
 
 		$this->logger 					= new XCloner_Logger("xcloner_api", $this->xcloner_settings->get_hash());
@@ -78,7 +80,7 @@ 
 			//$xcloner_db = new XCloner_Database($data['dbUsername'], $data['dbPassword'], $data['dbDatabase'], $data['dbHostname']);
 			$this->xcloner_database->init($data);
 
-		}catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -106,8 +108,9 @@ 
 		$params = array();
 		$schedule = array();
 		
-		if(isset($_POST['data']))
-			$params = json_decode(stripslashes($_POST['data']));
+		if(isset($_POST['data'])) {
+					$params = json_decode(stripslashes($_POST['data']));
+		}
 		
 		$this->process_params($params);
 		
@@ -130,8 +133,9 @@ 
 			{
 					$table = str_replace("\r","", $table);
 					$data = explode(".", $table);
-					if(isset($data[1]))
-						$return[$data[0]][] = $data[1];
+					if(isset($data[1])) {
+											$return[$data[0]][] = $data[1];
+					}
 			}
 			
 			$this->form_params['database'] = ($return);
@@ -142,8 +146,9 @@ 
 			foreach($excluded_files as $file)
 			{
 				$file = str_replace("\r","", $file);
-				if($file)
-					$return[] = $file;
+				if($file) {
+									$return[] = $file;
+				}
 			}
 			
 			$this->form_params['excluded_files'] = ($return);
@@ -153,19 +158,21 @@ 
 			
 			$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{
+			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'])						
-			$schedule['start_at'] = time();
+		if(!$schedule['start_at']) {
+					$schedule['start_at'] = time();
+		}
 		
 		$schedule['start_at'] = date('Y-m-d H:i:s', $schedule['start_at']);	
 		
@@ -185,7 +192,7 @@ 
 					'%s' 
 				) 
 			);
-		}else		{
+		} else		{
 			$insert = $wpdb->update( 
 				$wpdb->prefix.'xcloner_scheduler', 
 				$schedule, 
@@ -196,8 +203,9 @@ 
 				) 
 			);
 		}
-		if(isset($_POST['id']))
-			$scheduler->update_cron_hook($_POST['id']);
+		if(isset($_POST['id'])) {
+					$scheduler->update_cron_hook($_POST['id']);
+		}
 			
 		if( $wpdb->last_error ) {
             $response['error'] = 1;
@@ -226,8 +234,9 @@ 
 		
 		$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);
 		
@@ -236,7 +245,7 @@ 
 		//$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)
+		} catch(Exception $e)
 		{
 			$return = array();
 			$return['error'] = true;
@@ -248,8 +257,9 @@ 
 		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();
+			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;
@@ -263,7 +273,7 @@ 
 					$from = "";
 					$subject = "";
 					$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $this->form_params);
-				}catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->logger->error($e->getMessage());
 				}
@@ -289,18 +299,20 @@ 
 		
 		$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);
 			
 		//$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;
 		
@@ -321,8 +333,9 @@ 
 		$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);
 		
@@ -345,8 +358,9 @@ 
 	 */ 
 	private function process_params($params)
 	{
-		if(isset($params->hash))
-			$this->xcloner_settings->set_hash($params->hash);
+		if(isset($params->hash)) {
+					$this->xcloner_settings->set_hash($params->hash);
+		}
 			
 		$this->form_params['extra'] = array();
 		$this->form_params['backup_params'] = array();
@@ -399,8 +413,9 @@ 
 		
 		if(isset($params->extra))
 		{
-			foreach($params->extra as $key=>$value)
-				$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
+			foreach($params->extra as $key=>$value) {
+							$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
+			}
 		}
 			
 		return $this->xcloner_settings->get_hash();
@@ -437,7 +452,7 @@ 
 			
 			try{
 				$files = $this->xcloner_file_system->list_directory($folder);
-			}catch(Exception $e){
+			} catch(Exception $e){
 				
 				print $e->getMessage();
 				$this->logger->error($e->getMessage());
@@ -457,17 +472,19 @@ 
 				$children = false;
 				$text = $file['basename'];
 				
-				if($file['type'] == "dir")
-					$children = true;
-				else
-					 $text .= " (". $this->xcloner_requirements->file_format_size($file['size']).")";
+				if($file['type'] == "dir") {
+									$children = true;
+				} else {
+									 $text .= " (". $this->xcloner_requirements->file_format_size($file['size']).")";
+				}
 				
 				//if(in_array($file['path'], $this->xcloner_file_system->get_excluded_files()))
 				//echo $file['path']."--".$this->xcloner_file_system->is_excluded($file);
-				if($excluded_pattern = $this->xcloner_file_system->is_excluded($file))
-					$selected = true;
-				else
-					$selected = false;
+				if($excluded_pattern = $this->xcloner_file_system->is_excluded($file)) {
+									$selected = true;
+				} else {
+									$selected = false;
+				}
 					
 				$data[] = array(
 							'id' => $file['path'],
@@ -505,22 +522,24 @@ 
 		{
 			try{
 				$return = $this->xcloner_database->get_all_databases();
-			}catch(Exception $e){
+			} 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;
+				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;
+					if($database['num_tables'] < 25) {
+											$state['opened'] = false;
+					}
 				}
 					
 				$data[] = array(
@@ -533,13 +552,11 @@ 
 						);
 			}
 			
-		}
-		
-		else{
+		} else{
 			
 			try{
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->logger->error($e->getMessage());
 			}
 			
@@ -547,11 +564,13 @@ 
 			{
 				$state = array();
 				
-				if($xcloner_backup_only_wp_tables and !stristr($table['name'], $this->xcloner_settings->get_table_prefix()))
-					continue;
+				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);
+				if(isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database()) {
+									$state = array('selected' => true);
+				}
 					
 				$data[] = array(
 						'id' => $table['name'],
@@ -604,10 +623,11 @@ 
 		{
 			$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>';
+			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));
 				
@@ -615,17 +635,19 @@ 
 			
 			$remote_storage = $res->remote_storage;
 			
-			if(!$next_run_time >= time())
-				$next_run = " ";
+			if(!$next_run_time >= time()) {
+							$next_run = " ";
+			}
 			
 			if(trim($next_run))
 			{
 				$date_text = $next_run;
 				
-				if($next_run_time >= time())
-					$next_run = "in ".human_time_diff($next_run_time, time());
-				else
-					$next_run = __("executed", 'xcloner-backup-and-restore');
+				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)";	
@@ -712,7 +734,7 @@ 
 			$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();
@@ -740,15 +762,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->xcloner_file_system->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -780,7 +803,7 @@ 
 			{
 				$return = call_user_func_array(array($xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $storage_type));
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -925,11 +948,13 @@ 
 		$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']);
@@ -956,7 +981,7 @@ 
 			$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;
@@ -990,8 +1015,9 @@ 
 			$data['hash'] = $this->xcloner_settings->get_hash();
 		}
 			
-		if( ob_get_length() )
-			ob_clean();
+		if( ob_get_length() ) {
+					ob_clean();
+		}
 		wp_send_json($data);
 		
 		die();

includes/class-xcloner-database.php

Braces +75 added lines, -52 removed lines

@@ -44,11 +44,13 @@ 
 		$this->xcloner_settings 		= new Xcloner_Settings($hash);
 		$this->fs 						= new Xcloner_File_System($hash);
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
-			$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request')) {
+					$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		}
 		
-		if(!$this->recordsPerSession)
-			$this->recordsPerSession = 100;
+		if(!$this->recordsPerSession) {
+					$this->recordsPerSession = 100;
+		}
 		
 		$wp_host 	= $this->xcloner_settings->get_db_hostname();
 		$wp_user 	= $this->xcloner_settings->get_db_username();
@@ -105,37 +107,43 @@ 
 			{
 				foreach($params['#'] as $database)
 				{
-					if(!isset($params[$database]) or !is_array($params[$database]))
-						$params[$database] = array();
+					if(!isset($params[$database]) or !is_array($params[$database])) {
+											$params[$database] = array();
+					}
 				}
 				$db_count = -1;
 			}
 			
-			if(isset($params) and is_array($params))
-				foreach($params as $database=>$tables)
+			if(isset($params) and is_array($params)) {
+							foreach($params as $database=>$tables)
 				{	
 					if($database != "#")
 					{
-						$stats = $this->write_backup_process_list($database, $tables);	
+						$stats = $this->write_backup_process_list($database, $tables);
+			}
 						$return['stats']['tables_count'] 	+= $stats['tables_count'];
 						$return['stats']['total_records'] 	+= $stats['total_records'];
 					}
 				}
 
-			if(sizeof($params))
-				$return['stats']['database_count'] = sizeof($params)+$db_count;
-			else	
-				$return['stats']['database_count'] = 0;
+			if(sizeof($params)) {
+							$return['stats']['database_count'] = sizeof($params)+$db_count;
+			} else {
+							$return['stats']['database_count'] = 0;
+			}
 				
 			return $return;
 		}
 		
-		if(!isset($extra_params['startAtLine']))
-			$extra_params['startAtLine'] = 0;
-		if(!isset($extra_params['startAtRecord']))
-			$extra_params['startAtRecord'] = 0;
-		if(!isset($extra_params['dumpfile']))
-			$extra_params['dumpfile'] = "";
+		if(!isset($extra_params['startAtLine'])) {
+					$extra_params['startAtLine'] = 0;
+		}
+		if(!isset($extra_params['startAtRecord'])) {
+					$extra_params['startAtRecord'] = 0;
+		}
+		if(!isset($extra_params['dumpfile'])) {
+					$extra_params['dumpfile'] = "";
+		}
 		
 		$return = $this->process_incremental($extra_params['startAtLine'], $extra_params['startAtRecord'], $extra_params['dumpfile']);
 		
@@ -147,11 +155,13 @@ 
 		
 		if($message){
 			$this->logger->info( $message, array(""));
-		}else{	
-			if($this->last_query)
-				$this->logger->debug( $this->last_query, array(""));
-			if($this->last_error)
-				$this->logger->error( $this->last_error, array(""));
+		} else{	
+			if($this->last_query) {
+							$this->logger->debug( $this->last_query, array(""));
+			}
+			if($this->last_error) {
+							$this->logger->error( $this->last_error, array(""));
+			}
 		}
 		
 		return;
@@ -222,11 +232,12 @@ 
 		$databases_list[$i]['num_tables'] = $this->get_database_num_tables($this->dbname);
 		$i++;
 		
-		if(is_array($databases))
-		foreach( $databases as $db){
+		if(is_array($databases)) {
+				foreach( $databases as $db){
 			if($db->Database != $this->dbname)
 			{
 				$databases_list[$i]['name'] = $db->Database;
+		}
 				$databases_list[$i]['num_tables'] = $this->get_database_num_tables($db->Database);
 				$i++;
 			}
@@ -247,8 +258,9 @@ 
 		$tablesList[0] = array( );
 		$inc = 0;
 
-		if(!$database)
-			$database = $this->dbname;
+		if(!$database) {
+					$database = $this->dbname;
+		}
 		
 		$this->logger->debug(sprintf(("Listing tables in %s database"), $database));
 		
@@ -272,10 +284,11 @@ 
 			
 			$tablesList[$inc]['excluded'] = 0;
 						
-			if(sizeof($included) and is_array($included))
-				if(!in_array($table, $included) )
+			if(sizeof($included) and is_array($included)) {
+							if(!in_array($table, $included) )
 				{
 					$tablesList[$inc]['excluded'] = 1;
+			}
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
 				}
 			$inc++;
@@ -294,19 +307,21 @@ 
 		
 		$tables = $this->list_tables($dbname, $incl_tables, 1);
 		
-		if($this->dbname != $dbname)
-			$dumpfile = $dbname."-backup.sql";
-		else
-			$dumpfile = $this->TEMP_DUMP_FILE;
+		if($this->dbname != $dbname) {
+					$dumpfile = $dbname."-backup.sql";
+		} else {
+					$dumpfile = $this->TEMP_DUMP_FILE;
+		}
 		
 		$line = sprintf("###newdump###\t%s\t%s\n", $dbname, $dumpfile);
 		$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			
 		// write this to the class and write to $TEMP_DBPROCESS_FILE file as database.table records
-		foreach($tables as $key=>$table) 
-		if($table!= "" and !$tables[$key]['excluded']){
+		foreach($tables as $key=>$table) {
+				if($table!= "" and !$tables[$key]['excluded']){
 
 			$line = sprintf("`%s`.`%s`\t%s\t%s\n", $dbname, $tables[$key]['name'], $tables[$key]['records'], $tables[$key]['excluded']);
+		}
 			$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			$return['tables_count']++;
 			$return['total_records'] += $tables[$key]['records'];
@@ -354,8 +369,9 @@ 
 		$return['finished'] = 0;
 		$lines = array();
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		}
 	
 		foreach ($lines as $buffer){
 			
@@ -380,14 +396,16 @@ 
 						$startAtLine++;
 						$return['new_dump'] = 1;
 						//break;
-				}else{
+				} else{
 						//we export the table
-						if($tableInfo[0] == "###enddump###")
-							$return['endDump'] = 1;
+						if($tableInfo[0] == "###enddump###") {
+													$return['endDump'] = 1;
+						}
 	
 						//table is excluded
-						if($tableInfo[2])
-							continue;
+						if($tableInfo[2]) {
+													continue;
+						}
 							
 						$next = $startAtRecord + $this->recordsPerSession;
 						
@@ -404,16 +422,19 @@ 
 						//if(intval($return['totalRecords']) != 0)
 						//print_r($tableInfo);
 						
-						if(trim($tableName) !=""  and !$tableInfo[2])
-							$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						if(trim($tableName) !=""  and !$tableInfo[2]) {
+													$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						}
 						
 						$return['processedRecords'] = $startAtRecord+$processed_records;
 						
-						if($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
+						if($next >= $tableInfo[1]) {
+							//we finished loading the records for next sessions, will go to the new record
 						{
 								$startAtLine ++;
+						}
 								$startAtRecord = 0;
-						}else{
+						} else{
 								$startAtRecord = $startAtRecord + $this->recordsPerSession;
 							}
 
@@ -446,8 +467,9 @@ 
 		$return['finished'] = 1;
 		$return['startAtLine']	= $startAtLine;
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		}
 		
 		$this->logger->debug(sprintf(("Database backup finished!")));
 		
@@ -475,8 +497,9 @@ 
 		
 		$records = 0;
 		
-		if($start == 0)
-			$this->dump_structure($databaseName, $tableName, $dumpfile);
+		if($start == 0) {
+					$this->dump_structure($databaseName, $tableName, $dumpfile);
+		}
 
 		$start = intval($start);
 		$limit = intval($limit);
@@ -488,7 +511,7 @@ 
 			$result = mysqli_query($this->dbh, $query);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		
-		}else{
+		} else{
 			$result = mysql_query($query, $this->dbh);
 			$mysql_fetch_function = "mysql_fetch_array";
 		}

includes/class-xcloner-requirements.php

Braces +49 added lines, -34 removed lines

@@ -13,20 +13,25 @@ 
 	
 	public function check_backup_ready_status()
 	{
-		if(!$this->check_min_php_version(1))
-			return false;
+		if(!$this->check_min_php_version(1)) {
+					return false;
+		}
 		
-		if(!$this->check_safe_mode(1))
-			return false;
+		if(!$this->check_safe_mode(1)) {
+					return false;
+		}
 		
-		if(!$this->check_xcloner_start_path(1))
-			return false;
+		if(!$this->check_xcloner_start_path(1)) {
+					return false;
+		}
 		
-		if(!$this->check_xcloner_store_path(1))
-			return false;
+		if(!$this->check_xcloner_store_path(1)) {
+					return false;
+		}
 		
-		if(!$this->check_xcloner_tmp_path(1))
-			return false;
+		if(!$this->check_xcloner_tmp_path(1)) {
+					return false;
+		}
 			
 		return true;	
 	}
@@ -41,10 +46,11 @@ 
 		
 		if($return_bool == 1)
 		{
-			if(version_compare(phpversion(), $this->min_php_version, '<'))
-				return false;
-			else
-				return true;
+			if(version_compare(phpversion(), $this->min_php_version, '<')) {
+							return false;
+			} else {
+							return true;
+			}
 		}
 		
 		return phpversion();
@@ -56,14 +62,16 @@ 
 		
 		if($return_bool)
 		{
-			if( ini_get('safe_mode') )
-				return false;
-			else
-				return true;
+			if( ini_get('safe_mode') ) {
+							return false;
+			} else {
+							return true;
+			}
 		}
 		
-		if( ini_get('safe_mode') )
-			$safe_mode = "On";
+		if( ini_get('safe_mode') ) {
+					$safe_mode = "On";
+		}
 			
 		return $safe_mode;
 	}
@@ -74,8 +82,9 @@ 
 		
 		if($return_bool)
 		{
-			if(!file_exists($path))
-				return false;
+			if(!file_exists($path)) {
+							return false;
+			}
 				
 			return is_readable($path);
 		}
@@ -89,11 +98,13 @@ 
 		
 		if($return_bool)
 		{
-			if(!file_exists($path))
-				return false;
+			if(!file_exists($path)) {
+							return false;
+			}
 			
-			if(!is_writeable($path))	
-				@chmod($path, 0777);
+			if(!is_writeable($path)) {
+							@chmod($path, 0777);
+			}
 					
 			return is_writeable($path);
 		}
@@ -107,11 +118,13 @@ 
 		
 		if($return_bool)
 		{
-			if(!file_exists($path))
-				return false;
+			if(!file_exists($path)) {
+							return false;
+			}
 			
-			if(!is_writeable($path))	
-				@chmod($path, 0777);
+			if(!is_writeable($path)) {
+							@chmod($path, 0777);
+			}
 				
 			return is_writeable($path);
 		}
@@ -133,8 +146,9 @@ 
 	{
 		$open_basedir =  ini_get('open_basedir');
 		
-		if(!$open_basedir)
-			$open_basedir = "none";
+		if(!$open_basedir) {
+					$open_basedir = "none";
+		}
 		return $open_basedir;	
 	}
 	
@@ -153,8 +167,9 @@ 
 	  $unit_count = count($unit_list);
 	  for ($i = $unit_count - 1; $i >= 0; $i--) {
 	    $power = $i * 10;
-	    if (($bytes >> $power) >= 1)
-	      return round($bytes / (1 << $power), $decimals) . ' ' . $unit_list[$i];
+	    if (($bytes >> $power) >= 1) {
+	    	      return round($bytes / (1 << $power), $decimals) . ' ' . $unit_list[$i];
+	    }
 	  }
 	}
 }

includes/class-xcloner-file-transfer.php

Braces +7 added lines, -5 removed lines

@@ -19,8 +19,9 @@ 
 	
 	public function transfer_file($file, $start = 0, $hash = "")
 	{
-		if(!$this->target_url)
-			throw new Exception("Please setup a target url for upload");
+		if(!$this->target_url) {
+					throw new Exception("Please setup a target url for upload");
+		}
 
 		
 		$fp = $this->get_storage_filesystem()->readStream($file);
@@ -68,8 +69,9 @@ 
 		
 		$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)
 		{
@@ -94,7 +96,7 @@ 
 	            . ($postname ?: basename($filename))
 	            . ($mimetype ? ";type=$mimetype" : '');
 		
-		}else{
+		} else{
 			
 			return curl_file_create($filename, $mimetype, $postname);	
 				

includes/class-xcloner-file-system.php

Braces +154 added lines, -113 removed lines

@@ -59,13 +59,14 @@ 
 			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			return false;
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
-			$this->folders_to_process_per_session = $value;
+		if($value = get_option('xcloner_directories_to_scan_per_request')) {
+					$this->folders_to_process_per_session = $value;
+		}
 
 	}
 	
@@ -128,8 +129,9 @@ 
 	public function get_included_files_handler($metadata  = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
-			return $path;
+		if(!$metadata) {
+					return $path;
+		}
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
 		return $spl_info;
@@ -145,31 +147,36 @@ 
 	{
 		$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]))
-			return $new_list[0];
+		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");
+		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;
 	}
@@ -179,25 +186,28 @@ 
 		$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;		
 	}
 	
 	public function is_part($backup_name)
 	{
-		if(stristr($backup_name, "-part"))
-			return true;
+		if(stristr($backup_name, "-part")) {
+					return true;
+		}
 		
 		return false;	
 	}
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -208,8 +218,9 @@ 
 		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);
+			foreach($backup_parts as $part_file) {
+							$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -250,10 +261,11 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem()->delete($backup_name))
-			$return = true;
-		else
-			$return = false;
+		if($this->get_storage_filesystem()->delete($backup_name)) {
+					$return = true;
+		} else {
+					$return = false;
+		}
 			
 		return $return;	
 	}
@@ -271,8 +283,9 @@ 
 	{
 		$list = array();
 		
-		if(method_exists($this->get_storage_filesystem(), "listContents"))
-			$list = $this->get_storage_filesystem()->listContents();
+		if(method_exists($this->get_storage_filesystem(), "listContents")) {
+					$list = $this->get_storage_filesystem()->listContents();
+		}
 
 		
 		$backup_files = array();
@@ -285,10 +298,11 @@ 
 			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach($lines as $line) {
+									if($line)
 					{
 						$data = str_getcsv($line);
+				}
 						if(is_array($data)){
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
@@ -298,14 +312,16 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
-				$backup_files[$file_info['path']] = $file_info;
+			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions)) {
+							$backup_files[$file_info['path']] = $file_info;
+			}
 		}
 		
 		foreach($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			if(isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			}
 		}
 		
 		return $backup_files;
@@ -331,11 +347,11 @@ 
 				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();
 		}
 		
@@ -377,8 +393,9 @@ 
 	{
 		$return = array();
 		$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
-			$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+					$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		}
 		
 		return $return;
 	}
@@ -390,9 +407,10 @@ 
 		
 		$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());
 		
@@ -403,17 +421,21 @@ 
 	{
 		$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()))
-			$this->tmp_filesystem->delete($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()))	
-			$this->tmp_filesystem->delete($this->get_temp_dir_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()
@@ -433,8 +455,9 @@ 
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
-			$excluded_files = array();
+		if(!is_array($excluded_files)) {
+					$excluded_files = array();
+		}
 			
 		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
 		
@@ -468,21 +491,21 @@ 
 				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) ){
+				} 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']);
 					$this->store_file($file);
 					$this->files_counter++;
-					if(isset($file['size']))
-						$this->files_size += $file['size'];
+					if(isset($file['size'])) {
+											$this->files_size += $file['size'];
+					}
 					
-				}else{
+				} 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());
 		
@@ -509,7 +532,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			$this->logger->error($e->getMessage());
 			
@@ -530,12 +553,14 @@ 
 		
 		$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))
 				{
-					$_storage_size += $file['size']; //bytes
+					$_storage_size += $file['size'];
+		}
+		//bytes
 					$_backup_files_list[] = $file;
 				}
 			}
@@ -549,9 +574,11 @@ 
 		{
 			//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", $_storage_size." >= ".$set_storage_limit));
 			}
@@ -592,24 +619,26 @@ 
 	
 	public function process_backup_name($name = "", $max_length=100)
 	{
-		if(!$name)
-			$name = $this->xcloner_settings->get_default_backup_name();
+		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]')
+			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);
+		if($max_length) {
+					$name = substr($name, 0, $max_length);
+		}
 			
 		return $name;	
 	}
@@ -639,28 +668,32 @@ 
 		
 		if($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb'))
 		{
-			if(isset($file['size']) and $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb))
-				return "> ".$xcloner_exclude_files_larger_than_mb."MB";
+			if(isset($file['size']) and $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))
-			$this->set_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 == "/")
 				$needle = "$";
-			else
-				$needle = "$".$excluded_file_pattern;
+		} else {
+							$needle = "$".$excluded_file_pattern;
+			}
 				
 			if(strstr("$".$file['path'], $needle)){
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
-			return $regex;
+		if( $regex = $this->is_excluded_regex($file)) {
+					return $regex;
+		}
 		
 		return false;
 	}
@@ -714,13 +747,15 @@ 
 			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'] == "/")
-					$needle = "/";
-				else
-					$needle = "/".$file['path'];
+				if($file['path'] == "/") {
+									$needle = "/";
+				} else {
+									$needle = "/".$file['path'];
+				}
 				//echo $needle."---".$excluded_file_pattern."---\n";
 				
 				if(@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)){
@@ -736,10 +771,12 @@ 
 	{
 		$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";
+		if(!isset($file['size'])) {
+					$file['size'] = 0;
+		}
+		if(!isset($file['visibility'])) {
+					$file['visibility'] = "private";
+		}
 		
 		$line = '"'.addslashes($file['path']).'","'.$file['timestamp'].'","'.$file['size'].'","'.$file['visibility'].'","'.$storage.'"'.PHP_EOL;
 		
@@ -748,7 +785,7 @@ 
 		try{
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$this->logger->error($e->getMessage());	
 		}
@@ -756,7 +793,7 @@ 
 		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());	
 			}
 		}
@@ -769,35 +806,39 @@ 
 	
 	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;	
+		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;	
+		if($system == "tmp_filesystem") {
+					return $this->tmp_adapter;
+		} elseif($system == "storage_filesystem") {
+					return $this->storage_adapter;
+		} else {
+					return $this->start_adapter;
+		}
 	}
 	
 	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_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());
+		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")));