Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -r13613 -r13635
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13613)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13635)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 13613 2010-05-24 18:56:24Z alex $
+* @version	$Id: application.php 13635 2010-05-25 09:31:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2847,11 +2847,12 @@
 	 * @param string $email_event_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
-	 * @return unknown
+	 * @return kEvent
 	 */
-	function &EmailEventAdmin($email_event_name, $to_user_id = null, $send_params = false)
+	function &EmailEventAdmin($email_event_name, $to_user_id = null, $send_params = Array ())
 	{
-		$event =& $this->EmailEvent($email_event_name, 1, $to_user_id, $send_params);
+		$event =& $this->EmailEvent($email_event_name, EVENT_TYPE_ADMIN, $to_user_id, $send_params);
+
 		return $event;
 	}
 
@@ -2861,35 +2862,41 @@
 	 * @param string $email_event_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
-	 * @return unknown
+	 * @return kEvent
 	 */
-	function &EmailEventUser($email_event_name, $to_user_id = null, $send_params = false)
+	function &EmailEventUser($email_event_name, $to_user_id = null, $send_params = Array ())
 	{
-		$event =& $this->EmailEvent($email_event_name, 0, $to_user_id, $send_params);
+		$event =& $this->EmailEvent($email_event_name, EVENT_TYPE_FRONTEND, $to_user_id, $send_params);
+
 		return $event;
 	}
 
 	/**
 	 * Triggers general email event
 	 *
 	 * @param string $email_event_name
-	 * @param int $email_event_type ( 0 for User, 1 for Admin)
+	 * @param int $email_event_type (0 for User, 1 for Admin)
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params,
 	 *  possible keys: to_email, to_name, from_email, from_name, message, message_text
-	 * @return unknown
+	 * @return kEvent
 	 */
-	function &EmailEvent($email_event_name, $email_event_type, $to_user_id = -1, $send_params = false)
+	function &EmailEvent($email_event_name, $email_event_type, $to_user_id = null, $send_params = Array ())
 	{
-		$params = array(
+		$params = Array (
 			'EmailEventName' => $email_event_name,
 			'EmailEventToUserId' => $to_user_id,
 			'EmailEventType' => $email_event_type,
+			'DirectSendParams' => $send_params,
 		);
-		if ($send_params) {
-			$params['DirectSendParams'] = $send_params;
+
+		if (array_key_exists('use_special', $send_params)) {
+			$event_str = 'emailevents.' . $send_params['use_special'] . ':OnEmailEvent';
 		}
-		$event_str = isset($send_params['use_special']) ? 'emailevents.'.$send_params['use_special'].':OnEmailEvent' : 'emailevents:OnEmailEvent';
+		else {
+			$event_str = 'emailevents:OnEmailEvent';
+		}
+
 		$this->HandleEvent($event, $event_str, $params);
 
 		return $event;