--- loncom/interface/Attic/londropadd.pm	2004/06/17 18:31:24	1.114
+++ loncom/interface/Attic/londropadd.pm	2006/12/21 20:07:57	1.154
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.114 2004/06/17 18:31:24 raeburn Exp $
+# $Id: londropadd.pm,v 1.154 2006/12/21 20:07:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,25 +32,22 @@
 package Apache::londropadd;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::Constants qw(:common :http REDIRECT);
 use Spreadsheet::WriteExcel;
 use Apache::lonstathelpers();
 use Apache::lonlocal;
+use Apache::longroup;
+use LONCAPA();
 
 ###############################################################
 ###############################################################
 sub header {
-    my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
-    my $title = &mt('LON-CAPA Enrollment Manager');
+    my $start_page=&Apache::loncommon::start_page('Enrollment Manager');
     return(<<ENDHEAD);
-<html>
-<head>
-<title>$title</title>
-</head>
-$bodytag
+$start_page
 <form method="post" enctype="multipart/form-data"  
       action="/adm/dropadd" name="studentform">
 ENDHEAD
@@ -64,8 +61,8 @@ sub modifystudent {
     # if $csec is undefined, drop the student from all the courses matching
     # this one.  If $csec is defined, drop them from all other sections of 
     # this course and add them to section $csec
-    $courseid=~s/\_/\//g;
-    $courseid=~s/^(\w)/\/$1/;
+    my $cdom = $env{'course.'.$courseid.'.domain'};
+    my $cnum = $env{'course.'.$courseid.'.num'};
     my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
     my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles
@@ -73,16 +70,16 @@ sub modifystudent {
     # Go through the roles looking for enrollment in this course
     my $result = '';
     foreach my $course (keys(%roles)) {
-        if ($course=~/^$courseid(?:\/)*(?:\s+)*(\w+)*\_st$/) {
+        if ($course=~m{^/\Q$cdom\E/\Q$cnum\E(?:\/)*(?:\s+)*(\w+)*\_st$}) {
             # We are in this course
             my $section=$1;
-            $section='' if ($course eq $courseid.'_st');
+            $section='' if ($course eq "/$cdom/$cnum".'_st');
             if (defined($csec) && $section eq $csec) {
                 $result .= 'ok:';
             } elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
                 my (undef,$end,$start)=split(/\_/,$roles{$course});
                 my $now=time;
-                # if this is an active role 
+                # if this is an active role
                 if (!($start && ($now<$start)) || !($end && ($now>$end))) {
                     my $reply=&Apache::lonnet::modifystudent
                         # dom  name  id mode pass     f     m     l     g
@@ -136,52 +133,89 @@ sub domain_form {
 ###############################################################
 #  Menu Phase One
 sub print_main_menu {
-    my $r=shift;
-    my %Text = &Apache::lonlocal::texthash
-        ('upload'    => 'Upload a class list',
-         'enrollone' => 'Enroll a single student',
-         'modify'    => 'Modify student data',
-         'view'      => 'View Class List',
-         'drop'      => 'Drop Students',
-         'populate'  => 'Automated Enrollment Manager');
-    my %help=();
-    foreach ('Course_Drop_Student','Course_Add_Student',
-	     'Course_Modify_Student_Data','Course_View_Class_List',
-	     'Course_Create_Class_List') {
-	$help{$_}=&Apache::loncommon::help_open_topic($_);
-    }
-
-    $r->print(<<END);
-<p>
-<font size="+1">
-<a href="/adm/dropadd?action=upload">$Text{'upload'}</a>
-</font>$help{'Course_Create_Class_List'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=enrollstudent">$Text{'enrollone'}</a>
-    </font>$help{'Course_Add_Student'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=modifystudent">$Text{'modify'}</a>
-    </font>$help{'Course_Modify_Student_Data'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=classlist">$Text{'view'}</a>
-    </font>$help{'Course_View_Class_List'}
-</p><p>
-<font size="+1">
-    <a href="/adm/dropadd?action=drop">$Text{'drop'}</a>
-    </font>$help{'Course_Drop_Student'}
-</p><p>
-END
-    my ($cdom,$cnum) = split/_/,$ENV{'request.course.id'};
-    if (&Apache::lonnet::auto_run($cnum,$cdom) ) {
-        $r->print(<<END);
-<font size="+1">
-    <a href="/adm/populate">$Text{'populate'}</a>
-</font>
-END
+    my ($r,$enrl_permission,$view_permission,$grp_manage_permission,
+        $grp_view_permission)=@_;
+    #
+    my $cid =$env{'request.course.id'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
+    my @menu = 
+        ( 
+          { text => 'Upload a class list', 
+            help => 'Course_Create_Class_List',
+            action => 'upload',
+            permission => $enrl_permission,
+            },
+          { text => 'Enroll a single student', 
+            help => 'Course_Add_Student',
+            action => 'enrollstudent',
+            permission => $enrl_permission,
+            },
+          { text => 'Modify student data', 
+            help => 'Course_Modify_Student_Data',
+            action => 'modifystudent',
+            permission => $enrl_permission,
+            },
+          { text => 'View Class List', 
+            help => 'Course_View_Class_List',
+            action => 'classlist',
+            permission => $view_permission,
+            },
+          { text => 'Drop Students', 
+            help => 'Course_Drop_Student',
+            action => 'drop',
+            permission => $enrl_permission,
+            },
+          { text => 'Automated Enrollment Manager', 
+            permission => &Apache::lonnet::auto_run($cnum,$cdom),
+            url  => '/adm/populate',
+            },
+          { text => 'Create a new group',
+            help => 'Course_Create_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=create',
+            },
+          { text => 'Modify an existing group',
+            help => 'Course_Modify_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=modify',
+            },
+          { text => 'Delete an existing group',
+            help => 'Course_Delete_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=delete',
+            },
+          { text => 'Re-enable a deleted group',
+            help => 'Course_Reenable_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=reenable',
+            },
+          { text => 'Enter an existing group',
+            help => 'Course_Display_Group',
+            permission => $grp_view_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=view',
+            },
+          );
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/dropadd?action=$menu_item->{'action'}">};
+        }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='</p>'.$/;
     }
+    $r->print($menu_html);
+    return;
 }
 
 ###############################################################
@@ -195,17 +229,17 @@ sub print_upload_manager_header {
     my ($r,$datatoken,$distotal,$krbdefdom)=@_;
     my $javascript;
     #
-    if (! exists($ENV{'form.upfile_associate'})) {
-        $ENV{'form.upfile_associate'} = 'forward';
+    if (! exists($env{'form.upfile_associate'})) {
+        $env{'form.upfile_associate'} = 'forward';
     }
-    if ($ENV{'form.associate'} eq 'Reverse Association') {
-        if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
-            $ENV{'form.upfile_associate'} = 'reverse';
+    if ($env{'form.associate'} eq 'Reverse Association') {
+        if ( $env{'form.upfile_associate'} ne 'reverse' ) {
+            $env{'form.upfile_associate'} = 'reverse';
         } else {
-            $ENV{'form.upfile_associate'} = 'forward';
+            $env{'form.upfile_associate'} = 'forward';
         }
     }
-    if ($ENV{'form.upfile_associate'} eq 'reverse') {
+    if ($env{'form.upfile_associate'} eq 'reverse') {
 	$javascript=&upload_manager_javascript_reverse_associate();
     } else {
 	$javascript=&upload_manager_javascript_forward_associate();
@@ -213,8 +247,8 @@ sub print_upload_manager_header {
     #
     # Deal with restored settings
     my $password_choice = '';
-    if (exists($ENV{'form.ipwd_choice'}) &&
-        $ENV{'form.ipwd_choice'} ne '') {
+    if (exists($env{'form.ipwd_choice'}) &&
+        $env{'form.ipwd_choice'} ne '') {
         # If a column was specified for password, assume it is for an
         # internal password.  This is a bug waiting to be filed (could be
         # local or krb auth instead of internal) but I do not have the 
@@ -224,7 +258,7 @@ sub print_upload_manager_header {
     #
     my $javascript_validations=&javascript_validations('auth',$krbdefdom,
                                     $password_choice);
-    my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':'');
+    my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
     $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
               "<hr>\n".
               '<h3>'.&mt('Identify fields')."</h3>\n");
@@ -237,14 +271,14 @@ sub print_upload_manager_header {
               &hidden_input('state','got_file').
               &hidden_input('associate','').
               &hidden_input('datatoken',$datatoken).
-              &hidden_input('fileupload',$ENV{'form.fileupload'}).
-              &hidden_input('upfiletype',$ENV{'form.upfiletype'}).
-              &hidden_input('upfile_associate',$ENV{'form.upfile_associate'}));
+              &hidden_input('fileupload',$env{'form.fileupload'}).
+              &hidden_input('upfiletype',$env{'form.upfiletype'}).
+              &hidden_input('upfile_associate',$env{'form.upfile_associate'}));
     $r->print('<input type="button" value="Reverse Association" '.
               'name="'.&mt('Reverse Association').'" '.
               'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
-    $r->print('<input type="checkbox" name="noFirstLine" $checked />'.
-              &mt('Ignore First Line'));
+    $r->print('<label><input type="checkbox" name="noFirstLine"'.$checked.'/>'.
+              &mt('Ignore First Line').'</label>');
     $r->print("<hr />\n".
               '<script type="text/javascript" language="Javascript">'."\n".
               $javascript."\n".$javascript_validations.'</script>');
@@ -282,7 +316,7 @@ sub javascript_validations {
          ipass    => 'You need to specify the initial password.',
          name     => 'The optional name field was not specified.',
          snum     => 'The optional student number field was not specified.',
-         section  => 'The optional section or group field was not specified.', 
+         section  => 'The optional section field was not specified.', 
          email    => 'The optional email address field was not specified.',
          continue => 'Continue enrollment?',
          );
@@ -309,7 +343,7 @@ END
         return;
     }
     // alert('current.radiovalue = '+current.radiovalue);
-    if (current.radiovalue == null || current.radiovalue == 'nochange') {
+    if (current.radiovalue == null || current.radiovalue == '' || current.radiovalue == 'nochange') {
         // They did not check any of the login radiobuttons.
         alert('$alert{'authen'}');
         return;
@@ -368,6 +402,7 @@ END
     }
 END
     }
+    my $section_checks;
     my $optional_checks = '';
     if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
         $optional_checks = (<<END);
@@ -375,6 +410,7 @@ END
 }
 END
     } else {
+        $section_checks = &section_check_js();
         $optional_checks = (<<END);
     var message='';
     if (foundname==0) { 
@@ -415,7 +451,7 @@ END
     if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
         $result .= $auth_checks;
     }
-    $result .= $optional_checks;
+    $result .= $optional_checks."\n".$section_checks;
     if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
         $result .= $authheader;
     }
@@ -426,7 +462,7 @@ END
 ###############################################################
 sub upload_manager_javascript_forward_associate {
     return(<<ENDPICK);
-function verify(vf) {
+function verify(vf,sec_caller) {
     var founduname=0;
     var foundpwd=0;
     var foundname=0;
@@ -519,7 +555,7 @@ ENDPICK
 ###############################################################
 sub upload_manager_javascript_reverse_associate {
     return(<<ENDPICK);
-function verify(vf) {
+function verify(vf,sec_caller) {
     var founduname=0;
     var foundpwd=0;
     var foundname=0;
@@ -581,9 +617,9 @@ sub print_upload_manager_footer {
                   kerb_def_dom => $krbdefdom,
                   kerb_def_auth => $krbdef
                   );
-    if (exists($ENV{'form.ipwd_choice'}) &&
-        defined($ENV{'form.ipwd_choice'}) &&
-        $ENV{'form.ipwd_choice'} ne '') {
+    if (exists($env{'form.ipwd_choice'}) &&
+        defined($env{'form.ipwd_choice'}) &&
+        $env{'form.ipwd_choice'} ne '') {
         $param{'curr_authtype'} = 'int';
     }
     my $krbform = &Apache::loncommon::authform_kerberos(%param);
@@ -597,6 +633,7 @@ sub print_upload_manager_footer {
     $Str .= '<h3>'.&mt('Login Type')."</h3>\n";
     $Str .= "<p>\n".
         &mt('Note: this will not take effect if the user already exists').
+	&Apache::loncommon::help_open_topic('Auth_Options').
         "</p><p>\n";
     $Str .= $krbform."\n</p><p>\n".
         $intform."\n</p><p>\n".
@@ -606,15 +643,16 @@ sub print_upload_manager_footer {
     $Str .= "<h3>".&mt('Starting and Ending Dates')."</h3>\n";
     $Str .= "<p>\n".$date_table."</p>\n";
     $Str .= "<h3>".&mt('Full Update')."</h3>\n";
-    $Str .= '<input type="checkbox" name="fullup" value="yes">'.
+    $Str .= '<label><input type="checkbox" name="fullup" value="yes">'.
         ' '.&mt('Full update (also print list of users not enrolled anymore)').
-        "</p>\n";
+        "</label></p>\n";
     $Str .= "<h3>".&mt('Student Number')."</h3>\n";
-    $Str .= "<p>\n".'<input type="checkbox" name="forceid" value="yes">';
+    $Str .= "<p>\n".'<label><input type="checkbox" name="forceid" value="yes">';
     $Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
                 'of Conflicting IDs (only do if you know what you are doing)').
-                "\n</p><p>\n";
-    $Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
+                "</label>\n</p><p>\n";
+    $Str .= '<input type="button"'. 
+              'onClick="javascript:verify(this.form,this.form.csec)" '.
         'value="Update Class List" />'."<br />\n";
     $Str .= &mt('Note: for large courses, this operation may be time '.
                 'consuming');
@@ -629,14 +667,14 @@ sub print_upload_manager_form {
 
     my $firstLine;
     my $datatoken;
-    if (!$ENV{'form.datatoken'}) {
+    if (!$env{'form.datatoken'}) {
         $datatoken=&Apache::loncommon::upfile_store($r);
     } else {
-        $datatoken=$ENV{'form.datatoken'};
+        $datatoken=$env{'form.datatoken'};
         &Apache::loncommon::load_tmp_file($r);
     }
     my @records=&Apache::loncommon::upfile_record_sep();
-    if($ENV{'form.noFirstLine'}){
+    if($env{'form.noFirstLine'}){
         $firstLine=shift(@records);
     }
     my $total=$#records;
@@ -659,7 +697,7 @@ sub print_upload_manager_form {
                            });
     #
     # Determine kerberos parameters as appropriate
-    my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $defdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my ($krbdef,$krbdefdom) =
         &Apache::loncommon::get_kerberos_defaults($defdom);
     #
@@ -668,17 +706,17 @@ sub print_upload_manager_form {
     my $keyfields;
     if ($total>=0) {
         my @field=
-            (['username',&mt('Username'),     $ENV{'form.username_choice'}],
-             ['names',&mt('Last Name, First Names'),$ENV{'form.names_choice'}],
-             ['fname',&mt('First Name'),      $ENV{'form.fname_choice'}],
-             ['mname',&mt('Middle Names/Initials'),$ENV{'form.mname_choice'}],
-             ['lname',&mt('Last Name'),       $ENV{'form.lname_choice'}],
-             ['gen',  &mt('Generation'),      $ENV{'form.gen_choice'}],
-             ['id',   &mt('ID/Student Number'),$ENV{'form.id_choice'}],
-             ['sec',  &mt('Group/Section'),   $ENV{'form.sec_choice'}],
-             ['ipwd', &mt('Initial Password'),$ENV{'form.ipwd_choice'}],
-             ['email',&mt('EMail Address'),   $ENV{'form.email_choice'}]);
-	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
+            (['username',&mt('Username'),     $env{'form.username_choice'}],
+             ['names',&mt('Last Name, First Names'),$env{'form.names_choice'}],
+             ['fname',&mt('First Name'),      $env{'form.fname_choice'}],
+             ['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}],
+             ['lname',&mt('Last Name'),       $env{'form.lname_choice'}],
+             ['gen',  &mt('Generation'),      $env{'form.gen_choice'}],
+             ['id',   &mt('ID/Student Number'),$env{'form.id_choice'}],
+             ['sec',  &mt('Section'),          $env{'form.sec_choice'}],
+             ['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}],
+             ['email',&mt('EMail Address'),   $env{'form.email_choice'}]);
+	if ($env{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($r,\@records);
 	    $i=&Apache::loncommon::csv_print_select_table($r,\@records,
                                                           \@field);
@@ -702,25 +740,29 @@ sub print_upload_manager_form {
 sub enroll_single_student {
     my $r=shift;
     # Remove non alphanumeric values from section
-    $ENV{'form.csec'}=~s/\W//g;
+    $env{'form.csec'}=~s/\W//g;
     #
     # We do the dates first because the action of making them the defaul
     # in the course is entirely separate from the action of enrolling the
     # student.  Also, a failure in setting the dates as default is not fatal
     # to the process of enrolling / modifying a student.
     my ($startdate,$enddate) = &get_dates_from_form();
-    if ($ENV{'form.makedatesdefault'}) {
+    if ($env{'form.makedatesdefault'}) {
         $r->print(&make_dates_default($startdate,$enddate));
     }
 
     $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
-    $r->print('<p>'.&mt('Enrolling').' '.$ENV{'form.cuname'}." \@ ".
-              $ENV{'form.lcdomain'}.'</p>');
-    if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
-        ($ENV{'form.lcdomain'})&&($ENV{'form.lcdomain'}!~/\W/)) {
+    $r->print('<p>'.&mt('Enrolling').' '.$env{'form.cuname'}." \@ ".
+              $env{'form.lcdomain'}.'</p>');
+    if (($env{'form.cuname'})
+	&& ($env{'form.cuname'} 
+	    eq &LONCAPA::clean_username($env{'form.cuname'}))
+	&& ($env{'form.lcdomain'})
+	&& ($env{'form.lcdomain'}
+	    eq &LONCAPA::clean_domain($env{'form.lcdomain'}))) {
         # Deal with home server selection
-        my $domain=$ENV{'form.lcdomain'};
-        my $desiredhost = $ENV{'form.lcserver'};
+        my $domain=$env{'form.lcdomain'};
+        my $desiredhost = $env{'form.lcserver'};
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
@@ -735,33 +777,33 @@ sub enroll_single_student {
         # End of home server selection logic
 	my $amode='';
         my $genpwd='';
-        if ($ENV{'form.login'} eq 'krb') {
+        if ($env{'form.login'} eq 'krb') {
            $amode='krb';
-	   $amode.=$ENV{'form.krbver'};
-           $genpwd=$ENV{'form.krbarg'};
-        } elsif ($ENV{'form.login'} eq 'int') {
+	   $amode.=$env{'form.krbver'};
+           $genpwd=$env{'form.krbarg'};
+        } elsif ($env{'form.login'} eq 'int') {
            $amode='internal';
-           $genpwd=$ENV{'form.intarg'};
-        }  elsif ($ENV{'form.login'} eq 'loc') {
+           $genpwd=$env{'form.intarg'};
+        }  elsif ($env{'form.login'} eq 'loc') {
 	    $amode='localauth';
-	    $genpwd=$ENV{'form.locarg'};
+	    $genpwd=$env{'form.locarg'};
 	    if (!$genpwd) { $genpwd=" "; }
 	}
-        my $home = &Apache::lonnet::homeserver($ENV{'form.cuname'},
-                                                   $ENV{'form.lcdomain'});
+        my $home = &Apache::lonnet::homeserver($env{'form.cuname'},
+                                                   $env{'form.lcdomain'});
         if ((($amode) && ($genpwd)) || ($home ne 'no_host')) {
             # Clean out any old roles the student has in this class.
-            &modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'},
-                           $ENV{'request.course.id'},$ENV{'form.csec'},
+            &modifystudent($env{'form.lcdomain'},$env{'form.cuname'},
+                           $env{'request.course.id'},$env{'form.csec'},
                             $desiredhost);
             my $login_result = &Apache::lonnet::modifystudent
-                ($ENV{'form.lcdomain'},$ENV{'form.cuname'},
-                 $ENV{'form.cstid'},$amode,$genpwd,
-                 $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
-                 $ENV{'form.clast'},$ENV{'form.cgen'},
-                 $ENV{'form.csec'},$enddate,
-                 $startdate,$ENV{'form.forceid'},
-                 $desiredhost);
+                ($env{'form.lcdomain'},$env{'form.cuname'},
+                 $env{'form.cstid'},$amode,$genpwd,
+                 $env{'form.cfirst'},$env{'form.cmiddle'},
+                 $env{'form.clast'},$env{'form.cgen'},
+                 $env{'form.csec'},$enddate,
+                 $startdate,$env{'form.forceid'},
+                 $desiredhost,$env{'form.emailaddress'});
             if ($login_result =~ /^ok/) {
                 $r->print($login_result);
                 $r->print("<p> ".&mt('If active, the new role will be available when the student next logs in to LON-CAPA.')."</p>");
@@ -775,7 +817,7 @@ sub enroll_single_student {
             } else {
                 $r->print(&mt('Invalid login mode or password.').'  ');
             }
-            $r->print('<b>'.&mt('Unable to enroll').' '.$ENV{'form.cuname'}.'.</b></p>');
+            $r->print('<b>'.&mt('Unable to enroll').' '.$env{'form.cuname'}.'.</b></p>');
         }
     } else {
         $r->print(&mt('Invalid username or domain'));
@@ -787,9 +829,9 @@ sub setup_date_selectors {
     if (! defined($starttime)) {
         $starttime = time;
         unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
-            if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+            if (exists($env{'course.'.$env{'request.course.id'}.
                             '.default_enrollment_start_date'})) {
-                $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
+                $starttime = $env{'course.'.$env{'request.course.id'}.
                                   '.default_enrollment_start_date'};
             }
         }
@@ -797,9 +839,9 @@ sub setup_date_selectors {
     if (! defined($endtime)) {
         $endtime = time+(6*30*24*60*60); # 6 months from now, approx
         unless ($mode eq 'createcourse') {
-            if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+            if (exists($env{'course.'.$env{'request.course.id'}.
                             '.default_enrollment_end_date'})) {
-                $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
+                $endtime = $env{'course.'.$env{'request.course.id'}.
                                 '.default_enrollment_end_date'};
             }
         }
@@ -832,7 +874,7 @@ sub setup_date_selectors {
 sub get_dates_from_form {
     my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
     my $enddate   = &Apache::lonhtmlcommon::get_date_from_form('enddate');
-    if ($ENV{'form.no_end_date'}) {
+    if ($env{'form.no_end_date'}) {
         $enddate = 0;
     }
     return ($startdate,$enddate);
@@ -842,16 +884,16 @@ sub date_setting_table {
     my ($starttime,$endtime,$mode) = @_;
     my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
     my $dateDefault = '<nobr>'.
-        '<input type="checkbox" name="makedatesdefault" /> '.
-        &mt('make these dates the default for future enrollment');
+        '<label><input type="checkbox" name="makedatesdefault" /> '.
+        &mt('make these dates the default for future enrollment').'</label>';
     if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
         $dateDefault = '&nbsp;';
     }
-    my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
+    my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
     if (defined($endtime) && $endtime == 0) {
         $perpetual .= ' checked';
     }
-    $perpetual.= ' /> '.&mt('no ending date').'</nobr>';
+    $perpetual.= ' /> '.&mt('no ending date').'</label></nobr>';
     if ($mode eq 'create_enrolldates') {
         $perpetual = '&nbsp;';
     }
@@ -870,8 +912,8 @@ sub date_setting_table {
 sub make_dates_default {
     my ($startdate,$enddate) = @_;
     my $result = '';
-    my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $put_result = &Apache::lonnet::put('environment',
             {'default_enrollment_start_date'=>$startdate,
              'default_enrollment_end_date'  =>$enddate},$dom,$crs);
@@ -879,7 +921,8 @@ sub make_dates_default {
         $result .= "Set default start and end dates for course<br />";
         #
         # Refresh the course environment
-        &Apache::lonnet::coursedescription($ENV{'request.course.id'});
+        &Apache::lonnet::coursedescription($env{'request.course.id'},
+					   {'freshen_cache' => 1});
     } else {
         $result .= &mt('Unable to set default dates for course').":".$put_result.
             '<br />';
@@ -893,7 +936,7 @@ sub make_dates_default {
 sub get_student_username_domain_form {
     my $r = shift;
     my $domform = &Apache::loncommon::select_dom_form
-        ($ENV{'course.'.$ENV{'request.course.id'}.'.domain'},'cudomain',0);
+        ($env{'course.'.$env{'request.course.id'}.'.domain'},'cudomain',0);
     my %lt=&Apache::lonlocal::texthash(
 		    'eos'  => "Enroll One Student",
 		    'usr'  => "Username",
@@ -914,6 +957,10 @@ sub get_student_username_domain_form {
     <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />
     </td></tr>
 </table>
+<script type="text/javascript">
+// the if prevents the script error if the browser can not handle this
+if ( document.studentform.cuname ) { document.studentform.cuname.focus(); }
+</script>
 END
     return;
 }
@@ -922,8 +969,8 @@ sub print_enroll_single_student_form {
     my $r=shift;
     $r->print("<h3>".&mt('Enroll One Student')."</h3>");
     #
-    my $username = $ENV{'form.cuname'};
-    my $domain   = $ENV{'form.cudomain'};
+    my $username = &LONCAPA::clean_username($env{'form.cuname'});
+    my $domain   = &LONCAPA::clean_domain($env{'form.cudomain'});
     my $home = &Apache::lonnet::homeserver($username,$domain);
     # $new_user flags whether we are creating a new user or using an old one
     my $new_user = 1;
@@ -934,7 +981,7 @@ sub print_enroll_single_student_form {
     my $user_data_html = '';
     my $javascript_validations = '';
     if ($new_user) {
-        my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+        my $defdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
         # Set up authentication forms
         my ($krbdef,$krbdefdom) =
             &Apache::loncommon::get_kerberos_defaults($domain);
@@ -968,7 +1015,9 @@ sub print_enroll_single_student_form {
                        'hs'   => "Home Server",
                        'pswd' => "Password",
 		       'psam' => "Please select an authentication mechanism",
+                       'mail' => "Email Address"
 					   );
+	my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');
         $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>
 <table>
@@ -982,9 +1031,11 @@ sub print_enroll_single_student_form {
     <td><input type="text" name="cgen"    size="5"> </td></tr>
 <tr><th>$lt{'hs'}:</th>
     <td>$homeserver_form</td></tr>
+<tr><th>$lt{'mail'}:</th>
+    <td><input type="text" name="emailaddress" size="20" /></td></tr>
 </table>
 <h3>$lt{'pswd'}</h3>
-$lt{'psam'}
+$lt{'psam'}$authhelp
 <table>
 <p>
 $krbform
@@ -1004,6 +1055,7 @@ END
                        'mn'   => "Middle Name",
                        'ln'   => "Last Name",
                        'gen'  => "Generation",
+                       'mail' => "Email Address",
 					   );
         $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>
@@ -1025,6 +1077,10 @@ END
     <td>
     <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
     </td></tr>
+<tr><th>$lt{'mail'}:</th>
+    <td>
+    <input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" />
+    </td></tr>
 </table>
 END
     }
@@ -1032,7 +1088,7 @@ END
         # Print it all out
     my %lt=&Apache::lonlocal::texthash(
 		   'cd'   => "Course Data",
-                   'gs'   => "Group/Section",
+                   'gs'   => "Section",
                    'idsn' => "ID/Student Number",
                    'disn' => "Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)",
                    'eas'  => "Enroll as student",
@@ -1043,7 +1099,7 @@ END
 <input type="hidden" name="cuname" value="$username" />
 <input type="hidden" name="lcdomain" value="$domain" />
 <script type="text/javascript" language="Javascript">
-function verify(vf) {
+function verify(vf,sec_caller) {
     var founduname=0;
     var foundpwd=0;
     var foundname=0;
@@ -1060,6 +1116,9 @@ function verify(vf) {
     }
     if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) {
         foundsec=1;
+        if (validate(sec_caller) == "error") {
+            return;
+        }
     }
     if ((typeof(vf.cstid.value)!="undefined") && (vf.cstid.value!='')) {
 	foundid=1;
@@ -1091,10 +1150,12 @@ $date_table
 <p>
 $lt{'idsn'}: <input type="text" name="cstid" size="10">
 </p><p>
+<label>
 <input type="checkbox" name="forceid" value="yes"> 
 $lt{'disn'}
+</label>
 </p><p>
-<input type="button" onClick="verify(this.form)" value="$lt{'eas'}">
+<input type="button" onClick="verify(this.form,this.form.csec)" value="$lt{'eas'}">
 </p>
 END
     return;
@@ -1104,7 +1165,7 @@ END
 sub print_drop_menu {
     my $r=shift;
     $r->print("<h3>".&mt('Drop Students')."</h3>");
-    my $cid=$ENV{'request.course.id'};
+    my $cid=$env{'request.course.id'};
     my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {
         $r->print(&mt('There are no students currently enrolled.')."\n");
@@ -1118,30 +1179,31 @@ sub print_drop_menu {
 # ============================================== view classlist
 sub print_html_classlist {
     my ($r,$mode) = @_;
-    if (! exists($ENV{'form.sortby'})) {
-        $ENV{'form.sortby'} = 'username';
+    if (! exists($env{'form.sortby'})) {
+        $env{'form.sortby'} = 'username';
     }
-    if ($ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
-        $ENV{'form.Status'} = 'Active';
+    if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
+        $env{'form.Status'} = 'Active';
     }
     my $status_select = &Apache::lonhtmlcommon::StatusOptions
-        ($ENV{'form.Status'});
-    my $cid=$ENV{'request.course.id'};
-    my $cdom=$ENV{'course.'.$cid.'.domain'};
-    my $cnum=$ENV{'course.'.$cid.'.num'};
+        ($env{'form.Status'});
+    my $cid =$env{'request.course.id'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
     #
     # List course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
     #
-    if (! defined($ENV{'form.output'}) ||
-        $ENV{'form.output'} !~ /^(csv|excel|html)$/ ) {
-        $ENV{'form.output'} = 'html';
+    if (! defined($env{'form.output'}) ||
+        $env{'form.output'} !~ /^(csv|excel|html)$/ ) {
+        $env{'form.output'} = 'html';
     }
     #
-    $r->print('<br /><table border="2">');
+    $r->print('<br />'.&Apache::loncommon::start_data_table());
     foreach my $role (sort keys %coursepersonnel) {
         next if ($role =~ /^\s*$/);
-	$r->print('<tr><td>'.$role.'</td><td>');
+	$r->print(&Apache::loncommon::start_data_table_row().
+		  '<td>'.$role.'</td><td>');
         foreach my $user (split(',',$coursepersonnel{$role})) {
 	    my ($puname,$pudom)=split(':',$user);
 	    $r->print(' '.&Apache::loncommon::aboutmewrapper(
@@ -1149,22 +1211,22 @@ sub print_html_classlist {
                                                                   $pudom),
                                                              $puname,$pudom));
 	}
-        $r->print('</td></tr>');
+        $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
-    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_data_table());
     #
     # Interface output
     $r->print('<input type="hidden" name="action" value="'.
-              $ENV{'form.action'}.'" />');
+              $env{'form.action'}.'" />');
     $r->print("<p>\n");
-    if ($ENV{'form.action'} ne 'modifystudent') {
+    if ($env{'form.action'} ne 'modifystudent') {
 	my %lt=&Apache::lonlocal::texthash('csv' => "CSV",
                                            'excel' => "Excel",
                                            'html'  => 'HTML');
         my $output_selector = '<select size="1" name="output" >';
         foreach my $outputformat ('html','csv','excel') {
             my $option = '<option value="'.$outputformat.'" ';
-            if ($outputformat eq $ENV{'form.output'}) {
+            if ($outputformat eq $env{'form.output'}) {
                 $option .= 'selected ';
             }
             $option .='>'.$lt{$outputformat}.'</option>';
@@ -1184,12 +1246,12 @@ sub print_html_classlist {
         $r->print(&mt('There are no students currently enrolled.')."\n");
     } else {
         # Print out the available choices
-        if ($ENV{'form.action'} eq 'modifystudent') {
+        if ($env{'form.action'} eq 'modifystudent') {
             &show_class_list($r,'view','modify',
-                             $ENV{'form.Status'},$classlist,$keylist);
+                             $env{'form.Status'},$classlist,$keylist);
         } else {
-            &show_class_list($r,$ENV{'form.output'},'aboutme',
-                             $ENV{'form.Status'},$classlist,$keylist);
+            &show_class_list($r,$env{'form.output'},'aboutme',
+                             $env{'form.Status'},$classlist,$keylist);
         }
     }
 }
@@ -1197,7 +1259,11 @@ sub print_html_classlist {
 # =================================================== Show student list to drop
 sub show_class_list {
     my ($r,$mode,$linkto,$statusmode,$classlist,$keylist)=@_;
-    my $cid=$ENV{'request.course.id'};
+    my $cid=$env{'request.course.id'};
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+                                              $classlist,$keylist,$cdom,$cnum);
     #
     # Variables for excel output
     my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
@@ -1205,34 +1271,41 @@ sub show_class_list {
     # Variables for csv output
     my ($CSVfile,$CSVfilename);
     #
-    my $sortby = $ENV{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id|start|end|type)$/) {
+    my $sortby = $env{'form.sortby'};
+    if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end|type)$/) {
         $sortby = 'username';
     }
+    if (! exists($env{'form.displayphotos'})) {
+        $env{'form.displayphotos'} = 'off';
+    }
+    my $displayphotos = $env{'form.displayphotos'};
+
     # Print out header 
     unless ($mode eq 'autoenroll') {
         $r->print(<<END);
-<input type="hidden" name="state" value="$ENV{'form.state'}" />
+<input type="hidden" name="state" value="$env{'form.state'}" />
 END
     }
     $r->print(<<END);
 <input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="displayphotos" value="$displayphotos" />
 END
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
         if ($linkto eq 'aboutme') {
-            $r->print(&mt('Select a user name to view the users personal page.'));
+            $r->print(&mt("Select a user name to view the user's personal page."));
         } elsif ($linkto eq 'modify') {
-            $r->print(&mt('Select a user name to modify the students information'));
+            $r->print(&mt("Select a user name to modify the student's information"));
         }
 	my %lt=&Apache::lonlocal::texthash(
                                            'usrn'   => "username",
                                            'dom'    => "domain",
                                            'sn'     => "student name",
                                            'sec'    => "section",
+                                           'grp'    => "active groups",
                                            'start'  => "start date",
                                            'end'    => "end date",
-                                           'type'   => "enroll type",
-                                           'chan'   => "change"
+                                           'type'   => "enroll type/action",
+                                           'photo'  => "photo",
 					   );
         unless ($mode eq 'autoenroll') {
             $r->print(<<END);
@@ -1240,11 +1313,35 @@ END
 <input type="hidden" name="sdom"   value="" />
 END
         }
-        $r->print(<<END);
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+            $r->print('
+<script type="text/javascript">
+function photowindow(photolink) {
+    var title = "Photo_Viewer";
+    var options = "scrollbars=1,resizable=1,menubar=0";
+    options += ",width=240,height=240";
+    stdeditbrowser = open(photolink,title,options,"1");
+    stdeditbrowser.focus();
+}
+</script>
+           ');
+        }
+        $r->print("
 <p>
-<table border=2>
-<tr><th>Count
-    </th><th>
+".&Apache::loncommon::start_data_table()."
+<tr>
+        ");
+        if ($mode eq 'autoenroll') {
+            $r->print("
+ <th><a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a></th>
+            ");
+        } else {
+            $r->print("
+<th>Count</th>
+            ");
+        }
+        $r->print(<<END);
+    <th>
        <a href="javascript:document.studentform.sortby.value='username';document.studentform.submit();">$lt{'usrn'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='domain';document.studentform.submit();">$lt{'dom'}</a>
@@ -1258,22 +1355,31 @@ END
        <a href="javascript:document.studentform.sortby.value='start';document.studentform.submit();">$lt{'start'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='groups';document.studentform.submit();">$lt{'grp'}</a>
     </th>
 END
-        if ($mode eq 'autoenroll') {
-            $r->print("   <th>
-       <a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a>
-    </th><th>
-         $lt{'chan'}?</th>");
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+            my %photo_options = &Apache::lonlocal::texthash(
+                                                            'on' => 'Show',
+                                                            'off' => 'Hide',
+                                                            );
+            my $photochg = 'on';
+            if ($displayphotos eq 'on') {
+                $photochg = 'off';
+            }
+            $r->print('    <th>'."\n".'     '. 
+            '<a href="javascript:document.studentform.displayphotos.value='.
+                      "'".$photochg."'".';document.studentform.submit();">'.
+                      $photo_options{$photochg}.'</a>&nbsp;'.$lt{'photo'}."\n".
+                      '    </th>'."\n");
         }
-        $r->print("
-   </tr>
-        ");
+        $r->print("  </tr>\n");
     } elsif ($mode eq 'csv') {
 	#
 	# Open a file
 	$CSVfilename = '/prtspool/'.
-	    $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+	    $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
             time.'_'.rand(1000000000).'.csv';
 	unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
 	    $r->log_error("Couldn't open $CSVfilename for output $!");
@@ -1287,36 +1393,36 @@ END
         if($statusmode eq 'Expired') {
             print $CSVfile '"'.&mt('Students with expired roles').'"'."\n";
         }
+        if($statusmode eq 'Future') {
+            print $CSVfile '"'.&mt('Students with future roles').'"'."\n";
+        }
         if ($statusmode eq 'Any') {
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section","start date","end date","status")).'"'."\n";
+                   "section","start date","end date","status","active groups"))
+                  .'"'."\n";
         } else {
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section","start date","end date")).'"'."\n";
+                   "section","start date","end date","active groups")).'"'."\n";
         }
     } elsif ($mode eq 'excel') {
         # Create the excel spreadsheet
-        $excel_filename = '/prtspool/'.
-            $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-                time.'_'.rand(1000000000).'.xls';
-        $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.
-                                                       $excel_filename);
-        $excel_workbook->set_tempdir('/home/httpd/perl/tmp');
-        #
-        $format = &Apache::loncommon::define_excel_formats($excel_workbook);
+        ($excel_workbook,$excel_filename,$format) = 
+            &Apache::loncommon::create_workbook($r);
+        return if (! defined($excel_workbook));
         $excel_sheet = $excel_workbook->addworksheet('classlist');
         #
         my $description = 'Class List for '.
-            $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+            $env{'course.'.$env{'request.course.id'}.'.description'};
         $excel_sheet->write($row++,0,$description,$format->{'h1'});
         #
         $excel_sheet->write($row++,0,["username","domain","ID",
                                       "student name","section",
-                                      "start date","end date","status"],
+                                      "start date","end date","status",
+                                      "active groups"],
                             $format->{'bold'});
     }
     #
@@ -1326,6 +1432,7 @@ END
     foreach (@$keylist) {
         $index{$_} = $i++;
     }
+    $index{'groups'} = scalar(@{$keylist});
     my $index  = $index{$sortby};
     my $second = $index{'username'};
     my $third  = $index{'domain'};
@@ -1337,17 +1444,26 @@ END
         lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
         } (keys(%$classlist));
     my $studentcount = 0;
+    my $autocount = 0;
+    my $manualcount = 0;
+    my $unlockcount = 0;
+    my $lockcount = 0;
     foreach my $student (@Sorted_Students) {
         my $sdata = $classlist->{$student};
+        my $groups = $classgroups->{$student};
         my $username = $sdata->[$index{'username'}];
         my $domain   = $sdata->[$index{'domain'}];
         my $section  = $sdata->[$index{'section'}];
+        my $active_groups;
+        if (ref($groups->{active}) eq 'HASH') {
+            $active_groups = join(', ',keys(%{$groups->{'active'}}));
+        }
         my $name     = $sdata->[$index{'fullname'}];
         my $id       = $sdata->[$index{'id'}];
         my $status   = $sdata->[$index{'status'}];
         my $start    = $sdata->[$index{'start'}];
         my $end      = $sdata->[$index{'end'}];
-        my $type     = $sdata->[$index{'type'}]; 
+        my $type     = $sdata->[$index{'type'}];
         next if (($statusmode ne 'Any') && ($status ne $statusmode));
         if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
             if (! defined($start) || $start == 0) {
@@ -1360,7 +1476,30 @@ END
             } else {
                 $end = &Apache::lonlocal::locallocaltime($end);
             }
-            $r->print("<tr>\n    <td>".(++$studentcount)."</td><td>\n    ");
+	    $r->print(&Apache::loncommon::start_data_table_row());
+            if ($mode eq 'autoenroll') {
+                my $lockedtype = $sdata->[$index{'lockedtype'}];
+                $studentcount++;
+                my $cellentry;
+                if ($type eq 'auto') {
+                    $cellentry = '<b>'.&mt('auto').'</b>&nbsp;<label><input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" />&nbsp;Change</label>';
+                    $autocount ++;
+                } else {
+                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" />&nbsp;Change</label></nobr></td></tr><tr><td><nobr>';
+                    $manualcount ++;
+                    if ($lockedtype) {
+                        $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Unlock').'</label>';
+                        $unlockcount ++;
+                    } else {
+                        $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Lock').'</label>';
+                        $lockcount ++;
+                    }
+                    $cellentry .= '</nobr></td></tr></table>';
+                }
+                $r->print("<td>$cellentry<td>\n    ");
+            } else {
+                $r->print("<td>".(++$studentcount)."</td><td>\n    ");
+            }
             if ($linkto eq 'nothing') {
                 $r->print($username);
             } elsif ($linkto eq 'aboutme') {
@@ -1384,17 +1523,22 @@ END
     <td>$section</td>
     <td>$start</td>
     <td>$end</td>
+    <td>$active_groups</td>
 END
-            if ($mode eq 'autoenroll') {
-                my $longtype = &mt('manual').'&nbsp';
-                if ($type eq 'auto') {
-                    $longtype = &mt('auto').'&nbsp';
+            if ($env{'course.'.$env{'request.course.id'}.
+			 '.internal.showphoto'}) {
+                if ($displayphotos eq 'on') {
+                    my $imgurl = 
+			&Apache::lonnet::retrievestudentphoto($domain,
+							      $username,'gif',
+							      'thumbnail');
+                
+                    $r->print('    <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($domain,$username,'jpg')."'".')"><img src="'.$imgurl.'" border="1"></a></td>');
+                } else {
+                    $r->print('    <td>&nbsp;</td>  ');
                 }
-                $r->print("<td><b>$longtype</b></td><td><input type=\"checkbox\" name=\"switch:$username:$domain\" /></td>");
             }
-            $r->print("
-</tr>
-            ");
+	    $r->print(&Apache::loncommon::end_data_table_row());
         } elsif ($mode eq 'csv') {
             next if (! defined($CSVfile));
             # no need to bother with $linkto
@@ -1415,22 +1559,28 @@ END
             if ($statusmode eq 'Any') {
                 push @line,&Apache::loncommon::csv_translate($status);
             }
+            push @line,&Apache::loncommon::csv_translate($active_groups);
             print $CSVfile '"'.join('","',@line).'"'."\n";
         } elsif ($mode eq 'excel') {
             $excel_sheet->write($row,0,[$username,$domain,$id,
                                           $name,$section]);
             my $col = 5;
             foreach my $time ($start,$end) {
-                $excel_sheet->write($row,$col++,
+                if (defined($time) && $time != 0) {
+                    $excel_sheet->write($row,$col++,
                                    &Apache::lonstathelpers::calc_serial($time),
                                     $format->{'date'});
+                } else {
+                    $excel_sheet->write($row,$col++,'none');
+                }                    
             }
             $excel_sheet->write($row,$col++,$status);
+            $excel_sheet->write($row,$col++,$active_groups);
             $row++;
         }
     }
     if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
-        $r->print('</table><br>');
+	$r->print(&Apache::loncommon::end_data_table().'<br />');
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
         $r->print('<p><a href="'.$excel_filename.'">'.
@@ -1443,8 +1593,9 @@ END
         $r->rflush();
     }
     if ($mode eq 'autoenroll') {
-        return $studentcount;
+        return ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount);
     }
+    return;
 }
 
 
@@ -1455,9 +1606,9 @@ sub print_modify_student_form {
     my $r = shift();
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['sdom','sname']);    
-    my $sname  = $ENV{'form.sname'};
-    my $sdom   = $ENV{'form.sdom'};
-    my $sortby = $ENV{'form.sortby'};
+    my $sname  = $env{'form.sname'};
+    my $sdom   = $env{'form.sdom'};
+    my $sortby = $env{'form.sortby'};
     # determine the students name information
     my %info=&Apache::lonnet::get('environment',
                                   ['firstname','middlename',
@@ -1469,7 +1620,7 @@ sub print_modify_student_form {
                   '<p>'.
                   &mt('Unable to retrieve environment data for').' '.$sname.
                   &mt('in domain').' '.$sdom.'</p><p>'.
-                  &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p></body></html>');
+                  &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p>'.&Apache::loncommon::end_page());
         return;
     }
     # determine the students starting and ending times and section
@@ -1503,9 +1654,9 @@ sub print_modify_student_form {
     }
     my $date_table = &date_setting_table($starttime,$endtime);
     #
-    if (! exists($ENV{'form.Status'}) || 
-        $ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
-        $ENV{'form.Status'} = 'crap';
+    if (! exists($env{'form.Status'}) || 
+        $env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
+        $env{'form.Status'} = 'crap';
     }
     # Make sure student is enrolled in course
     my %lt=&Apache::lonlocal::texthash(
@@ -1521,7 +1672,19 @@ sub print_modify_student_form {
                    'sec'   => "Section",
                    'sm'    => "Submit Modifications",
 				       );
-    $r->print(<<END);
+# Check if section name is valid
+    my $section_check = &section_check_js();
+    $r->print(<<"END");
+<script type="text/javascript">
+$section_check
+function secverify(formname,caller) {
+    if (validate(caller) == "error") {
+        return;
+    } else {
+        formname.submit();
+    }
+}
+</script>
 <p>
 <font size="+1">
 $lt{'odcc'}
@@ -1532,7 +1695,7 @@ $lt{'odcc'}
 <input type="hidden" name="action"  value="modifystudent" />
 <input type="hidden" name="state"   value="done" />
 <input type="hidden" name="sortby"  value="$sortby" />
-<input type="hidden" name="Status"  value="$ENV{'form.Status'}" />
+<input type="hidden" name="Status"  value="$env{'form.Status'}" />
 <h2>$lt{'mef'} $info{'firstname'} $info{'middlename'} 
 $info{'lastname'} $info{'generation'}, $sname\@$sdom</h2>
 <p>
@@ -1548,16 +1711,18 @@ $info{'lastname'} $info{'generation'}, $
 </p><p>
 <b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
 </p><p>
+<label>
 <input type="checkbox" name="forceid" > 
 $lt{'disn'}
+</label>
 </p><p>
 <b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="14"/>
 </p>
 <p>$current_date_description</p>
 <p>$date_table</p>
-<input type="submit" value="$lt{'sm'}" />
-</body></html>
+<input type="button" value="$lt{'sm'}" onClick="secverify(this.form,this.form.section)" />
 END
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -1565,24 +1730,24 @@ END
 # modify a single students section 
 #
 sub modify_single_student {
-    my $r = shift;
+    my ($r) = @_;
     #
     # Remove non alphanumeric values from the section
-    $ENV{'form.section'} =~ s/\W//g;
+    $env{'form.section'} =~ s/\W//g;
     #
     # Do the date defaults first
     my ($starttime,$endtime) = &get_dates_from_form();
-    if ($ENV{'form.makedatesdefault'}) {
+    if ($env{'form.makedatesdefault'}) {
         $r->print(&make_dates_default($starttime,$endtime));
     }
     # Get the 'sortby' and 'Status' variables so the user goes back to their
     # previous screen
-    my $sortby = $ENV{'form.sortby'};
-    my $status = $ENV{'form.Status'};
+    my $sortby = $env{'form.sortby'};
+    my $status = $env{'form.Status'};
     #
     # We always need this information
-    my $slogin     = $ENV{'form.slogin'};
-    my $sdom       = $ENV{'form.sdomain'};
+    my $slogin     = $env{'form.slogin'};
+    my $sdom       = $env{'form.sdomain'};
     #
     # Get the old data
     my %old=&Apache::lonnet::get('environment',
@@ -1590,7 +1755,7 @@ sub modify_single_student {
                                   'lastname','generation','id'],
                                  $sdom, $slogin);
     $old{'section'} = &Apache::lonnet::getsection($sdom,$slogin,
-                                                  $ENV{'request.course.id'});
+                                                  $env{'request.course.id'});
     my ($tmp) = keys(%old);
     if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
         $r->print(&mt('There was an error determining the environment values for')." $slogin \@ $sdom.");
@@ -1599,19 +1764,19 @@ sub modify_single_student {
     undef $tmp;
     #
     # Get the new data
-    my $firstname  = $ENV{'form.firstname'};
-    my $middlename = $ENV{'form.middlename'};
-    my $lastname   = $ENV{'form.lastname'};
-    my $generation = $ENV{'form.generation'};
-    my $section    = $ENV{'form.section'};
-    my $courseid   = $ENV{'request.course.id'};
-    my $sid        = $ENV{'form.id'};
+    my $firstname  = $env{'form.firstname'};
+    my $middlename = $env{'form.middlename'};
+    my $lastname   = $env{'form.lastname'};
+    my $generation = $env{'form.generation'};
+    my $section    = $env{'form.section'};
+    my $courseid   = $env{'request.course.id'};
+    my $sid        = $env{'form.id'};
     my $displayable_starttime = localtime($starttime);
     my $displayable_endtime   = localtime($endtime);
     # 
     # check for forceid override
     if ((defined($old{'id'})) && ($old{'id'} ne '') && 
-        ($sid ne $old{'id'}) && (! exists($ENV{'form.forceid'}))) {
+        ($sid ne $old{'id'}) && (! exists($env{'form.forceid'}))) {
         $r->print("<font color=\"ff0000\">".&mt('You changed the students id but did not disable the ID change safeguard. The students id will not be changed.')."</font>");
         $sid = $old{'id'};
     }
@@ -1678,14 +1843,14 @@ END
     # Send request(s) to modify data (final undef is for 'desiredhost',
     # which is a moot point because the student already has an account.
     my $modify_section_results = &modifystudent($sdom,$slogin,
-                                                $ENV{'request.course.id'},
+                                                $env{'request.course.id'},
                                                 $section,undef);
     if ($modify_section_results !~ /^ok/) {
         $r->print(&mt('An error occured during the attempt to change the section for this student.')."<br />");
     }
     my $roleresults = &Apache::lonnet::modifystudent
         ($sdom,$slogin,$sid,undef,undef,$firstname,$middlename,$lastname,
-         $generation,$section,$endtime,$starttime,$ENV{'form.forceid'});
+         $generation,$section,$endtime,$starttime,$env{'form.forceid'});
     if ($roleresults eq 'refused' ) {
         $r->print(&mt('Your request to change the role information for this student was refused. You do not appear to have sufficient authority to change student information.'));
     } elsif ($roleresults !~ /ok/) {
@@ -1694,7 +1859,7 @@ END
                   $roleresults);
         &Apache::lonnet::logthis("londropadd:failed attempt to modify student".
                                  " data for ".$slogin." \@ ".$sdom." by ".
-                                 $ENV{'user.name'}." \@ ".$ENV{'user.domain'}.
+                                 $env{'user.name'}." \@ ".$env{'user.domain'}.
                                  ":".$roleresults);
     } else { # everything is okay!
         $r->print(&mt('Student information updated successfully.')." <br />".
@@ -1707,15 +1872,16 @@ END
 <input type="hidden" name="sortby" value="$sortby" />
 <input type="hidden" name="Status" value="$status" />
 <a href="javascript:document.studentform.submit();">$Masd</a>
-</body></html>
 END
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
 sub get_enrollment_data {
     my ($sname,$sdomain) = @_;
-    my $courseid = $ENV{'request.course.id'};
-    $courseid =~ s:_:/:g;
+    my $courseid = $env{'request.course.id'};
+    my $cdom = $env{'course.'.$courseid.'.domain'};
+    my $cnum = $env{'course.'.$courseid.'.num'};
     my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);
     my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles
@@ -1725,7 +1891,7 @@ sub get_enrollment_data {
     my $section = '';
     my $count = scalar(keys(%roles));
     while (my ($course,$role) = each(%roles)) {
-        if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {
+        if ($course=~m{^/\Q$cdom\E/\Q$cnum\E/*\s*(\w+)*_st$} ) {
             #
             # Get active role
             $section=$1;
@@ -1773,15 +1939,19 @@ which describes the order elements are s
 #################################################
 sub show_drop_list {
     my ($r,$classlist,$keylist,$nosort)=@_;
-    my $cid=$ENV{'request.course.id'};
-    if (! exists($ENV{'form.sortby'})) {
+    my $cid=$env{'request.course.id'};
+    if (! exists($env{'form.sortby'})) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                                 ['sortby']);
     }
-    my $sortby = $ENV{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
+    my $sortby = $env{'form.sortby'};
+    if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end)$/) {
         $sortby = 'username';
     }
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid,'.num'};
+    my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+                                              $classlist,$keylist,$cdom,$cnum);
     #
     my $action = "drop";
     $r->print(<<END);
@@ -1809,10 +1979,11 @@ my %lt=&Apache::lonlocal::texthash('usrn
                                    'sec'    => "section",
                                    'start'  => "start date",
                                    'end'    => "end date",
+                                   'groups' => "active groups",
                                    );
     if ($nosort) {
+	$r->print(&Apache::loncommon::start_data_table());
         $r->print(<<END);
-<table border=2>
 <tr>
     <th>&nbsp;</th>
     <th>$lt{'usrn'}</th>
@@ -1822,12 +1993,13 @@ my %lt=&Apache::lonlocal::texthash('usrn
     <th>$lt{'sec'}</th>
     <th>$lt{'start'}</th>
     <th>$lt{'end'}</th>
+    <th>$lt{'groups'}</th>
 </tr>
 END
 
     } else  {
+	$r->print(&Apache::loncommon::start_data_table());
         $r->print(<<END);
-<table border=2>
 <tr><th>&nbsp;</th>
     <th>
        <a href="/adm/dropadd?action=$action&sortby=username">$lt{'usrn'}</a>
@@ -1843,6 +2015,8 @@ END
        <a href="/adm/dropadd?action=$action&sortby=start">$lt{'start'}</a>
     </th><th>
        <a href="/adm/dropadd?action=$action&sortby=end">$lt{'end'}</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=groups">$lt{'groups'}</a>
     </th>
 </tr>
 END
@@ -1854,6 +2028,7 @@ END
     foreach (@$keylist) {
         $index{$_} = $i++;
     }
+    $index{'groups'} = scalar(@$keylist);
     my $index  = $index{$sortby};
     my $second = $index{'username'};
     my $third  = $index{'domain'};
@@ -1874,6 +2049,11 @@ END
         my $id       = $sdata->[$index{'id'}];
         my $start    = $sdata->[$index{'start'}];
         my $end      = $sdata->[$index{'end'}];
+        my $groups = $classgroups->{$student};
+        my $active_groups;
+        if (ref($groups->{active}) eq 'HASH') {
+            $active_groups = join(', ',keys(%{$groups->{'active'}}));
+        }
         if (! defined($start) || $start == 0) {
             $start = &mt('none');
         } else {
@@ -1887,8 +2067,8 @@ END
         my $status   = $sdata->[$index{'status'}];
         next if ($status ne 'Active');
         #
+        $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-<tr>
     <td><input type="checkbox" name="droplist" value="$student"></td>
     <td>$username</td>
     <td>$domain</td>
@@ -1897,10 +2077,11 @@ END
     <td>$section</td>
     <td>$start</td>
     <td>$end</td>
-</tr>
+    <td>$active_groups</td>
 END
+        $r->print(&Apache::loncommon::end_data_table_row());
     }
-    $r->print('</table><br>');
+    $r->print(&Apache::loncommon::end_data_table().'<br />');
     %lt=&Apache::lonlocal::texthash(
 	               'dp'   => "Drop Students",
                        'ca'   => "check all",
@@ -1929,15 +2110,15 @@ sub print_first_courselist_upload_form {
     $str .= "<p>\n";
     $str .= '<input type="submit" name="fileupload" value="'.
         &mt('Upload class list').'">'."\n";
-    $str .= '<input type="checkbox" name="noFirstLine" /> '.
-        &mt('Ignore First Line')."</p>\n";
+    $str .= '<label><input type="checkbox" name="noFirstLine" /> '.
+        &mt('Ignore First Line')."</label></p>\n";
     $str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
                          &mt("How do I create a class list from a spreadsheet")).
                              "<br />\n";
     $str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
                            &mt("How do I create a CSV file from a spreadsheet")).
                                "<br />\n";
-    $str .= "</body>\n</html>\n";
+    $str .= &Apache::loncommon::end_page();
     $r->print($str);
     return;
 }
@@ -1947,24 +2128,24 @@ sub upfile_drop_add {
     my $r=shift;
     &Apache::loncommon::load_tmp_file($r);
     my @studentdata=&Apache::loncommon::upfile_record_sep();
-    if($ENV{'form.noFirstLine'}){shift(@studentdata);}
-    my @keyfields = split(/\,/,$ENV{'form.keyfields'});
-    my $cid = $ENV{'request.course.id'};
+    if($env{'form.noFirstLine'}){shift(@studentdata);}
+    my @keyfields = split(/\,/,$env{'form.keyfields'});
+    my $cid = $env{'request.course.id'};
     my %fields=();
-    for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
-        if ($ENV{'form.upfile_associate'} eq 'reverse') {
-            if ($ENV{'form.f'.$i} ne 'none') {
-                $fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+    for (my $i=0; $i<=$env{'form.nfields'}; $i++) {
+        if ($env{'form.upfile_associate'} eq 'reverse') {
+            if ($env{'form.f'.$i} ne 'none') {
+                $fields{$keyfields[$i]}=$env{'form.f'.$i};
             }
         } else {
-            $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+            $fields{$env{'form.f'.$i}}=$keyfields[$i];
         }
     }
     #
     # Store the field choices away
     foreach my $field (qw/username names 
                        fname mname lname gen id sec ipwd email/) {
-        $ENV{'form.'.$field.'_choice'}=$fields{$field};
+        $env{'form.'.$field.'_choice'}=$fields{$field};
     }
     &Apache::loncommon::store_course_settings('enrollment_upload',
                                               { 'username_choice' => 'scalar',
@@ -1980,12 +2161,12 @@ sub upfile_drop_add {
 
     #
     my ($startdate,$enddate) = &get_dates_from_form();
-    if ($ENV{'form.makedatesdefault'}) {
+    if ($env{'form.makedatesdefault'}) {
         $r->print(&make_dates_default($startdate,$enddate));
     }
     # Determine domain and desired host (home server)
-    my $domain=$ENV{'form.lcdomain'};
-    my $desiredhost = $ENV{'form.lcserver'};
+    my $domain=$env{'form.lcdomain'};
+    my $desiredhost = $env{'form.lcserver'};
     if (lc($desiredhost) eq 'default') {
         $desiredhost = undef;
     } else {
@@ -1993,26 +2174,26 @@ sub upfile_drop_add {
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
                       &mt('Invalid home server specified'));
-            $r->print("</body>\n</html>\n");
+            $r->print(&Apache::loncommon::end_page());
             return;
         }
     }
     # Determine authentication mechanism
     my $amode  = '';
     my $genpwd = '';
-    if ($ENV{'form.login'} eq 'krb') {
+    if ($env{'form.login'} eq 'krb') {
         $amode='krb';
-	$amode.=$ENV{'form.krbver'};
-        $genpwd=$ENV{'form.krbarg'};
-    } elsif ($ENV{'form.login'} eq 'int') {
+	$amode.=$env{'form.krbver'};
+        $genpwd=$env{'form.krbarg'};
+    } elsif ($env{'form.login'} eq 'int') {
         $amode='internal';
-        if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
-            $genpwd=$ENV{'form.intarg'};
+        if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
+            $genpwd=$env{'form.intarg'};
         }
-    } elsif ($ENV{'form.login'} eq 'loc') {
+    } elsif ($env{'form.login'} eq 'loc') {
         $amode='localauth';
-        if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
-            $genpwd=$ENV{'form.locarg'};
+        if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
+            $genpwd=$env{'form.locarg'};
         }
     }
     if ($amode =~ /^krb/) {
@@ -2023,7 +2204,8 @@ sub upfile_drop_add {
             $amode = ''; # This causes the loop below to be skipped
         }
     }
-    unless (($domain=~/\W/) || ($amode eq '')) {
+    if ( $domain eq &LONCAPA::clean_domain($domain)
+	&& ($amode ne '')) {
         #######################################
         ##         Enroll Students           ##
         #######################################
@@ -2031,6 +2213,8 @@ sub upfile_drop_add {
         my $count=0;
         my $flushc=0;
         my %student=();
+        # Get information about course groups
+        my %curr_groups = &Apache::longroup::coursegroups();
         # Get new classlist
         foreach (@studentdata) {
             my %entries=&Apache::loncommon::record_sep($_);
@@ -2055,7 +2239,8 @@ sub upfile_drop_add {
                         $gen=$entries{$fields{'gen'}};
                     }
                 }
-                if ($entries{$fields{'username'}}=~/\W/) {
+                if ($entries{$fields{'username'}}
+		    ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
                     $r->print('<br />'.
       &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
           $entries{$fields{'username'}},$fname,$mname,$lname,$gen).
@@ -2071,6 +2256,17 @@ sub upfile_drop_add {
                     }
                     # remove non alphanumeric values from section
                     $sec =~ s/\W//g;
+                    if ($sec eq "none" || $sec eq 'all') {
+                        $r->print('<br />'.
+      &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a reserved word.',
+                        $username,$sec,$fname,$mname,$lname,$gen));
+                        next;
+                    } elsif (($sec ne '') && (exists($curr_groups{$sec}))) {
+                        $r->print('<br />'.
+      &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a course group. Section names and group names must be distinct.',
+                        $username,$sec,$fname,$mname,$lname,$gen));
+                        next;
+                    }
                     # determine student id number
                     my $id='';
                     if (defined($fields{'id'})) {
@@ -2103,13 +2299,13 @@ sub upfile_drop_add {
                              \$lname,\$gen,\$sec) {
                         $$_ =~ s/(\s+$|^\s+)//g;
                     }
-                    if ($password || $ENV{'form.login'} eq 'loc') {
+                    if ($password || $env{'form.login'} eq 'loc') {
                         &modifystudent($domain,$username,$cid,$sec,
                                        $desiredhost);
                         my $reply=&Apache::lonnet::modifystudent
                             ($domain,$username,$id,$amode,$password,
                              $fname,$mname,$lname,$gen,$sec,$enddate,
-                             $startdate,$ENV{'form.forceid'},$desiredhost,
+                             $startdate,$env{'form.forceid'},$desiredhost,
                              $email);
                         if ($reply ne 'ok') {
                             $reply =~ s/^error://;
@@ -2140,7 +2336,7 @@ sub upfile_drop_add {
         #####################################
         #           Drop students           #
         #####################################
-        if ($ENV{'form.fullup'} eq 'yes') {
+        if ($env{'form.fullup'} eq 'yes') {
             $r->print('<h3>'.&mt('Dropping Students')."</h3>\n");
             #  Get current classlist
             my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
@@ -2168,16 +2364,11 @@ sub upfile_drop_add {
 sub drop_student_list {
     my $r=shift;
     my $count=0;
-    my @droplist;
-    if (ref($ENV{'form.droplist'})) {
-        @droplist = @{$ENV{'form.droplist'}};
-    } else {
-        @droplist = ($ENV{'form.droplist'});
-    }
+    my @droplist = &Apache::loncommon::get_env_multiple('form.droplist');
     foreach (@droplist) {
         my ($uname,$udom)=split(/\:/,$_);
         # drop student
-        my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
+        my $result = &modifystudent($udom,$uname,$env{'request.course.id'});
         if ($result eq 'ok' || $result eq 'ok:') {
             $r->print(&mt('Dropped [_1]',$uname.'@'.$udom).'<br>');
             $count++;
@@ -2191,6 +2382,33 @@ sub drop_student_list {
     $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
 }
 
+sub section_check_js {
+    my $groupslist;
+    my %curr_groups = &Apache::longroup::coursegroups();
+    if (%curr_groups) {
+        $groupslist = join('","',sort(keys(%curr_groups)));
+    }
+    return <<"END";
+function validate(caller) {
+    var groups = new Array("$groupslist");
+    var secname = caller.value;
+    if ((secname == 'all') || (secname == 'none')) {
+        alert("'"+secname+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
+        return 'error';
+    }
+    if (secname != '') {
+        for (var k=0; k<groups.length; k++) {
+            if (secname == groups[k]) {
+                alert("'"+secname+"' may not be used as the name for a section, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+                return 'error';
+            }
+        }
+    }
+    return 'ok';
+}
+END
+}
+
 ###################################################################
 ###################################################################
 
@@ -2241,40 +2459,58 @@ sub handler {
           text=>"Enrollment Manager",
           faq=>9,bug=>'Instructor Interface',});
     #  Needs to be in a course
-    if (! (($ENV{'request.course.fn'}) &&
-          (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'})))) {
-        # Not in a course, or not allowed to modify parms
-        $ENV{'user.error.msg'}=
-            "/adm/dropadd:cst:0:0:Cannot drop or add students";
+    if (! ($env{'request.course.fn'})) {
+        # Not in a course
+        $env{'user.error.msg'}=
+            "/adm/dropadd:cst:0:0:Cannot manage or view course groups, ".
+                                  "or drop or add students";
         return HTTP_NOT_ACCEPTABLE; 
     }
     #
+    my $view_permission = 
+        &Apache::lonnet::allowed('vcl',$env{'request.course.id'});
+    my $enrl_permission = 
+        &Apache::lonnet::allowed('cst',$env{'request.course.id'});
+
+    my $grp_view_permission =
+        &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+    my $grp_manage_permission =
+        &Apache::lonnet::allowed('mdg',$env{'request.course.id'});
+
+
+    if (! $grp_view_permission && ! $grp_manage_permission && 
+                                  ! $view_permission && ! $enrl_permission) {
+        $env{'user.error.msg'}=
+     "/adm/coursegroups:cst:0:0:Cannot manage or view course groups, ".
+                                 "or drop or add students";
+        return HTTP_NOT_ACCEPTABLE;
+    }
+
+    #
     # Only output the header information if they did not request csv format
     #
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['state','action']);
     # Start page
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     $r->print(&header());
     #
     # Main switch on form.action and form.state, as appropriate
-    if (! exists($ENV{'form.action'})) {
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Enrollment Manager'));
-        &print_main_menu($r);
-    } elsif ($ENV{'form.action'} eq 'upload') {
+    if (! exists($env{'form.action'})) {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment Manager'));
+        &print_main_menu($r,$enrl_permission,$view_permission,$grp_manage_permission,
+                         $grp_view_permission);
+    } elsif ($env{'form.action'} eq 'upload' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=upload&state=',
               text=>"Upload Classlist"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Upload Classlist'));
-        if (! exists($ENV{'form.state'})) {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Classlist',
+						      'Course_Create_Class_List'));
+        if (! exists($env{'form.state'})) {
             &print_first_courselist_upload_form($r);            
-        } elsif ($ENV{'form.state'} eq 'got_file') {
+        } elsif ($env{'form.state'} eq 'got_file') {
             &print_upload_manager_form($r);
-        } elsif ($ENV{'form.state'} eq 'enrolling') {
-            if ($ENV{'form.datatoken'}) {
+        } elsif ($env{'form.state'} eq 'enrolling') {
+            if ($env{'form.datatoken'}) {
                 &upfile_drop_add($r);
             } else {
                 # Hmmm, this is an error
@@ -2282,60 +2518,60 @@ sub handler {
         } else {
             &print_first_courselist_upload_form($r);            
         }
-    } elsif ($ENV{'form.action'} eq 'drop') {
+    } elsif ($env{'form.action'} eq 'drop' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=drop',
               text=>"Drop Students"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Drop Students'));
-        if (! exists($ENV{'form.state'})) {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+						      'Course_Drop_Student'));
+        if (! exists($env{'form.state'})) {
             &print_drop_menu($r);
-        } elsif ($ENV{'form.state'} eq 'done') {
+        } elsif ($env{'form.state'} eq 'done') {
             &drop_student_list($r);
         } else {
             &print_drop_menu($r);
         }
-    } elsif ($ENV{'form.action'} eq 'enrollstudent') {
+    } elsif ($env{'form.action'} eq 'enrollstudent' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=enrollstudent',
               text=>"Enroll Student"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Enroll Student'));
-        if (! exists($ENV{'form.state'})) {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+						      'Course_Add_Student'));
+        if (! exists($env{'form.state'})) {
             &get_student_username_domain_form($r);
-        } elsif ($ENV{'form.state'} eq 'gotusername') {
+        } elsif ($env{'form.state'} eq 'gotusername') {
             &print_enroll_single_student_form($r);
-        } elsif ($ENV{'form.state'} eq 'enrolling') {
+        } elsif ($env{'form.state'} eq 'enrolling') {
             &enroll_single_student($r);
         } else {
             &get_student_username_domain_form($r);
         }
-    } elsif ($ENV{'form.action'} eq 'classlist') {
+    } elsif ($env{'form.action'} eq 'classlist' && $view_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=classlist',
               text=>"View Classlist"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'View Classlist'));
-        if (! exists($ENV{'form.state'})) {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('View Classlist',
+						      'Course_View_Class_List'));
+        if (! exists($env{'form.state'})) {
             &print_html_classlist($r,undef);
-        } elsif ($ENV{'form.state'} eq 'csv') {
+        } elsif ($env{'form.state'} eq 'csv') {
             &print_html_classlist($r,'csv');
-        } elsif ($ENV{'form.state'} eq 'excel') {
+        } elsif ($env{'form.state'} eq 'excel') {
             &print_html_classlist($r,'excel');
         } else {
             &print_html_classlist($r,undef);
         }
-    } elsif ($ENV{'form.action'} eq 'modifystudent') {
+    } elsif ($env{'form.action'} eq 'modifystudent' && $enrl_permission) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=modifystudent',
               text=>"Modify Student Data"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Modify Student Data'));
-        if (! exists($ENV{'form.state'})) {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Modify Student Data',
+						      'Course_Modify_Student_Data'));
+        if (! exists($env{'form.state'})) {
             &print_html_classlist($r);
-        } elsif ($ENV{'form.state'} eq 'selected') {
+        } elsif ($env{'form.state'} eq 'selected') {
             &print_modify_student_form($r);
-        } elsif ($ENV{'form.state'} eq 'done') {
+        } elsif ($env{'form.state'} eq 'done') {
             &modify_single_student($r);
         } else {
             &print_html_classlist($r);
@@ -2343,15 +2579,14 @@ sub handler {
     } else {
         # We should not end up here, but I guess it is possible
         &Apache::lonnet::logthis("Undetermined state in londropadd.pm.  ".
-                                 "form.action = ".$ENV{'form.action'}.
+                                 "form.action = ".$env{'form.action'}.
                                  "Someone should fix this.");
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,'Enrollment Manager'));
-        &print_main_menu($r);
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment Manager'));
+        &print_main_menu($r,$enrl_permission,$view_permission);
     }
     #
     # Finish up
-    $r->print('</form></body></html>');
+    $r->print('</form>'.&Apache::loncommon::end_page());
     return OK;
 }