Index: branches/5.3.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php
===================================================================
diff -u -N -r15659 -r15677
--- branches/5.3.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php	(.../system_event_subscriptions_config.php)	(revision 15659)
+++ branches/5.3.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php	(.../system_event_subscriptions_config.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: system_event_subscriptions_config.php 15659 2013-01-02 17:25:37Z alex $
+* @version	$Id: system_event_subscriptions_config.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -71,16 +71,16 @@
 	'ListSQLs' => Array (
 		'' => '	SELECT %1$s.* %2$s
 				FROM %1$s
-				LEFT JOIN ' . TABLE_PREFIX . 'EmailEvents ee ON %1$s.EmailEventId = ee.EventId
+				LEFT JOIN ' . TABLE_PREFIX . 'EmailTemplates et ON %1$s.EmailTemplateId = et.TemplateId
 				LEFT JOIN ' . TABLE_PREFIX . 'Users u ON %1$s.UserId = u.PortalUserId
 				LEFT JOIN ' . TABLE_PREFIX . 'Categories c ON %1$s.CategoryId = c.CategoryId',
 	),
 
 	'CalculatedFields' => Array (
 		'' => Array (
-			'BindToSystemEvent' => 'ee.BindToSystemEvent',
-			'EmailEventName' => 'ee.Event',
-			'Username' => 'CASE %1$s.UserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), IF(%1$s.UserId IS NULL, "Guest", u.Username)) END',
+			'BindToSystemEvent' => 'et.BindToSystemEvent',
+			'EmailTemplateName' => 'et.TemplateName',
+			'Username' => 'CASE %1$s.UserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), IF(%1$s.UserId IS NULL, "Guest", IF(u.Username = "", u.Email, u.Username))) END',
 			'CategoryName' => 'c.l%2$s_Name',
 			'ItemName' => '%1$s.ItemId',
 			'ParentItemName' => '%1$s.ParentItemId',
@@ -95,13 +95,13 @@
 
 	'Fields' => Array (
 		'SubscriptionId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-		'EmailEventId' => Array (
+		'EmailTemplateId' => Array (
 			'type' => 'int',
-			'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'EmailEvents WHERE BindToSystemEvent <> "" ORDER BY Event ASC', 'option_key_field' => 'EventId', 'option_title_field' => 'BindToSystemEvent',
+			'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'EmailTemplates WHERE BindToSystemEvent <> "" ORDER BY TemplateName ASC', 'option_key_field' => 'TemplateId', 'option_title_field' => 'BindToSystemEvent',
 			'required' => 1, 'default' => NULL
 		),
 		'SubscriberEmail' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-		'UserId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL),
+		'UserId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
 		'CategoryId' => Array ('type' => 'int', 'default' => NULL),
 		'IncludeSublevels' => Array (
 			'type' => 'int',
@@ -115,16 +115,16 @@
 
 	'VirtualFields' => Array (
 		'Username' => Array ('type' => 'string', 'default' => ''),
-		'EmailEventName' => Array ('type' => 'string', 'default' => ''),
+		'EmailTemplateName' => Array ('type' => 'string', 'default' => ''),
 		'CategoryName' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => ''),
 	),
 
 	'Grids' => Array (
 		'Default' => Array (
 			'Fields' => Array (
 				'SubscriptionId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80),
-				'EmailEventId' => Array ('title' => 'column:la_fld_SystemEvent', 'filter_block' => 'grid_options_filter', 'width' => 170),
-				'EmailEventName' => Array ('title' => 'column:la_fld_EmailEvent', 'filter_block' => 'grid_like_filter', 'width' => 170),
+				'EmailTemplateId' => Array ('title' => 'column:la_fld_SystemEvent', 'filter_block' => 'grid_options_filter', 'width' => 170),
+				'EmailTemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 170),
 				'SubscriberEmail' => Array ('title' => 'column:la_fld_Email', 'filter_block' => 'grid_like_filter'),
 				'UserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_range_filter', 'width' => 80),
 				'Username' => Array ('filter_block' => 'grid_like_filter'),