ovidiul / XCloner-Wordpress

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-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);	
 				

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>

admin/class-xcloner-admin.php

Braces +9 added lines, -7 removed lines

@@ -61,8 +61,9 @@ 
 	 */
 	public function enqueue_styles($hook) {
 		
-		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner"))
-			return;
+		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner")) {
+					return;
+		}
 
 		/**
 		 * This function is provided for demonstration purposes only.
@@ -93,8 +94,9 @@ 
 	 */
 	public function enqueue_scripts($hook) {
 
-		if(!stristr($hook, "page_".$this->plugin_name))
-			return;
+		if(!stristr($hook, "page_".$this->plugin_name)) {
+					return;
+		}
 			
 		/**
 		 * This function is provided for demonstration purposes only.
@@ -234,15 +236,15 @@ 
 					settings_fields('xcloner_general_settings_group');
 					do_settings_sections('xcloner_settings_page');
 					
-				}elseif( $active_tab == 'mysql_options' ) {
+				} elseif( $active_tab == 'mysql_options' ) {
 					
 					settings_fields('xcloner_mysql_settings_group');
 					do_settings_sections('xcloner_mysql_settings_page');
-				}elseif( $active_tab == 'system_options' ) {
+				} elseif( $active_tab == 'system_options' ) {
 					
 					settings_fields('xcloner_system_settings_group');
 					do_settings_sections('xcloner_system_settings_page');
-				}elseif( $active_tab == 'cleanup_options' ) {
+				} elseif( $active_tab == 'cleanup_options' ) {
 					
 					settings_fields('xcloner_cleanup_settings_group');
 					do_settings_sections('xcloner_cleanup_settings_page');

admin/partials/xcloner_remote_storage_page.php

Braces +8 added lines, -3 removed lines

@@ -3,8 +3,9 @@ 
 
 $gdrive_auth_url = "";
 
-if(method_exists($remote_storage, "get_gdrive_auth_url"))
+if(method_exists($remote_storage, "get_gdrive_auth_url")) {
 	$gdrive_auth_url = $remote_storage->get_gdrive_auth_url();
+}
 
 $gdrive_construct = $remote_storage->gdrive_construct();
 ?>
@@ -25,7 +26,8 @@ 
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) {
+	echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -286,6 +288,7 @@ 
 							<option readonly value=""><?php echo __("Please Select AWS Region")?></option>
 							<?php 							
 							$aws_regions = $remote_storage->get_aws_regions();
+}
 							
 							foreach($aws_regions as $key=>$region){
 								?>
@@ -339,7 +342,8 @@ 
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) {
+	echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -767,6 +771,7 @@ 
 								<div class="center">
 									<?php 
 										$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=xcloner-google-drive'), 'install-plugin_xcloner-google-drive');
+}
 									?>
 									<h6><?php echo __("This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated.")?></h6>
 									<h6><?php echo __("PHP 5.5 minimum version is required.")?></h6>

includes/class-xcloner-remote-storage.php

Braces +50 added lines, -34 removed lines

@@ -148,8 +148,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;
@@ -172,11 +173,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);
@@ -193,7 +196,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));
 		}
 	}
@@ -204,8 +207,9 @@ 
 		
 		$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();
 		
@@ -213,26 +217,30 @@ 
 		
 		if($storage_type == "gdrive")
 		{
-			if(!is_array($filesystem->listContents()))
-				throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+			if(!is_array($filesystem->listContents())) {
+							throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+			}
 			$this->logger->debug(sprintf("I can list data from remote storage %s", strtoupper($storage_type)));	
 			
 			return true;
 		}
 			
 		//testing write access
-		if(!$filesystem->write($test_file, "data"))
-			throw new Exception(__("Could not write data",'xcloner-backup-and-restore'));
+		if(!$filesystem->write($test_file, "data")) {
+					throw new Exception(__("Could not write data",'xcloner-backup-and-restore'));
+		}
 		$this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));	
 		
 		//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)));		
 		
 		return true;
@@ -248,8 +256,9 @@ 
 			
 		$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();
 		
@@ -275,14 +284,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->writeStream($part_file, $backup_file_stream))
-						return false;
+					if(!$remote_storage_filesystem->writeStream($part_file, $backup_file_stream)) {
+											return false;
+					}
 				}
 		}
 		
@@ -298,8 +309,9 @@ 
 		
 		$target_filename = $file;
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 			
 		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 		
@@ -328,14 +340,16 @@ 
 		if($this->xcloner_file_system->is_multipart($target_filename))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file, $storage);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if(is_array($parts)) {
+							foreach($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $part_file, strtoupper($storage)), array(""));
+			}
 					
 					$backup_file_stream = $remote_storage_filesystem->readStream($part_file);
-					if(!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file, $backup_file_stream))
-						return false;
+					if(!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file, $backup_file_stream)) {
+											return false;
+					}
 				}
 		}
 		
@@ -355,10 +369,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'])
 				{
@@ -524,8 +539,9 @@ 
 	{
 		$client = $this->gdrive_construct();
 		
-		if(!$client)
-			return false;
+		if(!$client) {
+					return false;
+		}
 			
 		return $authUrl = $client->createAuthUrl();
 	}
@@ -608,7 +624,7 @@ 
 				foreach ($response as $obj) {
 					$folderID =  $obj->getId();
 				}
-			}else{
+			} else{
 				$this->xcloner->trigger_message(sprintf(__("Could not find folder ID by name %s", 'xcloner-backup-and-restore'), $folderID), "error");
 			}
 		}

includes/class-xcloner.php

Braces +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
 			
 			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else{
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}

includes/class-xcloner-loader.php

Braces +3 added lines, -2 removed lines

@@ -58,8 +58,9 @@
 	
 	public function xcloner_backup_add_admin_menu()
 	{
-		if ( function_exists('add_menu_page') )
-			add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'), 'dashicons-backup');
+		if ( function_exists('add_menu_page') ) {
+					add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, 'xcloner_display'), 'dashicons-backup');
+		}
 
 		if ( function_exists('add_submenu_page') )
 		{