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-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-remote-storage.php

Braces +37 added lines, -25 removed lines

@@ -97,8 +97,9 @@ 
 		foreach($this->storage_fields as $storage=>$data)
 		{
 			$check_field = $this->storage_fields["option_prefix"].$storage."_enable";
-			if(get_option($check_field))
-				$return[$storage] = $data['text'];
+			if(get_option($check_field)) {
+							$return[$storage] = $data['text'];
+			}
 		}
 		
 		return $return;
@@ -116,11 +117,13 @@ 
 				$check_field = $this->storage_fields["option_prefix"].$field;
 				$sanitize_method = "sanitize_input_as_".$validation;
 				
-				if(!isset($_POST[$check_field]))
-					$_POST[$check_field] = 0;
+				if(!isset($_POST[$check_field])) {
+									$_POST[$check_field] = 0;
+				}
 				
-				if(!method_exists($this->xcloner_sanitization, $sanitize_method))
-					$sanitize_method = "sanitize_input_as_string";
+				if(!method_exists($this->xcloner_sanitization, $sanitize_method)) {
+									$sanitize_method = "sanitize_input_as_string";
+				}
 					
 				$sanitized_value = $this->xcloner_sanitization->$sanitize_method($_POST[$check_field]);
 				update_option($check_field, $sanitized_value);
@@ -135,7 +138,7 @@ 
 				$this->verify_filesystem($action);
 				$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", ucfirst($action));
 				$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));	
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", ucfirst($action));
 			}
 		}
@@ -148,38 +151,44 @@ 
 		
 		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem", strtoupper($storage_type)));	
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 		
 		list($adapter, $filesystem) = $this->$method();
 		
 		$test_file = substr(".xcloner_".md5(time()), 0, 15);
 			
 		//testing write access
-		if(!$filesystem->write($test_file, "data"))
-			throw new Exception(__("Could not write data",'xcloner-backup-and-restore'));
+		if(!$filesystem->write($test_file, "data")) {
+					throw new Exception(__("Could not write data",'xcloner-backup-and-restore'));
+		}
 		$this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));	
 		
 		//testing read access
-		if(!$filesystem->read($test_file))
-			throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		if(!$filesystem->read($test_file)) {
+					throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		}
 		$this->logger->debug(sprintf("I can read data to remote storage %s", strtoupper($storage_type)));		
 		
 		//delete test file
-		if(!$filesystem->delete($test_file))
-			throw new Exception(__("Could not delete data",'xcloner-backup-and-restore'));
+		if(!$filesystem->delete($test_file)) {
+					throw new Exception(__("Could not delete data",'xcloner-backup-and-restore'));
+		}
 		$this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));		
 	}
 	
 	public function upload_backup_to_storage($file, $storage)
 	{
-		if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
-			return false;
+		if(!$this->xcloner_file_system->get_storage_filesystem()->has($file)) {
+					return false;
+		}
 			
 		$method = "get_".$storage."_filesystem";	
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 			
 		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 		
@@ -205,14 +214,16 @@ 
 		if($this->xcloner_file_system->is_multipart($file))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if(is_array($parts)) {
+							foreach($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $part_file, strtoupper($storage)), array(""));
+			}
 					
 					$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($part_file);
-					if(!$remote_storage_filesystem->updateStream($part_file, $backup_file_stream))
-						return false;
+					if(!$remote_storage_filesystem->updateStream($part_file, $backup_file_stream)) {
+											return false;
+					}
 				}
 		}
 		
@@ -234,10 +245,11 @@ 
 			
 			$current_timestamp = strtotime("-".$expire_days." days");
 			
-			if(is_array($files))
-			foreach($files as $file)
+			if(is_array($files)) {
+						foreach($files as $file)
 			{
 				$file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
+			}
 				
 				if($current_timestamp >= $file['timestamp'])
 				{

includes/class-xcloner-scheduler.php

Braces +23 added lines, -18 removed lines

@@ -30,10 +30,11 @@ 
 		{
 			$new_list= array();
 			
-			foreach($list as $res)
-				if($res->status)
+			foreach($list as $res) {
+							if($res->status)
 				{
 					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
+			}
 					$new_list[] = $res;
 				}
 			$list = $new_list;	
@@ -59,8 +60,9 @@ 
 	{
 		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 		
-		if(!$data)
-			return false;
+		if(!$data) {
+					return false;
+		}
 		
 		$params = json_decode($data['params']);
 		
@@ -110,12 +112,13 @@ 
 			
 			if ( ! wp_next_scheduled( $hook, array($schedule->id) ) and $schedule->status) {
 				
-				if($schedule->recurrence == "single")
-					wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-				else	
-					wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+				if($schedule->recurrence == "single") {
+									wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+				} else {
+									wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+				}
 					
-			}elseif(!$schedule->status)
+			} elseif(!$schedule->status)
 			{
 				$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
 				wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
@@ -134,9 +137,9 @@ 
 		
 		if ($schedule->status) {
 			
-			if($schedule->recurrence == "single")
-				wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-			else{	
+			if($schedule->recurrence == "single") {
+							wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+			} else{	
 				wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
 			}
 				
@@ -268,8 +271,9 @@ 
 		
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
-				$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();
+		}
 		
 		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 		
@@ -279,8 +283,9 @@ 
 			
 			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 			
-			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
-				$return_storage = call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage")) {
+							$return_storage = call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			}
 		}
 		
 		
@@ -289,7 +294,7 @@ 
 			try{
 				$from = "XCloner Schedule - ".$schedule['name'];
 				$this->archive_system->send_notification($to, $from, "", $return['extra']['backup_parent'], $schedule);
-			}catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -308,7 +313,7 @@ 
 
 			$this->__xcloner_scheduler_callback($id, $schedule);
 			
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
 			{