ovidiul / XCloner-Wordpress

includes/class-xcloner.php

Indentation +4 added lines, -4 removed lines

@@ -612,10 +612,10 @@
 
 	}
 
-    /**
-     * @param $schedules
-     * @return mixed
-     */
+	/**
+	 * @param $schedules
+	 * @return mixed
+	 */
 	public function add_new_intervals($schedules)
 	{
 		//weekly scheduler interval

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

Spacing +3 added lines, -3 removed lines

@@ -1324,18 +1324,18 @@
 		if (file_exists($tmp_file)) {
 			header('Content-Description: File Transfer');
 			header('Content-Type: application/octet-stream');
-			header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
+			header('Content-Disposition: attachment; filename="'.basename($tmp_file).'"');
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate');
 			header('Pragma: public');
-			header('Content-Length: ' . filesize($tmp_file));
+			header('Content-Length: '.filesize($tmp_file));
 			readfile($tmp_file);
 
 		}
 
 		try {
 			unlink($tmp_file);
-		}catch(Exception $e) {
+		}catch (Exception $e) {
 			//We are not interested in the error here
 		}
 

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

Spacing +8 added lines, -8 removed lines

@@ -103,7 +103,7 @@ 
 		foreach ($list as $schedule) {
 			$hook = 'xcloner_scheduler_'.$schedule->id;
 
-			if($timestamp = wp_next_scheduled($hook, array($schedule->id))) {
+			if ($timestamp = wp_next_scheduled($hook, array($schedule->id))) {
 				wp_unschedule_event($timestamp, $hook, array($schedule->id));
 			}
 		}
@@ -127,7 +127,7 @@ 
 				}
 
 			} elseif (!$schedule->status) {
-				if($timestamp = wp_next_scheduled($hook, array($schedule->id))) {
+				if ($timestamp = wp_next_scheduled($hook, array($schedule->id))) {
 					wp_unschedule_event($timestamp, $hook, array($schedule->id));
 				}
 			}
@@ -139,7 +139,7 @@ 
 		$schedule = $this->get_schedule_by_id_object($id);
 		$hook     = 'xcloner_scheduler_'.$schedule->id;
 
-		if( $timestamp = wp_next_scheduled($hook, array($schedule->id))) {
+		if ($timestamp = wp_next_scheduled($hook, array($schedule->id))) {
 			wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		}
 
@@ -156,9 +156,9 @@ 
 
 	public function disable_single_cron($schedule_id) {
 		$schedule = array();
-		$hook      = 'xcloner_scheduler_'.$schedule_id;
+		$hook = 'xcloner_scheduler_'.$schedule_id;
 
-		if($timestamp = wp_next_scheduled($hook, array($schedule_id))) {
+		if ($timestamp = wp_next_scheduled($hook, array($schedule_id))) {
 			wp_unschedule_event($timestamp, $hook, array($schedule_id));
 		}
 
@@ -215,13 +215,13 @@ 
 		return $update;
 	}
 
-	private function _xcloner_scheduler_callback( $id, $schedule ) {
-		set_time_limit( 0 );
+	private function _xcloner_scheduler_callback($id, $schedule) {
+		set_time_limit(0);
 
 
 		$xcloner = new XCloner();
 		$xcloner->init();
-		$this->set_xcloner_container( $xcloner );
+		$this->set_xcloner_container($xcloner);
 		$return_encrypted = array();
 		$return = array();
 		$additional = array();

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

Spacing +8 added lines, -8 removed lines

@@ -166,26 +166,26 @@
 	 * Xcloner_Remote_Storage constructor.
 	 * @param Xcloner $xcloner_container
 	 */
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 		$this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
 		$this->xcloner_file_system  = $xcloner_container->get_xcloner_filesystem();
-		$this->logger               = $xcloner_container->get_xcloner_logger()->withName( "xcloner_remote_storage" );
+		$this->logger               = $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
 		$this->xcloner              = $xcloner_container;
 
-		foreach($this->storage_fields as $main_key=>$array){
+		foreach ($this->storage_fields as $main_key=>$array) {
 
-			if(is_array($array)) {
+			if (is_array($array)) {
 				foreach ($array as $key => $type) {
 
-					if( $type == "raw") {
-						add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
-							function ($value) {
+					if ($type == "raw") {
+						add_filter("pre_update_option_".$this->storage_fields['option_prefix'].$key,
+							function($value) {
 
 								return $this->simple_crypt($value, 'e');
 
 							}, 10, 1);
 
-						add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
+						add_filter("option_".$this->storage_fields['option_prefix'].$key, function($value) {
 
 							return $this->simple_crypt($value, 'd');
 

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']);
 		}
 	}

includes/class-xcloner-settings.php

Indentation +6 added lines, -6 removed lines

@@ -93,12 +93,12 @@
 
 			$path = sys_get_temp_dir();
 			if (!is_dir($path)) {
-			    try {
-                    mkdir($path);
-                    chmod($path, 0777);
-                }catch(Exception $e){
-			        //silent catch
-                }
+				try {
+					mkdir($path);
+					chmod($path, 0777);
+				}catch(Exception $e){
+					//silent catch
+				}
 			}
 
 			if (!is_dir($path) or !is_writeable($path)) {

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 			    try {
                     mkdir($path);
                     chmod($path, 0777);
-                }catch(Exception $e){
+                }catch (Exception $e) {
 			        //silent catch
                 }
 			}

Braces +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 			    try {
                     mkdir($path);
                     chmod($path, 0777);
-                }catch(Exception $e){
+                } catch(Exception $e){
 			        //silent catch
                 }
 			}