Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14989 -r15012
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 15012)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: users_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
@@ -110,7 +110,7 @@
 				if ( $group_id !== false ) {
 					// show only users, that user doesn't belong to current group
 					$sql = 'SELECT PortalUserId
-							FROM ' . $this->Application->GetTempName(TABLE_PREFIX . 'UserGroup', 'prefix:g') . '
+							FROM ' . $this->Application->GetTempName(TABLE_PREFIX . 'UserGroupRelations', 'prefix:g') . '
 							WHERE GroupId = ' . (int)$group_id;
 					$user_ids = $this->Conn->GetCol($sql);
 
@@ -203,7 +203,7 @@
 		 */
 		function OnSessionExpire(&$event)
 		{
-			$this->Application->resetCounters('UserSession');
+			$this->Application->resetCounters('UserSessions');
 
 			// place 2 of 2 (also in kHTTPQuery::getRedirectParams)
 			$admin_url_params = Array (
@@ -551,7 +551,7 @@
 				if ($group_id) {
 					// check, that group is allowed for Front-End
 					$sql = 'SELECT GroupId
-							FROM ' . TABLE_PREFIX . 'PortalGroup
+							FROM ' . TABLE_PREFIX . 'UserGroups
 							WHERE GroupId = ' . (int)$group_id . ' AND FrontRegistration = 1';
 					$group_id = $this->Conn->GetOne($sql);
 				}
@@ -576,7 +576,7 @@
 			$primary_group_id = $object->GetDBField('PrimaryGroupId');
 
 			if ($primary_group_id) {
-				$ug_table = TABLE_PREFIX . 'UserGroup';
+				$ug_table = TABLE_PREFIX . 'UserGroupRelations';
 
 				if ( $object->IsTempTable() ) {
 					$ug_table = $this->Application->GetTempName($ug_table, 'prefix:' . $event->Prefix);
@@ -787,7 +787,7 @@
 					'GroupId' => $this->Application->ConfigValue('User_SubscriberGroup'),
 				);
 
-				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroup');
+				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations');
 			}
 
 			$this->Application->EmailEventAdmin('USER.SUBSCRIBE');
@@ -803,7 +803,7 @@
 		{
 			$group_id = $this->Application->ConfigValue('User_SubscriberGroup');
 
-			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserGroup
+			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserGroupRelations
 					WHERE PortalUserId = ' . $user_id . ' AND GroupId = ' . $group_id;
 			$this->Conn->Query($sql);
 
@@ -1013,7 +1013,7 @@
 			// send pre-expiration reminders: begin
 			$pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24;
 			$sql = 'SELECT PortalUserId, GroupId
-					FROM '.TABLE_PREFIX.'UserGroup
+					FROM '.TABLE_PREFIX.'UserGroupRelations
 					WHERE (MembershipExpires IS NOT NULL) AND (ExpirationReminderSent = 0) AND (MembershipExpires < '.$pre_expiration.')';
 
 			$skip_clause = $event->getEventParam('skip_clause');
@@ -1029,7 +1029,7 @@
 					$this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE');
 					$conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')';
 				}
-				$sql = 'UPDATE '.TABLE_PREFIX.'UserGroup
+				$sql = 'UPDATE '.TABLE_PREFIX.'UserGroupRelations
 						SET ExpirationReminderSent = 1
 						WHERE '.implode(' OR ', $conditions);
 				$this->Conn->Query($sql);
@@ -1038,7 +1038,7 @@
 
 			// remove users from groups with expired membership: begin
 			$sql = 'SELECT PortalUserId
-					FROM '.TABLE_PREFIX.'UserGroup
+					FROM '.TABLE_PREFIX.'UserGroupRelations
 					WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.adodb_mktime().')';
 			$user_ids = $this->Conn->GetCol($sql);
 			if ($user_ids) {
@@ -1047,7 +1047,7 @@
 					$this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRED');
 				}
 			}
-			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroup
+			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations
 					WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.adodb_mktime().')';
 			$this->Conn->Query($sql);
 			// remove users from groups with expired membership: end
@@ -1251,7 +1251,7 @@
 			}
 
 			if ( $ids ) {
-				$q = 'DELETE FROM ' . TABLE_PREFIX . 'PersistantSessionData WHERE PortalUserId IN (' . join(',', $ids) . ') AND
+				$q = 'DELETE FROM ' . TABLE_PREFIX . 'UserPersistentSessionData WHERE PortalUserId IN (' . join(',', $ids) . ') AND
 							 (VariableName LIKE "%_columns_%"
 							 OR
 							 VariableName LIKE "%_filter%"
@@ -1440,7 +1440,7 @@
 			// deletes sessions from users, that are no longer active
 			if (($prev_status != $new_status) && ($new_status != STATUS_ACTIVE)) {
 				$sql = 'SELECT SessionKey
-						FROM ' . TABLE_PREFIX . 'UserSession
+						FROM ' . TABLE_PREFIX . 'UserSessions
 						WHERE PortalUserId = ' . $user_id;
 				$session_ids = $this->Conn->GetCol($sql);
 
@@ -1652,7 +1652,7 @@
 			$table_name = $this->Application->getUnitOption('ug', 'TableName');
 
 			// 1. mark group as primary
-			$sql = 'UPDATE ' . TABLE_PREFIX . 'PortalUser
+			$sql = 'UPDATE ' . TABLE_PREFIX . 'Users
 					SET PrimaryGroupId = ' . $primary_group_id . '
 					WHERE PortalUserId IN (' . implode(',', $user_ids) . ')';
 			$this->Conn->Query($sql);