--- loncom/interface/loncoursegroups.pm	2006/06/30 18:27:19	1.33
+++ loncom/interface/loncoursegroups.pm	2006/07/02 17:08:42	1.36
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.33 2006/06/30 18:27:19 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.36 2006/07/02 17:08:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -438,47 +438,9 @@ sub group_administration {
         }
     }
 
-    my %toolprivs =
-	(
-	 email      => {
-	     sgm => 'Send '.$gpterm.' mail',
-	     sgb => 'Broadcast mail',
-	 },
-	 discussion => {
-	     cgb => 'Create boards',
-	     pgd => 'Post',
-	     pag => 'Anon. posts',
-	     rgi => 'Get identities', 
-	     vgb => 'View boards',
-	 },
-	 chat       => {
-	     pgc => 'Chat',
-	 },
-	 files      => {
-	     rgf => 'Retrieve',
-	     ugf => 'Upload',
-             mgf => 'Modify',
-	     dgf => 'Delete',
-             agf => 'Control Access',
-	 },
-	 roster     => {
-	     vgm => 'View',
-	 },
-	 homepage   => {
-	     vgh => 'View page',
-	     mgh => 'Modify page',
-	 },
-	 );
+    my $toolprivs = &Apache::longroup::get_tool_privs($gpterm);
 
-    my %fixedprivs = 
-	(
-	 email      => {sgm => 1},
-	 discussion => {vgb => 1},
-	 chat       => {pgc => 1},
-	 files      => {rgf => 1},
-	 roster     => {vgm => 1},
-	 homepage   => {vgh => 1},
-	 );
+    my $fixedprivs = &Apache::longroup::get_fixed_privs();
 
     my %elements = 
 	(
@@ -686,8 +648,8 @@ sub group_administration {
                         }
                         my @currtools = ();
                         if (@userprivs > 0) {
-                            foreach my $tool (sort(keys(%fixedprivs))) {
-                                foreach my $priv (keys(%{$fixedprivs{$tool}})) {
+                            foreach my $tool (sort(keys(%{$fixedprivs}))) {
+                                foreach my $priv (keys(%{$$fixedprivs{$tool}})) {
                                     if (grep/^$priv$/,@userprivs) {
                                         push(@currtools,$tool);
                                         last;
@@ -757,8 +719,8 @@ sub group_administration {
         && ($specificity eq 'Yes')) {
         foreach my $user (sort(keys(%usertools))) {
             foreach my $tool (keys(%{$usertools{$user}})) {
-                foreach my $priv (keys(%{$toolprivs{$tool}})) {
-                    unless (exists($fixedprivs{$tool}{$priv})) {
+                foreach my $priv (keys(%{$$toolprivs{$tool}})) {
+                    unless (exists($$fixedprivs{$tool}{$priv})) {
                         $elements{$action}{$state}{'userpriv_'.$priv} = 'checkbox';
                     }
                 }
@@ -868,7 +830,7 @@ function changeSort(caller) {
 			  ("$crumbtitle Manager"));
                 &display_control($r,$cdom,$cnum,$tabcol,$action,$state,$page,
                        \%sectioncount,$groupname,$description,$functions,
-                       \@tools,\%toolprivs,\%fixedprivs,$startdate,$enddate,
+                       \@tools,$toolprivs,$fixedprivs,$startdate,$enddate,
                        \%users,\%userdata,$idx,\%memchg,\%usertools,
                        $function,$view_permission,$manage_permission,
                        \%stored,$granularity,$quota,$specificity,\@types,\@roles,
@@ -1371,7 +1333,8 @@ sub membership_options {
                    future => &mt('Will have future access'),
                    );
 
-    my @roles = ('st','cc','in','ta','ep','cr');
+    #FIXME need to plumb around for the various cr roles defined by the user
+    my @roles = ('st','cc','in','ta','ep');
 
     my @sections = keys(%{$sectioncount});
 
@@ -1779,7 +1742,7 @@ sub pick_new_members {
         if (@{$available} > 0) {
             if ($granularity eq 'Yes') {
                 $r->print('<tr bgcolor="#cccccc">
- <td colspan="5">&nbsp;</td>
+ <td colspan="6">&nbsp;</td>
  <td align="center"><small><nobr><b>'.&mt('All:').'</b>&nbsp;');
                 foreach my $tool (@{$available}) {
                     $r->print('<label><input type="checkbox" name="togglefunc" '.
@@ -2226,114 +2189,33 @@ sub current_membership {
                                           'curf' => 'Current Functionality',
                                           'chpr' => 'Change Privileges' 
                                         );
-    if (keys(%membership) > 0) {
-        my %current = ();
-        my %allnames = ();
-        my $hastools = 0;
-        my $addtools = 0;
-        my $num_reenable = 0;
-        my $num_activate = 0;
-        my $num_expire = 0;
-        foreach my $key (sort(keys(%membership))) {
-            if ($key =~ /^\Q$groupname\E:([^:]+):([^:]+)$/) {
-                my $uname = $1;
-                my $udom = $2;
-                my $user = $uname.':'.$udom;
-                my($end,$start,@userprivs) = split(/:/,$membership{$key});
-                unless ($start == -1) {
-                    $allnames{$udom}{$uname} = 1;
-                    $current{$user} = {
-			uname     => $uname,
-			udom      => $udom,
-			start     => &Apache::lonlocal::locallocaltime($start),
-			currtools => [],
-			newtools  => [],
-		    };
-
-                    if ($end == 0) {
-                        $current{$user}{end} =  'No end date';
-                    } else {
-                        $current{$user}{end} = 
-                                     &Apache::lonlocal::locallocaltime($end);
-                    }
-                    my $now = time;
-                    if (($end > 0) && ($end < $now)) {
-                        $current{$user}{changestate} = 'reenable';
-                        $num_reenable++;
-                    } elsif (($start > $now)) {
-                        $current{$user}{changestate} = 'activate';
-                        $num_activate ++;
-                    } else {
-                        $current{$user}{changestate} = 'expire';
-                        $num_expire ++;
-                    }
-                    if (@userprivs > 0) {
-                        foreach my $tool (sort(keys(%{$fixedprivs}))) {
-                            foreach my $priv (keys(%{$$fixedprivs{$tool}})) {
-                                if (grep/^$priv$/,@userprivs) {
-                                    push(@{$current{$user}{currtools}},$tool);
-                                    last;
-                                }
-                            }
-                        }
-                        $hastools = 1;
-                    }
-                    if (@{$available} > 0) {
-                        if (@{$current{$user}{currtools}} > 0) {
-                            if ("@{$available}" ne "@{$current{$user}{currtools}}") {
-                                foreach my $tool (@{$available}) {
-                                    unless (grep/^$tool$/,@{$current{$user}{currtools}}) {
-                                        push(@{$current{$user}{newtools}},$tool);
-                                    }
-                                }
-                            }
-                        } else {
-                            @{$current{$user}{newtools}} = @{$available};
-                        }
-                        if (@{$current{$user}{newtools}} > 0) {
-                            $addtools = 1;
-                        }
-                    }
-                }
-            }
-        }
-        if (keys(%current) > 0) {
-            my %idhash;
-            foreach my $udom (keys(%allnames)) {
-                %{$idhash{$udom}} = &Apache::lonnet::idrget($udom,
-                                                keys(%{$allnames{$udom}}));
-                foreach my $uname (keys(%{$idhash{$udom}})) {
-                    $current{$uname.':'.$udom}{'id'} = $idhash{$udom}{$uname};
-                }
-                foreach my $uname (keys(%{$allnames{$udom}})) {
-                    $current{$uname.':'.$udom}{'fullname'} =
-                                &Apache::loncommon::plainname($uname,$udom,
-                                                                  'lastname');
-                }
-            }
-            $r->print('
+    my ($current,$hastools,$addtools,$num_reenable,$num_activate,$num_expire) =
+        &Apache::longroup::group_memberlist($cdom,$cnum,$groupname,$fixedprivs,
+                                            $available);
+    if (keys(%{$current}) > 0) {
+        $r->print('
  <tr>
   <td>&nbsp;</td>
   <td colspan="2">
    <table>
     <tr>');
-            if ($num_expire) {
-                &check_uncheck_buttons($r,$formname,'expire',$lt{'expi'});
-            }
-            if ($num_reenable) {
-                &check_uncheck_buttons($r,$formname,'reenable',$lt{'reen'});
-            }
-            if ($num_activate) {
-                &check_uncheck_buttons($r,$formname,'activate',$lt{'acti'});
+        if ($num_expire) {
+            &check_uncheck_buttons($r,$formname,'expire',$lt{'expi'});
+        }
+        if ($num_reenable) {
+            &check_uncheck_buttons($r,$formname,'reenable',$lt{'reen'});
+        }
+        if ($num_activate) {
+            &check_uncheck_buttons($r,$formname,'activate',$lt{'acti'});
+        }
+        &check_uncheck_buttons($r,$formname,'deletion',$lt{'dele'});
+        if (@{$available} > 0) {
+            if ($specificity eq 'Yes') {
+                &check_uncheck_buttons($r,$formname,'changepriv',$lt{'chpr'});
             }
-            &check_uncheck_buttons($r,$formname,'deletion',$lt{'dele'});
-            if (@{$available} > 0) {
-                if ($specificity eq 'Yes') {
-                    &check_uncheck_buttons($r,$formname,'changepriv',$lt{'chpr'});
-                }
-                if ($granularity eq 'Yes') {
-                    $r->print(&check_uncheck_tools($r,$available));
-                    $r->print('
+            if ($granularity eq 'Yes') {
+                $r->print(&check_uncheck_tools($r,$available));
+                $r->print('
      <td>
       <nobr>
        <fieldset><legend><b>'.$lt{'curf'}.'</b></legend>
@@ -2346,9 +2228,9 @@ sub current_membership {
      </nobr>
     </td>
 ');
-                }
             }
-            $r->print(<<"END");
+        }
+        $r->print(<<"END");
    </tr>
   </table>
   </td>
@@ -2361,8 +2243,8 @@ sub current_membership {
   <td>&nbsp;</td>
   <td colspan="3">
 END
-            $r->print(&Apache::lonhtmlcommon::start_pick_box());
-            $r->print(<<"END");
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        $r->print(<<"END");
    <table border="0" cellpadding="4" cellspacing="1">
     <tr bgcolor="$tabcol" align="center">
      <td><b>$lt{'actn'}</b></td>
@@ -2374,135 +2256,134 @@ END
      <td><b><a href="javascript:changeSort('start')">$lt{'stda'}</a></b></td>
      <td><b><a href="javascript:changeSort('end')">$lt{'enda'}</a></b></td>
 END
-            my $colspan = 0;
-            if ($hastools) {
-                $r->print('<td><b>'.$lt{'curf'}.'</b></td>');
-                $colspan ++;  
-            }
-            if ($addtools) {
-                $r->print('<td><b>Additional Functionality</b></td>');
-                $colspan ++;
-            }
-            $r->print('</tr>');
-            if ($colspan) {
-                if ($granularity eq 'Yes') {
-                    $r->print('<tr bgcolor="#cccccc">
+        my $colspan = 0;
+        if ($hastools) {
+            $r->print('<td><b>'.$lt{'curf'}.'</b></td>');
+            $colspan ++;  
+        }
+        if ($addtools) {
+            $r->print('<td><b>Additional Functionality</b></td>');
+            $colspan ++;
+        }
+        $r->print('</tr>');
+        if ($colspan) {
+            if ($granularity eq 'Yes') {
+                $r->print('<tr bgcolor="#cccccc">
  <td colspan="7">&nbsp;</td>
  <td colspan="'.$colspan.'" align="center"><small><nobr><b>'.&mt('All:').
   '</b>&nbsp;');
-                    foreach my $tool (@{$available}) {
-                        $r->print('<label><input type="checkbox" name="togglefunc"'.
+                foreach my $tool (@{$available}) {
+                    $r->print('<label><input type="checkbox" name="togglefunc"'.
    ' onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
    ' value="'.$tool.'">'.'<b>'.$tool.'</b></label>&nbsp;&nbsp;&nbsp;');
-                    }
-                    $r->print('</nobr></small></td></tr>');
                 }
+                $r->print('</nobr></small></td></tr>');
             }
-            my %Sortby = ();
-            foreach my $user (sort(keys(%current))) {
-                if ($env{'form.sortby'} eq 'fullname') {
-                    push(@{$Sortby{$current{$user}{fullname}}},$user);
-                } elsif ($env{'form.sortby'} eq 'username') {
-                    push(@{$Sortby{$current{$user}{uname}}},$user);
-                } elsif ($env{'form.sortby'} eq 'domain') {
-                    push(@{$Sortby{$current{$user}{udom}}},$user);
-                } elsif ($env{'form.sortby'} eq 'id') {
-                    push(@{$Sortby{$current{$user}{id}}},$user);
+        }
+        my %Sortby = ();
+        foreach my $user (sort(keys(%{$current}))) {
+            if ($env{'form.sortby'} eq 'fullname') {
+                push(@{$Sortby{$$current{$user}{fullname}}},$user);
+            } elsif ($env{'form.sortby'} eq 'username') {
+                push(@{$Sortby{$$current{$user}{uname}}},$user);
+            } elsif ($env{'form.sortby'} eq 'domain') {
+                push(@{$Sortby{$$current{$user}{udom}}},$user);
+            } elsif ($env{'form.sortby'} eq 'id') {
+                push(@{$Sortby{$$current{$user}{id}}},$user);
+            } else {
+                push(@{$Sortby{$$current{$user}{fullname}}},$user);
+            }
+        }
+        my $rowNum = 0;
+        my $rowColor;
+        foreach my $key (sort(keys(%Sortby))) {
+            foreach my $user (@{$Sortby{$key}}) {
+                if ($rowNum %2 == 1) {
+                    $rowColor = $rowColor1;
                 } else {
-                    push(@{$Sortby{$current{$user}{fullname}}},$user);
+                    $rowColor = $rowColor2;
                 }
-            }
-            my $rowNum = 0;
-            my $rowColor;
-            foreach my $key (sort(keys(%Sortby))) {
-                foreach my $user (@{$Sortby{$key}}) {
-                    if ($rowNum %2 == 1) {
-                        $rowColor = $rowColor1;
-                    } else {
-                        $rowColor = $rowColor2;
-                    }
-                    my $id = $current{$user}{id};
-                    my $fullname = $current{$user}{fullname};
-                    my $udom = $current{$user}{udom};
-                    my $uname = $current{$user}{uname};
-                    my $start = $current{$user}{start};
-                    my $end = $current{$user}{end};
-                    $r->print('<tr bgcolor="'.$rowColor.'">
-                                <td><small>');
-                    if ($current{$user}{changestate} eq 'reenable') {
-                        $r->print('<nobr><label>'. 
+                my $id = $$current{$user}{id};
+                my $fullname = $$current{$user}{fullname};
+                my $udom = $$current{$user}{udom};
+                my $uname = $$current{$user}{uname};
+                my $start = $$current{$user}{start};
+                my $end = $$current{$user}{end};
+                $r->print('<tr bgcolor="'.$rowColor.'">
+                            <td><small>');
+                if ($$current{$user}{changestate} eq 'reenable') {
+                    $r->print('<nobr><label>'. 
    '<input type="checkbox" name="reenable" value="'.$user.'" />'.
    $lt{'reen'}.'</label></nobr><br />');
-                    } elsif ($current{$user}{changestate} eq 'expire') {
-                        $r->print('<nobr><label>'.
+                } elsif ($$current{$user}{changestate} eq 'expire') {
+                    $r->print('<nobr><label>'.
    '<input type="checkbox" name="expire" value="'.$user.'" />'.
    $lt{'expi'}.'</label></nobr><br />');
-                    } elsif ($current{$user}{changestate} eq 'activate') {
-                        $r->print('<nobr><label>'.
+                } elsif ($$current{$user}{changestate} eq 'activate') {
+                    $r->print('<nobr><label>'.
    '<input type="checkbox" name="activate" value="'.$user.'" />'.
    $lt{'acti'}.'</label></nobr><br />');
-                    }
-                    $r->print('<nobr><label>'.
+                }
+                $r->print('<nobr><label>'.
    '<input type="checkbox" name="deletion" value="'.$user.'" />'.
    $lt{'dele'}.'</label></nobr>');
-                    if ($specificity eq 'Yes') {
-                        $r->print('<br /><nobr><label>'.
+                if ($specificity eq 'Yes') {
+                    $r->print('<br /><nobr><label>'.
    '<input type="checkbox" name="changepriv" value="'.$user.'" />'.$lt{'chpr'}.
    '</label></nobr>');
-                    }
-                    $r->print('
+                }
+                $r->print('
    </td>
    <td><small>'.
     $fullname.'</small></td><td><small>'.$uname.'</small></td><td><small>'.
     $udom.'</small></td><td><small>'.$id.'</small></td><td><small>'.$start.
     '</small></td><td><small>'.$end.'</small></td>');
-                    if ($hastools) {
-                        $r->print('<td align="left"><small><nobr>'.
+                if ($hastools) {
+                    $r->print('<td align="left"><small><nobr>'.
                                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
-                        foreach my $tool (@{$current{$user}{currtools}}) {
-                            if ($granularity eq 'Yes') {
-                                $r->print('<label><input type="checkbox" '. 
+                    foreach my $tool (@{$$current{$user}{currtools}}) {
+                        if ($granularity eq 'Yes') {
+                            $r->print('<label><input type="checkbox" '. 
                                        'checked="checked" '. 
                                        'name="user_'.$tool.'" value="'.
                                        $user.'" />'.$tool.'</label>');
-                             } else {
-                               $r->print('<input type="hidden" '.
+                         } else {
+                             $r->print('<input type="hidden" '.
                                        'checked="checked" '.
                                        'name="user_'.$tool.'" value="'.
                                        $user.'" />'.$tool);
-                             }
-                             $r->print('&nbsp;&nbsp;&nbsp;');
-                        }
-                        $r->print('</nobr></small></td>');
+                         }
+                         $r->print('&nbsp;&nbsp;&nbsp;');
                     }
-                    if ($addtools) {
-                        $r->print('<td align="left"><small>');
-                        if ($granularity eq 'Yes') {
-                            foreach my $tool (@{$current{$user}{newtools}}) {
-                                $r->print('<nobr><label><input type="checkbox"
+                    $r->print('</nobr></small></td>');
+                }
+                if ($addtools) {
+                    $r->print('<td align="left"><small>');
+                    if ($granularity eq 'Yes') {
+                        foreach my $tool (@{$$current{$user}{newtools}}) {
+                            $r->print('<nobr><label><input type="checkbox"
                                           name="user_'.$tool.'" value="'.
                                           $user.'" />'.$tool.
                                           '</label></nobr>&nbsp;&nbsp;&nbsp;');
-                            }
-                        } else {
-                            foreach my $tool (@{$current{$user}{newtools}}) {
-                                $r->print('<nobr><input type="hidden" 
+                        }
+                    } else {
+                        foreach my $tool (@{$$current{$user}{newtools}}) {
+                            $r->print('<nobr><input type="hidden" 
                                           name="user_'. $tool.'" value="'.
                                           $user.'" />'.$tool.
                                           '</nobr>&nbsp;&nbsp;&nbsp;');
-                            }
                         }
-                        $r->print('</small></td>');
                     }
-                    $r->print('</tr>'."\n");
-                    $rowNum ++;
+                    $r->print('</small></td>');
                 }
+                $r->print('</tr>'."\n");
+                $rowNum ++;
             }
-            $r->print(&Apache::lonhtmlcommon::end_pick_box());
-            $r->print('
+        }
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+        $r->print('
   </td>
  </tr>');
-        }
     }
     return;
 }