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-api.php

Spacing +72 added lines, -72 removed lines

@@ -89,7 +89,7 @@ 
 		$this->xcloner_remote_storage   = $xcloner_container->get_xcloner_remote_storage();
 
 		if (isset($_POST['API_ID'])) {
-			$this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
+			$this->logger->info("Processing ajax request ID ".substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
 					0, 15));
 		}
 
@@ -131,13 +131,13 @@ 
 
 
 		$data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
-		$data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
-		$data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
+		$data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS.".database";
+		$data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS."database-sql.sql";
 
 		try {
 			$this->xcloner_database->init($data);
 
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -223,8 +223,8 @@ 
 		} else {
 
 			$schedule['status'] = 1;
-			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
-				" " . $this->form_params['backup_params']['schedule_start_time']);
+			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'].
+				" ".$this->form_params['backup_params']['schedule_start_time']);
 
 			if ($schedule['start_at'] <= time()) {
 				$schedule['start_at'] = "";
@@ -249,7 +249,7 @@ 
 
 		if (!isset($_POST['id'])) {
 			$wpdb->insert(
-				$wpdb->prefix . 'xcloner_scheduler',
+				$wpdb->prefix.'xcloner_scheduler',
 				$schedule,
 				array(
 					'%s',
@@ -258,7 +258,7 @@ 
 			);
 		} else {
 			$wpdb->update(
-				$wpdb->prefix . 'xcloner_scheduler',
+				$wpdb->prefix.'xcloner_scheduler',
 				$schedule,
 				array('id' => $_POST['id']),
 				array(
@@ -309,7 +309,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;
@@ -336,7 +336,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());
 				}
 			}
@@ -430,7 +430,7 @@ 
 		if (isset($params->backup_params)) {
 			foreach ($params->backup_params as $param) {
 				$this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
-				$this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
+				$this->logger->debug("Adding form parameter ".$param->name.".".$param->value."\n", array(
 					'POST',
 					'fields filter'
 				));
@@ -442,7 +442,7 @@ 
 		if (isset($params->table_params)) {
 			foreach ($params->table_params as $param) {
 				$this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
-				$this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
+				$this->logger->debug("Adding database filter ".$param->parent.".".$param->id."\n", array(
 					'POST',
 					'database filter'
 				));
@@ -461,7 +461,7 @@ 
 				if (!in_array($param->parent, $this->form_params['excluded_files'])) {
 					//$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
 					$unique_exclude_files[] = $param->id;
-					$this->logger->debug("Adding file filter " . $param->id . "\n", array(
+					$this->logger->debug("Adding file filter ".$param->id."\n", array(
 						'POST',
 						'exclude files filter'
 					));
@@ -509,13 +509,13 @@ 
 				'text' => $this->xcloner_settings->get_xcloner_start_path(),
 				//'children' => true,
 				'state' => array('selected' => false, 'opened' => true),
-				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
+				'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-root.png"
 			);
 		}
 
 		try {
 			$files = $this->xcloner_file_system->list_directory($folder);
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			print $e->getMessage();
 			$this->logger->error($e->getMessage());
@@ -536,7 +536,7 @@ 
 			if ($file['type'] == "dir") {
 				$children = true;
 			} else {
-				$text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
+				$text .= " (".$this->xcloner_requirements->file_format_size($file['size']).")";
 			}
 
 			if ($this->xcloner_file_system->is_excluded($file)) {
@@ -552,8 +552,8 @@ 
 				//'title' => "test",
 				'children' => $children,
 				'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
-				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
-						0, 1)) . ".png"
+				'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-".strtolower(substr($file['type'],
+						0, 1)).".png"
 			);
 		}
 
@@ -579,7 +579,7 @@ 
 		if ($database == "#") {
 			try {
 				$return = $this->xcloner_database->get_all_databases();
-			} catch (Exception $e) {
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -600,10 +600,10 @@ 
 				$data[] = array(
 					'id' => $database['name'],
 					'parent' => '#',
-					'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
+					'text' => $database['name']." (".(int)$database['num_tables'].")",
 					'children' => true,
 					'state' => $state,
-					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
+					'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/database-icon.png"
 				);
 			}
 
@@ -611,7 +611,7 @@ 
 
 			try {
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			} catch (Exception $e) {
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -628,12 +628,12 @@ 
 				}
 
 				$data[] = array(
-					'id' => $database . "." . $table['name'],
+					'id' => $database.".".$table['name'],
 					'parent' => $database,
-					'text' => $table['name'] . " (" . (int)$table['records'] . ")",
+					'text' => $table['name']." (".(int)$table['records'].")",
 					'children' => false,
 					'state' => $state,
-					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
+					'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/table-icon.png"
 				);
 			}
 		}
@@ -677,17 +677,17 @@ 
 		$return['data'] = array();
 
 		foreach ($data as $res) {
-			$action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
-					<a href=\"#" . $res->id . "\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
+			$action = "<a href=\"#".$res->id."\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
+					<a href=\"#" . $res->id."\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
 			if ($res->status) {
 				$status = '<i class="material-icons active status">timer</i>';
 			} else {
 				$status = '<i class="material-icons status inactive">timer_off</i>';
 			}
 
-			$next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
+			$next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
 
-			$next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
+			$next_run = date(get_option('date_format')." ".get_option('time_format'), $next_run_time);
 
 			$remote_storage = $res->remote_storage;
 
@@ -696,16 +696,16 @@ 
 			}
 
 			if (trim($next_run)) {
-				$date_text = date(get_option('date_format') . " " . get_option('time_format'),
+				$date_text = date(get_option('date_format')." ".get_option('time_format'),
 					$next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 
 				if ($next_run_time >= time()) {
-					$next_run = "in " . human_time_diff($next_run_time, time());
+					$next_run = "in ".human_time_diff($next_run_time, time());
 				} else {
 					$next_run = __("executed", 'xcloner-backup-and-restore');
 				}
 
-				$next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
+				$next_run = "<a href='#' title='".$date_text."'>".$next_run."</a>";
 				//$next_run .=" ($date_text)";
 			}
 
@@ -717,11 +717,11 @@ 
 				if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
 					$metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
 					$backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
-					$backup_time = date(get_option('date_format') . " " . get_option('time_format'),
+					$backup_time = date(get_option('date_format')." ".get_option('time_format'),
 						$metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 				}
 
-				$backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
+				$backup_text = "<span title='".$backup_time."' class='shorten_string'>".$res->last_backup." (".$backup_size.")</span>";
 			}
 
 			$schedules = wp_get_schedules();
@@ -733,7 +733,7 @@ 
 			$return['data'][] = array(
 				$res->id,
 				$res->name,
-				$res->recurrence,/*$res->start_at,*/
+				$res->recurrence, /*$res->start_at,*/
 				$next_run,
 				$remote_storage,
 				$backup_text,
@@ -795,25 +795,25 @@ 
 			$this->process_params($params);
 			$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($this->form_params['extra']['backup_parent']);
 
-			if(isset($this->form_params['extra']['start'])) {
+			if (isset($this->form_params['extra']['start'])) {
 				$start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
-			}else{
+			} else {
 				$start = 0;
 			}
 
-			if(isset($this->form_params['extra']['iv'])) {
+			if (isset($this->form_params['extra']['iv'])) {
 				$iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
-			}else{
+			} else {
 				$iv = "";
 			}
 
-			if(isset($this->form_params['extra']['part'])) {
+			if (isset($this->form_params['extra']['part'])) {
 				$return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['part']);
-			}else{
+			} else {
 				$return['part'] = 0;
 			}
 
-		}else{
+		} else {
 			$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 			$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
 			$iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
@@ -828,14 +828,14 @@ 
 		}
 
 		$return['processing_file'] = $backup_file;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 
 		try {
 			$this->logger->info(json_encode($_POST));
 			$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();
@@ -843,7 +843,7 @@ 
 
 		//echo strlen($return['iv']);exit;
 
-		if($return['finished']) {
+		if ($return['finished']) {
 			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
 				$return['start'] = 0;
 
@@ -857,7 +857,7 @@ 
 		}
 
 		if (isset($_POST['data'])) {
-			$return['extra'] = array_merge($this->form_params['extra'],  $return);
+			$return['extra'] = array_merge($this->form_params['extra'], $return);
 		}
 
 		$this->send_response($return, 0);
@@ -876,7 +876,7 @@ 
 		$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 		$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
 		$iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
-		$decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']);;
+		$decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']); ;
 		$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
 
 		$backup_file = $source_backup_file;
@@ -887,17 +887,17 @@ 
 		}
 
 		$return['processing_file'] = $backup_file;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 
 		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();
 		}
 
-		if($return['finished']) {
+		if ($return['finished']) {
 			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
 				$return['start'] = 0;
 
@@ -929,7 +929,7 @@ 
 		foreach ($backup_list as $file_info):?>
             <?php
 			if ($storage_selection == "gdrive") {
-				$file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
+				$file_info['path'] = $file_info['filename'].".".$file_info['extension'];
 			}
 			$file_exists_on_local_storage = true;
 
@@ -1050,10 +1050,10 @@ 
                             <?php endif ?>
                             <?php
 							$basename = $file_info['basename'];
-							if(isset($file_info['childs']) and sizeof($file_info['childs']))
+							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)) :?>
+                            <?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>
@@ -1110,7 +1110,7 @@ 
 			$backup_file = $backup_parts[$return['part']];
 		}
 
-		if($this->xcloner_encryption->is_encrypted_file($backup_file)) {
+		if ($this->xcloner_encryption->is_encrypted_file($backup_file)) {
 			$return['error'] = true;
 			$return['message'] = __("Backup archive is encrypted, please decrypt it first before you can list it's content.", "xcloner-backup-and-restore");
 			$this->send_response($return, 0);
@@ -1118,10 +1118,10 @@ 
 
 		try {
 			$tar = new Tar();
-			$tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
+			$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);
@@ -1129,14 +1129,14 @@ 
 
 		$return['files'] = array();
 		$return['finished'] = 1;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 		$i = 0;
 
 		if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
 			foreach ($data['extracted_files'] as $file) {
 				$return['files'][$i]['path'] = $file->getPath();
 				$return['files'][$i]['size'] = $file->getSize();
-				$return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
+				$return['files'][$i]['mtime'] = date(get_option('date_format')." ".get_option('time_format'),
 					$file->getMtime());
 
 				$i++;
@@ -1184,7 +1184,7 @@ 
 					"copy_backup_remote_to_local"
 				), array($backup_file, $storage_type));
 			}
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1223,7 +1223,7 @@ 
 					"upload_backup_to_storage"
 				), array($backup_file, $storage_type));
 			}
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1283,21 +1283,21 @@ 
         $phar2->setStub($phar2->createDefaultStub('vendor/autoload.php', 'vendor/autoload.php'));
          * */
 
-		$tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
+		$tmp_file = $this->xcloner_settings->get_xcloner_tmp_path().DS."xcloner-restore.tgz";
 
 		$tar = new Tar();
 		$tar->create($tmp_file);
 
-		$tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
+		$tar->addFile(dirname(__DIR__)."/restore/vendor.build.txt", "vendor.phar");
 		//$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 
 		$files = $xcloner_plugin_filesystem->listContents("vendor/", true);
 		foreach ($files as $file) {
-			$tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
+			$tar->addFile(dirname(__DIR__).DS.$file['path'], $file['path']);
 		}
 
-		$content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
-		$content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
+		$content = file_get_contents(dirname(__DIR__)."/restore/xcloner_restore.php");
+		$content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '".md5(AUTH_KEY)."');", $content);
 
 		$tar->addData("xcloner_restore.php", $content);
 
@@ -1306,11 +1306,11 @@ 
 		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);
 
 		}
@@ -1342,9 +1342,9 @@ 
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Cache-Control: private', false);
 		header('Content-Transfer-Encoding: binary');
-		header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
+		header('Content-Disposition: attachment; filename="'.$metadata['path'].'";');
 		header('Content-Type: application/octet-stream');
-		header('Content-Length: ' . $metadata['size']);
+		header('Content-Length: '.$metadata['size']);
 
 		@ob_end_clean();
 
@@ -1404,12 +1404,12 @@ 
 			$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;
 			$return['status'] = 500;
-			$return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
+			$return['message'] = "CURL communication error with the restore host. ".$e->getMessage();
 			$this->send_response($return, 0);
 
 		}
@@ -1433,7 +1433,7 @@ 
 		$this->check_access();
 
 		define("XCLONER_PLUGIN_ACCESS", 1);
-		include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
+		include_once(dirname(__DIR__).DS."restore".DS."xcloner_restore.php");
 
 		return;
 	}

Braces +21 added lines, -13 removed lines

@@ -797,23 +797,23 @@ 
 
 			if(isset($this->form_params['extra']['start'])) {
 				$start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
-			}else{
+			} else{
 				$start = 0;
 			}
 
 			if(isset($this->form_params['extra']['iv'])) {
 				$iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
-			}else{
+			} else{
 				$iv = "";
 			}
 
 			if(isset($this->form_params['extra']['part'])) {
 				$return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['part']);
-			}else{
+			} else{
 				$return['part'] = 0;
 			}
 
-		}else{
+		} else{
 			$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 			$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
 			$iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
@@ -835,7 +835,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();
@@ -892,7 +892,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();
 		}
@@ -994,7 +994,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
@@ -1013,7 +1014,9 @@ 
                                                         class="material-icons">file_upload</i></a>
                                         <?php endif ?>
                                     </li>
-                                <?php endforeach; ?>
+                                <?php endforeach;
+}
+?>
                             </ul>
                         <?php endif; ?>
                 <?php
@@ -1021,11 +1024,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();
 						?>
 
@@ -1050,15 +1054,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>
@@ -1068,7 +1074,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') ?>">

includes/class-xcloner-scheduler.php

Spacing +56 added lines, -56 removed lines

@@ -170,7 +170,7 @@ 
 		return $update;
 	}
 
-	public function update_hash( $schedule_id, $hash ) {
+	public function update_hash($schedule_id, $hash) {
 		$schedule = array();
 
 		$schedule['hash'] = $hash;
@@ -207,91 +207,91 @@ 
 		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);
 
 		#$hash = $this->xcloner_settings->get_hash();
 		#$this->get_xcloner_container()->get_xcloner_settings()->set_hash($hash);
 
 		//$this->xcloner_settings 		= $this->get_xcloner_container()->get_xcloner_settings();		
 		$this->xcloner_file_system    = $this->get_xcloner_container()->get_xcloner_filesystem();
-		$this->xcloner_encryption    = $this->get_xcloner_container()->get_xcloner_encryption();
+		$this->xcloner_encryption = $this->get_xcloner_container()->get_xcloner_encryption();
 		$this->xcloner_database       = $this->get_xcloner_container()->get_xcloner_database();
 		$this->archive_system         = $this->get_xcloner_container()->get_archive_system();
-		$this->logger                 = $this->get_xcloner_container()->get_xcloner_logger()->withName( "xcloner_scheduler" );
+		$this->logger                 = $this->get_xcloner_container()->get_xcloner_logger()->withName("xcloner_scheduler");
 		$this->xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-		$this->logger->info( sprintf( "New schedule hash is %s", $this->xcloner_settings->get_hash() ) );
+		$this->logger->info(sprintf("New schedule hash is %s", $this->xcloner_settings->get_hash()));
 
-		if ( isset( $schedule['backup_params']->diff_start_date ) && $schedule['backup_params']->diff_start_date ) {
-			$this->xcloner_file_system->set_diff_timestamp_start( $schedule['backup_params']->diff_start_date );
+		if (isset($schedule['backup_params']->diff_start_date) && $schedule['backup_params']->diff_start_date) {
+			$this->xcloner_file_system->set_diff_timestamp_start($schedule['backup_params']->diff_start_date);
 		}
 
-		if ( $schedule['recurrence'] == "single" ) {
-			$this->disable_single_cron( $schedule['id'] );
+		if ($schedule['recurrence'] == "single") {
+			$this->disable_single_cron($schedule['id']);
 		}
 
-		if ( ! $schedule ) {
-			$this->logger->info( sprintf( "Could not load schedule with id'%s'", $id ), array( "CRON" ) );
+		if (!$schedule) {
+			$this->logger->info(sprintf("Could not load schedule with id'%s'", $id), array("CRON"));
 
 			return;
 		}
 
 		//echo $this->get_xcloner_container()->get_xcloner_settings()->get_hash(); exit;
 
-		$this->update_hash( $schedule['id'], $this->xcloner_settings->get_hash() );
+		$this->update_hash($schedule['id'], $this->xcloner_settings->get_hash());
 
-		$this->logger->info( sprintf( "Starting cron schedule '%s'", $schedule['name'] ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting cron schedule '%s'", $schedule['name']), array("CRON"));
 
-		$this->xcloner_file_system->set_excluded_files( json_decode( $schedule['excluded_files'] ) );
+		$this->xcloner_file_system->set_excluded_files(json_decode($schedule['excluded_files']));
 
 		$init     = 1;
 		$continue = 1;
 
-		while ( $continue ) {
-			$continue = $this->xcloner_file_system->start_file_recursion( $init );
+		while ($continue) {
+			$continue = $this->xcloner_file_system->start_file_recursion($init);
 
 			$init = 0;
 		}
 
-		$this->logger->info( sprintf( "File scan finished" ), array( "CRON" ) );
+		$this->logger->info(sprintf("File scan finished"), array("CRON"));
 
-		$this->logger->info( sprintf( "Starting the database backup" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting the database backup"), array("CRON"));
 
 		$init               = 1;
 		$return['finished'] = 0;
 
-		while ( ! $return['finished'] ) {
-			$return = $this->xcloner_database->start_database_recursion( (array) json_decode( $schedule['table_params'] ), $return, $init );
+		while (!$return['finished']) {
+			$return = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
 			$init   = 0;
 		}
 
-		$this->logger->info( sprintf( "Database backup done" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Database backup done"), array("CRON"));
 
-		$this->logger->info( sprintf( "Starting file archive process" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting file archive process"), array("CRON"));
 
 		$init               = 0;
 		$return['finished'] = 0;
 		$return['extra']    = array();
 
-		while ( ! $return['finished'] ) {
-			$return = $this->archive_system->start_incremental_backup( (array) $schedule['backup_params'], $return['extra'], $init );
+		while (!$return['finished']) {
+			$return = $this->archive_system->start_incremental_backup((array)$schedule['backup_params'], $return['extra'], $init);
 			$init   = 0;
 		}
-		$this->logger->info( sprintf( "File archive process FINISHED." ), array( "CRON" ) );
+		$this->logger->info(sprintf("File archive process FINISHED."), array("CRON"));
 
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if ( $this->xcloner_file_system->is_part( $this->archive_system->get_archive_name_with_extension() ) ) {
+		if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
 			$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
 		}
 
 		//Updating schedule last backup archive
-		$this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] );
+		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 
 		//Encrypting the backup archive
 		$return_encrypted['finished'] = 0;
@@ -301,8 +301,8 @@ 
 		$part = 0;
 		$backup_parts = array();
 
-		if( $schedule['backup_params']->backup_encrypt){
-			$this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) );
+		if ($schedule['backup_params']->backup_encrypt) {
+			$this->logger->info(sprintf("Encrypting backup archive %s.", $return['extra']['backup_parent']), array("CRON"));
 
 			$backup_file = $return['extra']['backup_parent'];
 
@@ -311,7 +311,7 @@ 
 				$backup_file = $backup_parts[$part];
 			}
 
-			while ( ! $return_encrypted['finished'] ) {
+			while (!$return_encrypted['finished']) {
 				$return_encrypted = $this->xcloner_encryption->encrypt_file(
 											$backup_file,
 											"",
@@ -322,7 +322,7 @@ 
 											true
 				);
 
-				if($return_encrypted['finished']) {
+				if ($return_encrypted['finished']) {
 					++$part;
 
 					if ($part < sizeof($backup_parts)) {
@@ -334,37 +334,37 @@ 
 		}
 
 		//Sending backup to remote storage
-		if ( isset( $schedule['remote_storage'] ) && $schedule['remote_storage'] && array_key_exists( $schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages() ) ) {
+		if (isset($schedule['remote_storage']) && $schedule['remote_storage'] && array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages())) {
 			$backup_file = $return['extra']['backup_parent'];
 
-			$this->logger->info( sprintf( "Transferring backup to remote storage %s", strtoupper( $schedule['remote_storage'] ) ), array( "CRON" ) );
+			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 
-			if ( method_exists( $this->xcloner_remote_storage, "upload_backup_to_storage" ) ) {
-				call_user_func_array( array(
+			if (method_exists($this->xcloner_remote_storage, "upload_backup_to_storage")) {
+				call_user_func_array(array(
 					$this->xcloner_remote_storage,
 					"upload_backup_to_storage"
-				), array( $backup_file, $schedule['remote_storage'] ) );
+				), array($backup_file, $schedule['remote_storage']));
 			}
 		}
 
 		//Sending email notification
-		if ( isset( $schedule['backup_params']->email_notification ) and $to = $schedule['backup_params']->email_notification ) {
+		if (isset($schedule['backup_params']->email_notification) and $to = $schedule['backup_params']->email_notification) {
 			try {
 				$from                      = "";
 				$additional['lines_total'] = $return['extra']['lines_total'];
-				$subject                   = sprintf( __( "%s - new backup generated %s" ), $schedule['name'], $return['extra']['backup_parent'] );
+				$subject                   = sprintf(__("%s - new backup generated %s"), $schedule['name'], $return['extra']['backup_parent']);
 
-				$this->archive_system->send_notification( $to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional );
+				$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional);
 
-			} catch ( Exception $e ) {
-				$this->logger->error( $e->getMessage() );
+			}catch (Exception $e) {
+				$this->logger->error($e->getMessage());
 			}
 		}
 
 		//CHECK IF WE SHOULD DELETE BACKUP AFTER REMOTE TRANSFER IS DONE
-		if ( $schedule['remote_storage'] && $this->xcloner_settings->get_xcloner_option( 'xcloner_cleanup_delete_after_remote_transfer' ) ) {
-			$this->logger->info( sprintf( "Deleting %s from local storage matching rule xcloner_cleanup_delete_after_remote_transfer", $return['extra']['backup_parent'] ) );
-			$this->xcloner_file_system->delete_backup_by_name( $return['extra']['backup_parent'] );
+		if ($schedule['remote_storage'] && $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_delete_after_remote_transfer')) {
+			$this->logger->info(sprintf("Deleting %s from local storage matching rule xcloner_cleanup_delete_after_remote_transfer", $return['extra']['backup_parent']));
+			$this->xcloner_file_system->delete_backup_by_name($return['extra']['backup_parent']);
 
 		}
 
@@ -378,28 +378,28 @@ 
 		$this->xcloner_file_system->cleanup_tmp_directories();
 	}
 
-	public function xcloner_scheduler_callback( $id, $schedule = "" ) {
-		if ( $id ) {
-			$schedule = $this->get_schedule_by_id( $id );
+	public function xcloner_scheduler_callback($id, $schedule = "") {
+		if ($id) {
+			$schedule = $this->get_schedule_by_id($id);
 		}
 
 		try {
-			if( get_option('xcloner_disable_email_notification') ) {
+			if (get_option('xcloner_disable_email_notification')) {
 				//we disable email notifications
 				$schedule['backup_params']->email_notification = "";
 			}
-			$this->_xcloner_scheduler_callback( $id, $schedule );
+			$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 ) {
-				$schedule['backup_params']->email_notification = get_option( 'admin_email' );
+			if (!isset($schedule['backup_params']->email_notification) || !$schedule['backup_params']->email_notification) {
+				$schedule['backup_params']->email_notification = get_option('admin_email');
 			}
 
-			if ( isset( $schedule['backup_params']->email_notification ) && $to = $schedule['backup_params']->email_notification ) {
+			if (isset($schedule['backup_params']->email_notification) && $to = $schedule['backup_params']->email_notification) {
 				$from = "";
-				$this->archive_system->send_notification( $to, $from, $schedule['name'] . " - backup error", "", "", $e->getMessage() );
+				$this->archive_system->send_notification($to, $from, $schedule['name']." - backup error", "", "", $e->getMessage());
 			}
 
 		}

includes/class-xcloner-archive.php

Indentation +350 added lines, -350 removed lines

@@ -214,9 +214,9 @@ 
      * @return bool
      */
 
-    /**
-     * @param string $error_message
-     */
+	/**
+	 * @param string $error_message
+	 */
 	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
 	{
 
@@ -255,486 +255,486 @@ 
      *
      * @return bool
      */
-    public function send_notification(
-        $to,
-        $from,
-        $subject,
-        $backup_name,
-        $params,
-        $error_message = "",
-        $additional = array()
-    ) {
-        if (!$from) {
-            $from = "XCloner Backup";
-        }
+	public function send_notification(
+		$to,
+		$from,
+		$subject,
+		$backup_name,
+		$params,
+		$error_message = "",
+		$additional = array()
+	) {
+		if (!$from) {
+			$from = "XCloner Backup";
+		}
 
-        if (($error_message)) {
-            return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
-        }
+		if (($error_message)) {
+			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
+		}
 
-        $params = (array)$params;
+		$params = (array)$params;
 
-        if (!$subject) {
-            $subject = sprintf(__("New backup generated %s"), $backup_name);
-        }
+		if (!$subject) {
+			$subject = sprintf(__("New backup generated %s"), $backup_name);
+		}
 
-        $body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
-        $body .= "<br /><br />";
+		$body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
+		$body .= "<br /><br />";
 
-        if (isset($additional['lines_total'])) {
-            $body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
-            $body .= "<br /><br />";
-        }
+		if (isset($additional['lines_total'])) {
+			$body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
+			$body .= "<br /><br />";
+		}
 
-        $backup_parts = $this->filesystem->get_multipart_files($backup_name);
+		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 
-        if (!$backups_counter = sizeof($backup_parts)) {
-            $backups_counter = 1;
-        }
+		if (!$backups_counter = sizeof($backup_parts)) {
+			$backups_counter = 1;
+		}
 
-        $body .= sprintf(__("Backup Parts: %s"), $backups_counter);
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
+		$body .= "<br />";
 
-        if (sizeof($backup_parts)) {
-            $body .= implode("<br />", $backup_parts);
-            $body .= "<br />";
-        }
+		if (sizeof($backup_parts)) {
+			$body .= implode("<br />", $backup_parts);
+			$body .= "<br />";
+		}
 
-        $body .= "<br />";
+		$body .= "<br />";
 
-        $body .= sprintf(__("Backup Site Url: %s"), get_site_url());
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
+		$body .= "<br />";
 
-        if (isset($params['backup_params']->backup_comments)) {
-            $body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
-            $body .= "<br /><br />";
-        }
+		if (isset($params['backup_params']->backup_comments)) {
+			$body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
+			$body .= "<br /><br />";
+		}
 
-        if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n",
-                                                                        $this->logger->getLastDebugLines(50));
-        }
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+			$body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n",
+																		$this->logger->getLastDebugLines(50));
+		}
 
-        $attachments = $this->filesystem->get_backup_attachments();
+		$attachments = $this->filesystem->get_backup_attachments();
 
-        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path().DS."info.tgz";
+		$attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path().DS."info.tgz";
 
-        $tar = new Tar();
-        $tar->create($attachments_archive);
+		$tar = new Tar();
+		$tar->create($attachments_archive);
 
-        foreach ($attachments as $key => $file) {
-            $tar->addFile($file, basename($file));
-        }
-        $tar->close();
+		foreach ($attachments as $key => $file) {
+			$tar->addFile($file, basename($file));
+		}
+		$tar->close();
 
-        $this->logger->info(sprintf("Sending backup notification to %s", $to));
+		$this->logger->info(sprintf("Sending backup notification to %s", $to));
 
-        $admin_email = get_option("admin_email");
+		$admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
+		$headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
 
-        $return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
+		$return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Incremental Backup method
      *
      */
-    public function start_incremental_backup($backup_params, $extra_params, $init)
-    {
-        $return = array();
-
-        if (!isset($extra_params['backup_part'])) {
-            $extra_params['backup_part'] = 0;
-        }
-
-        $return['extra']['backup_part'] = $extra_params['backup_part'];
+	public function start_incremental_backup($backup_params, $extra_params, $init)
+	{
+		$return = array();
 
-        if (isset($extra_params['backup_archive_name'])) {
-            $this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
-        } else {
-            $this->set_archive_name($backup_params['backup_name']);
-        }
+		if (!isset($extra_params['backup_part'])) {
+			$extra_params['backup_part'] = 0;
+		}
 
-        if (!$this->get_archive_name()) {
-            $this->set_archive_name();
-        }
+		$return['extra']['backup_part'] = $extra_params['backup_part'];
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
+		if (isset($extra_params['backup_archive_name'])) {
+			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
+		} else {
+			$this->set_archive_name($backup_params['backup_name']);
+		}
 
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		if (!$this->get_archive_name()) {
+			$this->set_archive_name();
+		}
 
-        if ($init) {
-            $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
 
-            $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-            $return['extra']['backup_init'] = 1;
+		if ($init) {
+			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-        } else {
-            $this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
+			$this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
-            $this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
+			$return['extra']['backup_init'] = 1;
 
-            $return['extra']['backup_init'] = 0;
+		} else {
+			$this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 
-        }
+			$this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
 
-        $return['extra']['backup_archive_name'] = $this->get_archive_name();
-        $return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
+			$return['extra']['backup_init'] = 0;
 
-        if (!isset($extra_params['start_at_line'])) {
-            $extra_params['start_at_line'] = 0;
-        }
+		}
 
-        if (!isset($extra_params['start_at_byte'])) {
-            $extra_params['start_at_byte'] = 0;
-        }
+		$return['extra']['backup_archive_name'] = $this->get_archive_name();
+		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 
-        if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
-            $this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
-                $this->filesystem->get_included_files_handler()));
+		if (!isset($extra_params['start_at_line'])) {
+			$extra_params['start_at_line'] = 0;
+		}
 
-            $return['finished'] = 1;
-            return $return;
-        }
+		if (!isset($extra_params['start_at_byte'])) {
+			$extra_params['start_at_byte'] = 0;
+		}
 
-        $included_files_handler = $this->filesystem->get_included_files_handler(1);
+		if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
+			$this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
+				$this->filesystem->get_included_files_handler()));
 
-        $file = new SplFileObject($included_files_handler);
+			$return['finished'] = 1;
+			return $return;
+		}
 
-        $file->seek(PHP_INT_MAX);
+		$included_files_handler = $this->filesystem->get_included_files_handler(1);
 
-        $return['extra']['lines_total'] = ($file->key() - 1);
+		$file = new SplFileObject($included_files_handler);
 
-        //we skip the first CSV line with headers
-        if (!$extra_params['start_at_line']) {
-            $file->seek(1);
-        } else {
-            $file->seek($extra_params['start_at_line'] + 1);
-        }
+		$file->seek(PHP_INT_MAX);
 
-        $this->processed_size_bytes = 0;
+		$return['extra']['lines_total'] = ($file->key() - 1);
 
-        $counter = 0;
+		//we skip the first CSV line with headers
+		if (!$extra_params['start_at_line']) {
+			$file->seek(1);
+		} else {
+			$file->seek($extra_params['start_at_line'] + 1);
+		}
 
-        $start_byte = $extra_params['start_at_byte'];
+		$this->processed_size_bytes = 0;
 
-        $byte_limit = 0;
+		$counter = 0;
 
-        while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
-            $current_line_str = $file->current();
+		$start_byte = $extra_params['start_at_byte'];
 
-            $line = str_getcsv($current_line_str);
+		$byte_limit = 0;
 
-            $relative_path = stripslashes($line[0]);
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
+			$current_line_str = $file->current();
 
-            $start_filesystem = "start_filesystem";
+			$line = str_getcsv($current_line_str);
 
-            if (isset($line[4])) {
-                $start_filesystem = $line[4];
-            }
+			$relative_path = stripslashes($line[0]);
 
-            //$adapter = $this->filesystem->get_adapter($start_filesystem);
+			$start_filesystem = "start_filesystem";
 
-            if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
-                if ($relative_path != "") {
-                    $this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
-                        $relative_path));
-                }
+			if (isset($line[4])) {
+				$start_filesystem = $line[4];
+			}
 
-                $extra_params['start_at_line']++;
-                $file->next();
-                continue;
-            }
+			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 
-            $file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
+			if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
+				if ($relative_path != "") {
+					$this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
+						$relative_path));
+				}
 
-            if (!isset($file_info['size'])) {
-                $file_info['size'] = 0;
-            }
+				$extra_params['start_at_line']++;
+				$file->next();
+				continue;
+			}
 
-            if ($start_filesystem == "tmp_filesystem") {
-                $file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
-            }
+			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 
-            $byte_limit = (int)$this->file_size_per_request_limit / 512;
+			if (!isset($file_info['size'])) {
+				$file_info['size'] = 0;
+			}
 
-            $append = 0;
+			if ($start_filesystem == "tmp_filesystem") {
+				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
+			}
 
-            if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
-                $append = 1;
-            }
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 
-            if (!isset($return['extra']['backup_size'])) {
-                $return['extra']['backup_size'] = 0;
-            }
+			$append = 0;
 
-            $return['extra']['backup_size'] = $archive_info->getSize();
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
+				$append = 1;
+			}
 
-            $estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
+			if (!isset($return['extra']['backup_size'])) {
+				$return['extra']['backup_size'] = 0;
+			}
 
-            //we create a new backup part if we reach the Split Achive Limit
-            if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
-                $this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
-                    $this->xcloner_split_backup_limit, $estimated_new_size));
-                list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-                if ($file_info['size'] > $this->xcloner_split_backup_limit) {
-                    $this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
-                        $file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
-                    $extra_params['start_at_line']++;
-                }
+			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = 0;
+			//we create a new backup part if we reach the Split Achive Limit
+			if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
+				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
+					$this->xcloner_split_backup_limit, $estimated_new_size));
+				list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
 
-                $return['finished'] = 0;
+				if ($file_info['size'] > $this->xcloner_split_backup_limit) {
+					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
+						$file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
+					$extra_params['start_at_line']++;
+				}
 
-                return $return;
-            }
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = 0;
 
-            list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
-                $append, $start_filesystem);
-            $this->processed_size_bytes += $bytes_wrote;
+				$return['finished'] = 0;
 
-            //echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-            $return['extra']['backup_size'] = $archive_info->getSize();
+				return $return;
+			}
 
-            if ($last_position > 0) {
-                $start_byte = $last_position;
-            } else {
-                $extra_params['start_at_line']++;
-                $file->next();
-                $start_byte = 0;
-                $counter++;
-            }
+			list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
+				$append, $start_filesystem);
+			$this->processed_size_bytes += $bytes_wrote;
+
+			//echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+			$return['extra']['backup_size'] = $archive_info->getSize();
+
+			if ($last_position > 0) {
+				$start_byte = $last_position;
+			} else {
+				$extra_params['start_at_line']++;
+				$file->next();
+				$start_byte = 0;
+				$counter++;
+			}
 
-            if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
-                clearstatcache();
-                $return['extra']['backup_size'] = $archive_info->getSize();
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
+				clearstatcache();
+				$return['extra']['backup_size'] = $archive_info->getSize();
 
-                $return['finished'] = 0;
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = $last_position;
-                $this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
-                    $this->file_size_per_request_limit));
-                return $return;
-            }
-        }
+				$return['finished'] = 0;
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = $last_position;
+				$this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
+					$this->file_size_per_request_limit));
+				return $return;
+			}
+		}
 
-        if (!$file->eof()) {
-            clearstatcache();
-            $return['extra']['backup_size'] = $archive_info->getSize();
+		if (!$file->eof()) {
+			clearstatcache();
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            $return['finished'] = 0;
-            $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-            $return['extra']['start_at_byte'] = $last_position;
-            $this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
-                $this->files_to_process_per_request));
+			$return['finished'] = 0;
+			$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+			$return['extra']['start_at_byte'] = $last_position;
+			$this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
+				$this->files_to_process_per_request));
 
-            return $return;
-        }
+			return $return;
+		}
 
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
 
-        /**
-         * XCloner HOOK backup_archive_finished.
-         *
-         * This will get triggered when a backup archive is finished writing.
-         */
-        //do_action('backup_archive_finished', $this->backup_archive, $this);
+		/**
+		 * XCloner HOOK backup_archive_finished.
+		 *
+		 * This will get triggered when a backup archive is finished writing.
+		 */
+		//do_action('backup_archive_finished', $this->backup_archive, $this);
 
-        //updating archive_info
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		//updating archive_info
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-        if ($return['extra']['backup_part']) {
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+		if ($return['extra']['backup_part']) {
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
+		$return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
 
-        if (isset($file_info)) {
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-        }
+		if (isset($file_info)) {
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+		}
 
-        clearstatcache();
-        $return['extra']['backup_size'] = $archive_info->getSize();
+		clearstatcache();
+		$return['extra']['backup_size'] = $archive_info->getSize();
 
-        $return['finished'] = 1;
-        return $return;
-    }
+		$return['finished'] = 1;
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Write multipart file components
      *
      */
-    private function write_multipart_file($path = "")
-    {
-        if (!$path) {
-            $path = $this->get_archive_name_with_extension();
-        }
+	private function write_multipart_file($path = "")
+	{
+		if (!$path) {
+			$path = $this->get_archive_name_with_extension();
+		}
 
-        $file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
-        //print_r($file_info);
-        $line = '"'.$file['path'].'","'.$file['timestamp'].'","'.$file['size'].'"'.PHP_EOL;
+		$file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
+		//print_r($file_info);
+		$line = '"'.$file['path'].'","'.$file['timestamp'].'","'.$file['size'].'"'.PHP_EOL;
 
 
-        $this->filesystem->get_filesystem("storage_filesystem_append")
-            ->write($this->get_archive_name_multipart(), $line);
-    }
+		$this->filesystem->get_filesystem("storage_filesystem_append")
+			->write($this->get_archive_name_multipart(), $line);
+	}
 
-    /*
+	/*
      *
      * Create a new backup part
      *
      */
-    private function create_new_backup_part($part = 0)
-    {
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
-
-        if (!$part) {
-            $old_name = $this->get_archive_name_with_extension();
-            $this->set_archive_name($this->get_archive_name(), ++$part);
-            $this->rename_archive($old_name, $this->get_archive_name_with_extension());
-
-            if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
-                $this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
-            }
+	private function create_new_backup_part($part = 0)
+	{
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
+
+		if (!$part) {
+			$old_name = $this->get_archive_name_with_extension();
+			$this->set_archive_name($this->get_archive_name(), ++$part);
+			$this->rename_archive($old_name, $this->get_archive_name_with_extension());
+
+			if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
+				$this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
+			}
 
-            $this->write_multipart_file($this->get_archive_name_with_extension());
+			$this->write_multipart_file($this->get_archive_name_with_extension());
 
-        } else {
-            $this->logger->info(sprintf("Creating new multipart info file %s",
-                $this->get_archive_name_with_extension()));
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+		} else {
+			$this->logger->info(sprintf("Creating new multipart info file %s",
+				$this->get_archive_name_with_extension()));
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $this->set_archive_name($this->get_archive_name(), ++$part);
+		$this->set_archive_name($this->get_archive_name(), ++$part);
 
-        $this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
+		$this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
-        $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		$this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
-        return array($archive_info, $part);
+		return array($archive_info, $part);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Add file to archive
      *
      */
 
-    /**
-     * @param integer $append
-     */
-    public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
-    {
+	/**
+	 * @param integer $append
+	 */
+	public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
+	{
 
-        $start_adapter = $this->filesystem->get_adapter($filesystem);
-        $start_filesystem = $this->filesystem->get_adapter($filesystem);
+		$start_adapter = $this->filesystem->get_adapter($filesystem);
+		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 
-        if (!$file_info['path']) {
-            return;
-        }
+		if (!$file_info['path']) {
+			return;
+		}
 
-        if (isset($file_info['archive_prefix_path'])) {
-            $file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
-        } else {
-            $file_info['target_path'] = $file_info['path'];
-        }
+		if (isset($file_info['archive_prefix_path'])) {
+			$file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
+		} else {
+			$file_info['target_path'] = $file_info['path'];
+		}
 
-        $last_position = $start_at_byte;
+		$last_position = $start_at_byte;
 
-        //$start_adapter = $this->filesystem->get_start_adapter();
+		//$start_adapter = $this->filesystem->get_start_adapter();
 
-        if (!$append) {
-            $bytes_wrote = $file_info['size'];
-            $this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
-                $file_info['target_path'], $this->get_archive_name_with_extension()));
-            $this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
-                $file_info['target_path']);
-        } else {
-            $tmp_file = md5($file_info['path']);
+		if (!$append) {
+			$bytes_wrote = $file_info['size'];
+			$this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
+				$file_info['target_path'], $this->get_archive_name_with_extension()));
+			$this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
+				$file_info['target_path']);
+		} else {
+			$tmp_file = md5($file_info['path']);
 
-            //we isolate file to tmp if we are at byte 0, the starting point of file reading
-            if (!$start_at_byte) {
-                $this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
-                    $file_info['path'], $tmp_file));
-                $file_stream = $start_filesystem->readStream($file_info['path']);
+			//we isolate file to tmp if we are at byte 0, the starting point of file reading
+			if (!$start_at_byte) {
+				$this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
+					$file_info['path'], $tmp_file));
+				$file_stream = $start_filesystem->readStream($file_info['path']);
 
-                if (is_resource($file_stream['stream'])) {
-                    $this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
-                }
-            }
+				if (is_resource($file_stream['stream'])) {
+					$this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
+				}
+			}
 
-            if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
-                $is_tmp = 1;
-                $last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
-                                                        ->applyPathPrefix($tmp_file),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            } else {
-                $is_tmp = 0;
-                $last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            }
+			if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
+				$is_tmp = 1;
+				$last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
+														->applyPathPrefix($tmp_file),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			} else {
+				$is_tmp = 0;
+				$last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			}
 
 
-            if ($last_position == -1) {
-                $bytes_wrote = $file_info['size'] - $start_at_byte;
-            } else {
-                $bytes_wrote = $last_position - $start_at_byte;
-            }
+			if ($last_position == -1) {
+				$bytes_wrote = $file_info['size'] - $start_at_byte;
+			} else {
+				$bytes_wrote = $last_position - $start_at_byte;
+			}
 
 
-            if ($is_tmp) {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
-                    $bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
-            } else {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
-                    $bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
-            }
+			if ($is_tmp) {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
+					$bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
+			} else {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
+					$bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
+			}
 
-            //we delete here the isolated tmp file
-            if ($last_position == -1) {
-                if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
-                    $this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
-                    $this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
-                }
-            }
+			//we delete here the isolated tmp file
+			if ($last_position == -1) {
+				if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
+					$this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
+					$this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
+				}
+			}
 
-        }
+		}
 
-        return array($bytes_wrote, $last_position);
-    }
+		return array($bytes_wrote, $last_position);
+	}
 
-    /**
-     * Open a TAR archive and put the file cursor at the end for data appending
-     *
-     * If $file is empty, the tar file will be created in memory
-     *
-     * @param string $file
-     * @throws ArchiveIOException
-     */
-    /*
+	/**
+	 * Open a TAR archive and put the file cursor at the end for data appending
+	 *
+	 * If $file is empty, the tar file will be created in memory
+	 *
+	 * @param string $file
+	 * @throws ArchiveIOException
+	 */
+	/*
     public function openForAppend($file = '')
     {
         $this->file   = $file;

Spacing +6 added lines, -6 removed lines

@@ -148,7 +148,7 @@ 
 			$new_name = $this->archive_name;
 
 			if (!stristr($new_name, "-diff")) {
-				$new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+				$new_name = $this->archive_name."-diff".date("Y-m-d_H-i", $diff_timestamp_start);
 			}
 
 			$this->archive_name = $new_name;
@@ -156,9 +156,9 @@ 
 		}
 
 		if (isset($part) and $part) {
-			$new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+			$new_name = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
 			if (!stristr($new_name, "-part")) {
-				$new_name = $this->archive_name . "-part" . $part;
+				$new_name = $this->archive_name."-part".$part;
 			}
 
 			$this->archive_name = $new_name;
@@ -187,7 +187,7 @@ 
 	public function get_archive_name_multipart()
 	{
 		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-		return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+		return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
 	}
 
 	/*
@@ -197,7 +197,7 @@ 
      */
 	public function get_archive_name_with_extension()
 	{
-		return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+		return $this->archive_name.$this->xcloner_settings->get_backup_extension_name();
 	}
 
 	/*
@@ -233,7 +233,7 @@ 
 		$headers = array('Content-Type: text/html; charset=UTF-8');
 
 		if ($admin_email and $from) {
-			$headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+			$headers[] = 'From: '.$from.' <'.$admin_email.'>';
 		}
 
 		$return = wp_mail($to, $subject, $body, $headers);

includes/class-xcloner-encryption.php

Braces +1 added lines, -1 removed lines

@@ -377,6 +377,6 @@
 			$xcloner_encryption->decrypt_file($argv[2], $argv[2].".dec", $argv[4], '', '', true);
 		}
 	}
-}catch (\Exception $e) {
+} catch (\Exception $e) {
 	echo "CAUGHT: ".$e->getMessage();
 }

includes/class-xcloner-file-transfer.php

Indentation +99 added lines, -99 removed lines

@@ -29,137 +29,137 @@
 class Xcloner_File_Transfer extends Xcloner_File_System
 {
 
-    /**
-     * Target url web address of the restore script
-     * @var string
-     */
-    private $target_url;
-    /**
-     * Transfer data limit in bytes
-     * @var int
-     */
-    private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
+	/**
+	 * Target url web address of the restore script
+	 * @var string
+	 */
+	private $target_url;
+	/**
+	 * Transfer data limit in bytes
+	 * @var int
+	 */
+	private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
 
 
-    /**
-     * @param $target_url
-     *
-     * @return mixed
-     */
-    public function set_target($target_url)
-    {
-        return $this->target_url = $target_url;
-    }
+	/**
+	 * @param $target_url
+	 *
+	 * @return mixed
+	 */
+	public function set_target($target_url)
+	{
+		return $this->target_url = $target_url;
+	}
 
-    /**
-     * @return string
-     */
-    public function get_target()
-    {
-        return $this->target_url;
-    }
+	/**
+	 * @return string
+	 */
+	public function get_target()
+	{
+		return $this->target_url;
+	}
 
 
-    /**
-     * @param $file
-     * @param int $start
-     * @param string $hash
-     *
-     * @return bool|int
-     * @throws Exception
-     */
-    public function transfer_file($file, $start = 0, $hash = "")
-    {
-        if (!$this->target_url) {
-            throw new Exception("Please setup a target url for upload");
-        }
+	/**
+	 * @param $file
+	 * @param int $start
+	 * @param string $hash
+	 *
+	 * @return bool|int
+	 * @throws Exception
+	 */
+	public function transfer_file($file, $start = 0, $hash = "")
+	{
+		if (!$this->target_url) {
+			throw new Exception("Please setup a target url for upload");
+		}
 
 
-        $fp = $this->get_storage_filesystem()->readStream($file);
+		$fp = $this->get_storage_filesystem()->readStream($file);
 
-        fseek($fp, $start, SEEK_SET);
+		fseek($fp, $start, SEEK_SET);
 
-        $binary_data = fread($fp, $this->transfer_limit);
+		$binary_data = fread($fp, $this->transfer_limit);
 
-        $tmp_filename = "xcloner_upload_".substr(md5(time()), 0, 5);
+		$tmp_filename = "xcloner_upload_".substr(md5(time()), 0, 5);
 
-        $this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
+		$this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
 
-        $tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
+		$tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
 
-        $send_array = array();
+		$send_array = array();
 
-        $send_array['file'] = $file;
-        $send_array['start'] = $start;
-        $send_array['xcloner_action'] = "write_file";
-        $send_array['hash'] = $hash;
-        #$send_array['blob'] 	= $binary_data;
-        $send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
+		$send_array['file'] = $file;
+		$send_array['start'] = $start;
+		$send_array['xcloner_action'] = "write_file";
+		$send_array['hash'] = $hash;
+		#$send_array['blob'] 	= $binary_data;
+		$send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
 
-        //$data = http_build_query($send_array);
+		//$data = http_build_query($send_array);
 
-        $this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
-            $this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
+		$this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
+			$this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
 
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->target_url);
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $this->target_url);
 
-        curl_setopt($ch, CURLOPT_POST, 1);
-        //curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
-        //curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
-        curl_setopt($ch, CURLOPT_VERBOSE, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
+		curl_setopt($ch, CURLOPT_VERBOSE, true);
 
-        $original_result = curl_exec($ch);
+		$original_result = curl_exec($ch);
 
 
-        $this->get_tmp_filesystem()->delete($tmp_filename);
+		$this->get_tmp_filesystem()->delete($tmp_filename);
 
-        $result = json_decode($original_result);
+		$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) {
-            throw new Exception($result->response);
-        }
+		if ($result->status != 200) {
+			throw new Exception($result->response);
+		}
 
-        if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
-            $this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
-                $file, $this->target_url, ftell($fp)));
-            $this->remove_tmp_filesystem();
+		if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
+			$this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
+				$file, $this->target_url, ftell($fp)));
+			$this->remove_tmp_filesystem();
 
-            return false;
-        }
+			return false;
+		}
 
-        return ftell($fp);
-    }
+		return ftell($fp);
+	}
 
-    /**
-     * @param string $filename
-     * @param string $mimetype
-     * @param string $postname
-     *
-     * @return CURLFile|string
-     */
-    private function curl_file_create($filename, $mimetype = '', $postname = '')
-    {
-        if (!function_exists('curl_file_create')) {
+	/**
+	 * @param string $filename
+	 * @param string $mimetype
+	 * @param string $postname
+	 *
+	 * @return CURLFile|string
+	 */
+	private function curl_file_create($filename, $mimetype = '', $postname = '')
+	{
+		if (!function_exists('curl_file_create')) {
 
-            return "@$filename;filename="
-                . ($postname ?: basename($filename))
-                . ($mimetype ? ";type=$mimetype" : '');
+			return "@$filename;filename="
+				. ($postname ?: basename($filename))
+				. ($mimetype ? ";type=$mimetype" : '');
 
-        } else {
+		} else {
 
-            return curl_file_create($filename, $mimetype, $postname);
+			return curl_file_create($filename, $mimetype, $postname);
 
-        }
-    }
+		}
+	}
 }

includes/class-xcloner-settings.php

Spacing +131 added lines, -131 removed lines

@@ -56,7 +56,7 @@ 
 
 	public function get_xcloner_encryption_key() {
 
-		if(!get_option('xcloner_encryption_key') )
+		if (!get_option('xcloner_encryption_key'))
 		{
 			return $this->randomString(35);
 		}
@@ -72,7 +72,7 @@ 
 	 */
 	private function randomString($length = 6) {
 		$str = "";
-		$characters = array_merge(range('A','Z'), range('a','z'), range('0','9'));
+		$characters = array_merge(range('A', 'Z'), range('a', 'z'), range('0', '9'));
 		$max = count($characters) - 1;
 		for ($i = 0; $i < $length; $i++) {
 			$rand = mt_rand(0, $max);
@@ -213,17 +213,17 @@ 
 	/**
 	 * @param string $option
 	 */
-	public function get_xcloner_option( $option ) {
-		$data = get_option( $option );
+	public function get_xcloner_option($option) {
+		$data = get_option($option);
 
 		return $data;
 	}
 
-	public function get_server_unique_hash( $strlen = 0 ) {
-		$hash = md5( get_home_url() . __DIR__ );
+	public function get_server_unique_hash($strlen = 0) {
+		$hash = md5(get_home_url().__DIR__);
 
-		if ( $strlen ) {
-			$hash = substr( $hash, 0, $strlen );
+		if ($strlen) {
+			$hash = substr($hash, 0, $strlen);
 		}
 
 		return $hash;
@@ -287,287 +287,287 @@ 
 		//CRON section
 		add_settings_section(
 			'xcloner_cron_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_cron_settings_page'
 		);
 
 
 		//REGISTERING THE 'GENERAL SECTION' FIELDS
-		register_setting( 'xcloner_general_settings_group', 'xcloner_backup_compression_level', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_backup_compression_level', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_backup_compression_level',
-			__( 'Backup Compression Level', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Backup Compression Level', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_backup_compression_level',
-				__( 'Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load', 'xcloner-backup-and-restore' ),
+				__('Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load', 'xcloner-backup-and-restore'),
 				0,
 				9
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_start_path', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_start_path', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_absolute_path"
-		) );
+		));
 		add_settings_field(
 			'xcloner_start_path',
-			__( 'Backup Start Location', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Start Location', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_start_path',
-				__( 'Base path location from where XCloner can start the Backup.', 'xcloner-backup-and-restore' ),
+				__('Base path location from where XCloner can start the Backup.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_start_path(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_store_path', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_store_path', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_absolute_path"
-		) );
+		));
 		add_settings_field(
 			'xcloner_store_path',
-			__( 'Backup Storage Location', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Storage Location', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_store_path',
-				__( 'Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore' ),
+				__('Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_store_path(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_encryption_key', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_encryption_key', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_string"
-		) );
+		));
 		add_settings_field(
 			'xcloner_encryption_key',
-			__( 'Backup Encryption Key', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Encryption Key', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_encryption_key',
-				__( 'Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore' ),
+				__('Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_encryption_key(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_log', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_log', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_log',
-			__( 'Enable XCloner Backup Log', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Enable XCloner Backup Log', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_enable_log',
-				sprintf( __( 'Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s', 'xcloner-backup-and-restore' ), $this->get_logger_filename() )
+				sprintf(__('Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_pre_update_backup', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_pre_update_backup', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_pre_update_backup',
-			__( 'Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_enable_pre_update_backup',
-				sprintf( __( 'Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore' ), $this->get_logger_filename() )
+				sprintf(__('Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_regex_exclude', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_regex_exclude', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_regex_exclude',
-			__( 'Regex Exclude Files', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_textarea_field' ),
+			__('Regex Exclude Files', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_textarea_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_regex_exclude',
-				__( 'Regular expression match to exclude files and folders, example patterns provided below, one pattern per line', 'xcloner-backup-and-restore' ),
+				__('Regular expression match to exclude files and folders, example patterns provided below, one pattern per line', 'xcloner-backup-and-restore'),
 				//$this->get_xcloner_store_path(), 
 				//'disabled'
 			)
 		);
 
 		//REGISTERING THE 'MYSQL SECTION' FIELDS
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_mysql_backup',
-			__( 'Enable Mysql Backup', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Enable Mysql Backup', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_enable_mysql_backup',
-				__( 'Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.', 'xcloner-backup-and-restore' )
+				__('Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables' );
+		register_setting('xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables');
 		add_settings_field(
 			'xcloner_backup_only_wp_tables',
-			__( 'Backup only WP tables', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Backup only WP tables', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_backup_only_wp_tables',
-				sprintf( __( 'Enable this if you only want to Backup only tables starting with \'%s\' prefix', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this if you only want to Backup only tables starting with \'%s\' prefix', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_hostname',
-			__( 'Mysql Hostname', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Hostname', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_hostname',
-				__( 'Wordpress mysql hostname', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql hostname', 'xcloner-backup-and-restore'),
 				$this->get_db_hostname(),
 				'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_username', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_username', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_username',
-			__( 'Mysql Username', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Username', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_username',
-				__( 'Wordpress mysql username', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql username', 'xcloner-backup-and-restore'),
 				$this->get_db_username(),
 				'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_database', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_database', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_database',
-			__( 'Mysql Database', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Database', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_database',
-				__( 'Wordpress mysql database', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql database', 'xcloner-backup-and-restore'),
 				$this->get_db_database(),
 				'disabled'
 			)
 		);
 
 		//REGISTERING THE 'SYSTEM SECTION' FIELDS
-		register_setting( 'xcloner_system_settings_group', 'xcloner_size_limit_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_size_limit_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_size_limit_per_request',
-			__( 'Data Size Limit Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Data Size Limit Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_size_limit_per_request',
-				__( 'Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB', 'xcloner-backup-and-restore'),
 				0,
 				1024
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_files_to_process_per_request',
-			__( 'Files To Process Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Files To Process Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_files_to_process_per_request',
-				__( 'Use this option to set how many files XCloner should process at one time before doing another AJAX call', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many files XCloner should process at one time before doing another AJAX call', 'xcloner-backup-and-restore'),
 				0,
 				1000
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_directories_to_scan_per_request',
-			__( 'Directories To Scan Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Directories To Scan Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_directories_to_scan_per_request',
-				__( 'Use this option to set how many directories XCloner should scan at one time before doing another AJAX call', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many directories XCloner should scan at one time before doing another AJAX call', 'xcloner-backup-and-restore'),
 				0,
 				1000
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_database_records_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_database_records_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_database_records_per_request',
-			__( 'Database Records Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Database Records Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_database_records_per_request',
-				__( 'Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records', 'xcloner-backup-and-restore'),
 				0,
 				100000
 			)
@@ -585,140 +585,140 @@ 
 	         )
 	    );*/
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_exclude_files_larger_than_mb',
-			__( 'Exclude files larger than (MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Exclude files larger than (MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_exclude_files_larger_than_mb',
-				__( 'Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore'),
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_split_backup_limit', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_split_backup_limit', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_split_backup_limit',
-			__( 'Split Backup Archive Limit (MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Split Backup Archive Limit (MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_split_backup_limit',
-				__( 'Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB', 'xcloner-backup-and-restore'),
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root' );
+		register_setting('xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root');
 		add_settings_field(
 			'xcloner_force_tmp_path_site_root',
-			__( 'Force Temporary Path Within XCloner Storage', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Force Temporary Path Within XCloner Storage', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_force_tmp_path_site_root',
-				sprintf( __( 'Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_disable_email_notification' );
+		register_setting('xcloner_system_settings_group', 'xcloner_disable_email_notification');
 		add_settings_field(
 			'xcloner_disable_email_notification',
-			__( 'Disable Email Notifications', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Disable Email Notifications', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_disable_email_notification',
-				sprintf( __( 'Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_retention_limit_days',
-			__( 'Cleanup by Date(days)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Date(days)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_retention_limit_days',
-				__( 'Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_retention_limit_archives',
-			__( 'Cleanup by Quantity', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Quantity', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_retention_limit_archives',
-				__( 'Specify the maximum number of backup archives to keep on the server. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Specify the maximum number of backup archives to keep on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_capacity_limit',
-			__( 'Cleanup by Capacity(MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Capacity(MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_capacity_limit',
-				__( 'Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_delete_after_remote_transfer',
-			__( 'Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_delete_after_remote_transfer',
-				__( 'Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore' )
+				__('Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore')
 			)
 		);
 
 		//REGISTERING THE 'CRON SECTION' FIELDS
-		register_setting( 'xcloner_cron_settings_group', 'xcloner_cron_frequency' );
+		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
 		add_settings_field(
 			'xcloner_cron_frequency',
-			__( 'Cron frequency', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Cron frequency', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_cron_settings_page',
 			'xcloner_cron_settings_group',
 			array(
 				'xcloner_cron_frequency',
-				__( 'Cron frequency' )
+				__('Cron frequency')
 			)
 		);
 	}

includes/class-xcloner-remote-storage.php

Spacing +67 added lines, -67 removed lines

@@ -162,26 +162,26 @@ 
 	private $logger;
 	private $xcloner;
 
-	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');
 
@@ -201,22 +201,22 @@ 
 	 * @param string $action
 	 * @return string
 	 */
-	private function simple_crypt( $string, $action = 'e' ) {
+	private function simple_crypt($string, $action = 'e') {
 		// you may change these values to your own
 		$secret_key = NONCE_KEY;
 		$secret_iv = NONCE_SALT;
 
 		$output = $string;
 		$encrypt_method = "AES-256-CBC";
-		$key = hash( 'sha256', $secret_key );
-		$iv = substr( hash( 'sha256', $secret_iv ), 0, 16 );
+		$key = hash('sha256', $secret_key);
+		$iv = substr(hash('sha256', $secret_iv), 0, 16);
 
-		if( $action == 'e' && function_exists('openssl_encrypt')) {
-			$output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) );
+		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 )){
-			$decrypt = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv );
-			if($decrypt) {
+		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
 				$output = $decrypt;
 			}
@@ -231,121 +231,121 @@ 
 
 	public function get_available_storages() {
 		$return = array();
-		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'];
+		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'];
 			}
 		}
 
 		return $return;
 	}
 
-	public function save( $action = "ftp" ) {
-		if ( ! $action ) {
+	public function save($action = "ftp") {
+		if (!$action) {
 			return false;
 		}
 
-		$storage = $this->xcloner_sanitization->sanitize_input_as_string( $action );
-		$this->logger->debug( sprintf( "Saving the remote storage %s options", strtoupper( $action ) ) );
+		$storage = $this->xcloner_sanitization->sanitize_input_as_string($action);
+		$this->logger->debug(sprintf("Saving the remote storage %s options", strtoupper($action)));
 
-		if ( is_array( $this->storage_fields[ $storage ] ) ) {
-			foreach ( $this->storage_fields[ $storage ] as $field => $validation ) {
-				$check_field     = $this->storage_fields["option_prefix"] . $field;
-				$sanitize_method = "sanitize_input_as_" . $validation;
+		if (is_array($this->storage_fields[$storage])) {
+			foreach ($this->storage_fields[$storage] as $field => $validation) {
+				$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 ) ) {
+				if (!method_exists($this->xcloner_sanitization, $sanitize_method)) {
 					$sanitize_method = "sanitize_input_as_string";
 				}
 
-				$sanitized_value = $this->xcloner_sanitization->$sanitize_method( stripslashes( $_POST[ $check_field ] ) );
-				update_option( $check_field, $sanitized_value );
+				$sanitized_value = $this->xcloner_sanitization->$sanitize_method(stripslashes($_POST[$check_field]));
+				update_option($check_field, $sanitized_value);
 			}
 
-			$this->xcloner->trigger_message( __( "%s storage settings saved.", 'xcloner-backup-and-restore' ), "success", $this->storage_fields[ $action ]['text'] );
+			$this->xcloner->trigger_message(__("%s storage settings saved.", 'xcloner-backup-and-restore'), "success", $this->storage_fields[$action]['text']);
 		}
 
 	}
 
-	public function check( $action = "ftp" ) {
+	public function check($action = "ftp") {
 		try {
-			$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 ) {
-			$this->xcloner->trigger_message( "%s connection error: " . $e->getMessage(), "error", $this->storage_fields[ $action ]['text'] );
+			$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) {
+			$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", $this->storage_fields[$action]['text']);
 		}
 	}
 
 	/**
 	 * @param string $storage_type
 	 */
-	public function verify_filesystem( $storage_type ) {
-		$method = "get_" . $storage_type . "_filesystem";
+	public function verify_filesystem($storage_type) {
+		$method = "get_".$storage_type."_filesystem";
 
-		$this->logger->info( sprintf( "Checking validity of the remote storage %s filesystem", strtoupper( $storage_type ) ) );
+		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem", strtoupper($storage_type)));
 
-		if ( ! method_exists( $this, $method ) ) {
+		if (!method_exists($this, $method)) {
 			return false;
 		}
 
-		list( $adapter, $filesystem ) = $this->$method();
+		list($adapter, $filesystem) = $this->$method();
 
-		$test_file = substr( ".xcloner_" . md5( time() ), 0, 15 );
+		$test_file = substr(".xcloner_".md5(time()), 0, 15);
 
-		if ( $storage_type == "gdrive" ) {
-			if ( ! is_array( $filesystem->listContents() ) ) {
-				throw new Exception( __( "Could not read data", 'xcloner-backup-and-restore' ) );
+		if ($storage_type == "gdrive") {
+			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 ) ) );
+			$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 ) ) );
+		$this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));
 
 		//testing read access
-		if ( ! $filesystem->has( $test_file ) ) {
-			throw new Exception( __( "Could not read data", 'xcloner-backup-and-restore' ) );
+		if (!$filesystem->has($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 ) ) );
+		$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 ) ) );
+		$this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));
 
 		return true;
 	}
 
-	public function upload_backup_to_storage( $file, $storage ) {
-		if ( ! $this->xcloner_file_system->get_storage_filesystem()->has( $file ) ) {
-			$this->logger->info( sprintf( "File not found %s in local storage", $file ) );
+	public function upload_backup_to_storage($file, $storage) {
+		if (!$this->xcloner_file_system->get_storage_filesystem()->has($file)) {
+			$this->logger->info(sprintf("File not found %s in local storage", $file));
 
 			return false;
 		}
 
-		$method = "get_" . $storage . "_filesystem";
+		$method = "get_".$storage."_filesystem";
 
-		if ( ! method_exists( $this, $method ) ) {
+		if (!method_exists($this, $method)) {
 			return false;
 		}
 
-		list( $remote_storage_adapter, $remote_storage_filesystem ) = $this->$method();
+		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 
 		//doing remote storage cleaning here
-		$this->clean_remote_storage( $storage, $remote_storage_filesystem );
+		$this->clean_remote_storage($storage, $remote_storage_filesystem);
 
-		$this->logger->info( sprintf( "Transferring backup %s to remote storage %s", $file, strtoupper( $storage ) ), array( "" ) );
+		$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $file, strtoupper($storage)), array(""));
 
 		/*if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
 		{

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

xcloner.php

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 try {
 	$xcloner_plugin = run_xcloner();
-}catch (Exception $e) {
+} catch (Exception $e) {
 	echo $e->getMessage();
 }