Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php
===================================================================
diff -u -r7083 -r7287
--- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7083)
+++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7287)
@@ -2136,26 +2136,54 @@
 		return $current_prefix;
 	}
 
+	/**
+	 * Triggers email event of type Admin
+	 *
+	 * @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
+	 */
 	function &EmailEventAdmin($email_event_name, $to_user_id = -1, $send_params = false)
 	{
 		return $this->EmailEvent($email_event_name, 1, $to_user_id, $send_params);
 	}
 
+	/**
+	 * Triggers email event of type User
+	 *
+	 * @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
+	 */
 	function &EmailEventUser($email_event_name, $to_user_id = -1, $send_params = false)
 	{
 		return $this->EmailEvent($email_event_name, 0, $to_user_id, $send_params);
 	}
 
+	/**
+	 * Triggers general email event
+	 *
+	 * @param string $email_event_name
+	 * @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
+	 */
 	function &EmailEvent($email_event_name, $email_event_type, $to_user_id = -1, $send_params = false)
 	{
-		$event = new kEvent('emailevents:OnEmailEvent');
-		$event->setEventParam('EmailEventName', $email_event_name);
-		$event->setEventParam('EmailEventToUserId', $to_user_id);
-		$event->setEventParam('EmailEventType', $email_event_type);
-		if ($send_params){
-			$event->setEventParam('DirectSendParams', $send_params);
+		$params = array(
+			'EmailEventName' => $email_event_name,
+			'EmailEventToUserId' => $to_user_id,
+			'EmailEventType' => $email_event_type,
+		);
+		if ($send_params) {
+			$params['DirectSendParams'] = $send_params;
 		}
-		$this->HandleEvent($event);
+		$event_str = isset($send_params['use_special']) ? 'emailevents.'.$send_params['use_special'].':OnEmailEvent' : 'emailevents:OnEmailEvent';
+		$this->HandleEvent($event, $event_str, $params);
 
 		return $event;
 	}