Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15591 -r15605
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15591)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15605)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15591 2012-10-19 12:28:14Z alex $
+* @version	$Id: orders_event_handler.php 15605 2012-11-06 17:14:27Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -487,8 +487,8 @@
 				$this->PrepareCoupons($event, $order);
 			}
 
-			$this->Application->EmailEventUser('ORDER.SUBMIT', null, $this->OrderEmailParams($order));
-			$this->Application->EmailEventAdmin('ORDER.SUBMIT');
+			$this->Application->emailUser('ORDER.SUBMIT', null, $this->OrderEmailParams($order));
+			$this->Application->emailAdmin('ORDER.SUBMIT');
 		}
 
 		if ($shipping_control === false || $shipping_control == SHIPPING_CONTROL_PREAUTH ) {
@@ -2116,7 +2116,7 @@
 					$this->SplitOrder($event, $object);
 
 					if ( $object->GetDBField('IsRecurringBilling') != 1 ) {
-						$this->Application->EmailEventUser('ORDER.APPROVE', null, $email_params);
+						$this->Application->emailUser('ORDER.APPROVE', null, $email_params);
 
 						// Mask credit card with XXXX
 						if ( $this->Application->ConfigValue('Comm_MaskProcessedCreditCards') ) {
@@ -2139,7 +2139,7 @@
 				}
 
 				if ( ($original_order_status != ORDER_STATUS_INCOMPLETE) && ($event->Name == 'OnMassOrderDeny' || $event->Name == 'OnOrderDeny') ) {
-					$this->Application->EmailEventUser('ORDER.DENY', null, $email_params);
+					$this->Application->emailUser('ORDER.DENY', null, $email_params);
 
 					// inform payment gateway that order was declined
 					$gw_data = $object->getGatewayData();
@@ -2194,7 +2194,7 @@
 
 					$shipping_email = $object->GetDBField('ShippingEmail');
 					$email_params['to_email'] = $shipping_email ? $shipping_email : $email_params['_user_email'];
-					$this->Application->EmailEventUser('ORDER.SHIP', null, $email_params);
+					$this->Application->emailUser('ORDER.SHIP', null, $email_params);
 
 					// inform payment gateway that order was shipped
 					$gw_data = $object->getGatewayData();
@@ -2222,7 +2222,7 @@
 						$set_new_status = true;
 					}
 
-					$this->Application->EmailEventUser('BACKORDER.PROCESS', null, $email_params);
+					$this->Application->emailUser('BACKORDER.PROCESS', null, $email_params);
 				}
 				else {
 					$event->status = kEvent::erFAIL;
@@ -2885,8 +2885,8 @@
 				$sub_order->SetDBField('Status', ORDER_STATUS_BACKORDERS);
 
 				if ($event->Special != 'recurring') { // just in case if admin uses tangible backordered products in recurring orders
-					$this->Application->EmailEventUser('BACKORDER.ADD', null, $this->OrderEmailParams($sub_order));
-		    		$this->Application->EmailEventAdmin('BACKORDER.ADD');
+					$this->Application->emailUser('BACKORDER.ADD', null, $this->OrderEmailParams($sub_order));
+		    		$this->Application->emailAdmin('BACKORDER.ADD');
 				}
 			}
 			else {
@@ -3524,15 +3524,15 @@
 
 				if ($complete_event->status == kEvent::erSUCCESS) {
 					//send recurring ok email
-					$this->Application->EmailEventUser('ORDER.RECURRING.PROCESSED', null, $this->OrderEmailParams($order));
-					$this->Application->EmailEventAdmin('ORDER.RECURRING.PROCESSED');
+					$this->Application->emailUser('ORDER.RECURRING.PROCESSED', null, $this->OrderEmailParams($order));
+					$this->Application->emailAdmin('ORDER.RECURRING.PROCESSED');
 				}
 				else {
 					//send Recurring failed event
 					$order->SetDBField('Status', ORDER_STATUS_DENIED);
 					$order->Update();
-					$this->Application->EmailEventUser('ORDER.RECURRING.DENIED', null, $this->OrderEmailParams($order));
-					$this->Application->EmailEventAdmin('ORDER.RECURRING.DENIED');
+					$this->Application->emailUser('ORDER.RECURRING.DENIED', null, $this->OrderEmailParams($order));
+					$this->Application->emailAdmin('ORDER.RECURRING.DENIED');
 				}
 			}