ovidiul / XCloner-Wordpress

includes/class-xcloner-api.php

Unused Use Statements -5 removed lines

@@ -2,13 +2,8 @@
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
-
 use splitbrain\PHPArchive\Tar;
-use splitbrain\PHPArchive\Zip;
-use splitbrain\PHPArchive\Archive;
-use splitbrain\PHPArchive\FileInfo;
 
 
 class Xcloner_Api{

Indentation +29 added lines, -29 removed lines

@@ -200,12 +200,12 @@ 
 			$scheduler->update_cron_hook($_POST['id']);
 			
 		if( $wpdb->last_error ) {
-            $response['error'] = 1;
-            $response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/;
+			$response['error'] = 1;
+			$response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/;
             
-        }
+		}
         
-        $scheduler->update_wp_cron_hooks();
+		$scheduler->update_wp_cron_hooks();
 		$response['finished'] = 1;
 		
 		$this->send_response($response);
@@ -851,14 +851,14 @@ 
 		$tar->close();
 		
 		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('Expires: 0');
-		    header('Cache-Control: must-revalidate');
-		    header('Pragma: public');
-		    header('Content-Length: ' . filesize($tmp_file));
-		    readfile($tmp_file);
+			header('Content-Description: File Transfer');
+			header('Content-Type: application/octet-stream');
+			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));
+			readfile($tmp_file);
 		    
 		}
 		
@@ -888,25 +888,25 @@ 
 		
 		
 		header('Pragma: public');
-	    header('Expires: 0');
-	    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-Type: ' . $mimetype);
-	    header('Content-Type: application/octet-stream');
-	    header('Content-Length: ' . $metadata['size']);
+		header('Expires: 0');
+		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-Type: ' . $mimetype);
+		header('Content-Type: application/octet-stream');
+		header('Content-Length: ' . $metadata['size']);
 	    
-	    @ob_end_clean();
+		@ob_end_clean();
 	    
-	    $chunkSize = 1024 * 1024;
-	    while (!feof($read_stream))
-	    {
-	        $buffer = fread($read_stream, $chunkSize);
-	        echo $buffer;
-	    }
-	    fclose($read_stream);
-	    exit;
+		$chunkSize = 1024 * 1024;
+		while (!feof($read_stream))
+		{
+			$buffer = fread($read_stream, $chunkSize);
+			echo $buffer;
+		}
+		fclose($read_stream);
+		exit;
     
 	}
 	

Spacing +130 added lines, -130 removed lines

@@ -11,7 +11,7 @@ 
 use splitbrain\PHPArchive\FileInfo;
 
 
-class Xcloner_Api{
+class Xcloner_Api {
 
 	private $xcloner_database;
 	private $xcloner_settings;
@@ -27,33 +27,33 @@ 
 		global $wpdb;
 		
 		error_reporting(0);
-		if( ob_get_length() )
+		if (ob_get_length())
 			ob_end_clean();
 		ob_start();
 		
-		$wpdb->show_errors		= false;
+		$wpdb->show_errors = false;
 		
-		$this->xcloner_settings 		= new Xcloner_Settings();
+		$this->xcloner_settings = new Xcloner_Settings();
 		
 		//generating the hash suffix for tmp xcloner store folder
-		if(isset($_POST['hash'])){
+		if (isset($_POST['hash'])) {
 			
-			if($_POST['hash'] == "generate_hash")
+			if ($_POST['hash'] == "generate_hash")
 				$this->xcloner_settings->generate_new_hash();
 			else
 				$this->xcloner_settings->set_hash($_POST['hash']);
 		}
 
-		$this->logger 					= new XCloner_Logger("xcloner_api", $this->xcloner_settings->get_hash());
+		$this->logger = new XCloner_Logger("xcloner_api", $this->xcloner_settings->get_hash());
 		$this->xcloner_file_system 		= new Xcloner_File_System($this->xcloner_settings->get_hash());
 		$this->xcloner_sanitization 	= new Xcloner_Sanitization();
 		$this->xcloner_requirements 	= new XCloner_Requirements();
-		$this->archive_system 			= new Xcloner_Archive($this->xcloner_settings->get_hash());
-		$this->xcloner_database 		= new XCloner_Database($this->xcloner_settings->get_hash());
+		$this->archive_system = new Xcloner_Archive($this->xcloner_settings->get_hash());
+		$this->xcloner_database = new XCloner_Database($this->xcloner_settings->get_hash());
 		
 		
-		if(isset($_POST['API_ID'])){
-			$this->logger->info("Processing ajax request ID ".substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']), 0 , 15));
+		if (isset($_POST['API_ID'])) {
+			$this->logger->info("Processing ajax request ID ".substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']), 0, 15));
 		}
 		
 	}
@@ -69,16 +69,16 @@ 
 		$data['dbDatabase'] = $this->xcloner_settings->get_db_database();
 		
 		
-		$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['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";
 		
 		try
 		{
 			//$xcloner_db = new XCloner_Database($data['dbUsername'], $data['dbPassword'], $data['dbDatabase'], $data['dbHostname']);
 			$this->xcloner_database->init($data);
 
-		}catch(Exception $e)
+		}catch (Exception $e)
 		{
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -106,12 +106,12 @@ 
 		$params = array();
 		$schedule = array();
 		
-		if(isset($_POST['data']))
+		if (isset($_POST['data']))
 			$params = json_decode(stripslashes($_POST['data']));
 		
 		$this->process_params($params);
 		
-		if(isset($_POST['id']))
+		if (isset($_POST['id']))
 		{
 			
 			$this->form_params['backup_params']['backup_name'] = $this->xcloner_sanitization->sanitize_input_as_string($_POST['backup_name']);
@@ -126,11 +126,11 @@ 
 			$tables = explode(PHP_EOL, $this->form_params['database']);
 			$return = array();
 			
-			foreach($tables as $table)
+			foreach ($tables as $table)
 			{
-					$table = str_replace("\r","", $table);
+					$table = str_replace("\r", "", $table);
 					$data = explode(".", $table);
-					if(isset($data[1]))
+					if (isset($data[1]))
 						$return[$data[0]][] = $data[1];
 			}
 			
@@ -139,10 +139,10 @@ 
 			$excluded_files = explode(PHP_EOL, $this->form_params['excluded_files']);
 			$return = array();
 			
-			foreach($excluded_files as $file)
+			foreach ($excluded_files as $file)
 			{
-				$file = str_replace("\r","", $file);
-				if($file)
+				$file = str_replace("\r", "", $file);
+				if ($file)
 					$return[] = $file;
 			}
 			
@@ -151,20 +151,20 @@ 
 			//print_r($this->form_params['database'] );
 			//print_r($this->form_params['excluded_files']);
 			
-			$schedule['start_at'] = $this->form_params['backup_params']['start_at'] ;
+			$schedule['start_at'] = $this->form_params['backup_params']['start_at'];
 			
-			if(!isset($_POST['status']))
+			if (!isset($_POST['status']))
 				$schedule['status'] = 0;
 			else	
 				$schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
-		}else{
+		} else {
 		
 			$schedule['status'] = 1;
-			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
+			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'].
 								" ".$this->form_params['backup_params']['schedule_start_time']);
 		}
 		
-		if(!$schedule['start_at'])						
+		if (!$schedule['start_at'])						
 			$schedule['start_at'] = time();
 		
 		$schedule['start_at'] = date('Y-m-d H:i:s', $schedule['start_at']);	
@@ -175,7 +175,7 @@ 
 		
 		$schedule['params'] = json_encode($this->form_params);
 		
-		if(!isset($_POST['id']))
+		if (!isset($_POST['id']))
 		{
 			$insert = $wpdb->insert( 
 				$wpdb->prefix.'xcloner_scheduler', 
@@ -185,21 +185,21 @@ 
 					'%s' 
 				) 
 			);
-		}else		{
+		} else {
 			$insert = $wpdb->update( 
 				$wpdb->prefix.'xcloner_scheduler', 
 				$schedule, 
-				array( 'id' => $_POST['id'] ), 
+				array('id' => $_POST['id']), 
 				array( 
 					'%s', 
 					'%s' 
 				) 
 			);
 		}
-		if(isset($_POST['id']))
+		if (isset($_POST['id']))
 			$scheduler->update_cron_hook($_POST['id']);
 			
-		if( $wpdb->last_error ) {
+		if ($wpdb->last_error) {
             $response['error'] = 1;
             $response['error_message'] = $wpdb->last_error/*."--".$wpdb->last_query*/;
             
@@ -224,19 +224,19 @@ 
 		
 		$params = json_decode(stripslashes($_POST['data']));
 		
-		$init 	= (int)$_POST['init'];
+		$init = (int)$_POST['init'];
 		
-		if($params === NULL)
-			 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		if ($params === NULL)
+			 die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
 			 
 		$this->process_params($params);
 		
 		$return['finished'] = 1;
 
 		//$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'], $this->form_params['extra'], $init);
-		try{
+		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;
@@ -245,25 +245,25 @@ 
 			return $this->send_response($return, $hash = 1);
 		}
 		
-		if($return['finished'])
+		if ($return['finished'])
 		{
 			$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();
 		}
 		
 		$data = $return;
 		
 		//check if backup is finished
-		if($return['finished'] )
+		if ($return['finished'])
 		{
-			if(isset($this->form_params['backup_params']['email_notification']) and $to=$this->form_params['backup_params']['email_notification'])
+			if (isset($this->form_params['backup_params']['email_notification']) and $to = $this->form_params['backup_params']['email_notification'])
 			{
-				try{
+				try {
 					$from = "";
 					$subject = "";
 					$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $this->form_params);
-				}catch(Exception $e)
+				}catch (Exception $e)
 				{
 					$this->logger->error($e->getMessage());
 				}
@@ -287,17 +287,17 @@ 
 		
 		$params = json_decode(stripslashes($_POST['data']));
 		
-		$init 	= (int)$_POST['init'];
+		$init = (int)$_POST['init'];
 		
-		if($params === NULL)
-			 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		if ($params === NULL)
+			 die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
 		
 		$this->process_params($params);
 			
 		//$xcloner_database = $this->init_db();	
 		$return = $this->xcloner_database->start_database_recursion($this->form_params['database'], $this->form_params['extra'], $init);
 		
-		if(isset($return['error']) and $return['error'])
+		if (isset($return['error']) and $return['error'])
 			$data['finished'] = 1;
 		else	
 			$data['finished'] = $return['finished'];
@@ -319,10 +319,10 @@ 
 		}
 		
 		$params = json_decode(stripslashes($_POST['data']));
-		$init 	= (int)$_POST['init'];
+		$init = (int)$_POST['init'];
 		
-		if($params === NULL)
-			 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		if ($params === NULL)
+			 die('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
 			 
 		$hash = $this->process_params($params);
 		
@@ -333,7 +333,7 @@ 
 		$data["finished"] = !$return;
 		$data["total_files_num"] = $this->xcloner_file_system->get_scanned_files_num();
 		$data["last_logged_file"] = $this->xcloner_file_system->last_logged_file();
-		$data["total_files_size"] = sprintf("%.2f",$this->xcloner_file_system->get_scanned_files_total_size()/(1024*1024));
+		$data["total_files_size"] = sprintf("%.2f", $this->xcloner_file_system->get_scanned_files_total_size() / (1024 * 1024));
 		
 		return $this->send_response($data, $hash = 1);
 	}
@@ -345,7 +345,7 @@ 
 	 */ 
 	private function process_params($params)
 	{
-		if(isset($params->hash))
+		if (isset($params->hash))
 			$this->xcloner_settings->set_hash($params->hash);
 			
 		$this->form_params['extra'] = array();
@@ -353,9 +353,9 @@ 
 		
 		$this->form_params['database'] = array();
 		
-		if(isset($params->backup_params))
+		if (isset($params->backup_params))
 		{
-			foreach($params->backup_params as $param)
+			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('POST', 'fields filter'));
@@ -364,28 +364,28 @@ 
 		
 		$this->form_params['database'] = array();
 		
-		if(isset($params->table_params))
+		if (isset($params->table_params))
 		{
-			foreach($params->table_params as $param)
+			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('POST', 'database filter'));
 			}
 		}
 		
-		$this->form_params['excluded_files'] =  array();
-		if(isset($params->files_params))
+		$this->form_params['excluded_files'] = array();
+		if (isset($params->files_params))
 		{
-			foreach($params->files_params as $param)
+			foreach ($params->files_params as $param)
 			{
 				$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
 			}
 			
 			$unique_exclude_files = array();
 			
-			foreach($params->files_params as $key=>$param)
+			foreach ($params->files_params as $key=>$param)
 			{
-				if(!in_array($param->parent, $this->form_params['excluded_files'])){
+				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('POST', 'exclude files filter'));
@@ -397,9 +397,9 @@ 
 		
 		//$this->form_params['excluded_files'] =  array_merge($this->form_params['excluded_files'], $this->exclude_files_by_default);
 		
-		if(isset($params->extra))
+		if (isset($params->extra))
 		{
-			foreach($params->extra as $key=>$value)
+			foreach ($params->extra as $key=>$value)
 				$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
 		}
 			
@@ -421,7 +421,7 @@ 
 		
 		$data = array();
 		
-		if($folder == "#"){
+		if ($folder == "#") {
 			
 			$folder = "/";
 			//$list_directory = $this->xcloner_settings->get_xcloner_start_path();
@@ -435,9 +435,9 @@ 
 						);
 		}
 			
-			try{
+			try {
 				$files = $this->xcloner_file_system->list_directory($folder);
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				
 				print $e->getMessage();
 				$this->logger->error($e->getMessage());
@@ -452,19 +452,19 @@ 
 			}
 			array_multisort($type, SORT_ASC, $files);
 			
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
 				$children = false;
 				$text = $file['basename'];
 				
-				if($file['type'] == "dir")
+				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(in_array($file['path'], $this->xcloner_file_system->get_excluded_files()))
 				//echo $file['path']."--".$this->xcloner_file_system->is_excluded($file);
-				if($excluded_pattern = $this->xcloner_file_system->is_excluded($file))
+				if ($excluded_pattern = $this->xcloner_file_system->is_excluded($file))
 					$selected = true;
 				else
 					$selected = false;
@@ -501,25 +501,25 @@ 
 		
 		$xcloner_backup_only_wp_tables = $this->xcloner_settings->get_xcloner_option('xcloner_backup_only_wp_tables');
 	
-		if($database == "#")
+		if ($database == "#")
 		{
-			try{
+			try {
 				$return = $this->xcloner_database->get_all_databases();
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 			
-			foreach($return as $database)
+			foreach ($return as $database)
 			{
-				if($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database())
+				if ($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database())
 					continue;
 					
 				$state = array();
 				
-				if($database['name'] == $this->xcloner_settings->get_db_database())
+				if ($database['name'] == $this->xcloner_settings->get_db_database())
 				{
 					$state['selected'] = true;
-					if($database['num_tables'] < 25)
+					if ($database['num_tables'] < 25)
 						$state['opened'] = false;
 				}
 					
@@ -535,22 +535,22 @@ 
 			
 		}
 		
-		else{
+		else {
 			
-			try{
+			try {
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 			
-			foreach($return as $table)
+			foreach ($return as $table)
 			{
 				$state = array();
 				
-				if($xcloner_backup_only_wp_tables and !stristr($table['name'], $this->xcloner_settings->get_table_prefix()))
+				if ($xcloner_backup_only_wp_tables and !stristr($table['name'], $this->xcloner_settings->get_table_prefix()))
 					continue;
 				
-				if(isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database())
+				if (isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database())
 					$state = array('selected' => true);
 					
 				$data[] = array(
@@ -580,7 +580,7 @@ 
 		
 		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
 		$scheduler = new Xcloner_Scheduler();
-		$data  = $scheduler->get_schedule_by_id($schedule_id);
+		$data = $scheduler->get_schedule_by_id($schedule_id);
 		
 		return $this->send_response($data);
 	}
@@ -597,14 +597,14 @@ 
 		}
 		
 		$scheduler = new Xcloner_Scheduler();
-		$data  = $scheduler->get_scheduler_list();
+		$data = $scheduler->get_scheduler_list();
 		$return['data'] = array();
 		
-		foreach($data as $res)
+		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>";
-			if($res->status)
+			if ($res->status)
 				$status = '<i class="material-icons active status">timer</i>';
 			else
 				$status = '<i class="material-icons status inactive">timer_off</i>';
@@ -615,14 +615,14 @@ 
 			
 			$remote_storage = $res->remote_storage;
 			
-			if(!$next_run_time >= time())
+			if (!$next_run_time >= time())
 				$next_run = " ";
 			
-			if(trim($next_run))
+			if (trim($next_run))
 			{
 				$date_text = $next_run;
 				
-				if($next_run_time >= time())
+				if ($next_run_time >= time())
 					$next_run = "in ".human_time_diff($next_run_time, time());
 				else
 					$next_run = __("executed", 'xcloner-backup-and-restore');
@@ -635,9 +635,9 @@ 
 			$backup_size = "";
 			$backup_time = "";
 			
-			if($res->last_backup)
+			if ($res->last_backup)
 			{
-				if( $this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup))
+				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($metadata['size']);
@@ -647,7 +647,7 @@ 
 				$backup_text = "<span title='".$backup_time."' class='shorten_string'>".$res->last_backup." (".$backup_size.")</span>";
 			}
 				
-			$return['data'][] = array($res->id, $res->name, $res->recurrence,/*$res->start_at,*/ $next_run, $remote_storage, $backup_text, $status, $action);
+			$return['data'][] = array($res->id, $res->name, $res->recurrence, /*$res->start_at,*/ $next_run, $remote_storage, $backup_text, $status, $action);
 		}
 		
 		return $this->send_response($return, 0);
@@ -666,7 +666,7 @@ 
 		
 		$schedule_id = $this->xcloner_sanitization->sanitize_input_as_int($_GET['id']);
 		$scheduler = new Xcloner_Scheduler();
-		$data['finished']  = $scheduler->delete_schedule_by_id($schedule_id);
+		$data['finished'] = $scheduler->delete_schedule_by_id($schedule_id);
 		
 		return $this->send_response($data);
 	}
@@ -684,7 +684,7 @@ 
 		
 		$backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_POST['name']);
 		
-		$data['finished']  = $this->xcloner_file_system->delete_backup_by_name($backup_name);
+		$data['finished'] = $this->xcloner_file_system->delete_backup_by_name($backup_name);
 		
 		return $this->send_response($data);
 	}
@@ -701,32 +701,32 @@ 
 		
 		$backup_file = $source_backup_file;
 		
-		if($this->xcloner_file_system->is_multipart($backup_file))
+		if ($this->xcloner_file_system->is_multipart($backup_file))
 		{
 			$backup_parts = $this->xcloner_file_system->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];
 		}
 		
-		try{
+		try {
 			$tar = new Tar();
 			$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);
 		}
 		
-		$return['files'] 		= array();
-		$return['finished'] 	= 1;
-		$return['total_size'] 	= filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
+		$return['files'] = array();
+		$return['finished'] = 1;
+		$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']))
+		if (isset($data['extracted_files']) and is_array($data['extracted_files']))
 		{
-			foreach($data['extracted_files'] as $file)
+			foreach ($data['extracted_files'] as $file)
 			{
 				$return['files'][$i]['path'] = $file->getPath();
 				$return['files'][$i]['size'] = $file->getSize();
@@ -736,18 +736,18 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
-			if($this->xcloner_file_system->is_multipart($source_backup_file))
+		} else {
+			if ($this->xcloner_file_system->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
+				if ($return['part'] < sizeof($backup_parts))	
 					$return['finished'] = 0;
 				
 			}
@@ -776,17 +776,17 @@ 
 		
 		try
 		{
-			if(method_exists($xcloner_remote_storage, "upload_backup_to_storage"))
+			if (method_exists($xcloner_remote_storage, "upload_backup_to_storage"))
 			{
 				$return = call_user_func_array(array($xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $storage_type));
 			}
-		}catch(Exception $e){
+		}catch (Exception $e) {
 		
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
 		}
 		
-		if(!$return)
+		if (!$return)
 		{
 			$return['error'] = 1;
 			$return['message'] = "Upload failed, please check the error log for more information!";
@@ -824,7 +824,7 @@ 
 		
 		@ob_end_clean();
 		
-		$adapter = new Local(dirname(__DIR__) ,LOCK_EX, 'SKIP_LINKS');
+		$adapter = new Local(dirname(__DIR__), LOCK_EX, 'SKIP_LINKS');
 		$xcloner_plugin_filesystem = new Filesystem($adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -838,7 +838,7 @@ 
 		//$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 		
 		$files = $xcloner_plugin_filesystem->listContents("vendor/", true);
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			$tar->addFile(dirname(__DIR__).DS.$file['path'], $file['path']);
 		}
@@ -857,7 +857,7 @@ 
 		    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);
 		    
 		}
@@ -882,9 +882,9 @@ 
 		$backup_name = $this->xcloner_sanitization->sanitize_input_as_string($_GET['name']);
 		
 		
-		$metadata  = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($backup_name);
+		$metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($backup_name);
 		//$mimetype  = $this->xcloner_file_system->get_storage_filesystem()->getMimetype($backup_name);
-		$read_stream  = $this->xcloner_file_system->get_storage_filesystem()->readStream($backup_name);
+		$read_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($backup_name);
 		
 		
 		header('Pragma: public');
@@ -895,7 +895,7 @@ 
 	    header('Content-Disposition: attachment; filename="'.$metadata['path'].'";');
 	    //header('Content-Type: ' . $mimetype);
 	    header('Content-Type: application/octet-stream');
-	    header('Content-Length: ' . $metadata['size']);
+	    header('Content-Length: '.$metadata['size']);
 	    
 	    @ob_end_clean();
 	    
@@ -925,10 +925,10 @@ 
 		$file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 		$hash = $this->xcloner_sanitization->sanitize_input_as_string($_POST['hash']);
 		
-		if(isset($_POST['part']))
+		if (isset($_POST['part']))
 			$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
 		
-		if(isset($_POST['uploaded_size']))
+		if (isset($_POST['uploaded_size']))
 			$return['uploaded_size'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['uploaded_size']);
 		
 		$start = $this->xcloner_sanitization->sanitize_input_as_string($_POST['start']);
@@ -936,46 +936,46 @@ 
 		
 		$return['total_size'] = $this->xcloner_file_system->get_backup_size($file);
 		
-		if($this->xcloner_file_system->is_multipart($file))
+		if ($this->xcloner_file_system->is_multipart($file))
 		{
 			$backup_parts = $this->xcloner_file_system->get_multipart_files($file);
 			
-			$return['total_parts'] = sizeof($backup_parts)+1;
+			$return['total_parts'] = sizeof($backup_parts) + 1;
 			
-			if($return['part'] and isset($backup_parts[$return['part']-1]))
+			if ($return['part'] and isset($backup_parts[$return['part'] - 1]))
 			{
-				$file = $backup_parts[$return['part']-1];
+				$file = $backup_parts[$return['part'] - 1];
 			}
 			
 			$is_multipart = 1;	
 		}
 		
-		try{
+		try {
 		
 			$xcloner_file_transfer = new Xcloner_File_Transfer();
 			$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();
-			$this->send_response( $return, 0);
+			$this->send_response($return, 0);
 		
 		}
 		
 		$return['status'] = 200;
 		
 		//we have finished the upload
-		if(!$return['start'] and $is_multipart)
+		if (!$return['start'] and $is_multipart)
 		{
 			$return['part']++;
 			$return['uploaded_size'] += $this->xcloner_file_system->get_storage_filesystem()->getSize($file);
 		}
 		
-		$this->send_response( $return, 0);
+		$this->send_response($return, 0);
 	}
 	/*
 	 * 
@@ -985,12 +985,12 @@ 
 	private function send_response($data, $attach_hash = 1)
 	{
 		
-		if($attach_hash and null !== $this->xcloner_settings->get_hash())
+		if ($attach_hash and null !== $this->xcloner_settings->get_hash())
 		{
 			$data['hash'] = $this->xcloner_settings->get_hash();
 		}
 			
-		if( ob_get_length() )
+		if (ob_get_length())
 			ob_clean();
 		wp_send_json($data);
 		

Braces +111 added lines, -85 removed lines

@@ -27,8 +27,9 @@ 
 		global $wpdb;
 		
 		error_reporting(0);
-		if( ob_get_length() )
-			ob_end_clean();
+		if( ob_get_length() ) {
+					ob_end_clean();
+		}
 		ob_start();
 		
 		$wpdb->show_errors		= false;
@@ -38,10 +39,11 @@ 
 		//generating the hash suffix for tmp xcloner store folder
 		if(isset($_POST['hash'])){
 			
-			if($_POST['hash'] == "generate_hash")
-				$this->xcloner_settings->generate_new_hash();
-			else
-				$this->xcloner_settings->set_hash($_POST['hash']);
+			if($_POST['hash'] == "generate_hash") {
+							$this->xcloner_settings->generate_new_hash();
+			} else {
+							$this->xcloner_settings->set_hash($_POST['hash']);
+			}
 		}
 
 		$this->logger 					= new XCloner_Logger("xcloner_api", $this->xcloner_settings->get_hash());
@@ -78,7 +80,7 @@ 
 			//$xcloner_db = new XCloner_Database($data['dbUsername'], $data['dbPassword'], $data['dbDatabase'], $data['dbHostname']);
 			$this->xcloner_database->init($data);
 
-		}catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -106,8 +108,9 @@ 
 		$params = array();
 		$schedule = array();
 		
-		if(isset($_POST['data']))
-			$params = json_decode(stripslashes($_POST['data']));
+		if(isset($_POST['data'])) {
+					$params = json_decode(stripslashes($_POST['data']));
+		}
 		
 		$this->process_params($params);
 		
@@ -130,8 +133,9 @@ 
 			{
 					$table = str_replace("\r","", $table);
 					$data = explode(".", $table);
-					if(isset($data[1]))
-						$return[$data[0]][] = $data[1];
+					if(isset($data[1])) {
+											$return[$data[0]][] = $data[1];
+					}
 			}
 			
 			$this->form_params['database'] = ($return);
@@ -142,8 +146,9 @@ 
 			foreach($excluded_files as $file)
 			{
 				$file = str_replace("\r","", $file);
-				if($file)
-					$return[] = $file;
+				if($file) {
+									$return[] = $file;
+				}
 			}
 			
 			$this->form_params['excluded_files'] = ($return);
@@ -153,19 +158,21 @@ 
 			
 			$schedule['start_at'] = $this->form_params['backup_params']['start_at'] ;
 			
-			if(!isset($_POST['status']))
-				$schedule['status'] = 0;
-			else	
-				$schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
-		}else{
+			if(!isset($_POST['status'])) {
+							$schedule['status'] = 0;
+			} else {
+							$schedule['status'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['status']);
+			}
+		} else{
 		
 			$schedule['status'] = 1;
 			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
 								" ".$this->form_params['backup_params']['schedule_start_time']);
 		}
 		
-		if(!$schedule['start_at'])						
-			$schedule['start_at'] = time();
+		if(!$schedule['start_at']) {
+					$schedule['start_at'] = time();
+		}
 		
 		$schedule['start_at'] = date('Y-m-d H:i:s', $schedule['start_at']);	
 		
@@ -185,7 +192,7 @@ 
 					'%s' 
 				) 
 			);
-		}else		{
+		} else		{
 			$insert = $wpdb->update( 
 				$wpdb->prefix.'xcloner_scheduler', 
 				$schedule, 
@@ -196,8 +203,9 @@ 
 				) 
 			);
 		}
-		if(isset($_POST['id']))
-			$scheduler->update_cron_hook($_POST['id']);
+		if(isset($_POST['id'])) {
+					$scheduler->update_cron_hook($_POST['id']);
+		}
 			
 		if( $wpdb->last_error ) {
             $response['error'] = 1;
@@ -226,8 +234,9 @@ 
 		
 		$init 	= (int)$_POST['init'];
 		
-		if($params === NULL)
-			 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		if($params === NULL) {
+					 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		}
 			 
 		$this->process_params($params);
 		
@@ -236,7 +245,7 @@ 
 		//$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'], $this->form_params['extra'], $init);
 		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;
@@ -248,8 +257,9 @@ 
 		if($return['finished'])
 		{
 			$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()))
-				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+			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();
+			}
 		}
 		
 		$data = $return;
@@ -263,7 +273,7 @@ 
 					$from = "";
 					$subject = "";
 					$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $this->form_params);
-				}catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->logger->error($e->getMessage());
 				}
@@ -289,18 +299,20 @@ 
 		
 		$init 	= (int)$_POST['init'];
 		
-		if($params === NULL)
-			 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		if($params === NULL) {
+					 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		}
 		
 		$this->process_params($params);
 			
 		//$xcloner_database = $this->init_db();	
 		$return = $this->xcloner_database->start_database_recursion($this->form_params['database'], $this->form_params['extra'], $init);
 		
-		if(isset($return['error']) and $return['error'])
-			$data['finished'] = 1;
-		else	
-			$data['finished'] = $return['finished'];
+		if(isset($return['error']) and $return['error']) {
+					$data['finished'] = 1;
+		} else {
+					$data['finished'] = $return['finished'];
+		}
 			
 		$data['extra'] = $return;
 		
@@ -321,8 +333,9 @@ 
 		$params = json_decode(stripslashes($_POST['data']));
 		$init 	= (int)$_POST['init'];
 		
-		if($params === NULL)
-			 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		if($params === NULL) {
+					 die( '{"status":false,"msg":"The post_data parameter must be valid JSON"}' );
+		}
 			 
 		$hash = $this->process_params($params);
 		
@@ -345,8 +358,9 @@ 
 	 */ 
 	private function process_params($params)
 	{
-		if(isset($params->hash))
-			$this->xcloner_settings->set_hash($params->hash);
+		if(isset($params->hash)) {
+					$this->xcloner_settings->set_hash($params->hash);
+		}
 			
 		$this->form_params['extra'] = array();
 		$this->form_params['backup_params'] = array();
@@ -399,8 +413,9 @@ 
 		
 		if(isset($params->extra))
 		{
-			foreach($params->extra as $key=>$value)
-				$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
+			foreach($params->extra as $key=>$value) {
+							$this->form_params['extra'][$key] = $this->xcloner_sanitization->sanitize_input_as_raw($value);
+			}
 		}
 			
 		return $this->xcloner_settings->get_hash();
@@ -437,7 +452,7 @@ 
 			
 			try{
 				$files = $this->xcloner_file_system->list_directory($folder);
-			}catch(Exception $e){
+			} catch(Exception $e){
 				
 				print $e->getMessage();
 				$this->logger->error($e->getMessage());
@@ -457,17 +472,19 @@ 
 				$children = false;
 				$text = $file['basename'];
 				
-				if($file['type'] == "dir")
-					$children = true;
-				else
-					 $text .= " (". $this->xcloner_requirements->file_format_size($file['size']).")";
+				if($file['type'] == "dir") {
+									$children = true;
+				} else {
+									 $text .= " (". $this->xcloner_requirements->file_format_size($file['size']).")";
+				}
 				
 				//if(in_array($file['path'], $this->xcloner_file_system->get_excluded_files()))
 				//echo $file['path']."--".$this->xcloner_file_system->is_excluded($file);
-				if($excluded_pattern = $this->xcloner_file_system->is_excluded($file))
-					$selected = true;
-				else
-					$selected = false;
+				if($excluded_pattern = $this->xcloner_file_system->is_excluded($file)) {
+									$selected = true;
+				} else {
+									$selected = false;
+				}
 					
 				$data[] = array(
 							'id' => $file['path'],
@@ -505,22 +522,24 @@ 
 		{
 			try{
 				$return = $this->xcloner_database->get_all_databases();
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->logger->error($e->getMessage());
 			}
 			
 			foreach($return as $database)
 			{
-				if($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database())
-					continue;
+				if($xcloner_backup_only_wp_tables and $database['name'] != $this->xcloner_settings->get_db_database()) {
+									continue;
+				}
 					
 				$state = array();
 				
 				if($database['name'] == $this->xcloner_settings->get_db_database())
 				{
 					$state['selected'] = true;
-					if($database['num_tables'] < 25)
-						$state['opened'] = false;
+					if($database['num_tables'] < 25) {
+											$state['opened'] = false;
+					}
 				}
 					
 				$data[] = array(
@@ -533,13 +552,11 @@ 
 						);
 			}
 			
-		}
-		
-		else{
+		} else{
 			
 			try{
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->logger->error($e->getMessage());
 			}
 			
@@ -547,11 +564,13 @@ 
 			{
 				$state = array();
 				
-				if($xcloner_backup_only_wp_tables and !stristr($table['name'], $this->xcloner_settings->get_table_prefix()))
-					continue;
+				if($xcloner_backup_only_wp_tables and !stristr($table['name'], $this->xcloner_settings->get_table_prefix())) {
+									continue;
+				}
 				
-				if(isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database())
-					$state = array('selected' => true);
+				if(isset($database['name']) and $database['name'] == $this->xcloner_settings->get_db_database()) {
+									$state = array('selected' => true);
+				}
 					
 				$data[] = array(
 						'id' => $table['name'],
@@ -604,10 +623,11 @@ 
 		{
 			$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>';
+			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));
 				
@@ -615,17 +635,19 @@ 
 			
 			$remote_storage = $res->remote_storage;
 			
-			if(!$next_run_time >= time())
-				$next_run = " ";
+			if(!$next_run_time >= time()) {
+							$next_run = " ";
+			}
 			
 			if(trim($next_run))
 			{
 				$date_text = $next_run;
 				
-				if($next_run_time >= time())
-					$next_run = "in ".human_time_diff($next_run_time, time());
-				else
-					$next_run = __("executed", 'xcloner-backup-and-restore');
+				if($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 .=" ($date_text)";	
@@ -712,7 +734,7 @@ 
 			$tar->open($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file, $start);
 		
 			$data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
-		}catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
@@ -740,15 +762,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->xcloner_file_system->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -780,7 +803,7 @@ 
 			{
 				$return = call_user_func_array(array($xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $storage_type));
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -925,11 +948,13 @@ 
 		$file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 		$hash = $this->xcloner_sanitization->sanitize_input_as_string($_POST['hash']);
 		
-		if(isset($_POST['part']))
-			$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+		if(isset($_POST['part'])) {
+					$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
+		}
 		
-		if(isset($_POST['uploaded_size']))
-			$return['uploaded_size'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['uploaded_size']);
+		if(isset($_POST['uploaded_size'])) {
+					$return['uploaded_size'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['uploaded_size']);
+		}
 		
 		$start = $this->xcloner_sanitization->sanitize_input_as_string($_POST['start']);
 		$target_url = $this->xcloner_sanitization->sanitize_input_as_string($_POST['target_url']);
@@ -956,7 +981,7 @@ 
 			$xcloner_file_transfer->set_target($target_url);
 			$return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$return = array();
 			$return['error'] = true;
@@ -990,8 +1015,9 @@ 
 			$data['hash'] = $this->xcloner_settings->get_hash();
 		}
 			
-		if( ob_get_length() )
-			ob_clean();
+		if( ob_get_length() ) {
+					ob_clean();
+		}
 		wp_send_json($data);
 		
 		die();

includes/class-xcloner-archive.php

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 use splitbrain\PHPArchive\Tar;
-use splitbrain\PHPArchive\Archive;
 use splitbrain\PHPArchive\FileInfo;
 
 class Xcloner_Archive extends Tar

Indentation +27 added lines, -27 removed lines

@@ -555,15 +555,15 @@ 
 		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;
@@ -593,16 +593,16 @@ 
     }
     */
     
-     /**
-     * Append data to a file to the current TAR archive using an existing file in the filesystem
-     *
-     * @param string          	$file     path to the original file
-     * @param int          		$start    starting reading position in file
-     * @param int          		$end      end position in reading multiple with 512
-     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data, empty to take from original
-     * @throws ArchiveIOException
-     */
-    /*
+	 /**
+	  * Append data to a file to the current TAR archive using an existing file in the filesystem
+	  *
+	  * @param string          	$file     path to the original file
+	  * @param int          		$start    starting reading position in file
+	  * @param int          		$end      end position in reading multiple with 512
+	  * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data, empty to take from original
+	  * @throws ArchiveIOException
+	  */
+	/*
      * public function appendFileData($file, $fileinfo = '', $start = 0, $limit = 0)
     {
 		$end = $start+($limit*512);
@@ -658,14 +658,14 @@ 
         return $last_position;
     }*/
     
-    /**
-     * Adds a file to a TAR archive by appending it's data
-     *
-     * @param string $archive			name of the archive file
-     * @param string $file				name of the file to read data from				
-     * @param string $start				start position from where to start reading data
-     * @throws ArchiveIOException
-     */
+	/**
+	 * Adds a file to a TAR archive by appending it's data
+	 *
+	 * @param string $archive			name of the archive file
+	 * @param string $file				name of the file to read data from				
+	 * @param string $start				start position from where to start reading data
+	 * @throws ArchiveIOException
+	 */
 	/*public function addFileToArchive($archive, $file, $start = 0)
 	{
 		$this->openForAppend($archive);

Doc Comments +26 added lines

@@ -45,6 +45,11 @@ 
 	 * Rename backup archive
 	 * 
 	 */ 
+
+	/**
+	 * @param string $old_name
+	 * @param string $new_name
+	 */
 	public function rename_archive($old_name, $new_name)
 	{
 		$this->logger->info(sprintf("Renaming backup archive %s to %s", $old_name, $new_name));
@@ -109,6 +114,10 @@ 
 	 * Send notification error by E-Mail
 	 * 
 	 */
+
+	/**
+	 * @param string $error_message
+	 */
 	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
 	{
 		
@@ -133,6 +142,11 @@ 
 	 * Send backup archive notfication by E-Mail
 	 * 
 	 */ 
+
+	/**
+	 * @param string $from
+	 * @param string $subject
+	 */
 	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message="")
 	{
 		if(!$from)
@@ -205,6 +219,10 @@ 
 	 * Incremental Backup method
 	 * 
 	 */ 
+
+	/**
+	 * @param integer $init
+	 */
 	public function start_incremental_backup($backup_params, $extra_params, $init)
 	{
 		$return = array();
@@ -413,6 +431,10 @@ 
 	 * Write multipart file components
 	 * 
 	 */ 
+
+	/**
+	 * @param string $path
+	 */
 	private function write_multipart_file($path)
 	{
 		$path = $this->get_archive_name_with_extension();
@@ -472,6 +494,10 @@ 
 	 * Add file to archive
 	 * 
 	 */ 
+
+	/**
+	 * @param integer $append
+	 */
 	public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
 	{
 		

Spacing +79 added lines, -79 removed lines

@@ -8,9 +8,9 @@ 
 	/*
 	 * bytes
 	 */ 
-	private $file_size_per_request_limit	= 52428800 ; //50MB = 52428800; 1MB = 1048576
-	private $files_to_process_per_request 	= 250; //block of 512 bytes
-	private $compression_level 				= 0; //0-9 , 0 uncompressed
+	private $file_size_per_request_limit	= 52428800; //50MB = 52428800; 1MB = 1048576
+	private $files_to_process_per_request = 250; //block of 512 bytes
+	private $compression_level = 0; //0-9 , 0 uncompressed
 	private $xcloner_split_backup_limit		= 2048; //2048MB
 	
 	private $archive_name;
@@ -18,25 +18,25 @@ 
 	
 	public function __construct($hash = "", $archive_name = "")
 	{
-		$this->filesystem 		= new Xcloner_File_System($hash);
-		$this->logger 			= new XCloner_Logger('xcloner_archive', $hash);
+		$this->filesystem = new Xcloner_File_System($hash);
+		$this->logger = new XCloner_Logger('xcloner_archive', $hash);
 		$this->xcloner_settings = new Xcloner_Settings($hash);
 		
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request'))
-			$this->file_size_per_request_limit = $value*1024*1024; //MB
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request'))
+			$this->file_size_per_request_limit = $value * 1024 * 1024; //MB
 			
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request'))
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request'))
 			$this->files_to_process_per_request = $value;
 		
-		if($value = get_option('xcloner_backup_compression_level'))
+		if ($value = get_option('xcloner_backup_compression_level'))
 			$this->compression_level = $value;
 		
-		if($value = get_option('xcloner_split_backup_limit'))
+		if ($value = get_option('xcloner_split_backup_limit'))
 			$this->xcloner_split_backup_limit = $value;
 		
-		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024*1024; //transform to bytes
+		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
 			
-		if(isset($archive_name))
+		if (isset($archive_name))
 			$this->set_archive_name($archive_name);
 	}
 	
@@ -61,11 +61,11 @@ 
 	{
 		$this->archive_name = $this->filesystem->process_backup_name($name);
 		
-		if(isset($part) and $part)
+		if (isset($part) and $part)
 		{
-			$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 = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
+			if (!stristr($new_name, "-part"))
+				$new_name = $this->archive_name."-part".$part;
 			
 			$this->archive_name = $new_name;	
 		}
@@ -90,7 +90,7 @@ 
 	 */ 
 	public function get_archive_name_multipart()
 	{
-		$new_name =  preg_replace('/-part(\d*)/', "", $this->archive_name);
+		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
 		return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
 	}
 	
@@ -112,7 +112,7 @@ 
 	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
 	{
 		
-		$body  = $error_message; 
+		$body = $error_message; 
 		
 		$this->logger->info(sprintf("Sending backup error notification to %s", $to));
 		
@@ -120,10 +120,10 @@ 
 		
 		$headers = array('Content-Type: text/html; charset=UTF-8');
 		
-		if($admin_email and $from )
+		if ($admin_email and $from)
 			$headers[] = 'From: '.$from.' <'.$admin_email.'>';
 
-		$return = wp_mail( $to, $subject, $body, $headers );
+		$return = wp_mail($to, $subject, $body, $headers);
 		
 		return $return;
 	}
@@ -133,47 +133,47 @@ 
 	 * Send backup archive notfication by E-Mail
 	 * 
 	 */ 
-	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message="")
+	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message = "")
 	{
-		if(!$from)
+		if (!$from)
 			$from = "XCloner Backup";
 			
-		if(($error_message))
+		if (($error_message))
 		{
 			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
 		}
 		
 		$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 />";
 		
 		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 		
-		if(!$backups_counter = sizeof($backup_parts))
+		if (!$backups_counter = sizeof($backup_parts))
 			$backups_counter = 1;
 		
 		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
 		$body .= "<br />";
 		
-		if(sizeof($backup_parts))
+		if (sizeof($backup_parts))
 		{
-			$body .= implode("<br />",$backup_parts);
+			$body .= implode("<br />", $backup_parts);
 			$body .= "<br />";
 		}
 		
-		$body.= "<br />";
+		$body .= "<br />";
 		
-		if(isset($params['backup_params']->backup_comments))
+		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'))
+		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();
@@ -183,7 +183,7 @@ 
 		$tar = new Tar();
 		$tar->create($attachments_archive);
 			
-		foreach($attachments as $key => $file)
+		foreach ($attachments as $key => $file)
 		{
 			$tar->addFile($file, basename($file));
 		}
@@ -195,7 +195,7 @@ 
 		
 		$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;
 	}
@@ -209,17 +209,17 @@ 
 	{
 		$return = array();
 		
-		if(!isset($extra_params['backup_part']))
+		if (!isset($extra_params['backup_part']))
 			$extra_params['backup_part'] = 0;
 		
 		$return['extra']['backup_part'] = $extra_params['backup_part'];
 					
-		if(isset( $extra_params['backup_archive_name']))
+		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(!$this->get_archive_name())
+		if (!$this->get_archive_name())
 			$this->set_archive_name();
 		
 		$this->backup_archive = new Tar();
@@ -227,7 +227,7 @@ 
 		
 		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 		
-		if($init)
+		if ($init)
 		{
 			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 		
@@ -235,7 +235,7 @@ 
 			
 			$return['extra']['backup_init'] = 1;
 			
-		}else{
+		} 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());
@@ -247,13 +247,13 @@ 
 		$return['extra']['backup_archive_name'] = $this->get_archive_name();
 		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 		
-		if(!isset($extra_params['start_at_line']))
+		if (!isset($extra_params['start_at_line']))
 			$extra_params['start_at_line'] = 0;
 		
-		if(!isset($extra_params['start_at_byte']))
+		if (!isset($extra_params['start_at_byte']))
 			$extra_params['start_at_byte'] = 0;
 		
-		if(!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler()))
+		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()));
 			
@@ -279,7 +279,7 @@ 
 		
 		$byte_limit = 0;
 		
-		while(!$file->eof() and $counter<=$this->files_to_process_per_request)
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request)
 		{
 			$line = str_getcsv($file->current());
 
@@ -287,13 +287,13 @@ 
 			
 			$start_filesystem = "start_filesystem";
 			
-			if(isset($line[4])){
+			if (isset($line[4])) {
 				$start_filesystem = $line[4];
 			}
 			
 			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 			
-			if(!$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
+			if (!$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
 			{
 				$extra_params['start_at_line']++;
 				$file->next();
@@ -302,35 +302,35 @@ 
 			
 			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 			
-			if(!isset($file_info['size']))
+			if (!isset($file_info['size']))
 				$file_info['size'] = 0;
 			
-			if($start_filesystem == "tmp_filesystem")	
+			if ($start_filesystem == "tmp_filesystem")	
 				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
 			
-			$byte_limit = (int)$this->file_size_per_request_limit/512;
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 			
 			$append = 0;
 			
-			if($file_info['size'] > $byte_limit*512 or $start_byte)
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte)
 				$append = 1;
 						
-			if(!isset($return['extra']['backup_size']))
-				$return['extra']['backup_size'] =0;
+			if (!isset($return['extra']['backup_size']))
+				$return['extra']['backup_size'] = 0;
 			
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
 			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 			
 			//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))
+			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));
+				$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']);
 				
-				if($file_info['size'] > $this->xcloner_split_backup_limit)
+				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));
+					$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']++;
 				}
 				
@@ -342,7 +342,7 @@ 
 				return $return;
 			}
 			
-			list($bytes_wrote, $last_position) = $this->add_file_to_archive( $file_info, $start_byte, $byte_limit, $append, $start_filesystem);
+			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";
@@ -350,17 +350,17 @@ 
 			$return['extra']['processed_file_size'] = $file_info['size'];
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
-			if($last_position>0){	
+			if ($last_position > 0) {	
 				$start_byte = $last_position;
 			}
-			else{	
+			else {	
 				$extra_params['start_at_line']++;
 				$file->next();
 				$start_byte = 0;
 				$counter++;
 			}
 			
-			if($this->processed_size_bytes >= $this->file_size_per_request_limit)
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit)
 			{
 				clearstatcache();
 				$return['extra']['backup_size'] = $archive_info->getSize();
@@ -373,7 +373,7 @@ 
 			}
 		}
 		
-		if(!$file->eof())
+		if (!$file->eof())
 		{
 			clearstatcache();
 			$return['extra']['backup_size'] = $archive_info->getSize();
@@ -390,12 +390,12 @@ 
 		$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($return['extra']['backup_part'])
+		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))
+		if (isset($file_info))
 		{
 			$return['extra']['processed_file'] = $file_info['path'];
 			$return['extra']['processed_file_size'] = $file_info['size'];
@@ -437,20 +437,20 @@ 
 		$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)
+		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()))
+			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());
 			
-		}else
+		} else
 		{
-			$this->logger->info(sprintf("Creating new multipart info file %s",$this->get_archive_name_with_extension()));
+			$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());
 		}
 				
@@ -478,10 +478,10 @@ 
 		$start_adapter = $this->filesystem->get_adapter($filesystem);
 		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 		
-		if(!$file_info['path'])
+		if (!$file_info['path'])
 			return;
 		
-		if(isset($file_info['archive_prefix_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'];
@@ -490,36 +490,36 @@ 
 		
 		//$start_adapter = $this->filesystem->get_start_adapter();
 
-		if(!$append){
+		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{	
+		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)
+			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']))
+				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))
+			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{
+			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)
+			if ($last_position == -1)
 			{
 				$bytes_wrote = $file_info['size'] - $start_at_byte;
 			}
@@ -529,18 +529,18 @@ 
 			}
 			
 			
-			if($is_tmp)
+			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{
+			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 ($last_position == -1)
 			{
-				if($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file))
+				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);

Braces +87 added lines, -66 removed lines

@@ -22,22 +22,28 @@ 
 		$this->logger 			= new XCloner_Logger('xcloner_archive', $hash);
 		$this->xcloner_settings = new Xcloner_Settings($hash);
 		
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request'))
-			$this->file_size_per_request_limit = $value*1024*1024; //MB
+		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request')) {
+					$this->file_size_per_request_limit = $value*1024*1024;
+		}
+		//MB
 			
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request'))
-			$this->files_to_process_per_request = $value;
+		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request')) {
+					$this->files_to_process_per_request = $value;
+		}
 		
-		if($value = get_option('xcloner_backup_compression_level'))
-			$this->compression_level = $value;
+		if($value = get_option('xcloner_backup_compression_level')) {
+					$this->compression_level = $value;
+		}
 		
-		if($value = get_option('xcloner_split_backup_limit'))
-			$this->xcloner_split_backup_limit = $value;
+		if($value = get_option('xcloner_split_backup_limit')) {
+					$this->xcloner_split_backup_limit = $value;
+		}
 		
 		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024*1024; //transform to bytes
 			
-		if(isset($archive_name))
-			$this->set_archive_name($archive_name);
+		if(isset($archive_name)) {
+					$this->set_archive_name($archive_name);
+		}
 	}
 	
 	/*
@@ -64,8 +70,9 @@ 
 		if(isset($part) and $part)
 		{
 			$new_name =  preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
-			if(!stristr($new_name, "-part"))
-				$new_name = $this->archive_name . "-part".$part;
+			if(!stristr($new_name, "-part")) {
+							$new_name = $this->archive_name . "-part".$part;
+			}
 			
 			$this->archive_name = $new_name;	
 		}
@@ -120,8 +127,9 @@ 
 		
 		$headers = array('Content-Type: text/html; charset=UTF-8');
 		
-		if($admin_email and $from )
-			$headers[] = 'From: '.$from.' <'.$admin_email.'>';
+		if($admin_email and $from ) {
+					$headers[] = 'From: '.$from.' <'.$admin_email.'>';
+		}
 
 		$return = wp_mail( $to, $subject, $body, $headers );
 		
@@ -135,8 +143,9 @@ 
 	 */ 
 	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message="")
 	{
-		if(!$from)
-			$from = "XCloner Backup";
+		if(!$from) {
+					$from = "XCloner Backup";
+		}
 			
 		if(($error_message))
 		{
@@ -145,16 +154,18 @@ 
 		
 		$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 />";
 		
 		$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 />";
@@ -173,8 +184,9 @@ 
 			$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();
 		
@@ -209,18 +221,21 @@ 
 	{
 		$return = array();
 		
-		if(!isset($extra_params['backup_part']))
-			$extra_params['backup_part'] = 0;
+		if(!isset($extra_params['backup_part'])) {
+					$extra_params['backup_part'] = 0;
+		}
 		
 		$return['extra']['backup_part'] = $extra_params['backup_part'];
 					
-		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_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(!$this->get_archive_name())
-			$this->set_archive_name();
+		if(!$this->get_archive_name()) {
+					$this->set_archive_name();
+		}
 		
 		$this->backup_archive = new Tar();
 		$this->backup_archive->setCompression($this->compression_level);
@@ -235,7 +250,7 @@ 
 			
 			$return['extra']['backup_init'] = 1;
 			
-		}else{
+		} 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());
@@ -247,11 +262,13 @@ 
 		$return['extra']['backup_archive_name'] = $this->get_archive_name();
 		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 		
-		if(!isset($extra_params['start_at_line']))
-			$extra_params['start_at_line'] = 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;
+		if(!isset($extra_params['start_at_byte'])) {
+					$extra_params['start_at_byte'] = 0;
+		}
 		
 		if(!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler()))
 		{
@@ -302,21 +319,25 @@ 
 			
 			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 			
-			if(!isset($file_info['size']))
-				$file_info['size'] = 0;
+			if(!isset($file_info['size'])) {
+							$file_info['size'] = 0;
+			}
 			
-			if($start_filesystem == "tmp_filesystem")	
-				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
+			if($start_filesystem == "tmp_filesystem") {
+							$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
+			}
 			
 			$byte_limit = (int)$this->file_size_per_request_limit/512;
 			
 			$append = 0;
 			
-			if($file_info['size'] > $byte_limit*512 or $start_byte)
-				$append = 1;
+			if($file_info['size'] > $byte_limit*512 or $start_byte) {
+							$append = 1;
+			}
 						
-			if(!isset($return['extra']['backup_size']))
-				$return['extra']['backup_size'] =0;
+			if(!isset($return['extra']['backup_size'])) {
+							$return['extra']['backup_size'] =0;
+			}
 			
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
@@ -352,8 +373,7 @@ 
 			
 			if($last_position>0){	
 				$start_byte = $last_position;
-			}
-			else{	
+			} else{	
 				$extra_params['start_at_line']++;
 				$file->next();
 				$start_byte = 0;
@@ -390,8 +410,9 @@ 
 		$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($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;
 		
@@ -443,12 +464,13 @@ 
 			$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());
+			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());
 			
-		}else
+		} 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());
@@ -478,13 +500,15 @@ 
 		$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;
 		
@@ -494,8 +518,7 @@ 
 			$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{	
+		} else{	
 			$tmp_file = md5($file_info['path']);
 			
 			//we isolate file to tmp if we are at byte 0, the starting point of file reading
@@ -504,16 +527,16 @@ 
 				$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{
+			} 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);
 			}
@@ -522,8 +545,7 @@ 
 			if($last_position == -1)
 			{
 				$bytes_wrote = $file_info['size'] - $start_at_byte;
-			}
-			else
+			} else
 			{
 				$bytes_wrote = $last_position - $start_at_byte;
 			}
@@ -532,8 +554,7 @@ 
 			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{
+			} 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()));
 			}
 			

includes/class-xcloner-database.php

Doc Comments +5 added lines

@@ -469,6 +469,11 @@
 	 * 		handler $fd - file handler where to write the records
 	 * @return
 	 */
+
+	/**
+	 * @param integer $start
+	 * @param integer $limit
+	 */
 	public function export_table($databaseName, $tableName, $start, $limit, $dumpfile)
 	{
 		$this->logger->debug(sprintf(("Exporting table  %s.%s data"), $databaseName, $tableName));

Indentation +4 added lines, -4 removed lines

@@ -279,7 +279,7 @@ 
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
 				}
 			$inc++;
-        }
+		}
 
 		return $tablesList;
 
@@ -503,7 +503,7 @@ 
 					$buffer = "";
 					$this->countRecords++;
 
-	                foreach ($arr as $key => $value) {
+					foreach ($arr as $key => $value) {
 						$value = $this->_real_escape($value);
 						$buffer .= "'".$value."', ";
 					}
@@ -529,8 +529,8 @@ 
 		$line = ("\n#\n# Table structure for table `$tableName`\n#\n\n");
 		$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 
-        if ($this->dbDropSyntax)
-        {
+		if ($this->dbDropSyntax)
+		{
 			$line = ("\nDROP table IF EXISTS `$tableName`;\n");
 			$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		}

Spacing +91 added lines, -91 removed lines

@@ -21,12 +21,12 @@ 
  */
 
 
-class XCloner_Database extends wpdb{
+class XCloner_Database extends wpdb {
 
 
-	public  $debug 						= 0;
-	public  $recordsPerSession			= 10000;
-	public  $dbCompatibility			= "";
+	public  $debug = 0;
+	public  $recordsPerSession = 10000;
+	public  $dbCompatibility = "";
 	public  $dbDropSyntax				= 1;
 	public  $countRecords				= 0;
 
@@ -38,22 +38,22 @@ 
 	private   $TEMP_DBPROCESS_FILE = ".database";
 	private   $TEMP_DUMP_FILE = "database-backup.sql";
 	
-	public function __construct($hash="", $wp_user="", $wp_pass="", $wp_db="", $wp_host="")
+	public function __construct($hash = "", $wp_user = "", $wp_pass = "", $wp_db = "", $wp_host = "")
 	{
-		$this->logger 					= new XCloner_Logger("xcloner_database", $hash);
-		$this->xcloner_settings 		= new Xcloner_Settings($hash);
-		$this->fs 						= new Xcloner_File_System($hash);
+		$this->logger = new XCloner_Logger("xcloner_database", $hash);
+		$this->xcloner_settings = new Xcloner_Settings($hash);
+		$this->fs = new Xcloner_File_System($hash);
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
-			$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
+			$this->recordsPerSession = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
 		
-		if(!$this->recordsPerSession)
+		if (!$this->recordsPerSession)
 			$this->recordsPerSession = 100;
 		
 		$wp_host 	= $this->xcloner_settings->get_db_hostname();
 		$wp_user 	= $this->xcloner_settings->get_db_username();
 		$wp_pass 	= $this->xcloner_settings->get_db_password();
-		$wp_db 		= $this->xcloner_settings->get_db_database();
+		$wp_db = $this->xcloner_settings->get_db_database();
 
 		parent::__construct($wp_user, $wp_pass, $wp_db, $wp_host);
 		
@@ -68,7 +68,7 @@ 
 	 */
 	public function init($data, $start = 0)
 	{
-		if($start and $this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)){
+		if ($start and $this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
 				$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
 		}
 		
@@ -87,7 +87,7 @@ 
 				"database_count"=>0,
 		);
 		
-		if(!$this->xcloner_settings->get_enable_mysql_backup())
+		if (!$this->xcloner_settings->get_enable_mysql_backup())
 		{
 			$return['finished'] = 1;
 			return $return;
@@ -97,44 +97,44 @@ 
 		
 		$this->init($params, $init);
 		
-		if($init)
+		if ($init)
 		{
 			$db_count = 0;
 			
-			if(isset($params['#']))
+			if (isset($params['#']))
 			{
-				foreach($params['#'] as $database)
+				foreach ($params['#'] as $database)
 				{
-					if(!isset($params[$database]) or !is_array($params[$database]))
+					if (!isset($params[$database]) or !is_array($params[$database]))
 						$params[$database] = array();
 				}
 				$db_count = -1;
 			}
 			
-			if(isset($params) and is_array($params))
-				foreach($params as $database=>$tables)
+			if (isset($params) and is_array($params))
+				foreach ($params as $database=>$tables)
 				{	
-					if($database != "#")
+					if ($database != "#")
 					{
 						$stats = $this->write_backup_process_list($database, $tables);	
-						$return['stats']['tables_count'] 	+= $stats['tables_count'];
-						$return['stats']['total_records'] 	+= $stats['total_records'];
+						$return['stats']['tables_count'] += $stats['tables_count'];
+						$return['stats']['total_records'] += $stats['total_records'];
 					}
 				}
 
-			if(sizeof($params))
-				$return['stats']['database_count'] = sizeof($params)+$db_count;
+			if (sizeof($params))
+				$return['stats']['database_count'] = sizeof($params) + $db_count;
 			else	
 				$return['stats']['database_count'] = 0;
 				
 			return $return;
 		}
 		
-		if(!isset($extra_params['startAtLine']))
+		if (!isset($extra_params['startAtLine']))
 			$extra_params['startAtLine'] = 0;
-		if(!isset($extra_params['startAtRecord']))
+		if (!isset($extra_params['startAtRecord']))
 			$extra_params['startAtRecord'] = 0;
-		if(!isset($extra_params['dumpfile']))
+		if (!isset($extra_params['dumpfile']))
 			$extra_params['dumpfile'] = "";
 		
 		$return = $this->process_incremental($extra_params['startAtLine'], $extra_params['startAtRecord'], $extra_params['dumpfile']);
@@ -145,13 +145,13 @@ 
 	public function log($message = "")
 	{
 		
-		if($message){
-			$this->logger->info( $message, array(""));
-		}else{	
-			if($this->last_query)
-				$this->logger->debug( $this->last_query, array(""));
-			if($this->last_error)
-				$this->logger->error( $this->last_error, array(""));
+		if ($message) {
+			$this->logger->info($message, array(""));
+		} else {	
+			if ($this->last_query)
+				$this->logger->debug($this->last_query, array(""));
+			if ($this->last_error)
+				$this->logger->error($this->last_error, array(""));
 		}
 		
 		return;
@@ -166,7 +166,7 @@ 
 	*/
 	public function error($message)
 	{
-		$this->logger->error( $message, array(""));
+		$this->logger->error($message, array(""));
 		
 		return;
 	}
@@ -199,7 +199,7 @@ 
 		
 		$query = "show tables in `".$database."`";
 		
-		$res =  $this->get_results($query);
+		$res = $this->get_results($query);
 		$this->log();
 			
 		return count($res);
@@ -222,9 +222,9 @@ 
 		$databases_list[$i]['num_tables'] = $this->get_database_num_tables($this->dbname);
 		$i++;
 		
-		if(is_array($databases))
-		foreach( $databases as $db){
-			if($db->Database != $this->dbname)
+		if (is_array($databases))
+		foreach ($databases as $db) {
+			if ($db->Database != $this->dbname)
 			{
 				$databases_list[$i]['name'] = $db->Database;
 				$databases_list[$i]['num_tables'] = $this->get_database_num_tables($db->Database);
@@ -247,7 +247,7 @@ 
 		$tablesList[0] = array( );
 		$inc = 0;
 
-		if(!$database)
+		if (!$database)
 			$database = $this->dbname;
 		
 		$this->logger->debug(sprintf(("Listing tables in %s database"), $database));
@@ -255,14 +255,14 @@ 
 		$tables = $this->get_results("SHOW TABLES in `".$database."`");
 		$this->log();
 
-		foreach ($tables as $table){
+		foreach ($tables as $table) {
 			
 			$table = array_values((array)$table)[0];
 			
 			$tablesList[$inc]['name'] = $table;
 			$tablesList[$inc]['database'] = $database;
 
-			if($get_num_records)
+			if ($get_num_records)
 			{
 				$records_num_result = $this->get_var("SELECT count(*) FROM `".$database."`.`".$table."`");
 				$this->log();
@@ -272,8 +272,8 @@ 
 			
 			$tablesList[$inc]['excluded'] = 0;
 						
-			if(sizeof($included) and is_array($included))
-				if(!in_array($table, $included) )
+			if (sizeof($included) and is_array($included))
+				if (!in_array($table, $included))
 				{
 					$tablesList[$inc]['excluded'] = 1;
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
@@ -294,7 +294,7 @@ 
 		
 		$tables = $this->list_tables($dbname, $incl_tables, 1);
 		
-		if($this->dbname != $dbname)
+		if ($this->dbname != $dbname)
 			$dumpfile = $dbname."-backup.sql";
 		else
 			$dumpfile = $this->TEMP_DUMP_FILE;
@@ -303,8 +303,8 @@ 
 		$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			
 		// write this to the class and write to $TEMP_DBPROCESS_FILE file as database.table records
-		foreach($tables as $key=>$table) 
-		if($table!= "" and !$tables[$key]['excluded']){
+		foreach ($tables as $key=>$table) 
+		if ($table != "" and !$tables[$key]['excluded']) {
 
 			$line = sprintf("`%s`.`%s`\t%s\t%s\n", $dbname, $tables[$key]['name'], $tables[$key]['records'], $tables[$key]['excluded']);
 			$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
@@ -332,7 +332,7 @@ 
 
 			$result = $this->get_var("SELECT count(*) FROM $table;");
 
-			return intval($result) ;// not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
+			return intval($result); // not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
 
 	}
 
@@ -348,25 +348,25 @@ 
 	 * 		int $dbDropSyntax	- check if the DROP TABLE syntax should be added
 	 * @return array $return
 	 */
-	public function process_incremental($startAtLine= 0, $startAtRecord = 0, $dumpfile = "", $dbCompatibility= ""){
+	public function process_incremental($startAtLine = 0, $startAtRecord = 0, $dumpfile = "", $dbCompatibility = "") {
 
 		$count = 0;
 		$return['finished'] = 0;
 		$lines = array();
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		if ($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
+			$lines = array_filter(explode("\n", $this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
 	
-		foreach ($lines as $buffer){
+		foreach ($lines as $buffer) {
 			
-			if($count == $startAtLine)
+			if ($count == $startAtLine)
 			{
 	
-				$tableInfo =explode("\t", $buffer);
+				$tableInfo = explode("\t", $buffer);
 				
-				if($tableInfo[0] == "###newdump###"){
+				if ($tableInfo[0] == "###newdump###") {
 						// we create a new mysql dump file
-						if($dumpfile != ""){
+						if ($dumpfile != "") {
 								// we finished a previous one and write the footers
 								$return['dumpsize'] = $this->data_footers($dumpfile);
 						}
@@ -380,13 +380,13 @@ 
 						$startAtLine++;
 						$return['new_dump'] = 1;
 						//break;
-				}else{
+				} else {
 						//we export the table
-						if($tableInfo[0] == "###enddump###")
+						if ($tableInfo[0] == "###enddump###")
 							$return['endDump'] = 1;
 	
 						//table is excluded
-						if($tableInfo[2])
+						if ($tableInfo[2])
 							continue;
 							
 						$next = $startAtRecord + $this->recordsPerSession;
@@ -398,28 +398,28 @@ 
 
 						//return something to the browser
 						$return['databaseName'] 	= $databaseName;
-						$return['tableName'] 		= $tableName;
+						$return['tableName'] = $tableName;
 						$return['totalRecords'] 	= $tableInfo[1];
 
 						$processed_records = 0;
 						
-						if(trim($tableName) !=""  and !$tableInfo[2])
+						if (trim($tableName) != "" and !$tableInfo[2])
 							$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
 						
-						$return['processedRecords'] = $startAtRecord+$processed_records;
+						$return['processedRecords'] = $startAtRecord + $processed_records;
 						
-						if($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
+						if ($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
 						{
-								$startAtLine ++;
+								$startAtLine++;
 								$startAtRecord = 0;
-						}else{
+						} else {
 								$startAtRecord = $startAtRecord + $this->recordsPerSession;
 							}
 
 						//$return['dbCompatibility'] 	= self::$dbCompatibility;
 						
-						$return['startAtLine']		= $startAtLine;
-						$return['startAtRecord']	= $startAtRecord;
+						$return['startAtLine'] = $startAtLine;
+						$return['startAtRecord'] = $startAtRecord;
 						$return['dumpfile']			= $dumpfile;
 						$return['dumpsize']			= $this->fs->get_tmp_filesystem_append()->getSize($dumpfile);
 
@@ -437,15 +437,15 @@ 
 		}
 	
 		//while is finished, lets go home...
-		if($dumpfile != ""){
+		if ($dumpfile != "") {
 			// we finished a previous one and write the footers
 			$return['dumpsize'] = $this->data_footers($dumpfile);
 			$return['dumpfile'] = ($dumpfile);
 		}
 		$return['finished'] = 1;
-		$return['startAtLine']	= $startAtLine;
+		$return['startAtLine'] = $startAtLine;
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
+		if ($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
 			$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
 		
 		$this->logger->debug(sprintf(("Database backup finished!")));
@@ -474,7 +474,7 @@ 
 		
 		$records = 0;
 		
-		if($start == 0)
+		if ($start == 0)
 			$this->dump_structure($databaseName, $tableName, $dumpfile);
 
 		$start = intval($start);
@@ -482,20 +482,20 @@ 
 		//exporting the table content now
 
 		$query = "SELECT * from `$databaseName`.`$tableName` Limit $start, $limit ;";
-		if($this->use_mysqli)
+		if ($this->use_mysqli)
 		{
 			$result = mysqli_query($this->dbh, $query);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		
-		}else{
+		} else {
 			$result = mysql_query($query, $this->dbh);
 			$mysql_fetch_function = "mysql_fetch_array";
 		}
 		//$result = $this->get_results($query, ARRAY_N);
 		//print_r($result); exit;
 		
-		if($result){
-			while($row = $mysql_fetch_function($result, MYSQLI_ASSOC)){
+		if ($result) {
+			while ($row = $mysql_fetch_function($result, MYSQLI_ASSOC)) {
 					
 					$this->fs->get_tmp_filesystem_append()->write($dumpfile, "INSERT INTO `$tableName` VALUES (");
 					$arr = $row;
@@ -506,7 +506,7 @@ 
 						$value = $this->_real_escape($value);
 						$buffer .= "'".$value."', ";
 					}
-					$buffer = rtrim($buffer, ', ') . ");\n";
+					$buffer = rtrim($buffer, ', ').");\n";
 					$this->fs->get_tmp_filesystem_append()->write($dumpfile, $buffer);
 					unset($buffer);
 					
@@ -521,7 +521,7 @@ 
 
 	}
 
-	public function dump_structure($databaseName, $tableName ,$dumpfile)
+	public function dump_structure($databaseName, $tableName, $dumpfile)
 	{
 		$this->log(sprintf(__("Dumping the structure for %s.%s table"), $databaseName, $tableName));
 		
@@ -536,14 +536,14 @@ 
 
 		//$result = mysqli_query($this->dbh,"SHOW CREATE table `$databaseName`.`$tableName`;");
 		$result = $this->get_row("SHOW CREATE table `$databaseName`.`$tableName`;", ARRAY_N);
-		if($result){
+		if ($result) {
 			//$row = mysqli_fetch_row( $result);
 			$line = ($result[1].";\n");
 			$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		}
 
-		$line = ( "\n#\n# End Structure for table `$tableName`\n#\n\n");
-		$line .=("#\n# Dumping data for table `$tableName`\n#\n\n");
+		$line = ("\n#\n# End Structure for table `$tableName`\n#\n\n");
+		$line .= ("#\n# Dumping data for table `$tableName`\n#\n\n");
 		$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		
 		return;
@@ -566,7 +566,7 @@ 
 
 	}
 
-	public function resetcountRecords(){
+	public function resetcountRecords() {
 		
 		$this->countRecords = 0;
 
@@ -574,7 +574,7 @@ 
 	
 	}
 
-	public function getcountRecords(){
+	public function getcountRecords() {
 		
 		return $this->countRecords;
 		
@@ -591,14 +591,14 @@ 
 		$return .= "# Powered by XCloner Site Backup\n";
 		$return .= "# http://www.xcloner.com\n";
 		$return .= "#\n";
-		$return .= "# Host: " . $_SERVER['HTTP_HOST'] . "\n";
-		$return .= "# Generation Time: " . date("M j, Y \a\\t H:i") . "\n";
-		$return .= "# PHP Version: " . phpversion() . "\n";
-		$return .= "# Database Charset: ". $this->charset . "\n";
+		$return .= "# Host: ".$_SERVER['HTTP_HOST']."\n";
+		$return .= "# Generation Time: ".date("M j, Y \a\\t H:i")."\n";
+		$return .= "# PHP Version: ".phpversion()."\n";
+		$return .= "# Database Charset: ".$this->charset."\n";
 		
 		$results = $this->get_results("SHOW VARIABLES LIKE \"%version%\";", ARRAY_N);
-		if(isset($results)){
-			foreach($results as $result){
+		if (isset($results)) {
+			foreach ($results as $result) {
 
 					$return .= "# MYSQL ".$result[0].": ".$result[1]."\n";
 
@@ -608,13 +608,13 @@ 
 		$results = $this->get_results("SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
 					FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '".$database."';");
 		
-		if(isset($results[0])){
+		if (isset($results[0])) {
 
 			$return .= "# MYSQL DEFAULT_CHARACTER_SET_NAME: ".$results[0]->DEFAULT_CHARACTER_SET_NAME."\n";
 			$return .= "# MYSQL SCHEMA_NAME: ".$results[0]->DEFAULT_COLLATION_NAME."\n";
 		}
 
-		$return .= "#\n# Database : `" . $database . "`\n# --------------------------------------------------------\n\n";
+		$return .= "#\n# Database : `".$database."`\n# --------------------------------------------------------\n\n";
 		
 		$this->log(sprintf(__("Writing %s database dump headers"), $database));
 		

Braces +75 added lines, -52 removed lines

@@ -44,11 +44,13 @@ 
 		$this->xcloner_settings 		= new Xcloner_Settings($hash);
 		$this->fs 						= new Xcloner_File_System($hash);
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
-			$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request')) {
+					$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		}
 		
-		if(!$this->recordsPerSession)
-			$this->recordsPerSession = 100;
+		if(!$this->recordsPerSession) {
+					$this->recordsPerSession = 100;
+		}
 		
 		$wp_host 	= $this->xcloner_settings->get_db_hostname();
 		$wp_user 	= $this->xcloner_settings->get_db_username();
@@ -105,37 +107,43 @@ 
 			{
 				foreach($params['#'] as $database)
 				{
-					if(!isset($params[$database]) or !is_array($params[$database]))
-						$params[$database] = array();
+					if(!isset($params[$database]) or !is_array($params[$database])) {
+											$params[$database] = array();
+					}
 				}
 				$db_count = -1;
 			}
 			
-			if(isset($params) and is_array($params))
-				foreach($params as $database=>$tables)
+			if(isset($params) and is_array($params)) {
+							foreach($params as $database=>$tables)
 				{	
 					if($database != "#")
 					{
-						$stats = $this->write_backup_process_list($database, $tables);	
+						$stats = $this->write_backup_process_list($database, $tables);
+			}
 						$return['stats']['tables_count'] 	+= $stats['tables_count'];
 						$return['stats']['total_records'] 	+= $stats['total_records'];
 					}
 				}
 
-			if(sizeof($params))
-				$return['stats']['database_count'] = sizeof($params)+$db_count;
-			else	
-				$return['stats']['database_count'] = 0;
+			if(sizeof($params)) {
+							$return['stats']['database_count'] = sizeof($params)+$db_count;
+			} else {
+							$return['stats']['database_count'] = 0;
+			}
 				
 			return $return;
 		}
 		
-		if(!isset($extra_params['startAtLine']))
-			$extra_params['startAtLine'] = 0;
-		if(!isset($extra_params['startAtRecord']))
-			$extra_params['startAtRecord'] = 0;
-		if(!isset($extra_params['dumpfile']))
-			$extra_params['dumpfile'] = "";
+		if(!isset($extra_params['startAtLine'])) {
+					$extra_params['startAtLine'] = 0;
+		}
+		if(!isset($extra_params['startAtRecord'])) {
+					$extra_params['startAtRecord'] = 0;
+		}
+		if(!isset($extra_params['dumpfile'])) {
+					$extra_params['dumpfile'] = "";
+		}
 		
 		$return = $this->process_incremental($extra_params['startAtLine'], $extra_params['startAtRecord'], $extra_params['dumpfile']);
 		
@@ -147,11 +155,13 @@ 
 		
 		if($message){
 			$this->logger->info( $message, array(""));
-		}else{	
-			if($this->last_query)
-				$this->logger->debug( $this->last_query, array(""));
-			if($this->last_error)
-				$this->logger->error( $this->last_error, array(""));
+		} else{	
+			if($this->last_query) {
+							$this->logger->debug( $this->last_query, array(""));
+			}
+			if($this->last_error) {
+							$this->logger->error( $this->last_error, array(""));
+			}
 		}
 		
 		return;
@@ -222,11 +232,12 @@ 
 		$databases_list[$i]['num_tables'] = $this->get_database_num_tables($this->dbname);
 		$i++;
 		
-		if(is_array($databases))
-		foreach( $databases as $db){
+		if(is_array($databases)) {
+				foreach( $databases as $db){
 			if($db->Database != $this->dbname)
 			{
 				$databases_list[$i]['name'] = $db->Database;
+		}
 				$databases_list[$i]['num_tables'] = $this->get_database_num_tables($db->Database);
 				$i++;
 			}
@@ -247,8 +258,9 @@ 
 		$tablesList[0] = array( );
 		$inc = 0;
 
-		if(!$database)
-			$database = $this->dbname;
+		if(!$database) {
+					$database = $this->dbname;
+		}
 		
 		$this->logger->debug(sprintf(("Listing tables in %s database"), $database));
 		
@@ -272,10 +284,11 @@ 
 			
 			$tablesList[$inc]['excluded'] = 0;
 						
-			if(sizeof($included) and is_array($included))
-				if(!in_array($table, $included) )
+			if(sizeof($included) and is_array($included)) {
+							if(!in_array($table, $included) )
 				{
 					$tablesList[$inc]['excluded'] = 1;
+			}
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
 				}
 			$inc++;
@@ -294,19 +307,21 @@ 
 		
 		$tables = $this->list_tables($dbname, $incl_tables, 1);
 		
-		if($this->dbname != $dbname)
-			$dumpfile = $dbname."-backup.sql";
-		else
-			$dumpfile = $this->TEMP_DUMP_FILE;
+		if($this->dbname != $dbname) {
+					$dumpfile = $dbname."-backup.sql";
+		} else {
+					$dumpfile = $this->TEMP_DUMP_FILE;
+		}
 		
 		$line = sprintf("###newdump###\t%s\t%s\n", $dbname, $dumpfile);
 		$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			
 		// write this to the class and write to $TEMP_DBPROCESS_FILE file as database.table records
-		foreach($tables as $key=>$table) 
-		if($table!= "" and !$tables[$key]['excluded']){
+		foreach($tables as $key=>$table) {
+				if($table!= "" and !$tables[$key]['excluded']){
 
 			$line = sprintf("`%s`.`%s`\t%s\t%s\n", $dbname, $tables[$key]['name'], $tables[$key]['records'], $tables[$key]['excluded']);
+		}
 			$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			$return['tables_count']++;
 			$return['total_records'] += $tables[$key]['records'];
@@ -354,8 +369,9 @@ 
 		$return['finished'] = 0;
 		$lines = array();
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		}
 	
 		foreach ($lines as $buffer){
 			
@@ -380,14 +396,16 @@ 
 						$startAtLine++;
 						$return['new_dump'] = 1;
 						//break;
-				}else{
+				} else{
 						//we export the table
-						if($tableInfo[0] == "###enddump###")
-							$return['endDump'] = 1;
+						if($tableInfo[0] == "###enddump###") {
+													$return['endDump'] = 1;
+						}
 	
 						//table is excluded
-						if($tableInfo[2])
-							continue;
+						if($tableInfo[2]) {
+													continue;
+						}
 							
 						$next = $startAtRecord + $this->recordsPerSession;
 						
@@ -403,16 +421,19 @@ 
 
 						$processed_records = 0;
 						
-						if(trim($tableName) !=""  and !$tableInfo[2])
-							$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						if(trim($tableName) !=""  and !$tableInfo[2]) {
+													$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
+						}
 						
 						$return['processedRecords'] = $startAtRecord+$processed_records;
 						
-						if($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
+						if($next >= $tableInfo[1]) {
+							//we finished loading the records for next sessions, will go to the new record
 						{
 								$startAtLine ++;
+						}
 								$startAtRecord = 0;
-						}else{
+						} else{
 								$startAtRecord = $startAtRecord + $this->recordsPerSession;
 							}
 
@@ -445,8 +466,9 @@ 
 		$return['finished'] = 1;
 		$return['startAtLine']	= $startAtLine;
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
+					$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
+		}
 		
 		$this->logger->debug(sprintf(("Database backup finished!")));
 		
@@ -474,8 +496,9 @@ 
 		
 		$records = 0;
 		
-		if($start == 0)
-			$this->dump_structure($databaseName, $tableName, $dumpfile);
+		if($start == 0) {
+					$this->dump_structure($databaseName, $tableName, $dumpfile);
+		}
 
 		$start = intval($start);
 		$limit = intval($limit);
@@ -487,7 +510,7 @@ 
 			$result = mysqli_query($this->dbh, $query);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		
-		}else{
+		} else{
 			$result = mysql_query($query, $this->dbh);
 			$mysql_fetch_function = "mysql_fetch_array";
 		}

includes/class-xcloner-file-system.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
 
 class Xcloner_File_System{

Doc Comments +9 added lines

@@ -187,6 +187,9 @@ 
 		return $total;		
 	}
 	
+	/**
+	 * @param string $backup_name
+	 */
 	public function is_part($backup_name)
 	{
 		if(stristr($backup_name, "-part"))
@@ -577,6 +580,9 @@ 
 		
 	}
 	
+	/**
+	 * @param string $tmp_file
+	 */
 	public function estimate_reading_time($tmp_file)
 	{
 		$this->logger->debug(sprintf(("Estimating file system reading time")));
@@ -615,6 +621,9 @@ 
 		return $name;	
 	}
 	
+	/**
+	 * @param string $field
+	 */
 	public function sort_by( &$array, $field, $direction = 'asc')
 	{
 		if(strtolower($direction) == "desc" || $direction == SORT_DESC)

Indentation +18 added lines, -18 removed lines

@@ -260,12 +260,12 @@ 
 	}
 	
 	public function getMetadataFull($adapter = "storage_adapter" , $path)
-    {
-        $location = $this->$adapter->applyPathPrefix($path);
-        $spl_info = new SplFileInfo($location);
+	{
+		$location = $this->$adapter->applyPathPrefix($path);
+		$spl_info = new SplFileInfo($location);
         
-        return ($spl_info);
-    }
+		return ($spl_info);
+	}
 	
 	
 	public function get_backup_archives_list()
@@ -629,27 +629,27 @@ 
 	
 	private function array_orderby()
 	{
-	    $args = func_get_args();
-	    $data = array_shift($args);
+		$args = func_get_args();
+		$data = array_shift($args);
 	    
-	    foreach ($args as $n => $field) {
-	        if (is_string($field)) {
-	            $tmp = array();
-	            foreach ($data as $key => $row)
-	            {
+		foreach ($args as $n => $field) {
+			if (is_string($field)) {
+				$tmp = array();
+				foreach ($data as $key => $row)
+				{
 					if(is_array($row))
 						$tmp[$key] = $row[$field];
 					else
 						$tmp[$key] = $row->$field;
 				}
-	            $args[$n] = $tmp;
-	            }
-	    }
-	    $args[] = &$data;
+				$args[$n] = $tmp;
+				}
+		}
+		$args[] = &$data;
 	    
-	    call_user_func_array('array_multisort', $args);
+		call_user_func_array('array_multisort', $args);
 	    
-	    return array_pop($args);
+		return array_pop($args);
 	}
 	
 	public function is_excluded($file)

Spacing +135 added lines, -135 removed lines

@@ -4,12 +4,12 @@ 
 use League\Flysystem\Util;
 use League\Flysystem\Adapter\Local;
 
-class Xcloner_File_System{
+class Xcloner_File_System {
 	
-	private $excluded_files 			= "";
-	private $excluded_files_by_default	= array("administrator/backups", "wp-content/backups");
-	private $included_files_handler 	= "backup_files.csv";
-	private $temp_dir_handler 			= ".dir";
+	private $excluded_files = "";
+	private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
+	private $included_files_handler = "backup_files.csv";
+	private $temp_dir_handler = ".dir";
 	public  $filesystem;
 	public  $tmp_filesystem;
 	public  $storage_filesystem;
@@ -33,39 +33,39 @@ 
 		$this->logger = new XCloner_Logger('xcloner_file_system', $hash);
 		$this->xcloner_requirements = new Xcloner_Requirements();
 
-		$this->xcloner_settings 		= new Xcloner_Settings($hash);
+		$this->xcloner_settings = new Xcloner_Settings($hash);
 
-		try{
+		try {
 			
-			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(),LOCK_EX, 'SKIP_LINKS');
+			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
 			$this->start_filesystem = new Filesystem($this->start_adapter, new Config([
 					'disable_asserts' => true,
 				]));
 			
-			$this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(),LOCK_EX, 'SKIP_LINKS');
+			$this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
 			$this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-			$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(),LOCK_EX|FILE_APPEND, 'SKIP_LINKS');
+			$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
 			$this->tmp_filesystem_append = new Filesystem($adapter, new Config([
 					'disable_asserts' => true,
 				]));
 
-			$adapter = new Local($this->xcloner_settings->get_xcloner_store_path(),LOCK_EX, 'SKIP_LINKS');
+			$adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
 			$this->storage_filesystem = new Filesystem($adapter, new Config([
 					'disable_asserts' => true,
 				]));	
 			
-			$this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(),FILE_APPEND, 'SKIP_LINKS');
+			$this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND, 'SKIP_LINKS');
 			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			return false;
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
+		if ($value = get_option('xcloner_directories_to_scan_per_request'))
 			$this->folders_to_process_per_session = $value;
 
 	}
@@ -126,10 +126,10 @@ 
 		return $this->getMetadataFull('storage_adapter', $file);
 	}
 	
-	public function get_included_files_handler($metadata  = 0)
+	public function get_included_files_handler($metadata = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
+		if (!$metadata)
 			return $path;
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
@@ -146,16 +146,16 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 		
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
-		if(isset($new_list[0]))
+		if (isset($new_list[0]))
 			return $new_list[0];
 	}
 	
@@ -163,13 +163,13 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if (is_array($files))
+			$this->sort_by($files, "timestamp", "desc");
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach ($files as $key=>$file)
+			if (!isset($file['parent']))
 				$new_list[] = ($files[$key]);
 
 		return $new_list;
@@ -180,8 +180,8 @@ 
 		$files = $this->get_backup_archives_list();
 		$total = 0;
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 				$total += $file['size'];
 				
 		return $total;		
@@ -189,7 +189,7 @@ 
 	
 	public function is_part($backup_name)
 	{
-		if(stristr($backup_name, "-part"))
+		if (stristr($backup_name, "-part"))
 			return true;
 		
 		return false;	
@@ -197,7 +197,7 @@ 
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -206,10 +206,10 @@ 
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->get_storage_filesystem()->getSize($backup_name);
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
+			foreach ($backup_parts as $part_file)
 				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
 		}
 		
@@ -220,12 +220,12 @@ 
 	{
 		$files = array();
 		
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$files[] = $data[0];
@@ -238,12 +238,12 @@ 
 	
 	public function delete_backup_by_name($backup_name)
 	{
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$this->get_storage_filesystem()->delete($data[0]);
@@ -251,7 +251,7 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem()->delete($backup_name))
+		if ($this->get_storage_filesystem()->delete($backup_name))
 			$return = true;
 		else
 			$return = false;
@@ -259,7 +259,7 @@ 
 		return $return;	
 	}
 	
-	public function getMetadataFull($adapter = "storage_adapter" , $path)
+	public function getMetadataFull($adapter = "storage_adapter", $path)
     {
         $location = $this->$adapter->applyPathPrefix($path);
         $spl_info = new SplFileInfo($location);
@@ -272,25 +272,25 @@ 
 	{
 		$list = array();
 		
-		if(method_exists($this->get_storage_filesystem(), "listContents"))
+		if (method_exists($this->get_storage_filesystem(), "listContents"))
 			$list = $this->get_storage_filesystem()->listContents();
 
 		
 		$backup_files = array();
 		$parents = array();
 		
-		foreach($list as $file_info)
+		foreach ($list as $file_info)
 		{
 			$data = array();
 			
-			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach ($lines as $line)
+					if ($line)
 					{
 						$data = str_getcsv($line);
-						if(is_array($data)){
+						if (is_array($data)) {
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
 							$file_info['size'] += $data[2];
@@ -299,13 +299,13 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
 				$backup_files[$file_info['path']] = $file_info;
 		}
 		
-		foreach($backup_files as $key=>$file_info)
+		foreach ($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
+			if (isset($parents[$file_info['path']]))
 				$backup_files[$key]['parent'] = $parents[$file_info['path']];
 		}
 		
@@ -314,40 +314,40 @@ 
 	
 	public function start_file_recursion($init = 0)
 	{
-		if($init)
+		if ($init)
 		{
 			$this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"), $this->xcloner_settings->get_xcloner_start_path()));
 			$this->do_system_init();
 		}
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler())){
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
 		//.dir exists, we presume we have files to iterate	
 			$content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
 			$files = array_filter(explode("\n", $content));
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 			
 			$counter = 0;
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if($counter < $this->folders_to_process_per_session){
+				if ($counter < $this->folders_to_process_per_session) {
 					$this->build_files_list($file);
 					$counter++;
-				}else{
+				} else {
 					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
 				}
 			}
-		}else{
+		} else {
 			$this->build_files_list();
 		}
 		
-		if($this->scan_finished())
+		if ($this->scan_finished())
 		{
 			$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
 			$this->store_file($metadata_dumpfile, 'tmp_filesystem');
 			$this->files_counter++;
 		
 			//adding included dump file to the included files list
-			if($this->get_tmp_filesystem()->has($this->get_included_files_handler()))
+			if ($this->get_tmp_filesystem()->has($this->get_included_files_handler()))
 			{
 				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
 				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
@@ -355,13 +355,13 @@ 
 			}
 		
 			//adding a default index.html to the temp xcloner folder
-			if(!$this->get_tmp_filesystem()->has("index.html"))
+			if (!$this->get_tmp_filesystem()->has("index.html"))
 			{
-				$this->get_tmp_filesystem()->write("index.html","");
+				$this->get_tmp_filesystem()->write("index.html", "");
 			}
 			
 			//adding the default log file
-			if($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1)))
+			if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1)))
 			{
 				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
 				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
@@ -378,7 +378,7 @@ 
 	{
 		$return = array();
 		$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 			$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
 		
 		return $return;
@@ -391,8 +391,8 @@ 
 		
 		$contents = $this->get_tmp_filesystem()->listContents();
 	
-		if(is_array($contents))
-		foreach($contents as $file_info)
+		if (is_array($contents))
+		foreach ($contents as $file_info)
 			$this->get_tmp_filesystem()->delete($file_info['path']);
 			
 		@rmdir($this->xcloner_settings->get_xcloner_tmp_path());
@@ -404,16 +404,16 @@ 
 	{
 		$this->files_counter = 0;
 		
-		if(!$this->storage_filesystem->has("index.html"))	
-			$this->storage_filesystem->write("index.html","");
+		if (!$this->storage_filesystem->has("index.html"))	
+			$this->storage_filesystem->write("index.html", "");
 		
-		if(!$this->tmp_filesystem->has("index.html"))	
-			$this->tmp_filesystem->write("index.html","");
+		if (!$this->tmp_filesystem->has("index.html"))	
+			$this->tmp_filesystem->write("index.html", "");
 			
-		if($this->tmp_filesystem->has($this->get_included_files_handler()))
+		if ($this->tmp_filesystem->has($this->get_included_files_handler()))
 			$this->tmp_filesystem->delete($this->get_included_files_handler());
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 	}
 	
@@ -434,7 +434,7 @@ 
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
+		if (!is_array($excluded_files))
 			$excluded_files = array();
 			
 		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
@@ -457,33 +457,33 @@ 
 		$this->logger->debug(sprintf(("Building the files system list")));
 		
 		//if we start with the root folder(empty value), we initializa the file system
-		if(!$folder){
+		if (!$folder) {
 			
 		}
 			
-		try{
+		try {
 			
 			$files = $this->start_filesystem->listContents($folder);
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path']))
+				if (!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path']))
 				{
-					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"), $file['path']), array("FILESYSTEM SCAN","NOT READABLE"));
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"), $file['path']), array("FILESYSTEM SCAN", "NOT READABLE"));
 				}
-				elseif(!$matching_pattern = $this->is_excluded($file) ){
-					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array("FILESYSTEM SCAN","INCLUDE"));
+				elseif (!$matching_pattern = $this->is_excluded($file)) {
+					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array("FILESYSTEM SCAN", "INCLUDE"));
 					$file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
 					$this->store_file($file);
 					$this->files_counter++;
-					if(isset($file['size']))
+					if (isset($file['size']))
 						$this->files_size += $file['size'];
 					
-				}else{
-					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"), $file['path'], $matching_pattern), array("FILESYSTEM SCAN","EXCLUDE"));
+				} else {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"), $file['path'], $matching_pattern), array("FILESYSTEM SCAN", "EXCLUDE"));
 					}
 			}
 			
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
 			$this->logger->error($e->getMessage());
 		
@@ -497,9 +497,9 @@ 
 				
 		$start_time = microtime();
 		
-		$data = str_repeat(rand(0,9), 1024*1024); //write 1MB data
+		$data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
 		
-		try{
+		try {
 			$this->tmp_filesystem->write($tmp_file, $data);
 			
 			$end_time = microtime() - $start_time;
@@ -510,7 +510,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
 			$this->logger->error($e->getMessage());
 			
@@ -531,10 +531,10 @@ 
 		
 		$files = $this->storage_filesystem->listContents();
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if (is_array($files))
+			foreach ($files as $file)
 			{
-				if(isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
+				if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
 				{
 					$_storage_size += $file['size']; //bytes
 					$_backup_files_list[] = $file;
@@ -542,15 +542,15 @@ 
 			}
 		
 		
-		$this->sort_by($_backup_files_list, "timestamp","asc");
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
 		
 		$_backups_counter = sizeof($_backup_files_list);
 				
-		foreach($_backup_files_list as $file)
+		foreach ($_backup_files_list as $file)
 		{
 			//processing rule folder capacity
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-			$_storage_size >= ($set_storage_limit = 1024*1024*$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))	//bytes	
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
+			$_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))	//bytes	
 			{
 				$this->storage_filesystem->delete($file['path']);
 				$_storage_size -= $file['size'];
@@ -558,14 +558,14 @@ 
 			}
 			
 			//processing rule days limit
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp'])
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp'])
 			{
 				$this->storage_filesystem->delete($file['path']);
 				$this->logger->info("Deleting backup ".$file['path']." matching rule", array("RETENTION LIMIT TIMESTAMP", $file['timestamp']." =< ".$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')));
 			}
 			
 			//processing backup countert limit
-			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives'))
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives'))
 			{
 				$this->storage_filesystem->delete($file['path']);
 				$_backups_counter--;
@@ -591,33 +591,33 @@ 
 	
 	}
 	
-	public function process_backup_name($name = "", $max_length=100)
+	public function process_backup_name($name = "", $max_length = 100)
 	{
-		if(!$name)
+		if (!$name)
 			$name = $this->xcloner_settings->get_default_backup_name();
 		
-		foreach($this->backup_name_tags as $tag)
+		foreach ($this->backup_name_tags as $tag)
 		{
-			if($tag == '[time]')
-				$name = str_replace($tag, date("Y-m-d_H-i"),$name);
-			elseif($tag == '[hostname]')
-				$name = str_replace($tag, gethostname() ,$name);	
-			elseif($tag == '[domain]')
+			if ($tag == '[time]')
+				$name = str_replace($tag, date("Y-m-d_H-i"), $name);
+			elseif ($tag == '[hostname]')
+				$name = str_replace($tag, gethostname(), $name);	
+			elseif ($tag == '[domain]')
 			{
 				$domain = parse_url(admin_url(), PHP_URL_HOST);
-				$name = str_replace($tag, $domain ,$name);	
+				$name = str_replace($tag, $domain, $name);	
 			}
 		}
 		
-		if($max_length)
+		if ($max_length)
 			$name = substr($name, 0, $max_length);
 			
 		return $name;	
 	}
 	
-	public function sort_by( &$array, $field, $direction = 'asc')
+	public function sort_by(&$array, $field, $direction = 'asc')
 	{
-		if(strtolower($direction) == "desc" || $direction == SORT_DESC)
+		if (strtolower($direction) == "desc" || $direction == SORT_DESC)
 			$direction = SORT_DESC;
 		else
 			$direction = SORT_ASC;
@@ -637,7 +637,7 @@ 
 	            $tmp = array();
 	            foreach ($data as $key => $row)
 	            {
-					if(is_array($row))
+					if (is_array($row))
 						$tmp[$key] = $row[$field];
 					else
 						$tmp[$key] = $row->$field;
@@ -656,29 +656,29 @@ 
 	{
 		$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
 		
-		if($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb'))
+		if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb'))
 		{
-			if(isset($file['size']) and $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb))
+			if (isset($file['size']) and $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb))
 				return "> ".$xcloner_exclude_files_larger_than_mb."MB";
 		}
 		
-		if(!sizeof($this->excluded_files))
+		if (!sizeof($this->excluded_files))
 			$this->set_excluded_files();
 				
-		if(is_array($this->excluded_files))
-		foreach($this->excluded_files as $excluded_file_pattern)
+		if (is_array($this->excluded_files))
+		foreach ($this->excluded_files as $excluded_file_pattern)
 		{
-			if($excluded_file_pattern == "/")
+			if ($excluded_file_pattern == "/")
 				$needle = "$";
 			else
 				$needle = "$".$excluded_file_pattern;
 				
-			if(strstr("$".$file['path'], $needle)){
+			if (strstr("$".$file['path'], $needle)) {
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
+		if ($regex = $this->is_excluded_regex($file))
 			return $regex;
 		
 		return false;
@@ -724,25 +724,25 @@ 
 		
 		//print_r($regex_patterns);exit;
 		
-		if(is_array($regex_patterns))
+		if (is_array($regex_patterns))
 		{
 			//$this->excluded_files = array();
 			//$this->excluded_files[] ="(.*)\.(git)(.*)$";
 			//$this->excluded_files[] ="wp-content\/backups(.*)$";
 			
-			foreach($regex_patterns as $excluded_file_pattern)
+			foreach ($regex_patterns as $excluded_file_pattern)
 			{
 				
-				if( substr($excluded_file_pattern, strlen($excluded_file_pattern)-1, strlen($excluded_file_pattern)) == "\r")
-					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern)-1);
+				if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1, strlen($excluded_file_pattern)) == "\r")
+					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
 					
-				if($file['path'] == "/")
+				if ($file['path'] == "/")
 					$needle = "/";
 				else
 					$needle = "/".$file['path'];
 				//echo $needle."---".$excluded_file_pattern."---\n";
 				
-				if(@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)){
+				if (@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)) {
 					return $excluded_file_pattern;
 				}
 			}
@@ -755,27 +755,27 @@ 
 	{
 		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
 		
-		if(!isset($file['size']))
+		if (!isset($file['size']))
 			$file['size'] = 0;
-		if(!isset($file['visibility']))	
+		if (!isset($file['visibility']))	
 			$file['visibility'] = "private";
 		
 		$line = '"'.addslashes($file['path']).'","'.$file['timestamp'].'","'.$file['size'].'","'.$file['visibility'].'","'.$storage.'"'.PHP_EOL;
 		
 		$this->last_logged_file = $file['path'];
 		
-		try{
+		try {
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		}catch (Exception $e) {
 		
 			$this->logger->error($e->getMessage());	
 		}
 		
-		if($file['type'] == "dir"){
-			try{
+		if ($file['type'] == "dir") {
+			try {
 				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());	
 			}
 		}
@@ -788,13 +788,13 @@ 
 	
 	public function get_filesystem($system = "")
 	{
-		if($system == "storage_filesystem_append")
+		if ($system == "storage_filesystem_append")
 			return $this->storage_filesystem_append;
-		elseif($system == "tmp_filesystem_append")
+		elseif ($system == "tmp_filesystem_append")
 			return $this->tmp_filesystem_append;
-		elseif($system == "tmp_filesystem")
+		elseif ($system == "tmp_filesystem")
 			return $this->tmp_filesystem;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_filesystem;
 		else
 			return $this->start_filesystem;	
@@ -802,9 +802,9 @@ 
 	
 	public function get_adapter($system)
 	{
-		if($system == "tmp_filesystem")
+		if ($system == "tmp_filesystem")
 			return $this->tmp_adapter;
-		elseif($system == "storage_filesystem")
+		elseif ($system == "storage_filesystem")
 			return $this->storage_adapter;
 		else
 			return $this->start_adapter;	
@@ -812,10 +812,10 @@ 
 	
 	private function scan_finished()
 	{
-		if($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler()))
+		if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler()))
 			return false;
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler()))
 			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
 		
 		$this->logger->debug(sprintf(("File scan finished")));
@@ -825,7 +825,7 @@ 
 	
 	private function calc_to_bytes($mb_size)
 	{
-		return $mb_size*(1024*1024);
+		return $mb_size * (1024 * 1024);
 	}
 	
 }

Braces +164 added lines, -121 removed lines

@@ -60,13 +60,14 @@ 
 			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
 					'disable_asserts' => true,
 				]));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			return false;
 		}
 		
 		
-		if($value = get_option('xcloner_directories_to_scan_per_request'))
-			$this->folders_to_process_per_session = $value;
+		if($value = get_option('xcloner_directories_to_scan_per_request')) {
+					$this->folders_to_process_per_session = $value;
+		}
 
 	}
 	
@@ -129,8 +130,9 @@ 
 	public function get_included_files_handler($metadata  = 0)
 	{
 		$path = $this->included_files_handler;
-		if(!$metadata)
-			return $path;
+		if(!$metadata) {
+					return $path;
+		}
 		
 		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
 		return $spl_info;
@@ -146,31 +148,36 @@ 
 	{
 		$files = $this->get_backup_archives_list();
 		
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if(is_array($files)) {
+					$this->sort_by($files, "timestamp","desc");
+		}
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach($files as $key=>$file) {
+					if(!isset($file['parent']))
 				$new_list[] = ($files[$key]);
+		}
 
-		if(isset($new_list[0]))
-			return $new_list[0];
+		if(isset($new_list[0])) {
+					return $new_list[0];
+		}
 	}
 	
 	public function get_latest_backups()
 	{
 		$files = $this->get_backup_archives_list();
 
-		if(is_array($files))
-			$this->sort_by($files, "timestamp","desc");
+		if(is_array($files)) {
+					$this->sort_by($files, "timestamp","desc");
+		}
 		
 		$new_list = array();
 		
-		foreach($files as $key=>$file)
-			if(!isset($file['parent']))
+		foreach($files as $key=>$file) {
+					if(!isset($file['parent']))
 				$new_list[] = ($files[$key]);
+		}
 
 		return $new_list;
 	}
@@ -180,25 +187,28 @@ 
 		$files = $this->get_backup_archives_list();
 		$total = 0;
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if(is_array($files)) {
+					foreach($files as $file)
 				$total += $file['size'];
+		}
 				
 		return $total;		
 	}
 	
 	public function is_part($backup_name)
 	{
-		if(stristr($backup_name, "-part"))
-			return true;
+		if(stristr($backup_name, "-part")) {
+					return true;
+		}
 		
 		return false;	
 	}
 	
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -209,8 +219,9 @@ 
 		if($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
-				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			foreach($backup_parts as $part_file) {
+							$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -251,10 +262,11 @@ 
 			}
 		}
 		
-		if($this->get_storage_filesystem()->delete($backup_name))
-			$return = true;
-		else
-			$return = false;
+		if($this->get_storage_filesystem()->delete($backup_name)) {
+					$return = true;
+		} else {
+					$return = false;
+		}
 			
 		return $return;	
 	}
@@ -272,8 +284,9 @@ 
 	{
 		$list = array();
 		
-		if(method_exists($this->get_storage_filesystem(), "listContents"))
-			$list = $this->get_storage_filesystem()->listContents();
+		if(method_exists($this->get_storage_filesystem(), "listContents")) {
+					$list = $this->get_storage_filesystem()->listContents();
+		}
 
 		
 		$backup_files = array();
@@ -286,10 +299,11 @@ 
 			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->get_storage_filesystem()->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach($lines as $line) {
+									if($line)
 					{
 						$data = str_getcsv($line);
+				}
 						if(is_array($data)){
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
@@ -299,14 +313,16 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
-				$backup_files[$file_info['path']] = $file_info;
+			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions)) {
+							$backup_files[$file_info['path']] = $file_info;
+			}
 		}
 		
 		foreach($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			if(isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			}
 		}
 		
 		return $backup_files;
@@ -332,11 +348,11 @@ 
 				if($counter < $this->folders_to_process_per_session){
 					$this->build_files_list($file);
 					$counter++;
-				}else{
+				} else{
 					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file."\n");
 				}
 			}
-		}else{
+		} else{
 			$this->build_files_list();
 		}
 		
@@ -378,8 +394,9 @@ 
 	{
 		$return = array();
 		$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->get_included_files_handler();
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
-			$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+					$return[] = $this->xcloner_settings->get_xcloner_tmp_path().DS.$this->xcloner_settings->get_logger_filename(1);
+		}
 		
 		return $return;
 	}
@@ -391,9 +408,10 @@ 
 		
 		$contents = $this->get_tmp_filesystem()->listContents();
 	
-		if(is_array($contents))
-		foreach($contents as $file_info)
+		if(is_array($contents)) {
+				foreach($contents as $file_info)
 			$this->get_tmp_filesystem()->delete($file_info['path']);
+		}
 			
 		@rmdir($this->xcloner_settings->get_xcloner_tmp_path());
 		
@@ -404,17 +422,21 @@ 
 	{
 		$this->files_counter = 0;
 		
-		if(!$this->storage_filesystem->has("index.html"))	
-			$this->storage_filesystem->write("index.html","");
+		if(!$this->storage_filesystem->has("index.html")) {
+					$this->storage_filesystem->write("index.html","");
+		}
 		
-		if(!$this->tmp_filesystem->has("index.html"))	
-			$this->tmp_filesystem->write("index.html","");
+		if(!$this->tmp_filesystem->has("index.html")) {
+					$this->tmp_filesystem->write("index.html","");
+		}
 			
-		if($this->tmp_filesystem->has($this->get_included_files_handler()))
-			$this->tmp_filesystem->delete($this->get_included_files_handler());
+		if($this->tmp_filesystem->has($this->get_included_files_handler())) {
+					$this->tmp_filesystem->delete($this->get_included_files_handler());
+		}
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))	
-			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		if($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+					$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
 	}
 	
 	public function get_scanned_files_num()
@@ -434,8 +456,9 @@ 
 	
 	public function set_excluded_files($excluded_files = array())
 	{
-		if(!is_array($excluded_files))
-			$excluded_files = array();
+		if(!is_array($excluded_files)) {
+					$excluded_files = array();
+		}
 			
 		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
 		
@@ -469,21 +492,21 @@ 
 				if(!is_readable($this->xcloner_settings->get_xcloner_start_path().DS.$file['path']))
 				{
 					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"), $file['path']), array("FILESYSTEM SCAN","NOT READABLE"));
-				}
-				elseif(!$matching_pattern = $this->is_excluded($file) ){
+				} elseif(!$matching_pattern = $this->is_excluded($file) ){
 					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array("FILESYSTEM SCAN","INCLUDE"));
 					$file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
 					$this->store_file($file);
 					$this->files_counter++;
-					if(isset($file['size']))
-						$this->files_size += $file['size'];
+					if(isset($file['size'])) {
+											$this->files_size += $file['size'];
+					}
 					
-				}else{
+				} else{
 					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"), $file['path'], $matching_pattern), array("FILESYSTEM SCAN","EXCLUDE"));
 					}
 			}
 			
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			$this->logger->error($e->getMessage());
 		
@@ -510,7 +533,7 @@ 
 		
 			$this->tmp_filesystem->delete($tmp_file);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			$this->logger->error($e->getMessage());
 			
@@ -531,12 +554,14 @@ 
 		
 		$files = $this->storage_filesystem->listContents();
 		
-		if(is_array($files))
-			foreach($files as $file)
+		if(is_array($files)) {
+					foreach($files as $file)
 			{
 				if(isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions))
 				{
-					$_storage_size += $file['size']; //bytes
+					$_storage_size += $file['size'];
+		}
+		//bytes
 					$_backup_files_list[] = $file;
 				}
 			}
@@ -550,9 +575,11 @@ 
 		{
 			//processing rule folder capacity
 			if($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-			$_storage_size >= ($set_storage_limit = 1024*1024*$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))	//bytes	
+			$_storage_size >= ($set_storage_limit = 1024*1024*$this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit'))) {
+				//bytes	
 			{
 				$this->storage_filesystem->delete($file['path']);
+			}
 				$_storage_size -= $file['size'];
 				$this->logger->info("Deleting backup ".$file['path']." matching rule", array("STORAGE SIZE LIMIT", $_storage_size." >= ".$set_storage_limit));
 			}
@@ -593,34 +620,37 @@ 
 	
 	public function process_backup_name($name = "", $max_length=100)
 	{
-		if(!$name)
-			$name = $this->xcloner_settings->get_default_backup_name();
+		if(!$name) {
+					$name = $this->xcloner_settings->get_default_backup_name();
+		}
 		
 		foreach($this->backup_name_tags as $tag)
 		{
-			if($tag == '[time]')
-				$name = str_replace($tag, date("Y-m-d_H-i"),$name);
-			elseif($tag == '[hostname]')
-				$name = str_replace($tag, gethostname() ,$name);	
-			elseif($tag == '[domain]')
+			if($tag == '[time]') {
+							$name = str_replace($tag, date("Y-m-d_H-i"),$name);
+			} elseif($tag == '[hostname]') {
+							$name = str_replace($tag, gethostname() ,$name);
+			} elseif($tag == '[domain]')
 			{
 				$domain = parse_url(admin_url(), PHP_URL_HOST);
 				$name = str_replace($tag, $domain ,$name);	
 			}
 		}
 		
-		if($max_length)
-			$name = substr($name, 0, $max_length);
+		if($max_length) {
+					$name = substr($name, 0, $max_length);
+		}
 			
 		return $name;	
 	}
 	
 	public function sort_by( &$array, $field, $direction = 'asc')
 	{
-		if(strtolower($direction) == "desc" || $direction == SORT_DESC)
-			$direction = SORT_DESC;
-		else
-			$direction = SORT_ASC;
+		if(strtolower($direction) == "desc" || $direction == SORT_DESC) {
+					$direction = SORT_DESC;
+		} else {
+					$direction = SORT_ASC;
+		}
 					
 	   $array = $this->array_orderby($array, $field, $direction);
 	    
@@ -637,10 +667,11 @@ 
 	            $tmp = array();
 	            foreach ($data as $key => $row)
 	            {
-					if(is_array($row))
-						$tmp[$key] = $row[$field];
-					else
-						$tmp[$key] = $row->$field;
+					if(is_array($row)) {
+											$tmp[$key] = $row[$field];
+					} else {
+											$tmp[$key] = $row->$field;
+					}
 				}
 	            $args[$n] = $tmp;
 	            }
@@ -658,28 +689,32 @@ 
 		
 		if($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb'))
 		{
-			if(isset($file['size']) and $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb))
-				return "> ".$xcloner_exclude_files_larger_than_mb."MB";
+			if(isset($file['size']) and $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
+							return "> ".$xcloner_exclude_files_larger_than_mb."MB";
+			}
 		}
 		
-		if(!sizeof($this->excluded_files))
-			$this->set_excluded_files();
+		if(!sizeof($this->excluded_files)) {
+					$this->set_excluded_files();
+		}
 				
-		if(is_array($this->excluded_files))
-		foreach($this->excluded_files as $excluded_file_pattern)
+		if(is_array($this->excluded_files)) {
+				foreach($this->excluded_files as $excluded_file_pattern)
 		{
 			if($excluded_file_pattern == "/")
 				$needle = "$";
-			else
-				$needle = "$".$excluded_file_pattern;
+		} else {
+							$needle = "$".$excluded_file_pattern;
+			}
 				
 			if(strstr("$".$file['path'], $needle)){
 				return $excluded_file_pattern;
 			}
 		}
 		
-		if( $regex = $this->is_excluded_regex($file))
-			return $regex;
+		if( $regex = $this->is_excluded_regex($file)) {
+					return $regex;
+		}
 		
 		return false;
 	}
@@ -733,13 +768,15 @@ 
 			foreach($regex_patterns as $excluded_file_pattern)
 			{
 				
-				if( substr($excluded_file_pattern, strlen($excluded_file_pattern)-1, strlen($excluded_file_pattern)) == "\r")
-					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern)-1);
+				if( substr($excluded_file_pattern, strlen($excluded_file_pattern)-1, strlen($excluded_file_pattern)) == "\r") {
+									$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern)-1);
+				}
 					
-				if($file['path'] == "/")
-					$needle = "/";
-				else
-					$needle = "/".$file['path'];
+				if($file['path'] == "/") {
+									$needle = "/";
+				} else {
+									$needle = "/".$file['path'];
+				}
 				//echo $needle."---".$excluded_file_pattern."---\n";
 				
 				if(@preg_match("/(^|^\/)".$excluded_file_pattern."/i", $needle)){
@@ -755,10 +792,12 @@ 
 	{
 		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
 		
-		if(!isset($file['size']))
-			$file['size'] = 0;
-		if(!isset($file['visibility']))	
-			$file['visibility'] = "private";
+		if(!isset($file['size'])) {
+					$file['size'] = 0;
+		}
+		if(!isset($file['visibility'])) {
+					$file['visibility'] = "private";
+		}
 		
 		$line = '"'.addslashes($file['path']).'","'.$file['timestamp'].'","'.$file['size'].'","'.$file['visibility'].'","'.$storage.'"'.PHP_EOL;
 		
@@ -767,7 +806,7 @@ 
 		try{
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 		
-		}catch(Exception $e){
+		} catch(Exception $e){
 		
 			$this->logger->error($e->getMessage());	
 		}
@@ -775,7 +814,7 @@ 
 		if($file['type'] == "dir"){
 			try{
 				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->logger->error($e->getMessage());	
 			}
 		}
@@ -788,35 +827,39 @@ 
 	
 	public function get_filesystem($system = "")
 	{
-		if($system == "storage_filesystem_append")
-			return $this->storage_filesystem_append;
-		elseif($system == "tmp_filesystem_append")
-			return $this->tmp_filesystem_append;
-		elseif($system == "tmp_filesystem")
-			return $this->tmp_filesystem;
-		elseif($system == "storage_filesystem")
-			return $this->storage_filesystem;
-		else
-			return $this->start_filesystem;	
+		if($system == "storage_filesystem_append") {
+					return $this->storage_filesystem_append;
+		} elseif($system == "tmp_filesystem_append") {
+					return $this->tmp_filesystem_append;
+		} elseif($system == "tmp_filesystem") {
+					return $this->tmp_filesystem;
+		} elseif($system == "storage_filesystem") {
+					return $this->storage_filesystem;
+		} else {
+					return $this->start_filesystem;
+		}
 	}
 	
 	public function get_adapter($system)
 	{
-		if($system == "tmp_filesystem")
-			return $this->tmp_adapter;
-		elseif($system == "storage_filesystem")
-			return $this->storage_adapter;
-		else
-			return $this->start_adapter;	
+		if($system == "tmp_filesystem") {
+					return $this->tmp_adapter;
+		} elseif($system == "storage_filesystem") {
+					return $this->storage_adapter;
+		} else {
+					return $this->start_adapter;
+		}
 	}
 	
 	private function scan_finished()
 	{
-		if($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler()))
-			return false;
+		if($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) && $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
+					return false;
+		}
 		
-		if($this->tmp_filesystem->has($this->get_temp_dir_handler()))
-			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		if($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+					$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
 		
 		$this->logger->debug(sprintf(("File scan finished")));
 			

includes/class-xcloner-file-transfer.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
 		return ftell($fp);
 	}
 	
+	/**
+	 * @param string $filename
+	 */
 	function curl_file_create($filename, $mimetype = '', $postname = '') {
 		if (!function_exists('curl_file_create')) {
 	        

Indentation +7 added lines, -7 removed lines

@@ -54,10 +54,10 @@ 
 		
 		curl_setopt($ch, CURLOPT_POST, 1);
 		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); 
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+		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);
@@ -90,9 +90,9 @@ 
 	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{
 			

Braces +7 added lines, -5 removed lines

@@ -19,8 +19,9 @@ 
 	
 	public function transfer_file($file, $start = 0, $hash = "")
 	{
-		if(!$this->target_url)
-			throw new Exception("Please setup a target url for upload");
+		if(!$this->target_url) {
+					throw new Exception("Please setup a target url for upload");
+		}
 
 		
 		$fp = $this->get_storage_filesystem()->readStream($file);
@@ -68,8 +69,9 @@ 
 		
 		$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)
 		{
@@ -94,7 +96,7 @@ 
 	            . ($postname ?: basename($filename))
 	            . ($mimetype ? ";type=$mimetype" : '');
 		
-		}else{
+		} else{
 			
 			return curl_file_create($filename, $mimetype, $postname);	
 				

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Xcloner_File_Transfer extends Xcloner_File_System{
+class Xcloner_File_Transfer extends Xcloner_File_System {
 	
 	private $target_url;
 	private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
@@ -8,7 +8,7 @@ 
 	
 	public function set_target($target_url)
 	{
-		return $this->target_url= $target_url;
+		return $this->target_url = $target_url;
 	}
 	
 	public function get_target()
@@ -19,7 +19,7 @@ 
 	
 	public function transfer_file($file, $start = 0, $hash = "")
 	{
-		if(!$this->target_url)
+		if (!$this->target_url)
 			throw new Exception("Please setup a target url for upload");
 
 		
@@ -27,7 +27,7 @@ 
 		
 		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);
 		
@@ -38,11 +38,11 @@ 
 		$send_array = array();
 		
 		$send_array['file'] 	= $file;
-		$send_array['start'] 	= $start;
-		$send_array['action'] 	= "write_file";
+		$send_array['start'] = $start;
+		$send_array['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['blob'] 	= $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
 		
 		//$data = http_build_query($send_array);
 		
@@ -50,7 +50,7 @@ 
 		
 		
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL,$this->target_url);
+		curl_setopt($ch, CURLOPT_URL, $this->target_url);
 		
 		curl_setopt($ch, CURLOPT_POST, 1);
 		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); 
@@ -59,24 +59,24 @@ 
         curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array );
+		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);
 		
 		$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)
+		if ($result->status != 200)
 		{
 			throw new Exception($result->response);
 		}
 		
-		if(ftell($fp) >= $this->get_storage_filesystem()->getSize($file))
+		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();
@@ -93,7 +93,7 @@ 
 	            . ($postname ?: basename($filename))
 	            . ($mimetype ? ";type=$mimetype" : '');
 		
-		}else{
+		} else {
 			
 			return curl_file_create($filename, $mimetype, $postname);	
 				

includes/class-xcloner-remote-storage.php

Doc Comments +3 added lines

@@ -142,6 +142,9 @@
 		
 	}
 	
+	/**
+	 * @param string $storage_type
+	 */
 	public function verify_filesystem($storage_type)
 	{
 		$method = "get_".$storage_type."_filesystem";

Unused Use Statements -6 removed lines

@@ -1,20 +1,14 @@
 <?php
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
-
 use League\Flysystem\Adapter\Ftp as Adapter;
-
 use League\Flysystem\Sftp\SftpAdapter;
-
 use League\Flysystem\Dropbox\DropboxAdapter;
 use Dropbox\Client;
-
 use MicrosoftAzure\Storage\Common\ServicesBuilder;
 use League\Flysystem\Azure\AzureAdapter;
-
 use Aws\S3\S3Client;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
-
 use Mhetreramesh\Flysystem\BackblazeAdapter;
 use ChrisWhite\B2\Client as B2Client;
 

Indentation +28 added lines, -28 removed lines

@@ -254,9 +254,9 @@ 
 		$this->logger->info(sprintf("Creating the AZURE BLOB remote storage connection"), array(""));
 		
 		$endpoint = sprintf(
-		    'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
-		    get_option("xcloner_azure_account_name"),
-		    get_option("xcloner_azure_api_key")
+			'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
+			get_option("xcloner_azure_account_name"),
+			get_option("xcloner_azure_api_key")
 		);
 		
 		$blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint);
@@ -293,12 +293,12 @@ 
 		
 		
 		$client = new S3Client([
-		    'credentials' => [
-		        'key'    => get_option("xcloner_aws_key"),
-		        'secret' => get_option("xcloner_aws_secret")
-		    ],
-		    'region' => get_option("xcloner_aws_region"),
-		    'version' => 'latest',
+			'credentials' => [
+				'key'    => get_option("xcloner_aws_key"),
+				'secret' => get_option("xcloner_aws_secret")
+			],
+			'region' => get_option("xcloner_aws_region"),
+			'version' => 'latest',
 		]);
 		
 		$adapter = new AwsS3Adapter($client, get_option("xcloner_aws_bucket_name"));
@@ -332,16 +332,16 @@ 
 		$this->logger->info(sprintf("Creating the FTP remote storage connection"), array(""));
 		
 		$adapter = new Adapter([
-		    'host' => get_option("xcloner_ftp_hostname"),
-		    'username' => get_option("xcloner_ftp_username"),
-		    'password' => get_option("xcloner_ftp_password"),
-		
-		    /** optional config settings */
-		    'port' => get_option("xcloner_ftp_port", 21),
-		    'root' => get_option("xcloner_ftp_path"),
-		    'passive' => get_option("xcloner_ftp_transfer_mode"),
-		    'ssl' => get_option("xcloner_ftp_ssl_mode"),
-		    'timeout' => get_option("xcloner_ftp_timeout", 30),
+			'host' => get_option("xcloner_ftp_hostname"),
+			'username' => get_option("xcloner_ftp_username"),
+			'password' => get_option("xcloner_ftp_password"),
+		
+			/** optional config settings */
+			'port' => get_option("xcloner_ftp_port", 21),
+			'root' => get_option("xcloner_ftp_path"),
+			'passive' => get_option("xcloner_ftp_transfer_mode"),
+			'ssl' => get_option("xcloner_ftp_ssl_mode"),
+			'timeout' => get_option("xcloner_ftp_timeout", 30),
 		]);
 		
 		$adapter->connect();
@@ -358,15 +358,15 @@ 
 		$this->logger->info(sprintf("Creating the SFTP remote storage connection"), array(""));
 		
 		$adapter = new SftpAdapter([
-		    'host' => get_option("xcloner_sftp_hostname"),
-		    'username' => get_option("xcloner_sftp_username"),
-		    'password' => get_option("xcloner_sftp_password"),
-		
-		    /** optional config settings */
-		    'port' => get_option("xcloner_sftp_port", 22),
-		    'root' => get_option("xcloner_sftp_path"),
-		    'privateKey' => get_option("xcloner_sftp_private_key"),
-		    'timeout' => get_option("xcloner_ftp_timeout", 30),
+			'host' => get_option("xcloner_sftp_hostname"),
+			'username' => get_option("xcloner_sftp_username"),
+			'password' => get_option("xcloner_sftp_password"),
+		
+			/** optional config settings */
+			'port' => get_option("xcloner_sftp_port", 22),
+			'root' => get_option("xcloner_sftp_path"),
+			'privateKey' => get_option("xcloner_sftp_private_key"),
+			'timeout' => get_option("xcloner_ftp_timeout", 30),
 		]);
 		
 		$adapter->connect();

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
 use Mhetreramesh\Flysystem\BackblazeAdapter;
 use ChrisWhite\B2\Client as B2Client;
 
-class Xcloner_Remote_Storage{
+class Xcloner_Remote_Storage {
 	
 	private $storage_fields = array(
 					"option_prefix" => "xcloner_",
@@ -87,17 +87,17 @@ 
 	{
 		$this->xcloner_sanitization 	= new Xcloner_Sanitization($hash);
 		$this->xcloner_file_system 		= new Xcloner_File_System($hash);
-		$this->logger 					= new XCloner_Logger("xcloner_remote_storage", $hash);
+		$this->logger = new XCloner_Logger("xcloner_remote_storage", $hash);
 		$this->xcloner = new Xcloner();
 	}
 	
 	public function get_available_storages()
 	{
 		$return = array();
-		foreach($this->storage_fields as $storage=>$data)
+		foreach ($this->storage_fields as $storage=>$data)
 		{
 			$check_field = $this->storage_fields["option_prefix"].$storage."_enable";
-			if(get_option($check_field))
+			if (get_option($check_field))
 				$return[$storage] = $data['text'];
 		}
 		
@@ -109,17 +109,17 @@ 
 		$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]))
+		if (is_array($this->storage_fields[$storage]))
 		{
-			foreach($this->storage_fields[$storage] as $field=>$validation)
+			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]))
+				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($_POST[$check_field]);
@@ -129,13 +129,13 @@ 
 			$this->xcloner->trigger_message(__("%s storage settings saved.", 'xcloner-backup-and-restore'), "success", ucfirst($action));
 		}
 		
-		if(isset($_POST['connection_check']) && $_POST['connection_check'])
+		if (isset($_POST['connection_check']) && $_POST['connection_check'])
 		{
-			try{
+			try {
 				$this->verify_filesystem($action);
 				$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", ucfirst($action));
 				$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));	
-			}catch(Exception $e){
+			}catch (Exception $e) {
 				$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", ucfirst($action));
 			}
 		}
@@ -148,7 +148,7 @@ 
 		
 		$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();
@@ -156,29 +156,29 @@ 
 		$test_file = substr(".xcloner_".md5(time()), 0, 15);
 			
 		//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)));	
 		
 		//testing read access
-		if(!$filesystem->read($test_file))
-			throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		if (!$filesystem->read($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)));		
 		
 		//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)));		
 	}
 	
 	public function upload_backup_to_storage($file, $storage)
 	{
-		if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
+		if (!$this->xcloner_file_system->get_storage_filesystem()->has($file))
 			return false;
 			
 		$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();
@@ -188,7 +188,7 @@ 
 		
 		$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))
+		if (!$this->xcloner_file_system->get_storage_filesystem()->has($file))
 		{
 			$this->logger->info(sprintf("File not found %s in local storage", $file));
 			return false;
@@ -196,22 +196,22 @@ 
 		
 		$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($file);
 
-		if(!$remote_storage_filesystem->updateStream($file, $backup_file_stream))
+		if (!$remote_storage_filesystem->updateStream($file, $backup_file_stream))
 		{
 			$this->logger->info(sprintf("Could not transfer file %s", $file));
 			return false;
 		}
 		
-		if($this->xcloner_file_system->is_multipart($file))
+		if ($this->xcloner_file_system->is_multipart($file))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if (is_array($parts))
+				foreach ($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $part_file, strtoupper($storage)), array(""));
 					
 					$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($part_file);
-					if(!$remote_storage_filesystem->updateStream($part_file, $backup_file_stream))
+					if (!$remote_storage_filesystem->updateStream($part_file, $backup_file_stream))
 						return false;
 				}
 		}
@@ -227,19 +227,19 @@ 
 	public function clean_remote_storage($storage, $remote_storage_filesystem)
 	{
 		$check_field = $this->storage_fields["option_prefix"].$storage."_cleanup_days";
-		if($expire_days = get_option($check_field))
+		if ($expire_days = get_option($check_field))
 		{
 			$this->logger->info(sprintf("Doing %s remote storage cleanup for %s days limit", strtoupper($storage), $expire_days));
 			$files = $remote_storage_filesystem->listContents();
 			
 			$current_timestamp = strtotime("-".$expire_days." days");
 			
-			if(is_array($files))
-			foreach($files as $file)
+			if (is_array($files))
+			foreach ($files as $file)
 			{
 				$file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
 				
-				if($current_timestamp >= $file['timestamp'])
+				if ($current_timestamp >= $file['timestamp'])
 				{
 					$remote_storage_filesystem->delete($file['path']);
 					$this->logger->info("Deleting remote file ".$file['path']." matching rule", array("RETENTION LIMIT TIMESTAMP", $file['timestamp']." =< ".$expire_days));

Braces +37 added lines, -25 removed lines

@@ -97,8 +97,9 @@ 
 		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'];
+			if(get_option($check_field)) {
+							$return[$storage] = $data['text'];
+			}
 		}
 		
 		return $return;
@@ -116,11 +117,13 @@ 
 				$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))
-					$sanitize_method = "sanitize_input_as_string";
+				if(!method_exists($this->xcloner_sanitization, $sanitize_method)) {
+									$sanitize_method = "sanitize_input_as_string";
+				}
 					
 				$sanitized_value = $this->xcloner_sanitization->$sanitize_method($_POST[$check_field]);
 				update_option($check_field, $sanitized_value);
@@ -135,7 +138,7 @@ 
 				$this->verify_filesystem($action);
 				$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success", ucfirst($action));
 				$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));	
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error", ucfirst($action));
 			}
 		}
@@ -148,38 +151,44 @@ 
 		
 		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem", strtoupper($storage_type)));	
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 		
 		list($adapter, $filesystem) = $this->$method();
 		
 		$test_file = substr(".xcloner_".md5(time()), 0, 15);
 			
 		//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)));	
 		
 		//testing read access
-		if(!$filesystem->read($test_file))
-			throw new Exception(__("Could not read data",'xcloner-backup-and-restore'));
+		if(!$filesystem->read($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)));		
 		
 		//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)));		
 	}
 	
 	public function upload_backup_to_storage($file, $storage)
 	{
-		if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
-			return false;
+		if(!$this->xcloner_file_system->get_storage_filesystem()->has($file)) {
+					return false;
+		}
 			
 		$method = "get_".$storage."_filesystem";	
 		
-		if(!method_exists($this, $method))
-			return false;
+		if(!method_exists($this, $method)) {
+					return false;
+		}
 			
 		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 		
@@ -205,14 +214,16 @@ 
 		if($this->xcloner_file_system->is_multipart($file))
 		{
 			$parts = $this->xcloner_file_system->get_multipart_files($file);
-			if(is_array($parts))
-				foreach($parts as $part_file)
+			if(is_array($parts)) {
+							foreach($parts as $part_file)
 				{
 					$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $part_file, strtoupper($storage)), array(""));
+			}
 					
 					$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($part_file);
-					if(!$remote_storage_filesystem->updateStream($part_file, $backup_file_stream))
-						return false;
+					if(!$remote_storage_filesystem->updateStream($part_file, $backup_file_stream)) {
+											return false;
+					}
 				}
 		}
 		
@@ -234,10 +245,11 @@ 
 			
 			$current_timestamp = strtotime("-".$expire_days." days");
 			
-			if(is_array($files))
-			foreach($files as $file)
+			if(is_array($files)) {
+						foreach($files as $file)
 			{
 				$file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
+			}
 				
 				if($current_timestamp >= $file['timestamp'])
 				{

includes/class-xcloner.php

Doc Comments +3 added lines

@@ -115,6 +115,9 @@
 		
 	}
 	
+	/**
+	 * @param string $message
+	 */
 	public function trigger_message($message, $status = "error", $message_param1 = "", $message_param2 = "", $message_param3 = "")
 	{
 			$message = sprintf(__($message), $message_param1, $message_param2, $message_param3);

Indentation +16 added lines, -16 removed lines

@@ -247,7 +247,7 @@ 
 		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 		
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
-        //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
+		//   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
 
 	}
 
@@ -281,8 +281,8 @@ 
 	
 	private function define_plugin_settings(){
 		/**
-		* register wporg_settings_init to the admin_init action hook
-		*/
+		 * register wporg_settings_init to the admin_init action hook
+		 */
 		$settings = new Xcloner_Settings();
 		add_action('admin_init', array($settings, 'settings_init'));
 	}
@@ -316,15 +316,15 @@ 
 	}
 	
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 		
 	private function define_ajax_hooks()
@@ -355,20 +355,20 @@ 
 			add_action( 'admin_notices', array($this, 'xcloner_error_admin_notices' ));
 		
 		//if (is_admin()) {
-            add_filter('plugin_action_links', array($this, 'add_plugin_action_links'), 10, 2);
-        }
+			add_filter('plugin_action_links', array($this, 'add_plugin_action_links'), 10, 2);
+		}
 		
 	}
 	
 	function add_plugin_action_links($links, $file) {
-        if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+		if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
 		{	
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';
 		}
         
-        return $links;
-    }
+		return $links;
+	}
 	
 	public function xcloner_error_admin_notices() {
 			settings_errors( 'xcloner_error_message' );

Spacing +61 added lines, -61 removed lines

@@ -88,15 +88,15 @@ 
 		
 	}
 	
-	public function check_dependencies(){
+	public function check_dependencies() {
 		
 		$backup_storage_path = realpath(__DIR__.DS."..".DS."..".DS."..").DS."backups".DS;
 		
 		define("XCLONER_STORAGE_PATH", realpath($backup_storage_path));
 
-		if(!is_dir($backup_storage_path))
+		if (!is_dir($backup_storage_path))
 		{
-			if(!@mkdir($backup_storage_path))
+			if (!@mkdir($backup_storage_path))
 			{
 				$status = "error";
 				$message = sprintf(__("Unable to create the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -104,7 +104,7 @@ 
 				return;
 			}
 		}	
-		if(!is_writable($backup_storage_path))
+		if (!is_writable($backup_storage_path))
 		{
 			$status = "error";
 			$message = sprintf(__("Unable to write to the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -118,15 +118,15 @@ 
 	public function trigger_message($message, $status = "error", $message_param1 = "", $message_param2 = "", $message_param3 = "")
 	{
 			$message = sprintf(__($message), $message_param1, $message_param2, $message_param3);
-			add_action( 'xcloner_admin_notices', array($this,"trigger_message_notice"), 10, 2);
-			do_action( 'xcloner_admin_notices', $message, $status);
+			add_action('xcloner_admin_notices', array($this, "trigger_message_notice"), 10, 2);
+			do_action('xcloner_admin_notices', $message, $status);
 	}
 	
 	public function trigger_message_notice($message, $status = "success")
 	{
 		?>
 		<div class="notice notice-<?php echo $status?> is-dismissible">
-	        <p><?php _e( $message, 'xcloner-backup-and-restore' ); ?></p>
+	        <p><?php _e($message, 'xcloner-backup-and-restore'); ?></p>
 	    </div>
 		<?php
 	}
@@ -153,79 +153,79 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-i18n.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-xcloner-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-xcloner-admin.php';
 		
 		/**
 		 * The class responsible for debugging XCloner.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-logger.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-logger.php';
 		
 		/**
 		 * The class responsible for defining the admin settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-settings.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-settings.php';
 		
 		/**
 		 * The class responsible for defining the Remote Storage settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-remote-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-remote-storage.php';
 		
 		/**
 		 * The class responsible for implementing the database backup methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-database.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-database.php';
 		
 		/**
 		 * The class responsible for sanitization of users input.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-sanitization.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-sanitization.php';
 		
 		/**
 		 * The class responsible for XCloner system requirements validation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-requirements.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-requirements.php';
 		
 		/**
 		 * The class responsible for XCloner backup archive creation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-archive.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-archive.php';
 		
 		/**
 		 * The class responsible for XCloner API requests.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-api.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-api.php';
 		
 		/**
 		 * The class responsible for the XCloner File System methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-system.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-system.php';
 		
 		/**
 		 * The class responsible for the XCloner File Transfer methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-transfer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-transfer.php';
 		
 		/**
 		 * The class responsible for the XCloner Scheduler methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-scheduler.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-scheduler.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-xcloner-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-xcloner-public.php';
 		
 		$this->loader = new Xcloner_Loader();
 
@@ -244,7 +244,7 @@ 
 
 		$plugin_i18n = new Xcloner_i18n();
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 		
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
         //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
@@ -260,11 +260,11 @@ 
 	 */
 	private function define_admin_hooks() {
 	
-		$plugin_admin = new Xcloner_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Xcloner_Admin($this->get_plugin_name(), $this->get_version());
 		$this->plugin_admin = $plugin_admin;
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 		
 	}
 	
@@ -273,13 +273,13 @@ 
 	 * 
 	 * @access 	private
 	 */
-	private function define_admin_menu(){
+	private function define_admin_menu() {
 		
 		add_action('admin_menu', array($this->loader, 'xcloner_backup_add_admin_menu'));
 		
 	}
 	
-	private function define_plugin_settings(){
+	private function define_plugin_settings() {
 		/**
 		* register wporg_settings_init to the admin_init action hook
 		*/
@@ -296,10 +296,10 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Xcloner_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Xcloner_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 	}
 	
@@ -308,20 +308,20 @@ 
 		$logger = new XCloner_Logger("php_system");
 		$error = error_get_last();
 		
-		if($error['type'] and $logger)
+		if ($error['type'] and $logger)
 		{
-			$logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 	
 	}
 	
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
+	    static $levels = null;
+	    if ($levels === null) {
+	        $levels = [];
 	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+	            if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 	        }
 	    }
 	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -329,30 +329,30 @@ 
 		
 	private function define_ajax_hooks()
 	{
-		$plugin_public = new Xcloner_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Xcloner_Public($this->get_plugin_name(), $this->get_version());
 		//$this->loader->add_action( 'wp_ajax_get_database_tables_action', $plugin_public, array('Xcloner_Api','get_database_tables_action') );
 		
-		if(is_admin())
+		if (is_admin())
 		{
 			$xcloner_api = new Xcloner_Api();
 
-			add_action( 'wp_ajax_get_database_tables_action'	, array($xcloner_api,'get_database_tables_action')  );
-			add_action( 'wp_ajax_get_file_system_action'		, array($xcloner_api,'get_file_system_action')  );
-			add_action( 'wp_ajax_scan_filesystem'		, array($xcloner_api,'scan_filesystem')  );
-			add_action( 'wp_ajax_backup_database'		, array($xcloner_api,'backup_database')  );
-			add_action( 'wp_ajax_backup_files'		, array($xcloner_api,'backup_files')  );
-			add_action( 'wp_ajax_save_schedule'		, array($xcloner_api,'save_schedule')  );
-			add_action( 'wp_ajax_get_schedule_by_id'		, array($xcloner_api,'get_schedule_by_id')  );
-			add_action( 'wp_ajax_get_scheduler_list'		, array($xcloner_api,'get_scheduler_list')  );
-			add_action( 'wp_ajax_delete_schedule_by_id'		, array($xcloner_api,'delete_schedule_by_id')  );
-			add_action( 'wp_ajax_delete_backup_by_name'		, array($xcloner_api,'delete_backup_by_name')  );
-			add_action( 'wp_ajax_download_backup_by_name'		, array($xcloner_api,'download_backup_by_name')  );
-			add_action( 'wp_ajax_remote_storage_save_status'		, array($xcloner_api,'remote_storage_save_status')  );
-			add_action( 'wp_ajax_upload_backup_to_remote'		, array($xcloner_api,'upload_backup_to_remote')  );
-			add_action( 'wp_ajax_list_backup_files'		, array($xcloner_api,'list_backup_files')  );
-			add_action( 'wp_ajax_restore_upload_backup'		, array($xcloner_api,'restore_upload_backup')  );
-			add_action( 'wp_ajax_download_restore_script'		, array($xcloner_api,'download_restore_script')  );
-			add_action( 'admin_notices', array($this, 'xcloner_error_admin_notices' ));
+			add_action('wp_ajax_get_database_tables_action', array($xcloner_api, 'get_database_tables_action'));
+			add_action('wp_ajax_get_file_system_action', array($xcloner_api, 'get_file_system_action'));
+			add_action('wp_ajax_scan_filesystem', array($xcloner_api, 'scan_filesystem'));
+			add_action('wp_ajax_backup_database', array($xcloner_api, 'backup_database'));
+			add_action('wp_ajax_backup_files', array($xcloner_api, 'backup_files'));
+			add_action('wp_ajax_save_schedule', array($xcloner_api, 'save_schedule'));
+			add_action('wp_ajax_get_schedule_by_id', array($xcloner_api, 'get_schedule_by_id'));
+			add_action('wp_ajax_get_scheduler_list', array($xcloner_api, 'get_scheduler_list'));
+			add_action('wp_ajax_delete_schedule_by_id', array($xcloner_api, 'delete_schedule_by_id'));
+			add_action('wp_ajax_delete_backup_by_name', array($xcloner_api, 'delete_backup_by_name'));
+			add_action('wp_ajax_download_backup_by_name', array($xcloner_api, 'download_backup_by_name'));
+			add_action('wp_ajax_remote_storage_save_status', array($xcloner_api, 'remote_storage_save_status'));
+			add_action('wp_ajax_upload_backup_to_remote', array($xcloner_api, 'upload_backup_to_remote'));
+			add_action('wp_ajax_list_backup_files', array($xcloner_api, 'list_backup_files'));
+			add_action('wp_ajax_restore_upload_backup', array($xcloner_api, 'restore_upload_backup'));
+			add_action('wp_ajax_download_restore_script', array($xcloner_api, 'download_restore_script'));
+			add_action('admin_notices', array($this, 'xcloner_error_admin_notices'));
 		
 		//if (is_admin()) {
             add_filter('plugin_action_links', array($this, 'add_plugin_action_links'), 10, 2);
@@ -361,7 +361,7 @@ 
 	}
 	
 	function add_plugin_action_links($links, $file) {
-        if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+        if ($file == plugin_basename(dirname(dirname(__FILE__)).'/xcloner.php'))
 		{	
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';
@@ -371,13 +371,13 @@ 
     }
 	
 	public function xcloner_error_admin_notices() {
-			settings_errors( 'xcloner_error_message' );
+			settings_errors('xcloner_error_message');
 		}
 	
 	public function define_cron_hooks()
 	{
 		//registering new schedule intervals
-		add_filter( 'cron_schedules', array($this, 'add_new_intervals'));
+		add_filter('cron_schedules', array($this, 'add_new_intervals'));
 			
 		
 		$xcloner_scheduler = new Xcloner_Scheduler();
@@ -451,7 +451,7 @@ 
 	
 	public function display($page)
 	{
-		$plugin_admin = new Xcloner_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Xcloner_Admin($this->get_plugin_name(), $this->get_version());
 		$this->plugin_admin = $plugin_admin;
 		
 		$view = call_user_func_array(array($this->plugin_admin, $page), array());

uninstall.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }

phar-generate.php

Indentation +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@
 
 // add all files in the project, only include php files
 $phar2->buildFromIterator(
-    new RecursiveIteratorIterator(
-     new RecursiveDirectoryIterator(__DIR__.'/vendor/')),
-    __DIR__);
+	new RecursiveIteratorIterator(
+	 new RecursiveDirectoryIterator(__DIR__.'/vendor/')),
+	__DIR__);
 
 $phar2->setStub($phar2->createDefaultStub('vendor/autoload.php', 'vendor/autoload.php'));

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-if(!isset($argv))
+if (!isset($argv))
 	die('Access denied from web.');
 
 $file = 'restore/vendor.phar';	
 
-if(file_exists($file))
+if (file_exists($file))
 	unlink($file);
 $phar2 = new Phar($file, 0, 'vendor.phar');
 

Braces +4 added lines, -2 removed lines

@@ -1,12 +1,14 @@
 <?php
 
-if(!isset($argv))
+if(!isset($argv)) {
 	die('Access denied from web.');
+}
 
 $file = 'restore/vendor.phar';	
 
-if(file_exists($file))
+if(file_exists($file)) {
 	unlink($file);
+}
 $phar2 = new Phar($file, 0, 'vendor.phar');
 
 // add all files in the project, only include php files