r1488: Adding secondary usergroup support to the admin CP

diff --git a/admin/user.php b/admin/user.php
index e83977dd54ba223860df1da57fe3014f6be3cdb0..95ece6bb258808a823441d1aacd3d5782e58580c 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -86,6 +86,7 @@ if ($_POST['do'] == 'insert')
        $user->set('showemail',                 $bugsys->in['showemail']);
        $user->set('showcolors',                $bugsys->in['showcolors']);
        $user->set('usergroupid',               $bugsys->in['usergroupid']);
+       $user->set('groupids',                  $bugsys->in['groupids']);
        $user->set('languageid',                $bugsys->in['languageid']);
        $user->set('timezone',                  $bugsys->in['timezone']);
        $user->set('usedst',                    $bugsys->in['usedst']);
@@ -127,6 +128,7 @@ if ($_POST['do'] == 'update')
        $user->set('showemail',                 $bugsys->in['showemail']);
        $user->set('showcolors',                $bugsys->in['showcolors']);
        $user->set('usergroupid',               $bugsys->in['usergroupid']);
+       $user->set('groupids',                  $bugsys->in['groupids']);
        $user->set('languageid',                $bugsys->in['languageid']);
        $user->set('timezone',                  $bugsys->in['timezone']);
        $user->set('usedst',                    $bugsys->in['usedst']);
@@ -198,7 +200,18 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add')
        {
                $admin->list_item($group['title'], $group['usergroupid'], ($user->objdata['usergroupid'] == $group['usergroupid']));
        }
-       $admin->row_list(_('Usergroup'), 'usergroupid');
+       $admin->row_list(_('Primary Usergroup'), 'usergroupid');
+       
+       $ids = explode(',', $user->objdata['groupids']);
+       foreach ($bugsys->datastore['usergroup'] AS $id => $group)
+       {
+               if ($id == $user->objdata['usergroupid'])
+               {
+                       continue;
+               }
+               $admin->list_item($group['title'], $group['usergroupid'], in_array($id, $ids));
+       }
+       $admin->row_checkbox(_('Secondary Usergroups'), 'groupids');
        
        $admin->row_yesno(_('Show Email Publicly'), 'showemail', $user->objdata['showemail']);
        $admin->row_yesno(_('Show Status Colors on Bug Listings'), 'showcolors', $user->objdata['showcolors']);