Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -r2136 -r2444
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2136)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2444)
@@ -2,7 +2,7 @@
 
 	class EmailEventsEventsHandler extends InpDBEventHandler
 	{
-		
+
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
@@ -29,17 +29,17 @@
 			$this->StoreSelectedIDs($event);
 			$ids = $this->getSelectedIDs($event);
 			$ids = implode(',', $ids);
-			
+
 			$table = $this->Application->getUnitOption($event->Prefix,'TableName');
 			$sql = 'UPDATE '.$table.' SET Enabled = 2 WHERE EventId IN ('.$ids.')';
-			$this->Conn->Query($sql);			
+			$this->Conn->Query($sql);
 		}
-		
+
 		/**
-		 * Sets selected user to email events selected 
+		 * Sets selected user to email events selected
 		 *
 		 * @param kEvent $event
-		 */		
+		 */
 		function OnSelectUser(&$event)
 		{
 			$user_name = $this->Application->GetVar( $event->getPrefixSpecial(true).'_PopupSelectedUser' );
@@ -48,42 +48,42 @@
 				$this->StoreSelectedIDs($event);
 				$ids = $this->getSelectedIDs($event);
 				$ids = implode(',', $ids);
-				
+
 				$user_id = $this->Conn->GetOne('SELECT PortalUserId FROM '.TABLE_PREFIX.'PortalUser WHERE Login = '.$this->Conn->qstr($user_name) );
-				
+
 				$table = $this->Application->getUnitOption($event->Prefix,'TableName');
 				$sql = 'UPDATE '.$table.' SET FromUserId = '.$user_id.' WHERE EventId IN ('.$ids.')';
-				
-				$this->Conn->Query($sql);				
+
+				$this->Conn->Query($sql);
 			}
 		}
-		
+
 		/**
 		 * Raised when email message shoul be sent
 		 *
 		 * @param kEvent $event
-		 */		
+		 */
 		function OnEmailEvent(&$event){
-		
+
 			$email_event = $event->getEventParam('EmailEventName');
 			$to_user_id = $event->getEventParam('EmailEventToUserId');
 			$email_event_type = $event->getEventParam('EmailEventType');
-			
+
 			$this->Application->setUnitOption('emailmessages', 'AutoLoad', false);
 			$message_object = &$this->Application->recallObject('emailmessages');
-			
+
 			$event_table = $this->Application->getUnitOption('emailevents', 'TableName');
-			
+
 			$event_object = &$event->getObject();
 			$event_object->Load(array('Event'=>$email_event, 'Type'=>$email_event_type));
 
 			$event_id 		= $event_object->GetDBField('EventId');
 			$from_user_id	= $event_object->GetDBField('FromUserId');
 			$type 			= $event_object->GetDBField('Type');
 			$enabled		= $event_object->GetDBField('Enabled');
-			
+
 			$direct_send_params = $event->getEventParam('DirectSendParams');
-			
+
 			if ($enabled == 0) return;						// disabled event
 			if ($enabled == 2 && defined("ADMIN")) return;	// event only for front-end
 
@@ -104,17 +104,17 @@
 			$message_template	= $message_object->GetDBField('Template');
 
 			$email_object = &$this->Application->recallObject('kEmailMessage');
-			$email_object->Compiled = false;
-		
+			$email_object->Clear();
+
 			$old_autoload = $this->Application->getUnitOption('u', 'AutoLoad');
 			$this->Application->setUnitOption('u', 'AutoLoad', false);
-			
+
 			$from_user_object = &$this->Application->recallObject('u.-item');
 			$from_user_object->Load($from_user_id);
 			// here if we don't have from_user loaded, it takes a default user from config values
 			$from_user_email = $from_user_object->GetDBField('Email')?$from_user_object->GetDBField('Email'):$this->Application->ConfigValue('Smtp_AdminMailFrom');
 			$from_user_name = trim($from_user_object->GetDBField('FirstName').' '.$from_user_object->GetDBField('LastName'));
-			
+
 			$to_user_object = &$this->Application->recallObject('u.-item');
 			$to_user_object->Load($to_user_id);
 			$to_user_email = $to_user_object->GetDBField('Email');
@@ -131,8 +131,8 @@
 			}
 
 			$to_user_email = $to_user_email?$to_user_email:$this->Application->ConfigValue('Smtp_AdminMailFrom');
-			
-			
+
+
 			$this->Application->makeClass('Template');
 			$this->Application->InitParser();
 			$parser_params = $this->Application->Parser->Params;
@@ -141,31 +141,31 @@
 			$message_template = str_replace('<inp:touser _Field', '<inp2:u_Field name', $message_template);
 			$message_template = $this->Application->Parser->Parse($message_template, 'email_template', 0);
 			$this->Application->Parser->Params = $parser_params;
-			
-			$message_template 	= str_replace("\r", "", $message_template);			
-			
-			list($message_headers, $message_body) = explode("\n\n", $message_template, 2);			
-			
-			
+
+			$message_template 	= str_replace("\r", "", $message_template);
+
+			list($message_headers, $message_body) = explode("\n\n", $message_template, 2);
+
+
 			$email_object->setFrom($from_user_email, $from_user_name);
 			$email_object->setTo($to_user_email, $to_user_name);
 			$email_object->setSubject('Mail message');
-			
-			
+
+
 			$email_object->setHeaders($message_headers);
-			
+
 			if ($message_type == 'html'){
 				$email_object->setHTMLBody($message_body);
 			}
 			else {
 				$email_object->setTextBody($message_body);
 			}
-			
+
 			$smtp_object = &$this->Application->recallObject('kSmtpClient');
-			
+
 			$smtp_server = $this->Application->ConfigValue('Smtp_Server');
 			$smtp_port = $this->Application->ConfigValue('Smtp_Port');
-			
+
 			$smtp_authenticate = $this->Application->ConfigValue('Smtp_Authenticate');
 			if ($smtp_authenticate){
 				$smtp_user = $this->Application->ConfigValue('Smtp_User');
@@ -174,8 +174,8 @@
 				$smtp_user = '';
 				$smtp_pass = '';
 			}
-			
-		
+
+
 			if ($smtp_server){
 				if ($email_object->sendSMTP($smtp_object, $smtp_server, $smtp_user, $smtp_pass, $smtp_authenticate)){
 					$event->status=erSUCCESS;
@@ -189,10 +189,10 @@
 				}
 				else {
 					$event->status=erFAIL;
-				}				
+				}
 			}
-			
+
 			return $event;
-		}		
+		}
 	}
 ?>
\ No newline at end of file