ovidiul / XCloner-Wordpress

admin/partials/xcloner_manage_backups_page.php

Braces +5 added lines, -2 removed lines

@@ -31,10 +31,13 @@
             <?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)

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>

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>

includes/class-xcloner-file-system.php

Braces +8 added lines, -6 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());
         }
 
@@ -645,7 +645,7 @@ 
                 }
             }
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -672,7 +672,7 @@ 
 
             $this->tmp_filesystem->delete($tmp_file);
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -710,9 +710,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",
@@ -979,7 +981,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());
             }
         }
@@ -1005,7 +1007,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-deactivator.php

Braces +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		if (is_a($xcloner_plugin, 'Xcloner')) {
 			try {
 				$xcloner_plugin->get_xcloner_filesystem()->cleanup_tmp_directories();
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$xcloner_plugin->trigger_message_notice($e->getMessage());
 			}
 

includes/class-xcloner.php

Braces +2 added lines, -2 removed lines

@@ -377,7 +377,7 @@ 
 
 			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else{
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
@@ -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-database.php

Braces +71 added lines, -48 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']);
 		
@@ -151,10 +159,12 @@ 
 		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(""));
+			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) {
 			
@@ -387,12 +403,14 @@ 
 						//break;
 				} 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,14 +426,17 @@ 
 
 						$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 {
 								$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!")));
 		
@@ -484,8 +506,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);

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