Index: trunk/core/units/users/users_config.php =================================================================== diff -u -N -r4702 -r6669 --- trunk/core/units/users/users_config.php (.../users_config.php) (revision 4702) +++ trunk/core/units/users/users_config.php (.../users_config.php) (revision 6669) @@ -48,13 +48,13 @@ ), 'IDField' => 'PortalUserId', - + 'StatusField' => Array('Status'), - + 'TitleField' => 'Login', - + 'ItemType' => 6, // used for custom fields only (on user's case) - + 'StatisticsInfo' => Array( 'pending' => Array( 'icon' => 'icon16_user_pending.gif', @@ -64,101 +64,101 @@ 'status' => STATUS_PENDING, ), ), - + 'TitlePresets' => Array( 'default' => Array( 'new_status_labels' => Array('u'=>'!la_title_Adding_User!'), 'edit_status_labels' => Array('u'=>'!la_title_Editing_User!'), 'new_titlefield' => Array('u'=>'!la_title_New_User!'), ), - + 'users_list' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"), - + 'users_edit' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"), - + 'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), - + 'tree_users' => Array('format' => '!la_section_overview!'), ), - + 'PermSection' => Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'), - + 'Sections' => Array( 'in-portal:users' => Array( 'parent' => 'in-portal:root', - 'icon' => 'community', + 'icon' => 'in-portal:community', 'label' => 'la_tab_Community', 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 2, 'type' => stTREE, ), - + 'in-portal:user_list' => Array( 'parent' => 'in-portal:users', - 'icon' => 'users', + 'icon' => 'in-portal:users', 'label' => 'la_tab_User_List', 'url' => Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1), 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/), 'priority' => 1, 'type' => stTREE, ), - + 'in-portal:configure_users' => Array( 'parent' => 'in-portal:users', - 'icon' => 'users_settings', + 'icon' => 'in-portal:users_settings', 'label' => 'la_tab_ConfigSettings', 'url' => Array('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'edit'), 'priority' => 3, 'type' => stTREE, ), - + 'in-portal:user_email' => Array( 'parent' => 'in-portal:users', - 'icon' => 'settings_email', + 'icon' => 'in-portal:settings_email', 'label' => 'la_tab_ConfigE-mail', 'url' => Array('t' => 'config/config_email', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'edit'), 'priority' => 4, 'type' => stTREE, ), - + 'in-portal:user_custom' => Array( 'parent' => 'in-portal:users', - 'icon' => 'settings_custom', + 'icon' => 'in-portal:settings_custom', 'label' => 'la_tab_ConfigCustom', 'url' => Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 6, 'pass_section' => true, 'pass' => 'm,cf'), 'permissions' => Array('view', 'add', 'edit', 'delete'), 'priority' => 5, 'type' => stTREE, ), - + 'in-portal:user_banlist' => Array( 'parent' => 'in-portal:users', - 'icon' => 'banlist', + 'icon' => 'in-portal:banlist', 'label' => 'la_tab_BanList', 'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), 'priority' => 6, 'type' => stTREE, ), - ), - + ), + 'TableName' => TABLE_PREFIX.'PortalUser', 'ListSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1 LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId', ), - + 'ItemSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1 LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId', ), - + 'ListSortings' => Array( '' => Array( 'Sorting' => Array('Login' => 'asc'), @@ -171,20 +171,20 @@ 'Groups' => Array( Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER), ), - + 'Filters' => Array( 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), 2 => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), ) ), - + 'CalculatedFields' => Array( '' => Array( 'PrimaryGroup' => 'g.Name', ), ), - + 'Fields' => Array ( 'PortalUserId' => Array(), @@ -248,7 +248,7 @@ 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'), ), ), - + 'UserSelector' => Array( 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), 'Fields' => Array(