Index: branches/5.3.x/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -N -r15677 -r15938
--- branches/5.3.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 15677)
+++ branches/5.3.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 15938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_logs_config.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: email_logs_config.php 15938 2013-08-14 09:33:06Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -65,9 +65,16 @@
 
 	'ListSQLs' => Array (
 		'' => '	SELECT %1$s.* %2$s
-				FROM %1$s',
+				FROM %1$s
+				LEFT JOIN ' . TABLE_PREFIX . 'Users to_user ON %1$s.ToUserId = to_user.PortalUserId',
 	),
 
+	'CalculatedFields' => Array (
+		'' => Array (
+			'ToUser' => 'IF (ISNULL(to_user.Username), IF (%1$s.ToUserId = ' . USER_ROOT . ', "root", IF (%1$s.ToUserId = ' . USER_GUEST . ', "Guest", "n/a")), IF(to_user.Username = "", to_user.Email, to_user.Username))',
+		),
+	),
+
 	'ListSortings' => Array (
 		'' => Array (
 			'Sorting' => Array ('SentOn' => 'desc'),
@@ -91,19 +98,36 @@
 		),
 		'EventParams' => Array ('type' => 'string', 'default' => NULL),
 		'AccessKey' => Array ('type' => 'string', 'max_len' => 20, 'not_null' => 1, 'default' => ''),
+		'ToUserId' => Array('type' => 'int', 'default' => NULL),
+		'ItemPrefix' => Array(
+			'type' => 'string', 'max_len' => 50,
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => 'SELECT DISTINCT %s FROM ' . TABLE_PREFIX . 'EmailLog ORDER BY Phrase',
+			'option_key_field' => 'ItemPrefix', 'option_title_field' => 'CONCAT("la_prefix_", ItemPrefix) AS Phrase',
+			'use_phrases' => 1,
+			'not_null' => 1, 'default' => ''
+		),
+		'ItemId' => Array('type' => 'int', 'default' => NULL),
 	),
 
+	'VirtualFields' => array(
+		'ToUser' => array('type' => 'string', 'default' => ''),
+	),
+
 	'Grids' => Array (
 		'Default' => Array (
 			'Fields' => Array (
 				'EmailLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 80),
 				'From' => Array ('title' => 'column:la_fld_Sender', 'filter_block' => 'grid_like_filter', 'width' => 200),
 				'To' => Array ('title' => 'column:la_fld_Recipient', 'filter_block' => 'grid_like_filter', 'width' => 200),
+				'ToUser' => Array ('title' => 'column:la_fld_RecipientUser', 'filter_block' => 'grid_like_filter', 'width' => 120),
 				'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
 				'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 170),
 				'EventType' => Array ('title' => 'column:la_fld_Type', 'filter_block' => 'grid_options_filter', 'width' => 60),
 				'SentOn' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
 //				'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter'),
+				'ItemPrefix' => Array('filter_block' => 'grid_options_filter'),
+				'ItemId' => Array('filter_block' => 'grid_range_filter', 'width' => 80),
 			),
 		),
 	),