ovidiul / XCloner-Wordpress

includes/class-xcloner-archive.php

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

Spacing +16 added lines, -16 removed lines

@@ -4,32 +4,32 @@ 
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\RotatingFileHandler;
 
-class Xcloner_Logger extends Logger{
+class Xcloner_Logger extends Logger {
 	
-	private $logger_path ;
+	private $logger_path;
 	private $max_logger_files = 15;
 	private $main_logger_url;
 	
-	public function __construct($logger_name = "xcloner_logger", $hash="")
+	public function __construct($logger_name = "xcloner_logger", $hash = "")
 	{
-		$xcloner_settings 	= new Xcloner_Settings($hash);
-		$logger_path 		= $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
+		$xcloner_settings = new Xcloner_Settings($hash);
+		$logger_path = $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		$logger_path_tmp 	= "";
 		
-		if($hash)
+		if ($hash)
 			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
 		
 		
 		$this->logger_path = $logger_path;
 		//$this->logger_path_tmp = $logger_path_tmp;
 		
-		if(!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
+		if (!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
 		{
 			$logger_path = "php://stderr";
 			$logger_path_tmp = "";
 		}
 		
-		if(!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if (!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 		{
 			$logger_path = "php://stderr";
 			$logger_path_tmp = "";
@@ -40,19 +40,19 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
+		if (WP_DEBUG)
 			$debug_level = Logger::DEBUG;
 
 	
-		if($logger_path)
+		if ($logger_path)
 		{
 			$stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level);
 			$this->pushHandler($stream);
 			
-			$this->main_logger_url =  $stream->getUrl();
+			$this->main_logger_url = $stream->getUrl();
 		}
 			
-		if($hash and $logger_path_tmp)
+		if ($hash and $logger_path_tmp)
 			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
 		
 		return $this;
@@ -68,7 +68,7 @@ 
 		$lines = array();
 		
 		//if(!file_exists($this->logger_path) or !is_readable($this->logger_path))
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
+		if (!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
 			return false;
 		
 		//$fp = fopen($this->logger_path, 'r');
@@ -78,12 +78,12 @@ 
 		$lastLine = "";
 		
 		// Loop backword until we have our lines or we reach the start
-		while($pos > 0 && count($lines) < $totalLines) {
+		while ($pos > 0 && count($lines) < $totalLines) {
 		
 		$C = fgetc($fp);
-		if($C == "\n") {
+		if ($C == "\n") {
 		  // skip empty lines
-		  if(trim($lastLine) != "") {
+		  if (trim($lastLine) != "") {
 			$lines[] = $lastLine;
 		  }
 		  $lastLine = '';

Braces +12 added lines, -8 removed lines

@@ -16,8 +16,9 @@ 
 		$logger_path 		= $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		$logger_path_tmp 	= "";
 		
-		if($hash)
-			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
+		if($hash) {
+					$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
+		}
 		
 		
 		$this->logger_path = $logger_path;
@@ -40,8 +41,9 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
-			$debug_level = Logger::DEBUG;
+		if(WP_DEBUG) {
+					$debug_level = Logger::DEBUG;
+		}
 
 	
 		if($logger_path)
@@ -52,8 +54,9 @@ 
 			$this->main_logger_url =  $stream->getUrl();
 		}
 			
-		if($hash and $logger_path_tmp)
-			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
+		if($hash and $logger_path_tmp) {
+					$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
+		}
 		
 		return $this;
 	}
@@ -68,8 +71,9 @@ 
 		$lines = array();
 		
 		//if(!file_exists($this->logger_path) or !is_readable($this->logger_path))
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
-			return false;
+		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url)) {
+					return false;
+		}
 		
 		//$fp = fopen($this->logger_path, 'r');
 		$fp = fopen($this->main_logger_url, 'r');