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 @@
+
+
+
+
+
+
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 @@
|