Index: trunk/core/units/visits/visits_config.php
===================================================================
diff -u -N -r2385 -r2388
--- trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2385)
+++ trunk/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 2388)
@@ -5,7 +5,7 @@
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'VisitsEventHandler','file'=>'visits_event_handler.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
+					'TagProcessorClass' =>	Array('class'=>'VisitsTagProcessor','file'=>'visits_tag_processor.php','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
 
 					'QueryString'		=>	Array(
@@ -17,20 +17,33 @@
 											
 					'IDField' 			=>	'VisitId',
 					'TableName'			=>	TABLE_PREFIX.'Visits',
-					
+					'TitlePresets'		=>	Array(
+												'default'	=>	Array(	),
+												'visits_list'	=>	Array(		'prefixes'				=>	Array('visits_List'),
+																				'format'				=>	"!la_title_Visits! (#visits_recordcount#)",
+																				),
+																),					
 					'CalculatedFields' => Array(
 								'' => Array (
 										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
+										'AffiliateUser'			=>	'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
+										'AffiliatePortalUserId'	=>	'af.PortalUserId'
 									),
 								),
 								
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
+															'),
 																		 
 					'ItemSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
 															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
+															'),
 					
 					'ListSortings'	=> 	Array( 
 																'' => Array(
@@ -43,16 +56,29 @@
 										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '0'),
 										'Referer' => Array('type' => 'string','not_null' => '1','default' => ''),
             							'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''),
-										'AffiliateId' => Array('type' => 'int','not_null' => '1','default' => '0'),
+										'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','options'=>Array(0=>'lu_none'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0),
 										'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => -2),
 										'OrderId' => Array('type' => 'int','not_null' => '1','default' => '0'),
 							    ),		
 							
 					'VirtualFields'	=> 	Array(
-												'Username'		=>	Array('type'=>'string'),
+												'UserName'		=>	Array('type'=>'string'),
+												'AffiliateUser' =>	Array('type'=>'string'),
+												'AffiliatePortalUserId' => Array('type'=>'int'),
 											),
 									
-					'Grids'	=> Array(),
+					'Grids'	=> Array(
+								'Default'		=>	Array(
+																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
+																	'Fields' => Array(
+																			'VisitId' => Array( 'title'=>'la_col_VisitId', 'data_block' => 'grid_checkbox_td_no_icon'),
+																			'VisitDate' => Array( 'title'=>'la_col_VisitDate' ),
+																			'IPAddress' => Array( 'title'=>'la_col_IPAddress' ),
+																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
+																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
+																		),
+														),					
+								),
 					
 	);