Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -r2995 -r3031
--- trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2995)
+++ trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 3031)
@@ -68,6 +68,11 @@
function OnEmailEvent(&$event){
$email_event = $event->getEventParam('EmailEventName');
+ if( strpos($email_event, '_') !== false )
+ {
+ trigger_error('Invalid email event name '.$email_event.'. Use only UPPERCASE characters and dots as email event names', E_USER_ERROR);
+ }
+
$to_user_id = $event->getEventParam('EmailEventToUserId');
$email_event_type = $event->getEventParam('EmailEventType');
@@ -87,7 +92,7 @@
$direct_send_params = $event->getEventParam('DirectSendParams');
if ($enabled == 0) return; // disabled event
- if ($enabled == 2 && defined("ADMIN")) return; // event only for front-end
+ if ($enabled == 2 && $this->Application->IsAdmin() ) return; // event only for front-end
if ($type == 1){
// For type "Admin" recipient is a user from field FromUserId which means From/To user in Email events list