ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

Braces +113 added lines, -87 removed lines

@@ -45,11 +45,10 @@ 
 {
 	
 	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{	
+} else{	
 	
 	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
 	
@@ -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());
 }
 
@@ -191,7 +190,7 @@ 
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
+			} else{
 				throw new Exception($method ." does not exists");
 				}
 		}
@@ -205,13 +204,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']);
 			
@@ -221,18 +222,20 @@ 
 				
 				$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");
+				}
 				
 				@unlink($_FILES['blob']['tmp_name']);
-			}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");
-			}else{
+				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");
 			}
 			
@@ -256,10 +259,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;	
 	}
@@ -284,8 +288,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)
@@ -317,16 +322,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;
 				}
@@ -385,7 +392,7 @@ 
 		if(!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else{
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -437,7 +444,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();
@@ -465,15 +472,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->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;
+				}
 				
 			}
 		}	
@@ -590,19 +598,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;
 	}
@@ -629,8 +640,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);
 		
@@ -671,10 +683,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'] = "";
+							}
 						}
 					}
 				}
@@ -689,13 +702,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;
 	}
@@ -715,10 +730,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;
@@ -728,20 +744,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']));
 					
@@ -782,8 +800,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']];	
@@ -803,12 +822,13 @@ 
 			}
 		}
 		
-		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{
+		} else{
 			
 			$return['processed'] += $start;
 			
@@ -818,14 +838,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;
 		
@@ -854,8 +876,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;
 		}	
@@ -869,11 +890,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')));
@@ -904,8 +927,9 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -916,8 +940,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;
@@ -974,7 +999,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;
@@ -995,8 +1020,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);
@@ -1025,7 +1051,7 @@ 
 		    stristr($s, ':' ) != false
 		    ){
 		    return true;
-		}else{
+		} else{
 		    return false;
 		}
 

includes/class-xcloner.php

Braces +2 added lines, -2 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']);
 			}
 		}
@@ -452,7 +452,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-database.php

Braces +75 added lines, -52 removed lines

@@ -44,11 +44,13 @@ 
 		$this->xcloner_settings 		= $xcloner_container->get_xcloner_settings();
 		$this->fs 						= $xcloner_container->get_xcloner_filesystem();
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
-			$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request')) {
+					$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		}
 		
-		if(!$this->recordsPerSession)
-			$this->recordsPerSession = 100;
+		if(!$this->recordsPerSession) {
+					$this->recordsPerSession = 100;
+		}
 		
 		if(!$wp_user && !$wp_pass && !$wp_host && !$wp_db )
 		{
@@ -108,37 +110,43 @@ 
 			{
 				foreach($params['#'] as $database)
 				{
-					if(!isset($params[$database]) or !is_array($params[$database]))
-						$params[$database] = array();
+					if(!isset($params[$database]) or !is_array($params[$database])) {
+											$params[$database] = array();
+					}
 				}
 				$db_count = -1;
 			}
 			
-			if(isset($params) and is_array($params))
-				foreach($params as $database=>$tables)
+			if(isset($params) and is_array($params)) {
+							foreach($params as $database=>$tables)
 				{	
 					if($database != "#")
 					{
-						$stats = $this->write_backup_process_list($database, $tables);	
+						$stats = $this->write_backup_process_list($database, $tables);
+			}
 						$return['stats']['tables_count'] 	+= $stats['tables_count'];
 						$return['stats']['total_records'] 	+= $stats['total_records'];
 					}
 				}
 
-			if(sizeof($params))
-				$return['stats']['database_count'] = sizeof($params)+$db_count;
-			else	
-				$return['stats']['database_count'] = 0;
+			if(sizeof($params)) {
+							$return['stats']['database_count'] = sizeof($params)+$db_count;
+			} else {
+							$return['stats']['database_count'] = 0;
+			}
 				
 			return $return;
 		}
 		
-		if(!isset($extra_params['startAtLine']))
-			$extra_params['startAtLine'] = 0;
-		if(!isset($extra_params['startAtRecord']))
-			$extra_params['startAtRecord'] = 0;
-		if(!isset($extra_params['dumpfile']))
-			$extra_params['dumpfile'] = "";
+		if(!isset($extra_params['startAtLine'])) {
+					$extra_params['startAtLine'] = 0;
+		}
+		if(!isset($extra_params['startAtRecord'])) {
+					$extra_params['startAtRecord'] = 0;
+		}
+		if(!isset($extra_params['dumpfile'])) {
+					$extra_params['dumpfile'] = "";
+		}
 		
 		$return = $this->process_incremental($extra_params['startAtLine'], $extra_params['startAtRecord'], $extra_params['dumpfile']);
 		
@@ -150,11 +158,13 @@ 
 		
 		if($message){
 			$this->logger->info( $message, array(""));
-		}else{	
-			if($this->last_query)
-				$this->logger->debug( $this->last_query, array(""));
-			if($this->last_error)
-				$this->logger->error( $this->last_error, array(""));
+		} else{	
+			if($this->last_query) {
+							$this->logger->debug( $this->last_query, array(""));
+			}
+			if($this->last_error) {
+							$this->logger->error( $this->last_error, array(""));
+			}
 		}
 		
 		return;
@@ -225,11 +235,12 @@ 
 		$databases_list[$i]['num_tables'] = $this->get_database_num_tables($this->dbname);
 		$i++;
 		
-		if(is_array($databases))
-		foreach( $databases as $db){
+		if(is_array($databases)) {
+				foreach( $databases as $db){
 			if($db->Database != $this->dbname)
 			{
 				$databases_list[$i]['name'] = $db->Database;
+		}
 				$databases_list[$i]['num_tables'] = $this->get_database_num_tables($db->Database);
 				$i++;
 			}
@@ -252,8 +263,9 @@ 
 		$tablesList[0] = array( );
 		$inc = 0;
 
-		if(!$database)
-			$database = $this->dbname;
+		if(!$database) {
+					$database = $this->dbname;
+		}
 		
 		$this->logger->debug(sprintf(("Listing tables in %s database"), $database));
 		
@@ -277,10 +289,11 @@ 
 			
 			$tablesList[$inc]['excluded'] = 0;
 						
-			if(sizeof($included) and is_array($included))
-				if(!in_array($table, $included) )
+			if(sizeof($included) and is_array($included)) {
+							if(!in_array($table, $included) )
 				{
 					$tablesList[$inc]['excluded'] = 1;
+			}
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
 				}
 			$inc++;
@@ -299,19 +312,21 @@ 
 		
 		$tables = $this->list_tables($dbname, $incl_tables, 1);
 		
-		if($this->dbname != $dbname)
-			$dumpfile = $dbname."-backup.sql";
-		else
-			$dumpfile = $this->TEMP_DUMP_FILE;
+		if($this->dbname != $dbname) {
+					$dumpfile = $dbname."-backup.sql";
+		} else {
+					$dumpfile = $this->TEMP_DUMP_FILE;
+		}
 		
 		$line = sprintf("###newdump###\t%s\t%s\n", $dbname, $dumpfile);
 		$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			
 		// write this to the class and write to $TEMP_DBPROCESS_FILE file as database.table records
-		foreach($tables as $key=>$table) 
-		if($table!= "" and !$tables[$key]['excluded']){
+		foreach($tables as $key=>$table) {
+				if($table!= "" and !$tables[$key]['excluded']){
 
 			$line = sprintf("`%s`.`%s`\t%s\t%s\n", $dbname, $tables[$key]['name'], $tables[$key]['records'], $tables[$key]['excluded']);
+		}
 			$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			$return['tables_count']++;
 			$return['total_records'] += $tables[$key]['records'];
@@ -359,8 +374,9 @@ 
 		$return['finished'] = 0;
 		$lines = array();
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		}
 	
 		foreach ($lines as $buffer){
 			
@@ -385,14 +401,16 @@ 
 						$startAtLine++;
 						$return['new_dump'] = 1;
 						//break;
-				}else{
+				} else{
 						//we export the table
-						if($tableInfo[0] == "###enddump###")
-							$return['endDump'] = 1;
+						if($tableInfo[0] == "###enddump###") {
+													$return['endDump'] = 1;
+						}
 	
 						//table is excluded
-						if($tableInfo[2])
-							continue;
+						if($tableInfo[2]) {
+													continue;
+						}
 							
 						$next = $startAtRecord + $this->recordsPerSession;
 						
@@ -408,16 +426,19 @@ 
 
 						$processed_records = 0;
 						
-						if(trim($tableName) !=""  and !$tableInfo[2])
-							$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						if(trim($tableName) !=""  and !$tableInfo[2]) {
+													$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						}
 						
 						$return['processedRecords'] = $startAtRecord+$processed_records;
 						
-						if($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
+						if($next >= $tableInfo[1]) {
+							//we finished loading the records for next sessions, will go to the new record
 						{
 								$startAtLine ++;
+						}
 								$startAtRecord = 0;
-						}else{
+						} else{
 								$startAtRecord = $startAtRecord + $this->recordsPerSession;
 							}
 
@@ -450,8 +471,9 @@ 
 		$return['finished'] = 1;
 		$return['startAtLine']	= $startAtLine;
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		}
 		
 		$this->logger->debug(sprintf(("Database backup finished!")));
 		
@@ -479,8 +501,9 @@ 
 		
 		$records = 0;
 		
-		if($start == 0)
-			$this->dump_structure($databaseName, $tableName, $dumpfile);
+		if($start == 0) {
+					$this->dump_structure($databaseName, $tableName, $dumpfile);
+		}
 
 		$start = intval($start);
 		$limit = intval($limit);
@@ -492,7 +515,7 @@ 
 			$result = mysqli_query($this->dbh, $query);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		
-		}else{
+		} else{
 			$result = mysql_query($query, $this->dbh);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		}

admin/partials/xcloner_manage_backups_page.php

Braces +11 added lines, -5 removed lines

@@ -27,13 +27,16 @@ 
             <?php if ($storage_selection): ?>
                 <option value=""
                         selected><?php echo __('Change To Local Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php else: ?>
+            <?php else {
+	: ?>
                 <option value=""
                         selected><?php echo __('Change To Remote Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <?php foreach ($available_storages as $storage => $text): ?>
-                <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection)
+                <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection) {
                     echo "selected" ?>><?php echo $text ?></option>
             <?php endforeach ?>
         </select>
@@ -62,6 +65,7 @@ 
 
         <?php
         $i = 0;
+}
         foreach ($backup_list as $file_info):?>
             <?php
             if ($storage_selection == "gdrive") {
@@ -136,12 +140,14 @@ 
                             </ul>
                         <?php endif; ?>
                     </td>
-                    <td><?php if (isset($file_info['timestamp']))
+                    <td><?php if (isset($file_info['timestamp'])) {
                             echo date("Y-m-d H:i", $file_info['timestamp']) ?></td>
                     <td><?php echo size_format($file_info['size']) ?></td>
                     <td>
                         <?php if (!$storage_selection): ?>
-                            <a href="#<?php echo $file_info['basename']; ?>" class="download"
+                            <a href="#<?php echo $file_info['basename'];
+}
+?>" class="download"
                                title="<?php echo __('Download Backup', 'xcloner-backup-and-restore') ?>"><i
                                         class="material-icons">file_download</i></a>
 

admin/partials/xcloner_init_page.php

Braces +5 added lines, -2 removed lines

@@ -110,7 +110,8 @@ 
 											echo date( $date_format . " " . $time_format, $latest_backup['timestamp'] + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
 											?>
                                         </div>
-									<?php else: ?>
+									<?php else {
+	: ?>
                                         <div class="item">
                                             <div class="title"><?php echo __( "No Backup Yet", 'xcloner-backup-and-restore' ) ?></div>
                                         </div>
@@ -123,7 +124,9 @@ 
                                             <div class="title"><?php echo __( "Total Size", 'xcloner-backup-and-restore' ) ?>
                                                 :
                                             </div>
-											<?php echo size_format( $xcloner_file_system->get_storage_usage() ); ?>
+											<?php echo size_format( $xcloner_file_system->get_storage_usage() );
+}
+?>
                                         </div>
                                     </blockquote>
                                     <h5><?php echo __( "Next Scheduled Backup", 'xcloner-backup-and-restore' ) ?></h5>

admin/partials/xcloner_remote_storage_page.php

Braces +4 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_ftp_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_enable" ) )
+                                       value="1" <?php if ( get_option( "xcloner_ftp_enable" ) ) {
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -340,6 +340,7 @@ 
                                             value=""><?php echo __( "Please Select AWS S3 Region or Leave Unselected for Custom Endpoint" ) ?></option>
 									<?php
 									$aws_regions = $remote_storage->get_aws_regions();
+}
 
 									foreach ( $aws_regions as $key => $region ) {
 										?>
@@ -423,7 +424,7 @@ 
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_dropbox_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_dropbox_enable" ) )
+                                       value="1" <?php if ( get_option( "xcloner_dropbox_enable" ) ) {
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -957,6 +958,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 +1 added lines, -2 removed lines

@@ -213,8 +213,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

includes/class-xcloner-file-system.php

Braces +3 added lines, -1 removed lines

@@ -707,9 +707,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",