Index: branches/5.0.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -r12196 -r12244
--- branches/5.0.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 12196)
+++ branches/5.0.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 12244)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 12196 2009-08-05 10:25:32Z alex $
+* @version	$Id: email_events_event_handler.php 12244 2009-08-09 12:27:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -87,9 +87,11 @@
 
 			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$sql = 'UPDATE '.$table_name.'
-					SET Enabled = 2
+					SET FrontEndOnly = 1
 					WHERE EventId IN ('.$ids.')';
 			$this->Conn->Query($sql);
+
+			$this->clearSelectedIDs($event);
 		}
 
 		/**
@@ -99,6 +101,11 @@
 		 */
 		function OnSelectUser(&$event)
 		{
+			if ($event->Special != 'module') {
+				parent::OnSelectUser($event);
+				return ;
+			}
+
 			$items_info = $this->Application->GetVar('u');
 			if ($items_info) {
 				$user_id = array_shift( array_keys($items_info) );
@@ -152,11 +159,11 @@
 				return false;
 			}
 
-			$enabled = $email_event->GetDBField('Enabled');
-			if ($enabled == EVENT_STATUS_DISABLED) {
+			if ($email_event->GetDBField('Enabled') == STATUS_DISABLED) {
 				return false;
 			}
-			if ($enabled == EVENT_STATUS_FRONTEND && $this->Application->IsAdmin()) {
+
+			if ($email_event->GetDBField('FrontEndOnly') && $this->Application->IsAdmin()) {
 				return false;
 			}
 
@@ -190,7 +197,7 @@
 			/* @var $user UsersItem */
 
 			$email = $name = '';
-			$result = $user_id > 0 ? $user->Load($user_id) : $user->Clear();
+			$result = $user_id > 0 ? $user->Load( (int)$user_id ) : $user->Clear();
 			if ($user->IsLoaded()) {
 				 $email = $user->GetDBField('Email');
 				 $name = trim($user->GetDBField('FirstName').' '.$user->GetDBField('LastName'));