Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r14989 -r15012
--- branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 15012)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: email_events_event_handler.php 15012 2012-01-06 20:38:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -271,7 +271,7 @@
 
 					case EmailEvent::ADDRESS_TYPE_USER:
 						$sql = 'SELECT FirstName, LastName, Email, PortalUserId
-								FROM ' . TABLE_PREFIX . 'PortalUser
+								FROM ' . TABLE_PREFIX . 'Users
 								WHERE Username = ' . $this->Conn->qstr($address);
 						$user_info = $this->Conn->GetRow($sql);
 
@@ -356,7 +356,7 @@
 				$language_field = $event->getEventParam('EmailEventType') == EmailEvent::EVENT_TYPE_FRONTEND ? 'FrontLanguage' : 'AdminLanguage';
 
 				$sql = 'SELECT FirstName, LastName, Email, ' . $language_field . ' AS Language
-						FROM ' . TABLE_PREFIX . 'PortalUser
+						FROM ' . TABLE_PREFIX . 'Users
 						WHERE PortalUserId = ' . $to_user_id;
 				$user_info = $this->Conn->GetRow($sql);
 
@@ -433,7 +433,7 @@
 
 						case EmailEvent::ADDRESS_TYPE_USER:
 							$sql = 'SELECT FirstName, LastName, Email
-									FROM ' . TABLE_PREFIX . 'PortalUser
+									FROM ' . TABLE_PREFIX . 'Users
 									WHERE Username = ' . $this->Conn->qstr($address);
 							$user_info = $this->Conn->GetRow($sql);
 
@@ -450,9 +450,9 @@
 
 						case EmailEvent::ADDRESS_TYPE_GROUP:
 							$sql = 'SELECT u.FirstName, u.LastName, u.Email
-									FROM ' . TABLE_PREFIX . 'PortalGroup g
-									JOIN ' . TABLE_PREFIX . 'UserGroup ug ON ug.GroupId = g.GroupId
-									JOIN ' . TABLE_PREFIX . 'PortalUser u ON u.PortalUserId = ug.PortalUserId
+									FROM ' . TABLE_PREFIX . 'UserGroups g
+									JOIN ' . TABLE_PREFIX . 'UserGroupRelations ug ON ug.GroupId = g.GroupId
+									JOIN ' . TABLE_PREFIX . 'Users u ON u.PortalUserId = ug.PortalUserId
 									WHERE g.Name = ' . $this->Conn->qstr($address);
 							$users = $this->Conn->Query($sql);
 
@@ -1069,7 +1069,7 @@
 
 				case EmailEvent::ADDRESS_TYPE_USER:
 					$sql = 'SELECT PortalUserId
-							FROM ' . TABLE_PREFIX . 'PortalUser
+							FROM ' . TABLE_PREFIX . 'Users
 							WHERE Username = ' . $this->Conn->qstr($address);
 					if (!$this->Conn->GetOne($sql)) {
 						$object->SetError($field_prefix . 'Address', 'invalid_user');
@@ -1078,7 +1078,7 @@
 
 				case EmailEvent::ADDRESS_TYPE_GROUP:
 					$sql = 'SELECT GroupId
-							FROM ' . TABLE_PREFIX . 'PortalGroup
+							FROM ' . TABLE_PREFIX . 'UserGroups
 							WHERE Name = ' . $this->Conn->qstr($address);
 					if (!$this->Conn->GetOne($sql)) {
 						$object->SetError($field_prefix . 'Address', 'invalid_group');
@@ -1135,17 +1135,17 @@
 			switch ($address_type) {
 				case EmailEvent::ADDRESS_TYPE_EMAIL:
 					$field = 'Email';
-					$table_name = TABLE_PREFIX . 'PortalUser';
+					$table_name = TABLE_PREFIX . 'Users';
 					break;
 
 				case EmailEvent::ADDRESS_TYPE_USER:
 					$field = 'Username';
-					$table_name = TABLE_PREFIX . 'PortalUser';
+					$table_name = TABLE_PREFIX . 'Users';
 					break;
 
 				case EmailEvent::ADDRESS_TYPE_GROUP:
 					$field = 'Name';
-					$table_name = TABLE_PREFIX . 'PortalGroup';
+					$table_name = TABLE_PREFIX . 'UserGroups';
 					break;
 
 				default: