Index: branches/5.2.x/core/units/user_groups/user_groups_config.php
===================================================================
diff -u -N -r15563 -r16388
--- branches/5.2.x/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 15563)
+++ branches/5.2.x/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 16388)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_groups_config.php 15563 2012-10-09 16:05:41Z alex $
+* @version	$Id: user_groups_config.php 16388 2016-08-11 08:16:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -14,124 +14,122 @@
 
 defined('FULL_PATH') or die('restricted access!');
 
-	$config =	Array(
-					'Prefix'	=> 'ug',
-					'Clones'	=> Array(
-											'g-ug'	=>	Array(
-																'ParentPrefix'		=>	'g',
-																'ForeignKey'		=>	'GroupId',
-																'ParentTableKey' 	=> 	'GroupId',
+$config = Array (
+	'Prefix' => 'ug',
+	'Clones' => Array (
+		'g-ug' => Array (
+			'ParentPrefix' => 'g',
+			'ForeignKey' => 'GroupId',
+			'ParentTableKey' => 'GroupId',
 
-																'IDField'			=>	'PortalUserId',
+			'IDField' => 'PortalUserId',
 
-																'ListSQLs'	=>	Array(
-																	''	=>	'	SELECT %1$s.* %2$s FROM %1$s
-																						LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId
-																						LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId'
-															),
-																'ItemSQLs'	=>	Array(
-																	''	=>	'	SELECT %1$s.* %2$s FROM %1$s
-																						LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId
-																						LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId'
-																),
-																'CalculatedFields'	=>	Array (
-																	''	=>	Array(
-																		'UserName' => 'CONCAT(u.LastName, \' \', u.FirstName)',
-																		'UserLogin' => 'IF(u.Username = "", u.Email, u.Username)',
-																		'PrimaryGroup' => 'IF(u.PrimaryGroupId = %1$s.GroupId, 1, 0)',
-																	),
-																),
-																'VirtualFields'	=> Array (
-																	'UserName' => Array('type' => 'string', 'default' => ''),
-																	'UserLogin' => Array('type' => 'string', 'default' => ''),
-																),
-																'Grids'	=> Array(
-																	'GroupUsers'	=>	Array(
-																		'Icons' => Array ('default' => 'icon16_item.png'),
-																		'Fields' => Array(
-																			'PortalUserId'			=> Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-																			'UserName'			=> Array ('title'=>'la_col_UserFirstLastName', 'width' => 200, ),
-																			'UserLogin'			=> Array ('title'=>'column:la_fld_Username', 'width' => 100, ),
-																			'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-																			'MembershipExpires'	=>	Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
-																		),
-																	),
-																),
-															),
+			'ListSQLs' => Array (
+				'' => '	SELECT %1$s.* %2$s FROM %1$s
+						LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId
+						LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId'
+			),
 
-											'u-ug'	=>	Array(
-																'ParentPrefix'		=>	'u',
-																'ForeignKey'		=>	'PortalUserId',
-																'ParentTableKey' 	=> 	'PortalUserId',
-															),
-									),
+			'CalculatedFields' => Array (
+				'' => Array (
+					'UserName' => 'CONCAT(u.LastName, \' \', u.FirstName)',
+					'UserLogin' => 'IF(u.Username = "", u.Email, u.Username)',
+					'PrimaryGroup' => 'IF(u.PrimaryGroupId = %1$s.GroupId, 1, 0)',
+				),
+			),
+			'VirtualFields' => Array (
+				'UserName' => Array ('type' => 'string', 'default' => ''),
+				'UserLogin' => Array ('type' => 'string', 'default' => ''),
+			),
+			'Grids' => Array (
+				'GroupUsers' => Array (
+					'Icons' => Array ('default' => 'icon16_item.png'),
+					'Fields' => Array (
+						'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+						'UserName' => Array ('title' => 'la_col_UserFirstLastName', 'width' => 200, ),
+						'UserLogin' => Array ('title' => 'column:la_fld_Username', 'width' => 100, ),
+						'PrimaryGroup' => Array ( 'title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+						'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+					),
+				),
+			),
+		),
 
-					'ItemClass'			=>	Array('class'=>'UserGroups_DBItem','file'=>'user_groups_dbitem.php','build_event'=>'OnItemBuild'),
-					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class'=>'UserGroupsEventHandler','file'=>'user_groups_eh.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
-					'AutoLoad'			=>	true,
+		'u-ug' => Array (
+			'ParentPrefix' => 'u',
+			'ForeignKey' => 'PortalUserId',
+			'ParentTableKey' => 'PortalUserId',
+		),
+	),
 
-					'QueryString' => Array (
-						1 => 'id',
-						2 => 'Page',
-						3 => 'PerPage',
-						4 => 'event',
-					),
+	'ItemClass' => Array ('class' => 'UserGroups_DBItem', 'file' => 'user_groups_dbitem.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'UserGroupsEventHandler', 'file' => 'user_groups_eh.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
 
-					'IDField'			=>	'GroupId',
+	'AutoLoad' => true,
 
-					'TitleField' => 'GroupName',
-					'TableName'			=>	TABLE_PREFIX.'UserGroupRelations',
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
 
-					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
-															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sUsers u ON %1$s.PortalUserId = u.PortalUserId'),
+	'IDField' => 'GroupId',
 
-					'AutoDelete'		=>	true,
-					'AutoClone'			=> 	false,
+	'TitleField' => 'GroupName',
+	'TableName' => TABLE_PREFIX.'UserGroupRelations',
 
-					'CalculatedFields'	=>	Array (
-						''	=>	Array(
-							'GroupName' => 'g.Name',
-							'GroupDescription' => 'g.Description',
-							'PrimaryGroup' => 'IF(u.PrimaryGroupId = %1$s.GroupId, 1, 0)',
-						),
-					),
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId
+				LEFT JOIN '.TABLE_PREFIX.'%3$sUsers u ON %1$s.PortalUserId = u.PortalUserId'
+	),
 
-					'Fields'			=>	Array(
-						'PortalUserId'				=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-						'GroupId'					=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-						'MembershipExpires' 		=> Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
-						'ExpirationReminderSent'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-									        ),
+	'AutoDelete' => true,
+	'AutoClone' => false,
 
-					'VirtualFields'	=> Array (
-						'GroupName' => Array('type' => 'string', 'default' => ''),
-						'GroupDescription' => Array('type' => 'string', 'default' => ''),
-						'PrimaryGroup' => Array(
-							'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-							'not_null' => 1, 'default' => 1
-						),
-					),
+	'CalculatedFields' => Array (
+		'' => Array (
+			'GroupName' => 'g.Name',
+			'GroupDescription' => 'g.Description',
+			'PrimaryGroup' => 'IF(u.PrimaryGroupId = %1$s.GroupId, 1, 0)',
+		),
+	),
 
+	'Fields' => Array (
+		'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'GroupId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'MembershipExpires' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
+		'ExpirationReminderSent' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+	),
 
-					'Grids'	=> Array(
-						'Default'	=>	Array(
-							'Icons' => Array (
-								'default' => 'icon16_item.png',
-								1 => 'icon16_primary.png'
-							),
-							'Fields' => Array(
-								'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'GroupName' => Array ('width' => 100, ),
-								'GroupDescription' => Array ('title' => 'column:la_fld_Description', 'width' => 150, ),
-								'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
-								'MembershipExpires'	=>	Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
-							),
-						),
-					),
+	'VirtualFields' => Array (
+		'GroupName' => Array ('type' => 'string', 'default' => ''),
+		'GroupDescription' => Array ('type' => 'string', 'default' => ''),
+		'PrimaryGroup' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 1
+		),
+	),
 
-	);
\ No newline at end of file
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				1 => 'icon16_primary.png'
+			),
+			'Fields' => Array (
+				'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'GroupName' => Array ('width' => 100, ),
+				'GroupDescription' => Array ('title' => 'column:la_fld_Description', 'width' => 150, ),
+				'PrimaryGroup' => Array ( 'title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+				'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+			),
+		),
+	),
+);