Index: branches/unlabeled/unlabeled-1.2.2/core/units/groups/groups_event_handler.php =================================================================== diff -u -r6786 -r7575 --- branches/unlabeled/unlabeled-1.2.2/core/units/groups/groups_event_handler.php (.../groups_event_handler.php) (revision 6786) +++ branches/unlabeled/unlabeled-1.2.2/core/units/groups/groups_event_handler.php (.../groups_event_handler.php) (revision 7575) @@ -9,9 +9,28 @@ */ function SetCustomQuery(&$event) { - if ($event->Special == 'total') { $object =& $event->getObject(); + /* @var $object kDBList */ + + switch ($event->Special) { + case 'total': $object->AddGroupByField('%1$s.GroupId'); + break; + + case 'user': + $user_id = $this->Application->GetVar('u_id'); + if ($user_id !== false) { + // show only groups, that user doesn't belong to + $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:u'); + $sql = 'SELECT GroupId + FROM '.$table_name.' + WHERE PortalUserId = '.$user_id; + $group_ids = $this->Conn->GetCol($sql); + array_push($group_ids, 14, 15); // Guest & Everyone groups are set dynamically + + $object->addFilter('already_member_filter', '%1$s.GroupId NOT IN ('.implode(',', $group_ids).')'); + } + break; } } } Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/group_selector.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/group_selector.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/group_selector.tpl (revision 7575) @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + +
+ + +
+ + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r7564 -r7575 --- branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7564) +++ branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7575) @@ -159,7 +159,7 @@ $full_path = FULL_PATH.$folderPath.'/'.$sub_folder; if ($this->isDir($full_path)) { //the following is to exclude OLD, not removed files when upgrading to 'core' - if (preg_match('^/\/kernel\/kernel4\//', $folderPath) || ($folderPath == '/kernel/units' && file_exists(FULL_PATH.$this->getConfigName('/core/units/'.$sub_folder)))) { + if (preg_match('/^\/kernel\/kernel4\//', $folderPath) || ($folderPath == '/kernel/units' && file_exists(FULL_PATH.$this->getConfigName('/core/units/'.$sub_folder)))) { continue; } if (file_exists(FULL_PATH.$this->getConfigName($folderPath.'/'.$sub_folder))) { Index: branches/unlabeled/unlabeled-1.1.2/core/units/user_groups/user_groups_eh.php =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/units/user_groups/user_groups_eh.php (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/units/user_groups/user_groups_eh.php (revision 7575) @@ -0,0 +1,91 @@ +Application->GetVar('g'); + if (!$new_groups) { + return ; + } + + $new_groups = array_keys($new_groups); + + // don't insert duplicate group membership record + $user_id = $this->Application->GetVar('u_id'); + $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:u'); + $sql = 'SELECT GroupId + FROM '.$table_name.' + WHERE PortalUserId = '.$user_id; + $old_groups = $this->Conn->GetCol($sql); + + $new_groups = array_diff($new_groups, $old_groups); + if ($new_groups) { + foreach ($new_groups as $new_group) { + $fields_hash = Array ( + 'GroupId' => $new_group, + 'PortalUserId' => $user_id, + 'PrimaryGroup' => 0, + ); + $this->Conn->doInsert($fields_hash, $table_name); + } + } + + $event->SetRedirectParam('opener', 'u'); + } + + /** + * Sets primary group for user (in editing only) + * + * @param kEvent $event + */ + function OnSetPrimary(&$event) + { + $ids = $this->StoreSelectedIDs($event); + if ($ids) { + $id = array_shift($ids); + $object =& $event->getObject( Array('skip_autoload' => true) ); + $user_id = $this->Application->GetVar('u_id'); + + $sql = 'UPDATE '.$object->TableName.' + SET PrimaryGroup = 0 + WHERE PortalUserId = '.$user_id; + $this->Conn->Query($sql); + + $sql = 'UPDATE '.$object->TableName.' + SET PrimaryGroup = 1 + WHERE '.$object->IDField.' = '.$id.' AND PortalUserId = '.$user_id; + $this->Conn->Query($sql); + } + + $this->clearSelectedIDs($event); + } + + /** + * Don't allow primary group record deleting + * + * @param kEvent $event + */ + function customProcessing(&$event, $type) + { + if ($event->Name == 'OnMassDelete' && $type == 'before') { + $ids = $event->getEventParam('ids'); + if ($ids) { + $object =& $event->getObject( Array('skip_autoload' => true) ); + $user_id = $this->Application->GetVar('u_id'); + $sql = 'SELECT '.$object->IDField.' + FROM '.$object->TableName.' + WHERE '.$object->IDField.' IN ('.implode(',', $ids).') AND PortalUserId = '.$user_id.' AND PrimaryGroup = 0'; + $ids = $this->Conn->GetCol($sql); + $event->setEventParam('ids', $ids); + } + } + } + } + +?> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php =================================================================== diff -u -r7358 -r7575 --- branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php (.../sections_config.php) (revision 7358) +++ branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php (.../sections_config.php) (revision 7575) @@ -112,6 +112,27 @@ 'SectionPrefix' => 'u', ), + 'in-portal:user_list' => Array( + 'parent' => 'in-portal: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:k4_user_list' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'in-portal:users', + 'label' => 'la_title_K4Users', + 'url' => Array('t' => 'in-portal/users/users_list', 'pass' => 'm'), + 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/), + 'priority' => 1.5, + 'debug_only' => true, + 'type' => stTREE, + ), + 'in-portal:user_groups' => Array( 'parent' => 'in-portal:users', 'icon' => 'in-portal:usergroups', @@ -123,16 +144,7 @@ ), - 'in-portal:user_list' => Array( - 'parent' => 'in-portal: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' => 'in-portal:users_settings', Index: branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php =================================================================== diff -u -r7572 -r7575 --- branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php (.../users_config.php) (revision 7572) +++ branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php (.../users_config.php) (revision 7575) @@ -75,9 +75,12 @@ '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_custom' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"), + 'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), + 'user_groups_list' => Array('prefixes' => Array('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups! (#u-ug_recordcount#)"), + 'tree_users' => Array('format' => '!la_section_overview!'), ), Index: branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php =================================================================== diff -u -r7487 -r7575 --- branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php (.../tag_processor.php) (revision 7487) +++ branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php (.../tag_processor.php) (revision 7575) @@ -110,6 +110,9 @@ } return $ret; } + if ($this->Application->isDebugMode()) { + $this->Application->Debugger->appendTrace(); + } trigger_error('Tag '.$Method.' Undefined in '.get_class($this).'[Agregated Tag]:
'.$tag.'', E_USER_WARNING); } trigger_error('Tag Undefined:
'.$prefix.':'.$tag.'',E_USER_WARNING); Index: branches/unlabeled/unlabeled-1.3.2/core/units/user_groups/user_groups_config.php =================================================================== diff -u -r7426 -r7575 --- branches/unlabeled/unlabeled-1.3.2/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 7426) +++ branches/unlabeled/unlabeled-1.3.2/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 7575) @@ -14,81 +14,63 @@ 'ForeignKey' => 'PortalUserId', 'ParentTableKey' => 'PortalUserId', ), - ), 'ItemClass' => Array('class'=>'UserGroups_DBItem','file'=>'user_groups_dbitem.php','build_event'=>'OnItemBuild'), 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'kDBEventHandler','file'=>'','build_event'=>'OnBuild'), + 'EventHandlerClass' => Array('class'=>'UserGroupsEventHandler','file'=>'user_groups_eh.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), 'AutoLoad' => true, - 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', - ), + 'QueryString' => Array ( + 1 => 'id', + 2 => 'page', + 3 => 'event', + ), 'IDField' => 'GroupId', - 'StatusField' => Array('UserStatus'), 'TableName' => TABLE_PREFIX.'UserGroup', 'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId AND %1$s.PrimaryGroup = 1 - LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON u.PortalUserId = %1$s.PortalUserId'), + LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'), 'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId AND %1$s.PrimaryGroup = 1 - LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON u.PortalUserId = %1$s.PortalUserId'), + LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'), 'AutoDelete' => true, 'AutoClone' => true, - 'CalculatedFields' => Array( - '' => Array( - 'Login' => 'u.Login', - 'FirstName' => 'u.FirstName', - 'LastName' => 'u.LastName', - 'Email' => 'u.Email', - 'PrimaryGroup' => 'g.Name', - 'CreatedOn' => 'u.CreatedOn', - 'UserStatus' => 'u.Status' - ), - ), + 'CalculatedFields' => Array ( + '' => Array( + 'GroupName' => 'g.Name', + ), + ), 'Fields' => Array( - 'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'GroupId' => Array(), - 'MembershipExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''), - 'PrimaryGroup' => Array('type' => 'int','not_null' => '1','default' => '1'), - 'ExpirationReminderSent' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'PortalUserId' => Array('type' => 'int'), + 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), + 'MembershipExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''), + 'PrimaryGroup' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'ExpirationReminderSent' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ), - 'VirtualFields' => Array( - 'Login' => Array('type' => 'string'), - 'FirstName' => Array('type' => 'string'), - 'LastName' => Array('type' => 'string'), - 'Email' => Array('type' => 'string'), - 'PrimaryGroup' => Array('type' => 'string'), - 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'), - 'UserStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Pending'), 'use_phrases' => 1, 'not_null' => '1','default' => 2), - ), + 'VirtualFields' => Array ( + 'GroupName' => Array('type' => 'string'), + ), 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), - 'Fields' => Array( - 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'), - 'LastName' => Array( 'title'=>'la_col_LastName'), - 'FirstName' => Array( 'title'=>'la_col_FirstName'), - 'Email' => Array( 'title'=>'la_col_Email'), + 'Default' => Array( + 'Icons' => Array ('default' => 'icon16_group.gif'), + 'Fields' => Array( + 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'GroupName' => Array ('title'=>'la_col_GroupName'), 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup'), - 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'), - ), - ), - ), + 'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td'), + ), + ), + ), ); Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl =================================================================== diff -u -r7355 -r7575 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl (.../tab_blocks.tpl) (revision 7355) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl (.../tab_blocks.tpl) (revision 7575) @@ -15,7 +15,7 @@ - url(img/tab_active_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> +
url(img/tab_active_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
left.gif" width="15" height="23"> @@ -30,7 +30,7 @@ - url(img/tab_active_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> +
url(img/tab_active_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
left.gif" width="15" height="23"> @@ -45,7 +45,7 @@ - url(img/tab_active_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> +
url(img/tab_active_back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0"> - + Index: branches/unlabeled/unlabeled-1.15.2/core/units/groups/groups_config.php =================================================================== diff -u -r7047 -r7575 --- branches/unlabeled/unlabeled-1.15.2/core/units/groups/groups_config.php (.../groups_config.php) (revision 7047) +++ branches/unlabeled/unlabeled-1.15.2/core/units/groups/groups_config.php (.../groups_config.php) (revision 7575) @@ -39,23 +39,22 @@ 'groups_edit_additional_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ), - 'groups_select' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#) - !la_title_SelectGroup!"), + 'select_group' => Array('prefixes' => Array('g.user_List'), 'format' => "!la_title_Groups! (#g.user_recordcount#) - !la_title_SelectGroup!"), ), 'PermSection' => Array('main' => 'in-portal:user_groups'), 'TableName' => TABLE_PREFIX.'PortalGroup', 'ListSQLs' => Array( - '' => ' - SELECT %1$s.* %2$s FROM %1$s', - 'total' => ' - SELECT %1$s.* %2$s FROM %1$s + '' => 'SELECT %1$s.* %2$s FROM %1$s', + 'total' => 'SELECT %1$s.* %2$s + FROM %1$s LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId', ), - 'ItemSQLs' => Array('' => ' - SELECT %1$s.* %2$s FROM %1$s + 'ItemSQLs' => Array('' => ' SELECT %1$s.* %2$s + FROM %1$s LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId'), 'ListSortings' => Array( @@ -87,37 +86,43 @@ ), 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), - 'Name' => Array('title' => 'la_col_GroupName'), - 'UserCount' => Array('title' => 'la_col_UserCount'), - ), - ), + 'Default' => Array( + 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + 'UserCount' => Array('title' => 'la_col_UserCount'), + ), + ), - 'Radio' => Array( - 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_radio_td'), - 'Name' => Array('title' => 'la_col_GroupName'), - 'Description' => Array('title' => 'la_col_Description'), - ), - ), + 'UserGroups' => Array ( + 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array ( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + ), + ), + + 'Radio' => Array ( + 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_radio_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + 'Description' => Array('title' => 'la_col_Description'), + ), + ), + + 'GroupSelector' => Array ( + 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + 'Description' => Array('title' => 'la_col_Description'), + ), + ), + ), + - /*'GroupSelector' => Array( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), - 'Fields' => Array( - 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_radio_td'), - 'LastName' => Array( 'title'=>'la_col_LastName'), - 'FirstName' => Array( 'title'=>'la_col_FirstName'), - 'Email' => Array( 'title'=>'la_col_Email'), - 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup'), - 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'), - ), - ),*/ - ), - ); ?> \ No newline at end of file
left.gif" width="15" height="23"> style="border-top: black 1px solid;" background="img/tab_back.gif"> Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/group_selector.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/group_selector.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/group_selector.tpl (revision 7575) @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + +
+ + +
+ + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php =================================================================== diff -u -r7358 -r7575 --- branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php (.../sections_config.php) (revision 7358) +++ branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php (.../sections_config.php) (revision 7575) @@ -112,6 +112,27 @@ 'SectionPrefix' => 'u', ), + 'in-portal:user_list' => Array( + 'parent' => 'in-portal: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:k4_user_list' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'in-portal:users', + 'label' => 'la_title_K4Users', + 'url' => Array('t' => 'in-portal/users/users_list', 'pass' => 'm'), + 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/), + 'priority' => 1.5, + 'debug_only' => true, + 'type' => stTREE, + ), + 'in-portal:user_groups' => Array( 'parent' => 'in-portal:users', 'icon' => 'in-portal:usergroups', @@ -123,16 +144,7 @@ ), - 'in-portal:user_list' => Array( - 'parent' => 'in-portal: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' => 'in-portal:users_settings', Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -r7515 -r7575 --- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7515) +++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7575) @@ -128,7 +128,7 @@