Index: branches/5.3.x/units/listings/listings_event_handler.php
===================================================================
diff -u -N -r15486 -r15672
--- branches/5.3.x/units/listings/listings_event_handler.php	(.../listings_event_handler.php)	(revision 15486)
+++ branches/5.3.x/units/listings/listings_event_handler.php	(.../listings_event_handler.php)	(revision 15672)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_event_handler.php 15214 2012-03-15 09:32:52Z alex $
+* @version	$Id: listings_event_handler.php 15672 2013-01-17 11:49:55Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -141,8 +141,8 @@
 					WHERE ResourceId = ' . $object->GetDBField('ItemResourceId');
 			$user_id = $this->Conn->GetOne($sql);
 
-			$this->Application->EmailEventUser($email_event, $user_id);
-			$this->Application->EmailEventAdmin($email_event);
+			$this->Application->emailUser($email_event, $user_id);
+			$this->Application->emailAdmin($email_event);
 		}
 
 		if ( $type_modified || $link_modified ) {
@@ -414,8 +414,8 @@
 
 					$sql = 'SELECT CreatedById FROM '.$this->Application->getUnitOption('l', 'TableName').'
 							WHERE ResourceId = '.$object->GetDBField('ItemResourceId');
-					$this->Application->EmailEventUser('LINK.ENHANCE', $this->Conn->GetOne($sql));
-					$this->Application->EmailEventAdmin('LINK.ENHANCE');
+					$this->Application->emailUser('LINK.ENHANCE', $this->Conn->GetOne($sql));
+					$this->Application->emailAdmin('LINK.ENHANCE');
 					break;
 			}
 
@@ -569,8 +569,8 @@
 					$sql = 'SELECT CreatedById
 							FROM ' . $this->Application->getUnitOption('l', 'TableName') . '
 							WHERE ResourceId = ' . $object->GetDBField('ItemResourceId');
-					$this->Application->EmailEventUser('LINK.ENHANCE.DENY', $this->Conn->GetOne($sql));
-					$this->Application->EmailEventAdmin('LINK.ENHANCE.DENY');
+					$this->Application->emailUser('LINK.ENHANCE.DENY', $this->Conn->GetOne($sql));
+					$this->Application->emailAdmin('LINK.ENHANCE.DENY');
 				}
 			}
 		}
@@ -611,8 +611,8 @@
 					if ( $object->Update() ) {
 						$event->status = kEvent::erSUCCESS;
 						$event->SetRedirectParam('opener', 's');
-						$this->Application->EmailEventUser('LINK.ENHANCE.RENEW', $owner_id);
-						$this->Application->EmailEventAdmin('LINK.ENHANCE.RENEW');
+						$this->Application->emailUser('LINK.ENHANCE.RENEW', $owner_id);
+						$this->Application->emailAdmin('LINK.ENHANCE.RENEW');
 					}
 					else {
 						$event->status = kEvent::erFAIL;
@@ -621,8 +621,8 @@
 					}
 				}
 				else {
-					$this->Application->EmailEventUser('LINK.ENHANCE.APPROVE', $owner_id);
-					$this->Application->EmailEventAdmin('LINK.ENHANCE.APPROVE');
+					$this->Application->emailUser('LINK.ENHANCE.APPROVE', $owner_id);
+					$this->Application->emailAdmin('LINK.ENHANCE.APPROVE');
 				}
 			}
 		}
@@ -688,8 +688,8 @@
 
 		$sql = 'SELECT CreatedById FROM '.$this->Application->getUnitOption('l', 'TableName').'
 				WHERE ResourceId = '.$object->GetDBField('ItemResourceId');
-		$this->Application->EmailEventUser('LINK.ENHANCE.EXTEND', $this->Conn->GetOne($sql));
-		$this->Application->EmailEventAdmin('LINK.ENHANCE.EXTEND');
+		$this->Application->emailUser('LINK.ENHANCE.EXTEND', $this->Conn->GetOne($sql));
+		$this->Application->emailAdmin('LINK.ENHANCE.EXTEND');
 	}
 
 	/**
@@ -715,8 +715,8 @@
 
 		$sql = 'SELECT CreatedById FROM ' . $this->Application->getUnitOption('l', 'TableName') . '
 				WHERE ResourceId = ' . $object->GetDBField('ItemResourceId');
-		$this->Application->EmailEventUser('LINK.ENHANCE.CANCEL', $this->Conn->GetOne($sql));
-		$this->Application->EmailEventAdmin('LINK.ENHANCE.CANCEL');
+		$this->Application->emailUser('LINK.ENHANCE.CANCEL', $this->Conn->GetOne($sql));
+		$this->Application->emailAdmin('LINK.ENHANCE.CANCEL');
 
 		$object->Delete();
 		$event->redirect = $this->Application->GetVar('success_template');
@@ -747,8 +747,8 @@
 
 				$sql = 'SELECT CreatedById FROM '.$this->Application->getUnitOption('l', 'TableName').'
 						WHERE ResourceId = '.$object->GetDBField('ItemResourceId');
-				$this->Application->EmailEventUser('LINK.ENHANCE.EXPIRE', $this->Conn->GetOne($sql));
-				$this->Application->EmailEventAdmin('LINK.ENHANCE.EXPIRE');
+				$this->Application->emailUser('LINK.ENHANCE.EXPIRE', $this->Conn->GetOne($sql));
+				$this->Application->emailAdmin('LINK.ENHANCE.EXPIRE');
 			}
 		}
 
@@ -766,8 +766,8 @@
 			$listing_ids = Array();
 			foreach($res as $record)
 			{
-				$this->Application->EmailEventUser('LINK.ENHANCE.RENEWAL.NOTICE', $record['CreatedById']);
-				$this->Application->EmailEventAdmin('LINK.ENHANCE.RENEWAL.NOTICE');
+				$this->Application->emailUser('LINK.ENHANCE.RENEWAL.NOTICE', $record['CreatedById']);
+				$this->Application->emailAdmin('LINK.ENHANCE.RENEWAL.NOTICE');
 				$listing_ids[] = $record['ListingId'];
 			}
 			$sql = 'UPDATE '.$this->Application->getUnitOption($event->Prefix, 'TableName').'