Index: trunk/kernel/units/email_messages/email_messages_event_handler.php
===================================================================
diff -u -N -r1718 -r6583
--- trunk/kernel/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 1718)
+++ trunk/kernel/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 6583)
@@ -1,8 +1,8 @@
 <?php
 
-	class EmailMessagesEventHandler extends InpDBEventHandler 
+	class EmailMessagesEventHandler extends InpDBEventHandler
 	{
-	
+
 		/**
 		 * Replace id passed with id of email message
 		 *
@@ -12,11 +12,11 @@
 		{
 			$email_event_id = (int)$this->getEmailEventId();
 			$object =& $event->getObject();
-			
+
 			$parent_info = $object->getLinkedInfo();
-			
+
 			$sql = 'SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE ('.$parent_info['ForeignKey'].' = '.$parent_info['ParentId'].') AND (EventId = '.$email_event_id.')';
-			
+
 			$id = (int)$this->Conn->GetOne($sql);
 			if(!$id)
 			{
@@ -25,12 +25,12 @@
 			}
 			return $id;
 		}
-		
+
 		function getEmailEventId()
 		{
 			return parent::getPassedID( new kEvent('emailevents:OnDummy') );
 		}
-		
+
 		/**
 		 * If loading empty item, then set parent id
 		 *
@@ -44,8 +44,7 @@
 				$event->status = erFATAL;
 			}
 		}
-		
-		
+
 		/**
 		 * Parse message template (split into header, subject & body)
 		 *
@@ -54,15 +53,15 @@
 		function OnAfterItemLoad(&$event)
 		{
 			$object =& $event->getObject();
-			
+
 			$lines = explode("\n", $object->GetDBField('Template') );
-			
+
 			$headers = Array();
-			
+
 			foreach($lines as $line)
 			{
 				if( strlen(trim($line)) == 0 || ($line == '.') ) break;
-				
+
 				$parts = explode(':', $line, 2);
 				if(strtolower($parts[0]) == 'subject')
 				{
@@ -74,15 +73,15 @@
 				}
 			}
 			$object->SetDBField('Headers', implode("\n", $headers) );
-			
+
 			$message_body = '';
 			while( (list($line_id,$line) = each($lines)) )
 			{
 				$message_body .= $line;
 			}
 			$object->SetDBField('Body', $message_body);
 		}
-		
+
 		/**
 		 * Merge body+subject+headers into message template
 		 *
@@ -92,7 +91,7 @@
 		{
 			$this->parseVirtualFields($event);
 		}
-		
+
 		/**
 		 * Merge body+subject+headers into message template
 		 *
@@ -102,7 +101,7 @@
 		{
 			$this->parseVirtualFields($event);
 		}
-		
+
 		/**
 		 * Merge body+subject+headers into message template
 		 *
@@ -122,7 +121,7 @@
 				$object->SetDBField('Template', $ret);
 			}
 		}
-		
+
 		/**
 		 * Remove trailing CR/LF chars from string
 		 *