Added current mailbox runtime in seconds to debug mode when show memory usage is enabled

Changed errors formatting

Author: SL-Gundam

core/Mail/Parser.php

@@ -12,6 +12,7 @@ class ERP_Mail_Parser
 	private $_debug = FALSE;
 	private $_show_mem_usage = FALSE;
 	private $_memory_limit = FALSE;
+	private $_mailbox_starttime = NULL;
 
 	private $_file;
 	private $_content;
@@ -52,12 +53,13 @@ class ERP_Mail_Parser
 			'us-ascii' => 'ASCII',
 	);
 
-	public function __construct( $options )
+	public function __construct( $options, $mailbox_starttime )
 	{
 		$this->_parse_html = $options[ 'parse_html' ];
 		$this->_add_attachments = $options[ 'add_attachments' ];
 		$this->_debug = $options[ 'debug' ];
 		$this->_show_mem_usage = $options[ 'show_mem_usage' ];
+		$this->_mailbox_starttime = $mailbox_starttime;
 
 		$this->prepare_mb_list_encodings();
 
@@ -539,12 +541,14 @@ private function show_memory_usage( $p_location )
 	{
 		if ( $this->_debug && $this->_show_mem_usage )
 		{
+			$t_current_runtime = ( ( $this->_mailbox_starttime !== NULL ) ? round( ERP_get_timestamp() - $this->_mailbox_starttime, 4 ) : 0 );
 			echo 'Debug output memory usage' . "\n" .
 				'Location: Mail Parser - ' . $p_location . "\n" .
+				'Runtime in seconds: ' . $t_current_runtime . "\n" .
 				'Current memory usage: ' . ERP_formatbytes( memory_get_usage( FALSE ) ) . ' / ' . $this->_memory_limit . "\n" .
 				'Peak memory usage: ' . ERP_formatbytes( memory_get_peak_usage( FALSE ) ) . ' / ' . $this->_memory_limit . "\n" .
 				'Current real memory usage: ' . ERP_formatbytes( memory_get_usage( TRUE ) ) . ' / ' . $this->_memory_limit . "\n" .
-				'Peak real memory usage: ' . ERP_formatbytes( memory_get_peak_usage( TRUE ) ) . ' / ' . $this->_memory_limit . "\n";
+				'Peak real memory usage: ' . ERP_formatbytes( memory_get_peak_usage( TRUE ) ) . ' / ' . $this->_memory_limit . "\n\n";
 		}
 	}
 }

core/mail_api.php

@@ -27,6 +27,7 @@ class ERP_mailbox_api
 {
 	private $_functionality_enabled = FALSE;
 	private $_test_only = FALSE;
+	private $_mailbox_starttime = NULL;
 
 	public $_mailbox = array( 'description' => 'INITIALIZATION PHASE' );
 
@@ -166,6 +167,8 @@ public function __construct( $p_test_only = FALSE )
 	#  return a boolean for whether the mailbox was successfully processed
 	public function process_mailbox( $p_mailbox )
 	{
+		$this->_mailbox_starttime = ERP_get_timestamp();
+		
 		$this->_mailbox = $p_mailbox + ERP_get_default_mailbox();
 
 		if ( $this->_functionality_enabled )
@@ -217,6 +220,7 @@ public function process_mailbox( $p_mailbox )
 								if ( !$this->_test_only && $this->_mail_debug )
 								{
 									var_dump( $this->_mailbox );
+									echo "\n";
 								}
 
 								$this->show_memory_usage( 'Start process mailbox' );
@@ -263,7 +267,7 @@ private function pear_error( $p_location, &$p_pear )
 
 			if ( !$this->_test_only )
 			{
-				echo "\n\n" . 'Mailbox: ' . $this->_mailbox[ 'description' ] . "\n" . 'Location: ' . $p_location . "\n" . $p_pear->toString() . "\n";
+				echo 'Mailbox: ' . $this->_mailbox[ 'description' ] . "\n" . 'Location: ' . $p_location . "\n" . $p_pear->toString() . "\n\n";
 			}
 
 			return( TRUE );
@@ -291,7 +295,7 @@ private function custom_error( $p_error_text, $p_is_error = TRUE )
 
 		if ( !$this->_test_only )
 		{
-			echo "\n\n" . 'Mailbox: ' . $this->_mailbox[ 'description' ] . "\n" . $t_error_text;
+			echo 'Mailbox: ' . $this->_mailbox[ 'description' ] . "\n" . $t_error_text . "\n\n";
 		}
 	}
 
@@ -593,7 +597,7 @@ private function parse_content( &$p_msg )
 	{
 		$this->show_memory_usage( 'Start Mail Parser' );
 
-		$t_mp = new ERP_Mail_Parser( $this->_mp_options );
+		$t_mp = new ERP_Mail_Parser( $this->_mp_options, $this->_mailbox_starttime );
 
 		$t_mp->setInputString( $p_msg );
 
@@ -1492,12 +1496,14 @@ private function show_memory_usage( $p_location )
 	{
 		if ( !$this->_test_only && $this->_mail_debug && $this->_mail_debug_show_memory_usage )
 		{
+			$t_current_runtime = ( ( $this->_mailbox_starttime !== NULL ) ? round( ERP_get_timestamp() - $this->_mailbox_starttime, 4 ) : 0 );
 			echo 'Debug output memory usage' . "\n" .
 				'Location: Mail API - ' . $p_location . "\n" .
+				'Runtime in seconds: ' . $t_current_runtime . "\n" .
 				'Current memory usage: ' . ERP_formatbytes( memory_get_usage( FALSE ) ) . ' / ' . $this->_memory_limit . "\n" .
 				'Peak memory usage: ' . ERP_formatbytes( memory_get_peak_usage( FALSE ) ) . ' / ' . $this->_memory_limit . "\n" .
 				'Current real memory usage: ' . ERP_formatbytes( memory_get_usage( TRUE ) ) . ' / ' . $this->_memory_limit . "\n" .
-				'Peak real memory usage: ' . ERP_formatbytes( memory_get_peak_usage( TRUE ) ) . ' / ' . $this->_memory_limit . "\n";
+				'Peak real memory usage: ' . ERP_formatbytes( memory_get_peak_usage( TRUE ) ) . ' / ' . $this->_memory_limit . "\n\n";
 		}
 	}
 
@@ -1624,4 +1630,13 @@ function ERP_formatbytes( $p_bytes )
 
 		return( round( $t_bytes, 2 ) . $t_units[ $i ] );
 	}
+
+	# --------------------
+	# Returns the current timestamp
+	function ERP_get_timestamp()
+	{
+		$t_time = explode( ' ', microtime() );
+		return( $t_time[1] + $t_time[0] );
+	}
+
 ?>

doc/CHANGELOG.txt

@@ -4,6 +4,8 @@ Jun 2016 - EmailReporting-0.9.2-DEV
 	- Modified the user option list to also check user accessible projects
 	- Show missing user id behind the error in the user option list
 	- user_is_realname_valid function does not exist in MantisBT 1.3.x
+	- Changed errors formatting
+	- Added current mailbox runtime in seconds to debug mode when show memory usage is enabled
 
 May 2016 - EmailReporting-0.9.1
 	- Modified error message incase no valid reporter could be found