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-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'])
 				{

xcloner.php

Braces +3 added lines, -2 removed lines

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

admin/partials/xcloner_console_page.php

Braces +4 added lines, -1 removed lines

@@ -33,7 +33,10 @@
 			<li class="active">
 				<div class="collapsible-header active"><i class="material-icons">bug_report</i>XCloner Debugger</div>
 				<div class="collapsible-body">
-					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
+					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) {
+	echo implode("<br />\n", $logger_content);
+}
+?></div>
 				</div>
 			</li>
 		</ul>