--- loncom/interface/loncoursegroups.pm	2006/03/21 18:32:59	1.10
+++ 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 {
@@ -37,7 +38,7 @@ sub handler {
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-                                                                                
+
     if ($r->header_only) {
         return OK;
     }
@@ -106,8 +107,7 @@ sub print_main_menu {
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/coursegroups",
           text=>"Course Groups",});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs
-              (undef,'Course Groups'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Groups'));
     &display_groups($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,
                     $view_permission,$manage_permission,$action,$rowColor1,
                     $rowColor2);
@@ -155,8 +155,8 @@ sub display_groups {
         if (!defined($action)) {
             $action = 'view';
         }
-        my %curr_groups;
-        if (&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum)) {
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+        if (%curr_groups) {
             $r->print('<br /><br />');
             $r->print(&Apache::lonhtmlcommon::start_pick_box());
             $r->print(<<"END");
@@ -183,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);
@@ -268,10 +268,10 @@ END
         my @coursegroups = split(/:/,$env{'request.course.groups'});
         if (@coursegroups > 0) {
             $r->print('<br /><br />');
-            my %curr_groups;
-            if (&Apache::loncommon::coursegroups(\%curr_groups,$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});
@@ -434,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'}} = (
@@ -455,16 +458,16 @@ sub group_administration {
         (($state eq 'pick_name') || ($state eq 'pick_privs'))) ||
        (($action eq 'modify') && (($state eq 'change_settings') ||
                                   ($state eq 'add_members')))) {
-        my $numsections = &Apache::loncommon::get_sections($cdom,$cnum,
-                                                           \%sectioncount);
-        if ($numsections > 0) {
+        %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
+        if (%sectioncount) {
             $elements{'create'}{'pick_name'}{'sectionpick'} = 'selectbox';
             $elements{'modify'}{'change_mapping'}{'sectionpick'} = 'selectbox';
             $elements{'modify'}{'add_members'}{'sectionpick'} = 'selectbox';
         }
     }
 
-    if ($action eq 'create') {
+    if (($action eq 'create') || 
+        ($action eq 'modify' && $state eq 'pick_members')) {
         if (defined($env{'form.types'})) {
             @types=&Apache::loncommon::get_env_multiple('form.types');
         }
@@ -688,7 +691,7 @@ function changeSort(caller) {
     document.$state.sortby.value = caller;
     document.$state.submit();
 } 
-                                                                                      
+
 |;
     $jscript .= &Apache::lonhtmlcommon::set_form_elements(
                            \%{$elements{$action}{$state}},\%stored);
@@ -771,7 +774,7 @@ function changeSort(caller) {
                 &Apache::lonhtmlcommon::add_breadcrumb(
                    {text=>"$trail{$action}{$state}"});
                 $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                     (undef,'Course Groups Manager'));
+			  ('Course Groups Manager'));
                 &display_control($r,$cdom,$cnum,$tabcol,$action,$state,$page,
                        \%sectioncount,$groupname,$description,$functions,
                        \@tools,\%toolprivs,\%fixedprivs,$startdate,$enddate,
@@ -796,7 +799,7 @@ function changeSort(caller) {
                         &Apache::lonhtmlcommon::add_breadcrumb(
                    {text=>"View groups"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                     (undef,'Course Groups Manager'));
+		  ('Course Groups Manager'));
         &display_groups($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,
                         $view_permission,$manage_permission,$action,
                         $rowColor1,$rowColor2);
@@ -808,55 +811,57 @@ function changeSort(caller) {
 
 sub retrieve_settings {
     my ($cdom,$cnum,$groupname) = @_;
-    my %groupinfo;
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$groupname);
+
+    return if (!%curr_groups);
+
+    my %groupinfo = 
+	&Apache::longroup::get_group_settings($curr_groups{$groupname});
+
     my %stored;
-    my %curr_groups;
-    my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,
-                                                             $cnum,$groupname);
-    if ($numgroups > 0) {
-        %groupinfo = &Apache::loncommon::get_group_settings(
-                                                     $curr_groups{$groupname});
-        $stored{'description'} = &Apache::lonnet::unescape(
-                                                    $groupinfo{'description'});
-        $stored{'startdate'} = $groupinfo{'startdate'};
-        $stored{'enddate'} = $groupinfo{'enddate'};
-        if ($stored{'enddate'} == 0) {
-            $stored{'no_end_date'} = 1;
-        }
-        $stored{'granularity'} = $groupinfo{'granularity'};
-        $stored{'specificity'} = $groupinfo{'specificity'};
-        $stored{'creation'} = $groupinfo{'creation'};
-        $stored{'creator'} = $groupinfo{'creator'};
-
-        foreach my $tool (sort(keys(%{$groupinfo{'functions'}}))) {
-            if ($groupinfo{functions}{$tool} eq 'on') {
-                push(@{$stored{tool}},$tool);
-            }
-        }
-        foreach my $role (@{$groupinfo{'roles'}}) {
-            push(@{$stored{roles}},$role);
-        }
-        foreach my $type (@{$groupinfo{'types'}}) {
-            push(@{$stored{types}},$type);
-        }
-        foreach my $section (@{$groupinfo{'sectionpick'}}) {
-            push(@{$stored{sectionpick}},$section);
-        }
-        foreach my $defpriv (@{$groupinfo{'defpriv'}}) {
-            push(@{$stored{defpriv}},$defpriv);
-        }
-        $stored{'autoadd'} = $groupinfo{'autoadd'};
-        $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);
-                }
+
+    $stored{'description'} = 
+	&Apache::lonnet::unescape($groupinfo{'description'});
+    $stored{'startdate'} = $groupinfo{'startdate'};
+    $stored{'enddate'} = $groupinfo{'enddate'};
+    if ($stored{'enddate'} == 0) {
+	$stored{'no_end_date'} = 1;
+    }
+    $stored{'granularity'} = $groupinfo{'granularity'};
+    $stored{'specificity'} = $groupinfo{'specificity'};
+    $stored{'creation'} = $groupinfo{'creation'};
+    $stored{'creator'} = $groupinfo{'creator'};
+
+    foreach my $tool (sort(keys(%{$groupinfo{'functions'}}))) {
+	if ($groupinfo{functions}{$tool} eq 'on') {
+	    push(@{$stored{tool}},$tool);
+	}
+    }
+    foreach my $role (@{$groupinfo{'roles'}}) {
+	push(@{$stored{roles}},$role);
+    }
+    foreach my $type (@{$groupinfo{'types'}}) {
+	push(@{$stored{types}},$type);
+    }
+    foreach my $section (@{$groupinfo{'sectionpick'}}) {
+	push(@{$stored{sectionpick}},$section);
+    }
+    foreach my $defpriv (@{$groupinfo{'defpriv'}}) {
+	push(@{$stored{defpriv}},$defpriv);
+    }
+    $stored{'autoadd'} = $groupinfo{'autoadd'};
+    $stored{'autodrop'} = $groupinfo{'autodrop'};
+    if (exists($groupinfo{'autosec'})) {
+	foreach my $role (sort(keys(%{$groupinfo{'autosec'}}))) {
+            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;
 }
@@ -952,11 +957,13 @@ sub display_control {
 sub header {
     my ($bodytitle,$jscript,$action,$state,$page,$function,$loaditems) = @_;
     my $start_page=
-	&Apache::loncommon::start_page($bodytitle,$jscript,
+	&Apache::loncommon::start_page($bodytitle,
+				       '<script type="text/javascript">'.
+				       $jscript.'</script>',
 				       {'function'    => $function,
 					'add_entries' => $loaditems,});
     my $output = <<"END";
-$bodytag
+$start_page
 <form method="POST" name="$state">
 
 END
@@ -973,23 +980,23 @@ END
 
 sub onload_action {
     my ($action,$state) = @_;
-    my $loaditems;
+    my %loaditems;
     if ((defined($env{'form.origin'})) && ($action eq 'create') &&
                 ($state eq 'pick_name' || $state eq 'pick_members' || 
                  $state eq 'pick_privs')) {
         unless ($env{'form.origin'} eq '') {
-            $loaditems = 
-             'onload="javascript:setFormElements(document.'.$state.')"';
+	    $loaditems{'onload'} = 
+		'javascript:setFormElements(document.'.$state.')';
         }
     }
     if (($action eq 'modify') &&
                 ($state eq 'change_settings' || $state eq 'change_members' ||
                  $state eq 'change_privs' || $state eq 'add_members' ||
                  $state eq 'pick_members')) {
-            $loaditems =
-             'onload="javascript:setFormElements(document.'.$state.')"';
+	$loaditems{'onload'} = 
+	    'javascript:setFormElements(document.'.$state.')';
     }
-    return $loaditems;
+    return \%loaditems;
 }
 
 sub footer {
@@ -1210,7 +1217,7 @@ sub membership_options {
                    previous => &mt('Previously had access'),
                    future => &mt('Will have future access'),
                    );
-                                                                                 
+
     my @roles = ('st','cc','in','ta','ep','cr');
 
     my @sections = keys(%{$sectioncount});
@@ -1246,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>');
@@ -1268,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";
@@ -2306,7 +2313,7 @@ END
                         $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><label><input type="checkbox"
                                           name="user_'.$tool.'" value="'.
                                           $user.'" />'.$tool.
                                           '</label></nobr>&nbsp;&nbsp;&nbsp;');
@@ -2587,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;
@@ -2709,7 +2718,6 @@ END
                           '<br />');
                 &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
                             $toolprivs,\@defprivs);
-                                                                                      
             }
         } else {
             if (keys(%{$usertools}) > 0) {
@@ -2772,7 +2780,9 @@ sub process_request {
             @defprivs = @temp; 
         }
     } else {
-        @defprivs = @{$$stored{'defpriv'}};
+        if (defined($$stored{'defpriv'})) {
+            @defprivs = @{$$stored{'defpriv'}};
+        }
     }
 
     my $outcome;
@@ -2808,7 +2818,7 @@ sub write_group_data {
                              'creation','modified','creator','granularity',
                              'specificity','autoadd','autodrop');
     my @mult_attributes = ('roles','types','sectionpick','defpriv');
-                                                                                    
+
     my %groupinfo = (
                      description => $esc_description,
                      startdate => $startdate,
@@ -2847,14 +2857,11 @@ sub write_group_data {
     }
     my $autosec;
     my @autorole = &Apache::loncommon::get_env_multiple('form.autorole');
-                                                                                    
+
     foreach my $role (@autorole) {
         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;
 }
 
@@ -3409,11 +3423,9 @@ function toggleTools(field,caller) {
 
 sub validate_groupname {
     my ($groupname,$action,$cdom,$cnum) = @_;
-    my %sectioncount;
-    my $numsec=&Apache::loncommon::get_sections($cdom,$cnum,\%sectioncount);
-    my %curr_groups;
-    my $numgroups=&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum);
-                                                                                         
+    my %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+
     my %lt = &Apache::lonlocal::texthash (
                       igna => 'Invalid group name',
                       tgne => 'The group name entered ',
@@ -3427,7 +3439,7 @@ sub validate_groupname {
                       thgr => '- does not correspond to the name of an existing'.  
                               ' group ',    
     );
-                                                                                         
+
     my $exitmsg = '<b>'.$lt{'igna'}.'</b><br /><br />'.$lt{'tgne'}.' "'.
                   $groupname.'" ';
     my $dupmsg = $lt{'grna'};
@@ -3436,21 +3448,16 @@ sub validate_groupname {
         $earlyout = $exitmsg.$lt{'isno'}.'<br />'.$lt{'gnmo'};
         return $earlyout;
     }
-    if ($numsec) {
-        if (exists($sectioncount{$groupname})) {
-            $earlyout = $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
-                        '<br />'.$lt{'grna'};
-            return $earlyout;
-        }
+    if (exists($sectioncount{$groupname})) {
+	return $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
+	    '<br />'.$lt{'grna'};
     }
-    if ($action eq 'create') {
-        if ($numgroups) {
-            if (exists($curr_groups{$groupname})) {
-                $earlyout = $exitmsg.$lt{'cnnb'}.&mt('an existing group').
-                            $lt{'inth'}.'<br />'.$lt{'grna'};
-                return $earlyout;
-            }
-        }
+    if ($action eq 'create' 
+	&& exists($curr_groups{$groupname})) {
+
+	return $exitmsg.$lt{'cnnb'}.&mt('an existing group').
+	    $lt{'inth'}.'<br />'.$lt{'grna'};
+
     } elsif ($action eq 'modify') {
         unless(exists($curr_groups{$groupname})) {
             $earlyout = &mt('Group name:').' '.$groupname.$lt{'thgr'}.$lt{'inth'};