ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

Braces +109 added lines, -85 removed lines

@@ -45,8 +45,7 @@ 
 {
 	
 	require_once($file);
-}
-elseif (file_exists("vendor.phar") and extension_loaded('phar'))
+} elseif (file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
 } else {	
@@ -87,7 +86,7 @@ 
 try {
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch (Exception $e) {
+} catch (Exception $e) {
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -231,13 +230,15 @@ 
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if (!$_POST['start'])
-				$fp = fopen($target_file, "wb+");
-			else
-				$fp = fopen($target_file, "ab+");	
+			if (!$_POST['start']) {
+							$fp = fopen($target_file, "wb+");
+			} else {
+							$fp = fopen($target_file, "ab+");
+			}
 			
-			if (!$fp)
-				throw new Exception("Unable to open $target_file file for writing");
+			if (!$fp) {
+							throw new Exception("Unable to open $target_file file for writing");
+			}
 			
 			fseek($fp, $_POST['start']);
 			
@@ -247,22 +248,24 @@ 
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if (!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
+				if (!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
 
 				try {
 					unlink($_FILES['blob']['tmp_name']);
-				}catch (Exception $e) {
+				} catch (Exception $e) {
 					//silent message
 				}
 
-			}elseif (isset($_POST['blob'])) {
+			} elseif (isset($_POST['blob'])) {
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if (!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
+				if (!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
 			} else {
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
@@ -297,10 +300,11 @@ 
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if (isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
-			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
-		else
-			$mysqli->query("SET NAMES utf8;");
+		if (isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file']) {
+					$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
+		} else {
+					$mysqli->query("SET NAMES utf8;");
+		}
 			
 		return $mysqli;	
 	}
@@ -330,8 +334,9 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if (!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists", $mysql_backup_file));
+		if (!file_exists($mysql_backup_file)) {
+					throw new Exception(sprintf("Mysql backup file %s does not exists", $mysql_backup_file));
+		}
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -364,16 +369,18 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if (substr($line, 0, 1) == "#")
-					continue;
+				if (substr($line, 0, 1) == "#") {
+									continue;
+				}
 				
 				//check if line is empty	
-				if ($line == "\n" or trim($line) == "")
-					continue;
+				if ($line == "\n" or trim($line) == "") {
+									continue;
+				}
 					
-				if (substr($line, strlen($line) - 2, strlen($line)) == ";\n")
-					$query .= $line;
-				else {
+				if (substr($line, strlen($line) - 2, strlen($line)) == ";\n") {
+									$query .= $line;
+				} else {
 					$query .= $line;
 					continue;
 				}
@@ -497,7 +504,7 @@ 
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
@@ -532,8 +539,9 @@ 
 				
 				++$return['part'];
 			
-				if ($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if ($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -674,19 +682,22 @@ 
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if (isset($matches[1]))
-				$table_prefix = $matches[1];
-			else
-				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			if (isset($matches[1])) {
+							$table_prefix = $matches[1];
+			} else {
+							throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			}
+		} else {
+					throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 		}
-		else
-			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
-			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'")) {
+					throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		}
 		
-		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
-			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'")) {
+					throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		}
 		
 		return true;
 	}
@@ -724,8 +735,9 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if (!file_put_contents($wp_config, $content))
-			throw new Exception("Could not write updated config data to ".$wp_config);
+		if (!file_put_contents($wp_config, $content)) {
+					throw new Exception("Could not write updated config data to ".$wp_config);
+		}
 		
 		chmod($wp_config, $file_perms);
 		
@@ -770,10 +782,11 @@ 
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
 							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i", $file['timestamp']);
 							
-							if ($hash and $hash == $matches[1])
-								$mysqldump_list[$file['path']]['selected'] = "selected";
-							else
-								$mysqldump_list[$file['path']]['selected'] = "";	
+							if ($hash and $hash == $matches[1]) {
+															$mysqldump_list[$file['path']]['selected'] = "selected";
+							} else {
+															$mysqldump_list[$file['path']]['selected'] = "";
+							}
 						}
 					}
 				}
@@ -794,13 +807,15 @@ 
 	 */
 	private function get_hash_from_backup($backup_file)
 	{
-		if (!$backup_file)
-			return false;
+		if (!$backup_file) {
+					return false;
+		}
 			
 		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file) - 10, strlen($backup_file)), $matches);
 		
-		if ($result and isset($matches[1]))
-			return ($matches[1]);
+		if ($result and isset($matches[1])) {
+					return ($matches[1]);
+		}
 		
 		return false;
 	}
@@ -825,10 +840,11 @@ 
 			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->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;
@@ -838,20 +854,22 @@ 
 						
 			}
 			
-			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;
+			}
 		}
 		
 		$new_list = array();
 		
 		foreach ($backup_files as $key=>$file_info)
 		{
-			if (isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else {
+			if (isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			} else {
 				
-				if ($local_backup_file and ($file_info['basename'] == $local_backup_file))
-					$file_info['selected'] = 'selected';
+				if ($local_backup_file and ($file_info['basename'] == $local_backup_file)) {
+									$file_info['selected'] = 'selected';
+				}
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
 					
@@ -898,8 +916,9 @@ 
 		$backup_archive = new Tar();
 		if ($this->is_multipart($backup_file))
 		{
-			if (!$return['part'])
-				$return['processed'] += $this->filesystem->getSize($backup_file);
+			if (!$return['part']) {
+							$return['processed'] += $this->filesystem->getSize($backup_file);
+			}
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];	
@@ -919,10 +938,11 @@ 
 			}
 		}
 		
-		if (isset($data['start']))
-		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
+		if (isset($data['start'])) {
+				//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
+		}
 			$return['start'] = $data['start'];
 		} else {
 			
@@ -934,14 +954,16 @@ 
 				
 				++$return['part'];
 			
-				if ($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if ($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}
 		
-		if ($return['finished'])
-			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		if ($return['finished']) {
+					$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		}
 		
 		$return['backup_file'] = $backup_file;
 		
@@ -973,8 +995,7 @@ 
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
 			$return['remote_mysql_db'] = $wpdb->dbname;
-		}
-		else {
+		} else {
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -993,11 +1014,13 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if (!file_put_contents($tmp_file, "++"))
-			throw new Exception("Could not write to new host");
+		if (!file_put_contents($tmp_file, "++")) {
+					throw new Exception("Could not write to new host");
+		}
 		
-		if (!unlink($tmp_file))
-			throw new Exception("Could not delete temporary file from new host");
+		if (!unlink($tmp_file)) {
+					throw new Exception("Could not delete temporary file from new host");
+		}
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
@@ -1044,8 +1067,9 @@ 
 	 */
 	public function is_multipart($backup_name)
 	{
-		if (stristr($backup_name, "-multipart"))
-			return true;
+		if (stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -1063,8 +1087,9 @@ 
 		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach ($backup_parts as $part_file)
-				$backup_size += $this->filesystem->getSize($part_file);
+			foreach ($backup_parts as $part_file) {
+							$backup_size += $this->filesystem->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -1126,15 +1151,13 @@ 
 				if ($direction == 'desc') {
 					if ($a > $b) {
 						return -1;
-					}
-					else {
+					} else {
 						return 1;
 					}
 				} else {
 					if ($a < $b) {
 						return -1;
-					}
-					else {
+					} else {
 						return 1;
 					}
 				}
@@ -1164,7 +1187,7 @@ 
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif ($status != 200 and $status != 418)
+		} elseif ($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -1188,8 +1211,9 @@ 
 		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function($m) {
 				  $data = "";
 				  	
-				  if (!isset($m[3]))
-					$m[3] = "";
+				  if (!isset($m[3])) {
+				  					$m[3] = "";
+				  }
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
 				  //return $this->unescape_quotes($data);

includes/class-xcloner-file-system.php

Braces +9 added lines, -7 removed lines

@@ -102,7 +102,7 @@ 
             $this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
                 'disable_asserts' => true,
             ]));
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
         }
 
@@ -510,7 +510,7 @@ 
 
         try{
             rmdir($this->xcloner_settings->get_xcloner_tmp_path());
-        }catch(Exception $e){
+        } catch(Exception $e){
             //silent continue
         }
 
@@ -649,7 +649,7 @@ 
                 }
             }
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -676,7 +676,7 @@ 
 
             $this->tmp_filesystem->delete($tmp_file);
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -714,9 +714,11 @@ 
         foreach ($_backup_files_list as $file) {
             //processing rule folder capacity
             if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
+                $_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",
@@ -983,7 +985,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());
 			}
 		}
@@ -1009,7 +1011,7 @@ 
 
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$this->logger->error($e->getMessage());
 		}

includes/class-xcloner.php

Braces +1 added lines, -1 removed lines

@@ -489,7 +489,7 @@
 
 		try {
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 

includes/class-xcloner-api.php

Braces +28 added lines, -20 removed lines

@@ -137,7 +137,7 @@ 
 		try {
 			$this->xcloner_database->init($data);
 
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -312,7 +312,7 @@ 
 		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;
 			$return['status'] = 500;
@@ -339,7 +339,7 @@ 
 					$additional['lines_total'] = $return['extra']['lines_total'];
 					$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
 						$this->form_params, "", $additional);
-				}catch (Exception $e) {
+				} catch (Exception $e) {
 					$this->logger->error($e->getMessage());
 				}
 			}
@@ -522,7 +522,7 @@ 
 
 		try {
 			$files = $this->xcloner_file_system->list_directory($folder);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			print $e->getMessage();
 			$this->logger->error($e->getMessage());
@@ -586,7 +586,7 @@ 
 		if ($database == "#") {
 			try {
 				$return = $this->xcloner_database->get_all_databases();
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -618,7 +618,7 @@ 
 
 			try {
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -848,7 +848,7 @@ 
 			$this->logger->info($iv);
 			$return = array_merge($return,
 				$this->xcloner_encryption->encrypt_file($backup_file, "", "", $start, base64_decode($iv)));
-		}catch (\Exception $e) {
+		} catch (\Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$return['error_message'] = $e->getMessage();
@@ -905,7 +905,7 @@ 
 		try {
 			$return = array_merge($return,
 				$this->xcloner_encryption->decrypt_file($backup_file, "", $decryption_key, $start, base64_decode($iv)));
-		}catch (\Exception $e) {
+		} catch (\Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 		}
@@ -1009,7 +1009,8 @@ 
                                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
                                                     <i class="material-icons">enhanced_encryption</i>
                                                 </a>
-                                            <?php else: ?>
+                                            <?php else {
+	: ?>
                                                 <a href="#<?php echo $child[0] ?>" class="list-backup-content"
                                                    title="<?php echo __('List Backup Content',
 													   'xcloner-backup-and-restore') ?>"><i
@@ -1028,7 +1029,9 @@ 
                                                         class="material-icons">file_upload</i></a>
                                         <?php endif ?>
                                     </li>
-                                <?php endforeach; ?>
+                                <?php endforeach;
+}
+?>
                             </ul>
                         <?php endif; ?>
                 <?php
@@ -1036,11 +1039,12 @@ 
 				ob_end_clean();
 				?>
                     <?php ob_start(); ?>
-                        <?php if (isset($file_info['timestamp']))
+                        <?php if (isset($file_info['timestamp'])) {
 							echo date("Y-m-d H:i", $file_info['timestamp'])
 						?>
                     <?php
 						$return['data'][$i][] = ob_get_contents();
+}
 						ob_end_clean();
 						?>
 
@@ -1065,15 +1069,17 @@ 
                             <?php endif ?>
                             <?php
 							$basename = $file_info['basename'];
-							if (isset($file_info['childs']) and sizeof($file_info['childs']))
-								$basename = $file_info['childs'][0][0];
+							if (isset($file_info['childs']) and sizeof($file_info['childs'])) {
+															$basename = $file_info['childs'][0][0];
+							}
 							?>
                             <?php if ($this->xcloner_encryption->is_encrypted_file($basename)) :?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="backup-decryption"
                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
                                     <i class="material-icons">enhanced_encryption</i>
                                 </a>
-                            <?php else: ?>
+                            <?php else {
+	: ?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="list-backup-content"
                                     title="<?php echo __('List Backup Content', 'xcloner-backup-and-restore') ?>"><i
                                     class="material-icons">folder_open</i></a>
@@ -1083,7 +1089,9 @@ 
                                     <i class="material-icons">no_encryption</i>
                                 </a>
                             <?php endif?>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
 
                         <a href="#<?php echo $file_info['basename'] ?>" class="delete"
                            title="<?php echo __('Delete Backup', 'xcloner-backup-and-restore') ?>">
@@ -1137,7 +1145,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();
 			$this->send_response($return, 0);
@@ -1200,7 +1208,7 @@ 
 					"copy_backup_remote_to_local"
 				), array($backup_file, $storage_type));
 			}
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1239,7 +1247,7 @@ 
 					"upload_backup_to_storage"
 				), array($backup_file, $storage_type));
 			}
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1335,7 +1343,7 @@ 
 
 		try {
 			unlink($tmp_file);
-		}catch(Exception $e) {
+		} catch(Exception $e) {
 			//We are not interested in the error here
 		}
 
@@ -1430,7 +1438,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;

includes/class-xcloner-scheduler.php

Braces +2 added lines, -2 removed lines

@@ -368,7 +368,7 @@ 
 
 				$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional);
 
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 		}
@@ -402,7 +402,7 @@ 
 			}
 			$this->_xcloner_scheduler_callback($id, $schedule);
 
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			//send email to site admin if email notification is not set in the scheduler
 			if (!isset($schedule['backup_params']->email_notification) || !$schedule['backup_params']->email_notification) {

includes/class-xcloner-remote-storage.php

Braces +2 added lines, -3 removed lines

@@ -217,8 +217,7 @@ 
 
 		if ($action == 'e' && function_exists('openssl_encrypt')) {
 			$output = base64_encode(openssl_encrypt($string, $encrypt_method, $key, 0, $iv));
-		}
-		else if ($action == 'd' && function_exists('openssl_decrypt') && base64_decode($string)) {
+		} else if ($action == 'd' && function_exists('openssl_decrypt') && base64_decode($string)) {
 			$decrypt = openssl_decrypt(base64_decode($string), $encrypt_method, $key, 0, $iv);
 			if ($decrypt) {
 				//we check if decrypt was succesful
@@ -280,7 +279,7 @@ 
 			$this->verify_filesystem($action);
 			$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", $this->storage_fields[$action]['text']);
 			$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", $this->storage_fields[$action]['text']);
 		}
 	}