--- loncom/interface/loncoursegroups.pm	2006/05/09 15:09:27	1.16
+++ loncom/interface/loncoursegroups.pm	2006/05/18 01:08:50	1.17
@@ -30,6 +30,7 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::lonnavmaps;
+use Apache::longroup;
 use Apache::Constants qw(:common :http);
 
 sub handler {
@@ -154,7 +155,7 @@ sub display_groups {
         if (!defined($action)) {
             $action = 'view';
         }
-        my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum);
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
         if (%curr_groups) {
             $r->print('<br /><br />');
             $r->print(&Apache::lonhtmlcommon::start_pick_box());
@@ -182,7 +183,7 @@ END
             my %Sortby = ();
             foreach my $group (sort(keys(%curr_groups))) {
                 %{$grp_info{$group}} = 
-                                  &Apache::loncommon::get_group_settings(
+                                  &Apache::longroup::get_group_settings(
                                                          $curr_groups{$group});
                 my $members_result = &group_members($cdom,$cnum,$group,
                                                     \%grp_info);
@@ -267,10 +268,10 @@ END
         my @coursegroups = split(/:/,$env{'request.course.groups'});
         if (@coursegroups > 0) {
             $r->print('<br /><br />');
-            my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum);
+            my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
             if (%curr_groups) {
                 foreach my $group (@coursegroups) {
-                    my %group_info =  &Apache::loncommon::get_group_settings(
+                    my %group_info =  &Apache::longroup::get_group_settings(
                                         $curr_groups{$group});
                     my $description = &Apache::lonnet::unescape(
                                         $group_info{description});
@@ -433,7 +434,10 @@ sub group_administration {
                                    );
     if (ref($stored{'autorole'}) eq 'ARRAY') {
         foreach my $role (@{$stored{'autorole'}}) {
-            $elements{'modify'}{'change_settings'}{'sec_'.$role} = 'selectbox'; 
+            unless ($role eq 'cc') {
+                $elements{'modify'}{'change_settings'}{'sec_'.$role} = 
+                                                                   'selectbox';
+            }
         }
     }
     %{$elements{'create'}{'pick_members'}} = (
@@ -807,12 +811,12 @@ function changeSort(caller) {
 
 sub retrieve_settings {
     my ($cdom,$cnum,$groupname) = @_;
-    my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum,$groupname);
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$groupname);
 
     return if (!%curr_groups);
 
     my %groupinfo = 
-	&Apache::loncommon::get_group_settings($curr_groups{$groupname});
+	&Apache::longroup::get_group_settings($curr_groups{$groupname});
 
     my %stored;
 
@@ -849,12 +853,14 @@ sub retrieve_settings {
     $stored{'autodrop'} = $groupinfo{'autodrop'};
     if (exists($groupinfo{'autosec'})) {
 	foreach my $role (sort(keys(%{$groupinfo{'autosec'}}))) {
-	    foreach my $section (@{$groupinfo{'autosec'}{$role}}) {
-		push (@{$stored{'sec_'.$role}},$section);
-	    }
-	    if (@{$groupinfo{'autosec'}{$role}} > 0) {
-		push(@{$stored{'autorole'}},$role);
-	    }
+            if (ref($groupinfo{'autosec'}{$role}) eq 'ARRAY') {
+	        foreach my $section (@{$groupinfo{'autosec'}{$role}}) {
+	            push (@{$stored{'sec_'.$role}},$section);
+	        }
+	        if (@{$groupinfo{'autosec'}{$role}} > 0) {
+		    push(@{$stored{'autorole'}},$role);
+	        }
+            }
 	}
     }
     return %stored;
@@ -1247,8 +1253,8 @@ sub membership_options {
     $r->print(&Apache::lonhtmlcommon::role_select_row(\@roles));
     if (@sections > 0) {
         @sections = sort {$a cmp $b} @sections;
-        unshift(@sections,'_all'); # Put 'all' at the front of the list
-        unshift(@sections,'_nosec'); # Put 'no sections' next
+        unshift(@sections,'all'); # Put 'all' at the front of the list
+        unshift(@sections,'none'); # Put 'no sections' next
         $r->print('<td>&nbsp;</td>
                    <td colspan="3" align="center" valign="top">'.
         &sections_selection(\@sections,'sectionpick').'</td>');
@@ -1269,9 +1275,9 @@ sub sections_selection {
         $numvisible = @{$sections};
     }
     foreach my $sec (@{$sections}) {
-        if ($sec eq '_all') {
+        if ($sec eq 'all') {
             $section_sel .= '  <option value="'.$sec.'" />all sections'."\n";
-        } elsif ($sec eq '_nosec') {
+        } elsif ($sec eq 'none') {
             $section_sel .= '  <option value="'.$sec.'" />no section'."\n"; 
         } else {
             $section_sel .= '  <option value="'.$sec.'" />'.$sec."\n";
@@ -2588,7 +2594,9 @@ sub member_privileges_form {
         }
         $specificity = $env{'form.specificity'};
     } else {
-        @defprivs = @{$$stored{'defpriv'}};
+        if (defined($$stored{'defpriv'})) {
+            @defprivs = @{$$stored{'defpriv'}};
+        }
         $specificity = $$stored{'specificity'};
     }
     my @showtools;
@@ -2772,7 +2780,9 @@ sub process_request {
             @defprivs = @temp; 
         }
     } else {
-        @defprivs = @{$$stored{'defpriv'}};
+        if (defined($$stored{'defpriv'})) {
+            @defprivs = @{$$stored{'defpriv'}};
+        }
     }
 
     my $outcome;
@@ -2852,9 +2862,6 @@ sub write_group_data {
         if (defined($env{'form.sec_'.$role})) {
             my @autosections=&Apache::loncommon::get_env_multiple('form.sec_'.
                                                                   $role);
-            if (grep/^_all$/,@autosections) {
-                @autosections = sort {$a cmp $b} keys(%{$sectioncount});
-            }
             $autosec .= '<role id="'.$role.'">';
             foreach my $sec (@autosections) {
                 $autosec .= '<section>'.$sec.'</section>';
@@ -3055,9 +3062,9 @@ sub process_membership {
         }
     }
     if ($roster_result eq 'ok') {
-        $r->print('<br />Group membership list updated.');
+        $r->print('<br />'.&mt('Group membership list updated.'));
     } else {
-        $r->print('<br />An error occurred while updating the group membership list -'.$roster_result.'<br />');
+        $r->print('<br />'.&mt('An error occurred while updating the group membership list -').$roster_result.'<br />');
     }
     return;
 }
@@ -3115,7 +3122,7 @@ sub automapping {
    <td>&nbsp;</td>
    <td colspan="3">
    <nobr>'.$$lt{'auad'}.':&nbsp;
-    <input type="radio" name="autoadd" value="on" />on&nbsp;&nbsp;<input type="radio" name="autoadd" value="off" />off');
+    <input type="radio" name="autoadd" value="on" />on&nbsp;&nbsp;<input type="radio" name="autoadd" value="off" checked="checked" />off');
     if ($action eq 'modify') {
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$add}.'</b>)');
     }
@@ -3127,7 +3134,7 @@ sub automapping {
    <td>&nbsp;</td>
    <td colspan="3">
     <nobr>'.$$lt{'auex'}.':&nbsp;
-    <input type="radio" name="autodrop" value="on" />on&nbsp;&nbsp;<input type="radio" name="autodrop" value="off" />off');
+    <input type="radio" name="autodrop" value="on" />on&nbsp;&nbsp;<input type="radio" name="autodrop" value="off" checked="checked" />off');
     if ($action eq 'modify') {
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$drop}.'</b>)');
     }
@@ -3150,8 +3157,8 @@ sub mapping_settings {
     my @sections = keys(%{$sectioncount});
     if (@sections > 0) {
         @sections = sort {$a cmp $b} @sections;
-        unshift(@sections,'_nosec'); # Put 'no sections' next
-        unshift(@sections,'_all'); # Put 'all' at the front of the list
+        unshift(@sections,'none'); # Put 'no sections' next
+        unshift(@sections,'all'); # Put 'all' at the front of the list
     }
     &topic_bar($r,$tabcol,$image,$$lt{'pirs'});
     $r->print('
@@ -3175,8 +3182,15 @@ sub mapping_settings {
         my $plrole=&Apache::lonnet::plaintext($role);
         my $sections_sel;
         if (@sections > 0) {
-            $sections_sel='<td>'.&sections_selection(\@sections,'sec_'.$role).
-                                                                       '</td>';
+            if ($role eq 'cc') {
+                $sections_sel = '<td align="right">'.
+                                &mt('all sections').'<input type="hidden" '. 
+                                'name="sec_cc" value="all" /></td>';
+            } else { 
+                $sections_sel='<td align="right">'.
+                              &sections_selection(\@sections,'sec_'.$role).
+                              '</td>';
+            }
         }
         if ($rowNum %2 == 1) {
             $rowColor = $rowColor1;
@@ -3209,7 +3223,7 @@ sub mapping_settings {
 }
 
 sub standard_roles {
-    my @roles = ('st','ep','ta','in','cc');
+    my @roles = ('cc','in','ta','ep','st');
     return @roles;
 }
 
@@ -3410,7 +3424,7 @@ function toggleTools(field,caller) {
 sub validate_groupname {
     my ($groupname,$action,$cdom,$cnum) = @_;
     my %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
-    my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum);
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
 
     my %lt = &Apache::lonlocal::texthash (
                       igna => 'Invalid group name',