--- loncom/interface/loncoursegroups.pm	2006/03/21 18:32:59	1.10
+++ loncom/interface/loncoursegroups.pm	2006/06/28 16:01:01	1.28
@@ -1,3 +1,6 @@
+# The LearningOnline Network with CAPA
+#
+# $Id: loncoursegroups.pm,v 1.28 2006/06/28 16:01:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,14 +33,17 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::lonnavmaps;
+use Apache::longroup;
 use Apache::Constants qw(:common :http);
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my ($r) = @_;
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-                                                                                
+
     if ($r->header_only) {
         return OK;
     }
@@ -82,10 +88,16 @@ sub handler {
     my $rowColor2 = "#eeeeee";
 
     my $action = $env{'form.action'};
+    my $state = $env{'form.state'};
+    if ((!defined($action)) || ($action eq 'view')) {
+        if (!defined($state)) {
+            $state = 'view';
+        }
+    }
     if ($action eq 'create' || $action eq 'modify' || $action eq 'view') { 
         if ($view_permission || $manage_permission) {
-            &group_administration($r,$action,$cdom,$cnum,$function,$tabcol,
-                                  \%functions,\%idx,$view_permission,
+            &group_administration($r,$action,$state,$cdom,$cnum,$function,
+                                  $tabcol,\%functions,\%idx,$view_permission,
                                   $manage_permission,$rowColor1,$rowColor2);
         } else {
             $r->print(&mt('You do not have group administration '.
@@ -93,7 +105,7 @@ sub handler {
         }
     } else {
         &print_main_menu($r,$cdom,$cnum,$function,$tabcol,\%functions,\%idx,
-                         $view_permission,$manage_permission,$action,
+                         $view_permission,$manage_permission,$action,$state,
                          $rowColor1,$rowColor2);
     }
     return OK;
@@ -101,32 +113,36 @@ sub handler {
 
 sub print_main_menu {
     my ($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,$view_permission,
-        $manage_permission,$action,$rowColor1,$rowColor2) = @_;
-    $r->print(&header('Course Groups',undef,undef,undef,undef,$function));
+        $manage_permission,$action,$state,$rowColor1,$rowColor2) = @_;
+    my $jscript = qq|
+function changeSort(caller) {
+    document.$state.sortby.value = caller;
+    document.$state.submit();
+}\n|;
+    $r->print(&header('Course Groups',$jscript,$action,$state,
+                      undef,$function));
     &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);
+                    $view_permission,$manage_permission,$action,$state,
+                    $rowColor1,$rowColor2);
     $r->print(&footer());
     return;
 }
 
 sub display_groups {
     my ($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,$view_permission,
-        $manage_permission,$action,$rowColor1,$rowColor2) = @_;
+        $manage_permission,$action,$state,$rowColor1,$rowColor2) = @_;
     my %curr_groups = ();
     my %grp_info = ();
-
     my %actionlinks = (
-      modify => '<a href="/adm/coursegroups?action=modify&state=pick_task&refpage='.
-                $env{'form.refpage'}.'&groupname=',
+      modify => '<a href="/adm/coursegroups?action=modify&refpage='.
+                         $env{'form.refpage'}.'&groupname=',
       view => '<a href="/adm/'.$cdom.'/'.$cnum.'/',
       delete => '<a href="/adm/coursegroups?action=delete&refpage='.
-                $env{'form.refpage'}.'&groupname=',
+                         $env{'form.refpage'}.'&groupname=',
     );
     my %lt = &Apache::lonlocal::texthash( 
                           modify => 'Modify',
@@ -155,8 +171,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");
@@ -174,7 +190,7 @@ sub display_groups {
         <td><b>$lt{'func'}</b>
         </td>
         <td><b><a href="javascript:changeSort('quota')">$lt{'quot'}</a></b></td>
-        <td><b><a href="javascript:changeSort('totalmembers)">$lt{'memb'}</a></b></td>
+        <td><b><a href="javascript:changeSort('totalmembers')">$lt{'memb'}</a></b></td>
         <td><b><a href="javascript:changeSort('totalfiles')">$lt{'file'}</a></b></td>
         <td><b><a href="javascript:changeSort('boards')">$lt{'dibd'}</a></b></td>
         <td><b><a href="javascript:changeSort('diskuse')">$lt{'dius'}</a></b></td>
@@ -183,7 +199,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);
@@ -224,7 +240,7 @@ END
                         $rowColor = $rowColor2;
                     }
                     my $description = 
-                   &Apache::lonnet::unescape($grp_info{$group}{'description'});
+                   &unescape($grp_info{$group}{'description'});
                     my $creator = $grp_info{$group}{'creator'};
                     my $creation = $grp_info{$group}{'creation'};
                     my $modified = $grp_info{$group}{'modified'}; 
@@ -246,15 +262,31 @@ END
                     if ($action eq 'modify' || $action eq 'delete') {
                         $link .= $group;
                     } else {
-                        $link .= $group.'/grppg?register=1';
+                        $link .= $group.'/grppg';
+                    }
+                    $link .= '">'.$lt{$action}.'</a>';
+                    if ($action eq 'view') { 
+                        if (($manage_permission) && 
+                            ($env{'form.refpage'} ne 'enrl')) {
+                            $link .= '&nbsp;&nbsp;'.$actionlinks{'modify'}.
+                                      $group.'">'.$lt{'modify'}.'</a>';
+                        }
                     }
-                    $link .= '">'.$lt{$action}.'</a>';  
                     $r->print('<tr bgcolor="'.$rowColor.'"><td><small>'.$link.'</small></td><td><small>'.$group.'</small></td><td><small>'.$description.'</small></td><td><small>'.$creator.'</small></td><td><small>'. &Apache::lonnavmaps::timeToHumanString($creation).'</small></td><td><small>'. &Apache::lonnavmaps::timeToHumanString($modified).'</small></td><td><small>'.$functionality.'</small></td><td><small>'.$quota.'</small></td><td><small>'.$totalmembers.'</small></td><td><small>'.$totalfiles.'</small></td><td><small>'.$boards.'</small></td><td><small>'.$diskuse.'</small></td></tr>');
                     $rowNum ++;
                 }
             }
             $r->print('</table>');
             $r->print(&Apache::lonhtmlcommon::end_pick_box());
+            $r->print('<input type="hidden" name="refpage" '.
+                      'value="'.$env{'form.refpage'}.'" />');
+            if ($action eq 'view') {
+                if (!defined($state)) {
+                    $state = 'view';
+                }
+                $r->print('<input type="hidden" name="state" value="'.
+                      $state.'" />');
+            }
         } else {
             $r->print($lt{'nogr'});
             if ($manage_permission) {
@@ -268,15 +300,15 @@ 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(
+                    my $description = &unescape(
                                         $group_info{description});
                     my ($uname,$udom) = split(/:/,$group_info{creator});
-                    $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg?register=1">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
+                    $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
                 }
             }
         } else {
@@ -288,7 +320,7 @@ END
 }
 
 sub group_administration {
-    my ($r,$action,$cdom,$cnum,$function,$tabcol,$functions,$idx,
+    my ($r,$action,$state,$cdom,$cnum,$function,$tabcol,$functions,$idx,
         $view_permission,$manage_permission,$rowColor1,$rowColor2) = @_;
     my %sectioncount = ();
     my @tools = ();
@@ -303,7 +335,6 @@ sub group_administration {
     my %memchg;
     my @member_changes = ('deletion','expire','activate','reenable',
                           'changefunc','changepriv');
-    my $state = $env{'form.state'};
     my ($groupname,$description,$startdate,$enddate,$granularity,$specificity);
 
     if (defined($env{'form.groupname'})) {
@@ -342,7 +373,11 @@ sub group_administration {
 
     if ($action eq 'modify') {
         if ($state eq '') {
-            $state = 'pick_group';
+            if (defined($env{'form.groupname'})) {
+                $state = 'pick_task';
+            } else {
+                $state = 'pick_group';
+            }
         } else {
             %stored = &retrieve_settings($cdom,$cnum,$groupname);
             if (ref($stored{'types'}) eq 'ARRAY') {
@@ -367,85 +402,100 @@ sub group_administration {
         }
     }
 
-    my %toolprivs = ();
-    %{$toolprivs{'email'}} = (
-                                 sgm => 'Send group mail',
-                                 sgb => 'Broadcast mail',
-                             );
-    %{$toolprivs{'discussion'}} =  (
-                                     cgb => 'Create boards',
-                                     pgd => 'Post',
-                                     pag => 'Anon. posts',
-                                     rgi => 'Get identities', 
-                                     vgb => 'View boards',
-                                   );
-    %{$toolprivs{'chat'}} =  (
-                                pgc => 'Chat',
-                             );
-    %{$toolprivs{'files'}} =  (
-                                 rgf => 'Retrieve',
-                                 ugf => 'Upload',
-                                 dgf => 'Delete',
-                              );
-    %{$toolprivs{'roster'}} = (
-                                 vgm => 'View',
-                              );
-    %{$toolprivs{'homepage'}} = (
-                                vgh => 'View page',
-                                mgh => 'Modify page',
-                              );
-    my %fixedprivs = ();
-    %{$fixedprivs{'email'}} = ('sgm' => 1);
-    %{$fixedprivs{'discussion'}} = ('vgb' => 1);
-    %{$fixedprivs{'chat'}} = ('pgc' => 1);
-    %{$fixedprivs{'files'}} = ('rgf' => 1);
-    %{$fixedprivs{'roster'}} = ('vgm' => 1);
-    %{$fixedprivs{'homepage'}} = ('vgh' => 1);
-
-    my %elements = ();
-    %{$elements{'create'}} = ();
-    %{$elements{'modify'}} = ();
-    %{$elements{'create'}{'pick_name'}} = (
-        startdate_month => 'selectbox',
-        startdate_hour => 'selectbox',
-        enddate_month => 'selectbox',
-        enddate_hour => 'selectbox',
-        startdate_day => 'text',
-        startdate_year => 'text',
-        startdate_minute => 'text',
-        startdate_second => 'text',
-        enddate_day => 'text',
-        enddate_year => 'text',
-        enddate_minute => 'text',
-        enddate_second => 'text',
-        groupname => 'text',
-        description => 'text',
-        tool => 'checkbox',
-        granularity => 'radio',
-        no_end_date => 'checkbox',
-    );
-    %{$elements{'modify'}{'change_settings'}} = (
-                                   %{$elements{'create'}{'pick_name'}},
-                                                specificity => 'radio',
-                                                defpriv => 'checkbox',
-                                                autorole => 'checkbox',
-                                                autoadd => 'radio',
-                                                autodrop => 'radio',
-                                   );
+    my %toolprivs =
+	(
+	 email      => {
+	     sgm => 'Send group 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 %fixedprivs = 
+	(
+	 email      => {sgm => 1},
+	 discussion => {vgb => 1},
+	 chat       => {pgc => 1},
+	 files      => {rgf => 1},
+	 roster     => {vgm => 1},
+	 homepage   => {vgh => 1},
+	 );
+
+    my %elements = 
+	(
+	 create => {
+	     pick_name => {
+		 startdate_month  => 'selectbox',
+		 startdate_hour   => 'selectbox',
+		 enddate_month    => 'selectbox',
+		 enddate_hour     => 'selectbox',
+		 startdate_day    => 'text',
+		 startdate_year   => 'text',
+		 startdate_minute => 'text',
+		 startdate_second => 'text',
+		 enddate_day      => 'text',
+		 enddate_year     => 'text',
+		 enddate_minute   => 'text',
+		 enddate_second   => 'text',
+		 groupname        => 'text',
+		 description      => 'text',
+		 tool             => 'checkbox',
+		 granularity      => 'radio',
+		 no_end_date      => 'checkbox',
+	     },
+	     pick_members => {
+		 member          => 'checkbox',
+		 defpriv         => 'checkbox',
+	     },
+	 },
+	 );
+    
+    $elements{'modify'} = {
+	change_settings => {
+	    %{$elements{'create'}{'pick_name'}},
+	    specificity => 'radio',
+	    defpriv     => 'checkbox',
+	    autorole    => 'checkbox',
+	    autoadd     => 'radio',
+	    autodrop    => 'radio',
+	},
+	add_members => {
+	    types       => 'selectbox',
+	    roles       => 'selectbox',
+	},
+    };
+
     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'}} = (
-        member => 'checkbox',
-        defpriv => 'checkbox',
-    );
-
-    %{$elements{'modify'}{'add_members'}} = (
-        types => 'selectbox',
-        roles => 'selectbox',
-    );
 
     if (($action eq 'create') && ($state eq 'pick_name')) {
         $elements{'create'}{'pick_name'}{'types'} = 'selectbox';
@@ -455,16 +505,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');
         }
@@ -473,7 +523,7 @@ sub group_administration {
         }
         if (defined($env{'form.sectionpick'})) {
             @sections=&Apache::loncommon::get_env_multiple('form.sectionpick');
-            if (grep/^_all$/,@sections) {
+            if (grep/^all$/,@sections) {
                 @sections = sort {$a cmp $b} keys(%sectioncount);
             }
         }
@@ -557,11 +607,17 @@ sub group_administration {
     }
 
     if (($state eq 'pick_privs') || ($state eq 'change_privs') ||
-        (($specificity eq 'No') && 
-         (($state eq 'result') || ($state eq 'memresult')))) {
+         (($specificity eq 'No') && 
+          ($state eq 'memresult' || $state eq 'result' || $state eq 'addresult'))) { 
         foreach my $tool (@tools) {
             my @values = &Apache::loncommon::get_env_multiple('form.user_'.$tool);
             foreach my $user (@values) {
+                if ($state eq 'pick_privs' || $state eq 'result' 
+                    || $state eq 'addresult') {
+                    if (!grep(/^\Q$user\E$/,@members)) {
+                        next;
+                    }
+                }
                 unless(exists($usertools{$user}{$tool})) {
                     $usertools{$user}{$tool} = 1;
                 }
@@ -688,7 +744,7 @@ function changeSort(caller) {
     document.$state.sortby.value = caller;
     document.$state.submit();
 } 
-                                                                                      
+
 |;
     $jscript .= &Apache::lonhtmlcommon::set_form_elements(
                            \%{$elements{$action}{$state}},\%stored);
@@ -702,7 +758,7 @@ function changeSort(caller) {
     @{$branchstates{'members'}} = ('change_members','change_privs','memresult');
     @{$branchstates{'adds'}} = ('add_members','pick_members','pick_privs',
                                 'addresult');
-    
+
     if (defined($env{'form.branch'})) {
         push (@{$states{$action}},@{$branchstates{$env{'form.branch'}}});
     }
@@ -771,7 +827,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,9 +852,9 @@ 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,
+                        $view_permission,$manage_permission,$action,$state,
                         $rowColor1,$rowColor2);
 
     }
@@ -808,55 +864,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'} = 
+	&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;
 }
@@ -898,7 +956,7 @@ sub display_control {
         my $groupname = $env{'form.groupname'};
         if ($state eq 'pick_group') {
             &display_groups($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,
-                            $view_permission,$manage_permission,$action,
+                            $view_permission,$manage_permission,$action,$state,
                             $rowColor1,$rowColor2);
         } elsif ($state eq 'pick_task') {
             &modify_menu($r,$groupname,$page);
@@ -952,11 +1010,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 +1033,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 {
@@ -1028,7 +1088,6 @@ sub group_members {
         $$group_info{'totalmembers'} = 'Unknown - an error occurred';
         return $tmp;
     }
-    my $now = time;
     my $totalmembers = 0;
     my $active = 0;
     my $previous = 0;
@@ -1200,7 +1259,8 @@ sub membership_options {
                 'meof' => 'members of the new group.',
                 'admg' => 'additional members of the group.',
                 'ifno' => 'If you do not wish to add members when you first '.
-                          'create the group, do not make any selections',  
+                          'create the group, do not make any selections.',
+                'asub' => 'A subsequent step will also allow you to specify automatic adding/dropping of group members triggered by specified role and section changes.',
                 'acty' => 'Access types',
                 'coro' => 'Course roles',
                 'cose' => 'Course sections',
@@ -1210,7 +1270,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});
@@ -1222,7 +1282,7 @@ sub membership_options {
     <td colspan="3">
      <b>'.$lt{'gmem'}.'</b><br/>'.$lt{'picr'});
     if ($action eq 'create') {
-        $r->print($lt{'meof'}.'<br />'.$lt{'ifno'});
+        $r->print($lt{'meof'}.'<br />'.$lt{'ifno'}.'<br />'.$lt{'asub'});
     } else {
         $r->print($lt{'admg'});
     }
@@ -1246,8 +1306,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 +1328,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";
@@ -2061,7 +2121,7 @@ sub current_membership {
         my $addtools = 0;
         my $num_reenable = 0;
         my $num_activate = 0;
-        my $num_expire - 0;
+        my $num_expire = 0;
         foreach my $key (sort(keys(%membership))) {
             if ($key =~ /^\Q$groupname\E:([^:]+):([^:]+)$/) {
                 my $uname = $1;
@@ -2070,11 +2130,14 @@ sub current_membership {
                 my($end,$start,@userprivs) = split(/:/,$membership{$key});
                 unless ($start == -1) {
                     $allnames{$udom}{$uname} = 1;
-                    %{$current{$user}} = ();
-                    $current{$user}{uname} = $uname;
-                    $current{$user}{udom} = $udom;
-                    $current{$user}{start} = 
-                                     &Apache::lonlocal::locallocaltime($start);
+                    $current{$user} = {
+			uname     => $uname,
+			udom      => $udom,
+			start     => &Apache::lonlocal::locallocaltime($start),
+			currtools => [],
+			newtools  => [],
+		    };
+
                     if ($end == 0) {
                         $current{$user}{end} =  'No end date';
                     } else {
@@ -2092,8 +2155,6 @@ sub current_membership {
                         $current{$user}{changestate} = 'expire';
                         $num_expire ++;
                     }
-                    @{$current{$user}{currtools}} = ();
-                    @{$current{$user}{newtools}} = ();
                     if (@userprivs > 0) {
                         foreach my $tool (sort(keys(%{$fixedprivs}))) {
                             foreach my $priv (keys(%{$$fixedprivs{$tool}})) {
@@ -2306,7 +2367,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 +2648,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 +2772,6 @@ END
                           '<br />');
                 &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
                             $toolprivs,\@defprivs);
-                                                                                      
             }
         } else {
             if (keys(%{$usertools}) > 0) {
@@ -2772,7 +2834,9 @@ sub process_request {
             @defprivs = @temp; 
         }
     } else {
-        @defprivs = @{$$stored{'defpriv'}};
+        if (defined($$stored{'defpriv'})) {
+            @defprivs = @{$$stored{'defpriv'}};
+        }
     }
 
     my $outcome;
@@ -2803,12 +2867,12 @@ sub write_group_data {
         $creation = $$stored{'creation'};
         $creator = $$stored{'creator'};
     }
-    my $esc_description = &Apache::lonnet::escape($description);
+    my $esc_description = &escape($description);
     my @single_attributes = ('description','functions','startdate','enddate',
                              'creation','modified','creator','granularity',
                              'specificity','autoadd','autodrop');
     my @mult_attributes = ('roles','types','sectionpick','defpriv');
-                                                                                    
+
     my %groupinfo = (
                      description => $esc_description,
                      startdate => $startdate,
@@ -2847,14 +2911,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>';
@@ -2898,6 +2959,9 @@ sub process_membership {
     my $num_ok = 0;
     my $num_fail = 0;
     my %group_privs = ();
+    my %curr_privs = ();
+    my %curr_start = ();
+    my %curr_end = ();
     my %tooltype = ();
 
     foreach my $tool (@{$tools}) {
@@ -2916,7 +2980,7 @@ sub process_membership {
                 }
             } else {
                 if (@{$defprivs} > 0) {
-                    foreach my $priv (@{$defprivs}) {
+                    if (grep/^\Q$priv\E$/,@{$defprivs}) {
                         foreach my $user (sort(keys(%{$usertools}))) {
                             if ($$usertools{$user}{$tool}) {
                                 $group_privs{$user} .= $priv.':';
@@ -2936,6 +3000,7 @@ sub process_membership {
     my @expire = ();
     my @deletion = ();
     my @reenable = ();
+    my @unchanged = ();
     if ($state eq 'memresult') {
         if (ref($$memchg{'activate'}) eq 'ARRAY') {
             @activate = @{$$memchg{'activate'}};
@@ -2949,21 +3014,25 @@ sub process_membership {
         if (ref($$memchg{'reenable'}) eq 'ARRAY') {
             @reenable = @{$$memchg{'reenable'}};
         }
+        my %membership = &Apache::lonnet::get_group_membership($cdom,$cnum,
+                                                                 $groupname);
+        foreach my $key (sort(keys(%membership))) {
+            if ($key =~ /^\Q$groupname\E:([^:]+:[^:]+)$/) {
+                ($curr_end{$1},$curr_start{$1},$curr_privs{$1}) = 
+                                                split(/:/,$membership{$key},3);
+            }
+        }
         if (@expire + @deletion > 0) {
-            my %membership = &Apache::lonnet::get_group_membership($cdom,$cnum,
-                                                                   $groupname);
             foreach my $user (@expire) {
-                my ($currend,$currstart,@userprivs) = 
-                                  split(/:/,$membership{$groupname.':'.$user});
-                $group_privs{$user} = join(':',@userprivs); 
-                if ($currstart > $now) {
-                    $currstart = $now;
+                my $savestart = $curr_start{$user};
+                if ($savestart > $now) {
+                    $savestart = $now;
                 }
-                $usersettings{$groupname.':'.$user} = $now.':'.$currstart.':'.
-                                                      $group_privs{$user};
+                $usersettings{$groupname.':'.$user} = $now.':'.$savestart.':'.
+                                                      $curr_privs{$user};
                 if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname,
-                                                       $user,$now,$currstart,
-                                                       $group_privs{$user}) eq 'ok') {
+                                                       $user,$now,$savestart,
+                                                       $curr_privs{$user}) eq 'ok') {
                     push(@{$added{'expired'}},$user);
                     $num_ok ++;
                 } else {
@@ -2987,19 +3056,35 @@ sub process_membership {
     }
 
     foreach my $user (sort(keys(%{$usertools}))) {
+        if ((grep(/^$user$/,@expire)) || (grep(/^$user$/,@deletion))) {
+            next;
+        }
         my $type;
         my $start = $startdate;
         my $end = $enddate;
         if ($state eq 'memresult') {
+            if ($curr_privs{$user} eq $group_privs{$user}) {
+               push(@unchanged,$user);
+               next;
+            }
+            if (exists($curr_start{$user})) {
+                $start = $curr_start{$user};
+            }
+            if (exists($curr_end{$user})) {
+                $end = $curr_end{$user};
+            }
             $type = 'modified';
             if (@activate > 0) {
                 if (grep/^$user$/,@activate) {
                     $start = $now;
+                    $end = $enddate;
                     $type = 'activated';
                 }
             }
             if (@reenable > 0) {
                 if (grep/^$user$/,@reenable) {
+                    $start = $startdate;
+                    $end = $enddate;
                     $type = 'reenabled';
                 }
             }
@@ -3023,7 +3108,7 @@ sub process_membership {
     if ($num_ok) {
         foreach my $type (sort(keys(%added))) { 
             $r->print(&mt('The following users were successfully [_1]',$type));
-            if (!($type eq 'deleted' ||  $type eq 'expired')) {   
+            if (!($type eq 'deleted' || $type eq 'expired')) {   
                 $r->print(&mt(' with the following privileges'));
             }
             $r->print(':<br />');
@@ -3044,6 +3129,7 @@ sub process_membership {
                 }
                 $r->print($$userdata{$user}[$$idx{fullname}].'&nbsp;-&nbsp;'.$user.$privlist.'<br />');
             }
+            $r->print('<br />');
         }
     }
     if ($num_fail) {
@@ -3053,11 +3139,19 @@ sub process_membership {
                 $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'<br />');
             }
         }
+        $r->print('<br />');
+    }
+    if (@unchanged > 0) {
+        $r->print(&mt('No change occurred for the following users:<br />'));
+        foreach my $user (sort(@unchanged)) {
+            $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'<br />');
+        }
+        $r->print('<br />');
     }
     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 +3209,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');
+    <label><input type="radio" name="autoadd" value="on" />on&nbsp;&nbsp;</label><label><input type="radio" name="autoadd" value="off" checked="checked" />off</label>');
     if ($action eq 'modify') {
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$add}.'</b>)');
     }
@@ -3127,7 +3221,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');
+    <label><input type="radio" name="autodrop" value="on" />on&nbsp;&nbsp;</label><label><input type="radio" name="autodrop" value="off" checked="checked" />off</label>');
     if ($action eq 'modify') {
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$drop}.'</b>)');
     }
@@ -3150,8 +3244,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 +3269,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 +3310,7 @@ sub mapping_settings {
 }
 
 sub standard_roles {
-    my @roles = ('st','ep','ta','in','cc');
+    my @roles = ('cc','in','ta','ep','st');
     return @roles;
 }
 
@@ -3355,7 +3456,7 @@ sub date_setting_table {
 sub create_homepage {
     my ($cdom,$cnum,$name,$groupinfo,$tools) = @_;
     my $functionality = join(',',@{$tools});
-    my $content = &Apache::lonnet::unescape($$groupinfo{description});
+    my $content = &unescape($$groupinfo{description});
     $content=~s/\s+$//s;
     $content=~s/^\s+//s;
     $content=~s/\<br\s*\/*\>$//s;
@@ -3409,11 +3510,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 +3526,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 +3535,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'};