--- loncom/interface/Attic/londropadd.pm	2001/02/13 21:24:18	1.10
+++ loncom/interface/Attic/londropadd.pm	2003/12/28 01:30:50	1.97
@@ -1,322 +1,478 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# (Handler to set parameters for assessments
+# $Id: londropadd.pm,v 1.97 2003/12/28 01:30:50 raeburn Exp $
 #
-# (Handler to resolve ambiguous file locations
+# Copyright Michigan State University Board of Trustees
 #
-# (TeX Content Handler
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
-# 10/11,10/12,10/16 Gerd Kortemeyer)
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28,
-# 12/08,12/12 Gerd Kortemeyer)
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# 12/26,12/27,12/28,
-# 01/01/01,01/15,02/10,02/13 Gerd Kortemeyer
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+#
+###############################################################
+##############################################################
 
 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::lonlocal;
 
-# ================================================================ Print header
-
+###############################################################
+###############################################################
 sub header {
-    my $r=shift;
-    $r->print(<<ENDHEAD);
+    my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
+    my $title = &mt('LON-CAPA Enrollment Manager');
+    return(<<ENDHEAD);
 <html>
 <head>
-<title>LON-CAPA Student Drop/Add</title>
+<title>$title</title>
 </head>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Drop/Add Students</h1>
-<form method="post" enctype="multipart/form-data"
-action="/adm/dropadd" name="studentform">
-<h2>Course: $ENV{'course.'.$ENV{'request.course.id'}.'.description'}</h2>
+$bodytag
+<form method="post" enctype="multipart/form-data"  
+      action="/adm/dropadd" name="studentform">
 ENDHEAD
 }
 
-# ========================================================= Store uploaded file
-# needs $ENV{'form.upfile'}
-# return $datatoken to be put into hidden field
-
-sub upfile_store {
-    my $r=shift;
-    $ENV{'form.upfile'}=~s/\r/\n/gs;
-    $ENV{'form.upfile'}=~s/\f/\n/gs;
-    $ENV{'form.upfile'}=~s/\n+/\n/gs;
-    $ENV{'form.upfile'}=~s/\n+$//gs;
-	      
-    my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
-		  '_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$;
-    {
-       my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').
-                                   '/tmp/'.$datatoken.'.tmp');
-       print $fh $ENV{'form.upfile'};
-    }
-    return $datatoken;
-}
-
-# ================================================= Load uploaded file from tmp
-# needs $ENV{'form.datatoken'}
-# sets $ENV{'form.upfile'}
-
-sub load_tmp_file {
-    my $r=shift;
-    my @studentdata=();
-    {
-      my $fh;
-      if ($fh=Apache::File->new($r->dir_config('lonDaemons').
-	  '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) {
-	     @studentdata=<$fh>;
-      }
+###############################################################
+###############################################################
+# Drop student from all sections of a course, except optional $csec
+sub modifystudent {
+    my ($udom,$unam,$courseid,$csec,$desiredhost)=@_;
+    # 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 %roles = &Apache::lonnet::dump('roles',$udom,$unam);
+    my ($tmp) = keys(%roles);
+    # Bail out if we were unable to get the students roles
+    return "$1" if ($tmp =~ /^(con_lost|error|no_such_host)/i);
+    # Go through the roles looking for enrollment in this course
+    my $result = '';
+    foreach my $course (keys(%roles)) {
+        if ($course=~/^$courseid(?:\/)*(?:\s+)*(\w+)*\_st$/) {
+            # We are in this course
+            my $section=$1;
+            $section='' if ($course eq $courseid.'_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 (!($start && ($now<$start)) || !($end && ($now>$end))) {
+                    my $reply=&Apache::lonnet::modifystudent
+                        # dom  name  id mode pass     f     m     l     g
+                        ($udom,$unam,'',  '',  '',undef,undef,undef,undef,
+                         $section,time,undef,undef,$desiredhost);
+                    $result .= $reply.':';
+                }
+            }
+        }
     }
-    $ENV{'form.upfile'}=join('',@studentdata);
+    if ($result eq '') {
+        $result = 'Unable to find section for this student';
+    } else {
+        $result =~ s/(ok:)+/ok/g;
+    }
+    return $result;
 }
 
-# ========================================= Separate uploaded file into records
-# returns array of records
-
-sub upfile_record_sep {
-    if ($ENV{'form.upfiletype'} eq 'xml') {
-    } else {
-       return split(/\n/,$ENV{'form.upfile'});
-    }
-}
-
-# =============================================== Separate a record into fields
-
-sub record_sep {
-    my $record=shift;
-    my %components=();
-    if ($ENV{'form.upfiletype'} eq 'xml') {
-    } elsif ($ENV{'form.upfiletype'} eq 'space') {
-        my $i=0;
-        map {
-            my $field=$_;
-            $field=~s/^(\"|\')//;
-            $field=~s/(\"|\')$//;
-            $components{$i}=$field;
-            $i++;
-        } split(/\s+/,$record);
-    } elsif ($ENV{'form.upfiletype'} eq 'tab') {
-        my $i=0;
-        map {
-            my $field=$_;
-            $field=~s/^(\"|\')//;
-            $field=~s/(\"|\')$//;
-            $components{$i}=$field;
-            $i++;
-        } split(/\t+/,$record);        
-    } else {
-        my @allfields=split(/\,/,$record);
-        my $i=0;
-        my $j;
-        for ($j=0;$j<=$#allfields;$j++) {
-            my $field=$allfields[$j];
-            if ($field=~/^\s*(\"|\')/) {
-		my $delimiter=$1;
-                while (($field!~/$delimiter$/) && ($j<$#allfields)) {
-		    $j++;
-		    $field.=','.$allfields[$j];
-		}
-                $field=~s/^\s*$delimiter//;
-                $field=~s/$delimiter\s*$//;
-            }
-            $components{$i}=$field;
-	    $i++;
-        }
-    }
-    return %components;
-}
-
-# =========== Drop student from all sections of a course, except optional $csec
-
-sub dropstudent {
-     my ($udom,$unam,$courseid,$csec)=@_;
-     $courseid=~s/\_/\//g;
-     $courseid=~s/^(\w)/\/$1/;
-     map {
-        my ($key,$value)=split(/\=/,$_);
-        $key=&Apache::lonnet::unescape($key);
-        if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
-          my $section=$1;
-          if ($key eq $courseid.'_st') { $section=''; }
-          if ($section ne $csec) {
-	    my ($dummy,$end,$start)=split(/\_/,
-                                    &Apache::lonnet::unescape($value));
-            my $now=time;
-            my $notactive=0;
-            if ($start) {
-		if ($now<$start) { $notactive=1; }
-            }
-            if ($end) {
-                if ($now>$end) { $notactive=1; }
-            } 
-            unless ($notactive) {
-                my $reply=&Apache::lonnet::modifystudent(
-                                   $udom,$unam,'','','',
-			           '','','','',$section,time);
-            }
-	  }
+###############################################################
+###############################################################
+# build a domain and server selection form
+sub domain_form {
+    my ($defdom) = @_;
+    # Set up domain and server selection forms
+    #
+    # Get the domains
+    my @domains = &Apache::loncommon::get_domains();
+    # build up the menu information to be passed to 
+    # &Apache::loncommon::linked_select_forms
+    my %select_menus;
+    foreach my $dom (@domains) {
+        # set up the text for this domain
+        $select_menus{$dom}->{'text'}= $dom;
+        # we want a choice of 'default' as the default in the second menu
+        $select_menus{$dom}->{'default'}= 'default';
+        $select_menus{$dom}->{'select2'}->{'default'} = 'default';
+        # Now build up the other items in the second menu
+        my %servers = &Apache::loncommon::get_library_servers($dom);
+        foreach my $server (keys(%servers)) {
+            $select_menus{$dom}->{'select2'}->{$server} 
+                                            = "$server $servers{$server}";
         }
-    } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles',
-                                 &Apache::lonnet::homeserver($unam,$udom)));
+    }
+    my $result  = &Apache::loncommon::linked_select_forms
+        ('studentform',' with home server ',$defdom,
+         'lcdomain','lcserver',\%select_menus);
+    return $result;
 }
 
-# ============================================================== Menu Phase One
-
-sub menu_phase_one {
+###############################################################
+###############################################################
+#  Menu Phase One
+sub print_main_menu {
     my $r=shift;
-    $r->print(<<ENDUPFORM);
-<input type=hidden name=phase value=two>
-<hr>
-<h3>Upload a courselist</h3>
-<input type=file name=upfile size=50>
-<br>Type: <select name=upfiletype>
-<option value=csv>CSV (comma separated values, spreadsheet)</option>
-<option value=space>Space separated</option>
-<option value=tab>Tabulator separated</option>
-<option value=xml>HTML/XML</option>
-</select>
-<p><input type=submit name=fileupload value="Upload Courselist">
-<hr>
-<h3>Enroll a single student</h3>
-<p><input type=submit name=enroll value="Enroll Student">
-<hr>
-<h3>Drop a student</h3>
-<p><input type=submit name=drop value="Drop Student">
-ENDUPFORM
+    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');
+
+    $r->print(<<END);
+<p>
+<font size="+1">
+    <a href="/adm/dropadd?action=upload">$Text{'upload'}</a>
+</font>
+</p><p>
+<font size="+1">
+    <a href="/adm/dropadd?action=enrollstudent">$Text{'enrollone'}</a>
+</font>
+</p><p>
+<font size="+1">
+    <a href="/adm/dropadd?action=modifystudent">$Text{'modify'}</a>
+</font>
+</p><p>
+<font size="+1">
+    <a href="/adm/dropadd?action=classlist">$Text{'view'}</a>
+</font>
+</p><p>
+<font size="+1">
+    <a href="/adm/dropadd?action=drop">$Text{'drop'}</a>
+</font>
+</p><p>
+<font size="+1">
+    <a href="/adm/populate">$Text{'populate'}</a>
+</font>
+END
 }
 
-# ======================================================= Menu Phase Two Upload
+###############################################################
+###############################################################
+sub hidden_input {
+    my ($name,$value) = @_;
+    return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
+}
 
-sub menu_phase_two_upload {
-    my $r=shift;
+sub print_upload_manager_header {
+    my ($r,$datatoken,$distotal,$krbdefdom)=@_;
+    my $javascript;
+    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';
+        } else {
+            $ENV{'form.upfile_associate'} = 'forward';
+        }
+    }
+    if ($ENV{'form.upfile_associate'} eq 'reverse') {
+	$javascript=&upload_manager_javascript_reverse_associate();
+    } else {
+	$javascript=&upload_manager_javascript_forward_associate();
+    }
+    my $javascript_validations=&javascript_validations('auth',$krbdefdom);
+    my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':'');
+    $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
+              "<hr>\n".
+              '<h3>'.&mt('Identify fields')."</h3>\n");
+    $r->print("<p>\n".
+              &mt('Total number of records found in file: [_1].',$distotal).
+              "\n".
+              "</p><hr>\n");
+    $r->print(&mt('Enter as many fields as you can. The system will inform you and bring you back to this page if the data selected is insufficient to enroll students in your class.')."<hr>\n");
+    $r->print(&hidden_input('action','upload').
+              &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'}));
+    $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("<hr />\n".
+              '<script type="text/javascript" language="Javascript">'."\n".
+              $javascript."\n".$javascript_validations.'</script>');
+}
 
-    my $datatoken=&upfile_store($r);
+###############################################################
+###############################################################
+sub javascript_validations {
+    my ($mode,$krbdefdom,$curr_authtype,$curr_authfield)=@_;
+    my $authheader;
+    if ($mode eq 'auth') {
+        my %param = ( formname => 'studentform',
+                      kerb_def_dom => $krbdefdom );
+        $authheader = &Apache::loncommon::authform_header(%param);
+    } elsif ($mode eq 'createcourse') {
+        my %param = ( formname => 'ccrs',
+                  kerb_def_dom => $krbdefdom );
+        $authheader = &Apache::loncommon::authform_header(%param);
+    } elsif ($mode eq 'modifycourse') {
+        my %param = ( formname => 'cmod',
+                  kerb_def_dom => $krbdefdom,
+                  mode => 'modifycourse',
+                  curr_authtype => $curr_authtype,
+                  curr_autharg => $curr_authfield );
+        $authheader = &Apache::loncommon::authform_header(%param);
+    }
 
-    my @records=&upfile_record_sep();
-    my $total=$#records;
-    my $distotal=$total+1;
     
-    $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
-    my $krbdefdom=$1;
-    $krbdefdom=~tr/a-z/A-Z/;
-
-    my $today=time;
-    my $halfyear=$today+15552000;
-
-    my $defdom=$r->dir_config('lonDefDomain');
+    my %alert = &Apache::lonlocal::texthash
+        (username => 'You need to specify the username field.',
+         authen   => 'You must choose an authentication type.',
+         krb      => 'You need to specify the Kerberos domain.',
+         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.', 
+         email    => 'The optional email address field was not specified.',
+         continue => 'Continue enrollment?',
+         );
+    
+#    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+    my $function_name =(<<END);
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
+END
+    my $auth_checks;
+    if ($mode eq 'createcourse') {
+        $auth_checks .= (<<END);
+    if (vf.autoadds[0].checked == true) {
+        if (current.radiovalue == null || current.radiovalue == 'nochange') {
+            alert('$alert{'authen'}');
+            return;
+        }
+    }
+END
+    } else {
+        $auth_checks .= (<<END);
+    var foundatype=0;
+    if (founduname==0) {
+	alert('$alert{'username'}');
+        return;
+    }
+    // alert('current.radiovalue = '+current.radiovalue);
+    if (current.radiovalue == null || current.radiovalue == 'nochange') {
+        // They did not check any of the login radiobuttons.
+        alert('$alert{'authen'}');
+        return;
+    }
+END
+    }
+    if ($mode eq 'createcourse') {
+        $auth_checks .= "
+    if ( (vf.autoadds[0].checked == true) &&
+         (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') ) {
+";
+    } elsif ($mode eq 'modifycourse') {
+        $auth_checks .= " 
+    if (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') {
+";
+    }
+    if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
+        $auth_checks .= (<<END);
+        var alertmsg = '';
+        switch (current.radiovalue) {
+            case 'krb':
+                alertmsg = '$alert{'krb'}';
+                break;
+            default:
+                alertmsg = '';
+        }
+        if (alertmsg != '') {
+            alert(alertmsg);
+            return;
+        }
+    }
+END
+    } else {
+        $auth_checks .= (<<END);
+    foundatype=1;
+    if (current.argfield == null || current.argfield == '') {
+        var alertmsg = '';
+        switch (current.value) {
+            case 'krb': 
+                alertmsg = '$alert{'krb'}';
+                break;
+            case 'loc':
+            case 'fsys':
+                alertmsg = '$alert{'ipass'}';
+                break;
+            case 'fsys':
+                alertmsg = '';
+                break;
+            default: 
+                alertmsg = '';
+        }
+        if (alertmsg != '') {
+            alert(alertmsg);
+            return;
+        }
+    }
+END
+    }
+    my $optional_checks = '';
+    if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
+        $optional_checks = (<<END);
+    vf.submit();
+}
+END
+    } else {
+        $optional_checks = (<<END);
+    var message='';
+    if (foundname==0) { 
+        message='$alert{'name'}';
+    }
+    if (foundid==0) { 
+        if (message!='') { 
+            message+='\\n'; 
+        }
+        message+='$alert{'snum'}';
+    }
+    if (foundsec==0) {
+        if (message!='') {
+            message+='\\n';
+        } 
+        message+='$alert{'section'}';
+    }
+    if (foundemail==0) {
+        if (message!='') {
+            message+='\\n';
+        }
+        message+='$alert{'email'}';
+    }
+    if (message!='') {
+        message+= '\\n$alert{'continue'}';
+        if (confirm(message)) {
+            vf.state.value='enrolling';
+            vf.submit();
+        }
+    } else {
+        vf.state.value='enrolling';
+        vf.submit();
+    }
+}
+END
+    }
+    my $result = $function_name;
+    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
+        $result .= $auth_checks;
+    }
+    $result .= $optional_checks;
+    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
+        $result .= $authheader;
+    }
+    return $result;
+}
 
-    $r->print(<<ENDPICK);
-<input type=hidden name=phase value=three>
-<input type=hidden name=datatoken value="$datatoken">
-<input type=hidden name=upfiletype value=$ENV{'form.upfiletype'}>
-<hr>
-<h3>Identify fields</h3>
-Total number of records found in file: $distotal
-<script>
+###############################################################
+###############################################################
+sub upload_manager_javascript_forward_associate {
+    return(<<ENDPICK);
 function verify(vf) {
     var founduname=0;
     var foundpwd=0;
     var foundname=0;
     var foundid=0;
     var foundsec=0;
-    var foundatype=0;
+    var foundemail=0;
     var tw;
-    var message='';
     for (i=0;i<=vf.nfields.value;i++) {
         tw=eval('vf.f'+i+'.selectedIndex');
         if (tw==1) { founduname=1; }
         if ((tw>=2) && (tw<=6)) { foundname=1; }
         if (tw==7) { foundid=1; }
-        if (tw==8) { foundsec=1; } 
+        if (tw==8) { foundsec=1; }
         if (tw==9) { foundpwd=1; }
+        if (tw==10) { foundemail=1; }
     }
-    if (founduname==0) {
-	alert('You need to specify at least the username field');
-        return;
-    }
-    if (vf.login[0].checked) {
-	foundatype=1;
-        if (vf.krbdom.value=='') {
-	    alert('You need to specify the Kerberos domain');
-            return;
-        }
-    }
-    if (vf.login[1].checked) {
-	foundatype=1;
-        if ((vf.intpwd.value=='') && (foundpwd==0)) {
-	    alert('You need to specify the initial password');
-            return;
-        }
-    }
-    if (foundatype==0) {
-	alert('You need to set the login type');
-        return;
-    }
-    if (foundname==0) { message='No name fields specified. '; }
-    if (foundid==0) { message+='No ID or student number field specified. '; }
-    if (foundsec==0) { message+='No section or group field specified. '; }
-    if (vf.startdate.value=='') {
-	message+='No starting date set. ';
-    }
-    if (vf.enddate.value=='') {
-        message+='No ending date set. ';
-    }
-    if ((vf.enddate.value!='') && (vf.startdate.value!='')) {
-       if (Math.round(vf.enddate.value)<Math.round(vf.startdate.value)) {
-          alert('Ending date is before starting date');
-          return;
-       }
-    }
-    if (message!='') {
-       message+='Continue enrollment?';
-       if (confirm(message)) {
-	  pclose();
-	  vf.submit();
-       }
-    } else {
-      pclose();
-      vf.submit();
-    }   
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail);
 }
 
+//
+// vf = this.form
+// tf = column number
+//
+// values of nw
+//
+// 0 = none
+// 1 = username
+// 2 = names (lastname, firstnames)
+// 3 = fname (firstname)
+// 4 = mname (middlename)
+// 5 = lname (lastname)
+// 6 = gen   (generation)
+// 7 = id
+// 8 = section
+// 9 = ipwd  (password)
+// 10 = email address
+
 function flip(vf,tf) {
    var nw=eval('vf.f'+tf+'.selectedIndex');
    var i;
+   // make sure no other columns are labeled the same as this one
    for (i=0;i<=vf.nfields.value;i++) {
       if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
-          eval('vf.f'+i+'.selectedIndex=0;')      
-      } 
+          eval('vf.f'+i+'.selectedIndex=0;')
+      }
    }
+   // If we set this to 'lastname, firstnames', clear out all the ones
+   // set to 'fname','mname','lname','gen' (3,4,5,6) currently.
    if (nw==2) {
       for (i=0;i<=vf.nfields.value;i++) {
          if ((eval('vf.f'+i+'.selectedIndex')>=3) &&
              (eval('vf.f'+i+'.selectedIndex')<=6)) {
              eval('vf.f'+i+'.selectedIndex=0;')
          }
-      }      
+      }
    }
+   // If we set this to one of 'fname','mname','lname','gen' (3,4,5,6),
+   // clear out any that are set to 'lastname, firstnames' (2)
    if ((nw>=3) && (nw<=6)) {
       for (i=0;i<=vf.nfields.value;i++) {
          if (eval('vf.f'+i+'.selectedIndex')==2) {
              eval('vf.f'+i+'.selectedIndex=0;')
          }
-      }      
+      }
    }
+   // If we set the password, make the password form below correspond to 
+   // the new value.
    if (nw==9) {
-       vf.login[1].checked=true;
-       vf.intpwd.value='';
-       vf.krbdom.value='';
+       changed_radio('int',document.studentform);
+       set_auth_radio_buttons('int',document.studentform);
+       vf.intarg.value='';
+       vf.krbarg.value='';
+       vf.locarg.value='';
    }
-
 }
 
 function clearpwd(vf) {
@@ -325,252 +481,1406 @@ function clearpwd(vf) {
         if (eval('vf.f'+i+'.selectedIndex')==9) {
             eval('vf.f'+i+'.selectedIndex=0;')
         }
-    }      
+    }
 }
 
-function setkrb(vf) {
-    if (vf.krbdom.value!='') {
-       clearpwd(vf);
-       vf.login[0].checked=true;
-       vf.krbdom.value=vf.krbdom.value.toUpperCase();
-       vf.intpwd.value='';
-   }
+ENDPICK
+}
+
+###############################################################
+###############################################################
+sub upload_manager_javascript_reverse_associate {
+    return(<<ENDPICK);
+function verify(vf) {
+    var founduname=0;
+    var foundpwd=0;
+    var foundname=0;
+    var foundid=0;
+    var foundsec=0;
+    var tw;
+    for (i=0;i<=vf.nfields.value;i++) {
+        tw=eval('vf.f'+i+'.selectedIndex');
+        if (i==0 && tw!=0) { founduname=1; }
+        if (((i>=1) && (i<=5)) && tw!=0 ) { foundname=1; }
+        if (i==6 && tw!=0) { foundid=1; }
+        if (i==7 && tw!=0) { foundsec=1; }
+        if (i==8 && tw!=0) { foundpwd=1; }
+    }
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
 }
 
-function setint(vf) {
-    if (vf.intpwd.value!='') {
-       clearpwd(vf);
-       vf.login[1].checked=true;
-       vf.krbdom.value='';
+function flip(vf,tf) {
+   var nw=eval('vf.f'+tf+'.selectedIndex');
+   var i;
+   // picked the all one one name field, reset the other name ones to blank
+   if (tf==1 && nw!=0) {
+      for (i=2;i<=5;i++) {
+         eval('vf.f'+i+'.selectedIndex=0;')
+      }
+   }
+   //picked one of the piecewise name fields, reset the all in
+   //one field to blank
+   if ((tf>=2) && (tf<=5) && (nw!=0)) {
+      eval('vf.f1.selectedIndex=0;')
+   }
+   // intial password specified, pick internal authentication
+   if (tf==8 && nw!=0) {
+       changed_radio('int',document.studentform);
+       set_auth_radio_buttons('int',document.studentform);
+       vf.krbarg.value='';
+       vf.intarg.value='';
+       vf.locarg.value='';
    }
 }
 
-function clickkrb(vf) {
-    vf.krbdom.value='$krbdefdom';
-    clearpwd(vf);
-    vf.intpwd.value='';
+function clearpwd(vf) {
+    var i;
+    if (eval('vf.f8.selectedIndex')!=0) {
+        eval('vf.f8.selectedIndex=0;')
+    }
+}
+ENDPICK
 }
 
-function clickint(vf) {
-    vf.krbdom.value='';
+###############################################################
+###############################################################
+sub print_upload_manager_footer {
+    my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_;
+
+    my ($krbdef,$krbdefdom) =
+        &Apache::loncommon::get_kerberos_defaults($defdom);
+    my %param = ( formname => 'document.studentform',
+                  kerb_def_dom => $krbdefdom,
+                  kerb_def_auth => $krbdef
+                  );
+    my $krbform = &Apache::loncommon::authform_kerberos(%param);
+    my $intform = &Apache::loncommon::authform_internal(%param);
+    my $locform = &Apache::loncommon::authform_local(%param);
+    my $domform = &domain_form($defdom);
+    my $date_table = &date_setting_table();
+    my $Str = "</table>\n";
+    $Str .= &hidden_input('nfields',$i);
+    $Str .= &hidden_input('keyfields',$keyfields);
+    $Str .= '<h3>'.&mt('Login Type')."</h3>\n";
+    $Str .= "<p>\n".
+        &mt('Note: this will not take effect if the user already exists').
+        "</p><p>\n";
+    $Str .= $krbform."\n</p><p>\n".
+        $intform."\n</p><p>\n".
+        $locform."\n</p>\n";
+    $Str .= '<h3>'.&mt('LON-CAPA Domain for Students')."</h3>\n";
+    $Str .= "<p>\n".&mt('LON-CAPA domain: [_1]',$domform)."\n</p>\n";
+    $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">'.
+        ' '.&mt('Full update (also print list of users not enrolled anymore)').
+        "</p>\n";
+    $Str .= "<h3>".&mt('Student Number')."</h3>\n";
+    $Str .= "<p>\n".'<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)" '.
+        'value="Update Class List" />'."<br />\n";
+    $Str .= &mt('Note: for large courses, this operation may be time '.
+                'consuming');
+    $r->print($Str);
+    return;
 }
 
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
+###############################################################
+###############################################################
+sub print_upload_manager_form {
+    my $r=shift;
+    my $firstLine;
+    my $datatoken;
+    if (!$ENV{'form.datatoken'}) {
+        $datatoken=&Apache::loncommon::upfile_store($r);
+    } else {
+        $datatoken=$ENV{'form.datatoken'};
+        &Apache::loncommon::load_tmp_file($r);
     }
+    my @records=&Apache::loncommon::upfile_record_sep();
+    if($ENV{'form.noFirstLine'}){
+        $firstLine=shift(@records);
+    }
+    my $total=$#records;
+    my $distotal=$total+1;
+    my $today=time;
+    my $halfyear=$today+15552000;
+    my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my ($krbdef,$krbdefdom) =
+        &Apache::loncommon::get_kerberos_defaults($defdom);
+    &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);
+    my $i;
+    my $keyfields;
+    if ($total>=0) {
+        my @field=(['username',&mt('Username')],
+                   ['names',&mt('Last Name, First Names')],
+                   ['fname',&mt('First Name')],
+                   ['mname',&mt('Middle Names/Initials')],
+                   ['lname',&mt('Last Name')],
+                   ['gen',&mt('Generation')],
+                   ['id',&mt('ID/Student Number')],
+                   ['sec',&mt('Group/Section')],
+                   ['ipwd',&mt('Initial Password')],
+                   ['email',&mt('EMail Address')]);
+	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
+	    &Apache::loncommon::csv_print_samples($r,\@records);
+	    $i=&Apache::loncommon::csv_print_select_table($r,\@records,
+                                                          \@field);
+	    foreach (@field) { 
+                $keyfields.=$_->[0].','; 
+            }
+	    chop($keyfields);
+	} else {
+	    unshift(@field,['none','']);
+	    $i=&Apache::loncommon::csv_samples_select_table($r,\@records,
+                                                            \@field);
+	    my %sone=&Apache::loncommon::record_sep($records[0]);
+	    $keyfields=join(',',sort(keys(%sone)));
+	}
+    }
+    &print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear);
+}
 
-    function pjump(type,dis,value,marker,ret,call) {
-        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
-                 +"&value="+escape(value)+"&marker="+escape(marker)
-                 +"&return="+escape(ret)
-                 +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-
+###############################################################
+###############################################################
+sub enroll_single_student {
+    my $r=shift;
+    # Remove non alphanumeric values from section
+    $ENV{'form.csec'}=~s/\W//g;
+    #
+    # We do the dates first because the action of making them the defaul
+    # in the course is entirely seperate 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'}) {
+        $r->print(&make_dates_default($startdate,$enddate));
     }
 
-    function dateset() {
-        if (document.studentform.pres_marker.value=='end') {
-           document.studentform.enddate.value=
-	       document.studentform.pres_value.value;
+    $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/)) {
+        # Deal with home server selection
+        my $domain=$ENV{'form.lcdomain'};
+        my $desiredhost = $ENV{'form.lcserver'};
+        if (lc($desiredhost) eq 'default') {
+            $desiredhost = undef;
+        } else {
+            my %home_servers =&Apache::loncommon::get_library_servers($domain);
+            if (! exists($home_servers{$desiredhost})) {
+                $r->print('<font color="#ff0000">'.&mt('Error').':</font>'.
+                          &mt('Invalid home server specified'));
+                return;
+            }
+        }
+        $r->print(" ".&mt('with server')." $desiredhost :") if (defined($desiredhost));
+        # End of home server selection logic
+	my $amode='';
+        my $genpwd='';
+        if ($ENV{'form.login'} eq 'krb') {
+           $amode='krb';
+	   $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') {
+	    $amode='localauth';
+	    $genpwd=$ENV{'form.locarg'};
+	    if (!$genpwd) { $genpwd=" "; }
+	}
+        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'},
+                            $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);
+            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>");
+            } else {
+                $r->print(&mt('unable to enroll').": ".$login_result);
+            }
+	} else {
+            $r->print('<p><font color="#ff0000">'.&mt('ERROR').'</font>&nbsp;');
+            if ($amode =~ /^krb/) {
+                $r->print(&mt('Missing Kerberos domain information.').'  ');
+            } else {
+                $r->print(&mt('Invalid login mode or password.').'  ');
+            }
+            $r->print('<b>'.&mt('Unable to enroll').' '.$ENV{'form.cuname'}.'.</b></p>');
+        }
+    } else {
+        $r->print(&mt('Invalid username or domain'));
+    }    
+}
+
+sub setup_date_selectors {
+    my ($starttime,$endtime,$mode) = @_;
+    if (! defined($starttime)) {
+        $starttime = time;
+        unless ($mode eq 'createcourse') {
+            if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+                            '.default_enrollment_start_date'})) {
+                $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
+                                  '.default_enrollment_start_date'};
+            }
         }
-        if (document.studentform.pres_marker.value=='start') {
-           document.studentform.startdate.value=
-	       document.studentform.pres_value.value;
+    }
+    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'}.
+                            '.default_enrollment_end_date'})) {
+                $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
+                                '.default_enrollment_end_date'};
+            }
         }
-        pclose();
     }
+    my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
+                                                            'startdate',
+                                                            $starttime);
+    my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
+                                                          'enddate',
+                                                          $endtime);
+    if ($mode eq 'createcourse') {
+        $startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+                                                            'startdate',
+                                                            $starttime);
+        $enddateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+                                                          'enddate',
+                                                          $endtime);
+    }
+    return ($startdateform,$enddateform);
+}
 
-</script>
-<table border=2><tr><th>Field</th><th>Samples</th></tr>
-ENDPICK
-             my %sone; my %stwo; my %sthree;
-             my $i=0;
+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'}) {
+        $enddate = 0;
+    }
+    return ($startdate,$enddate);
+}
 
-             if ($total>=0) {
-                %sone=&record_sep($records[0]);
-                if ($total>=1) {
-                   %stwo=&record_sep($records[1]);
-                   
-	        }
-                if ($total>=2) {
-                   %sthree=&record_sep($records[2]);
-	        }
-                map {
-                   $r->print('<tr><td><select name=f'.$i.
-                       ' onChange="flip(this.form,'.$i.');">');
-                   map {
-                      my ($value,$display)=split(/\:/,$_);
-                      $r->print('<option value='.$value.'>'.$display.
-                              '</option>');
-                   } ('none: ','username:Username',
-                      'names:Last Name, First Names',
-                      'fname:First Name','mname:Middle Names/Initials',
-                      'lname:Last Name','gen:Generation',
-                      'id:ID/Student Number','sec:Group/Section',
-                      'ipwd:Initial Password');
-                   $r->print('</select></td><td>');
-                   if (defined($sone{$i})) { 
-                      $r->print($sone{$i}."</br>\n"); 
-                   }
-	           if (defined($stwo{$i})) { 
-                      $r->print($stwo{$i}."</br>\n"); 
-                   }
-	           if (defined($sthree{$i})) { 
-                      $r->print($sthree{$i}."</br>\n"); 
-                   }
-                   $r->print('</td></tr>');
-                   $i++;
-	       } sort keys %sone;
-	       $i--;
-	     }
-             my $keyfields=join(',',sort keys %sone);
-             $r->print(<<ENDPICK);
-</table>
-<input type=hidden name=nfields value=$i>
-<input type=hidden name=keyfields value="$keyfields">
-<h3>Login Type</h3>
-<input type=radio name=login value=krb onClick="clickkrb(this.form);">
-Kerberos authenticated with domain
-<input type=text size=10 name=krbdom onChange="setkrb(this.form);"><p>
-<input type=radio name=login value=int onClick="clickint(this.form);"> 
-Internally authenticated (with initial password 
-<input type=text size=10 name=intpwd onChange="setint(this.form);">)
-<h3>LON-CAPA Domain for Students</h3>
-LON-CAPA domain: <input type=text size=10 value=$defdom name=lcdomain><p>
-<h3>Starting and Ending Dates</h3>
-<input type="hidden" value='' name="pres_value">
-<input type="hidden" value='' name="pres_type">
-<input type="hidden" value='' name="pres_marker">
-<input type="hidden" value='$today' name=startdate>
-<input type="hidden" value='$halfyear' name=enddate>
-<a 
- href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"
->Set Starting Date</a><p>
-
-<a 
- href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"
->Set Ending Date</a><p>
-<h3>Full Update</h3>
-<input type=checkbox name=fullup value=yes> Full update 
-(also dropping students)<p>
-<input type=button onClick="verify(this.form)" value="Update Courselist"><br>
-Note: for large courses, this operation might be time consuming.
-ENDPICK
+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');
+    if ($mode eq 'createcourse') {
+        $dateDefault = '&nbsp;';
+    }
+    my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
+    if (defined($endtime) && $endtime == 0) {
+        $perpetual .= ' checked';
+    }
+    $perpetual.= ' /> '.&mt('no ending date').'</nobr>';
+    my $result = '';
+    $result .= "<table>\n";
+    $result .= '<tr><td align="right">'.&mt('Starting Date').'</td>'.
+        '<td>'.$startform.'</td>'.
+        '<td>'.$dateDefault.'</td>'."</tr>\n";
+    $result .= '<tr><td align="right">'.&mt('Ending Date').'</td>'.
+        '<td>'.$endform.'</td>'.
+        '<td>'.$perpetual.'</td>'."</tr>\n";
+    $result .= "</table>\n";
+    return $result;
 }
 
-# ======================================================= Menu Phase Two Enroll
+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 $put_result = &Apache::lonnet::put('environment',
+            {'default_enrollment_start_date'=>$startdate,
+             'default_enrollment_end_date'  =>$enddate},$dom,$crs);
+    if ($put_result eq 'ok') {
+        $result .= "Set default start and end dates for course<br />";
+        #
+        # Refresh the course environment
+        &Apache::lonnet::coursedescription($ENV{'request.course.id'});
+    } else {
+        $result .= &mt('Unable to set default dates for course').":".$put_result.
+            '<br />';
+    }
+    return $result;
+}
+
+##
+## Single student enrollment routines (some of them)
+##
+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);
+    my %lt=&Apache::lonlocal::texthash(
+		    'eos'  => "Enroll One Student",
+		    'usr'  => "Username",
+                    'dom'  => "Domain",
+                    'been' => "Begin Enrollment",
+				       );
+    $r->print(<<END);
+<input type="hidden" name="action" value="enrollstudent" />
+<input type="hidden" name="state"  value="gotusername" />
+<h3>$lt{'eos'}</h3>
+<table>
+<tr><th>$lt{'usr'}:</th>
+    <td><input type="text" name="cuname"  size="15" /></td></tr>
+<tr><th>$lt{'dom'}:</th>
+    <td>$domform</td></tr>
+<tr><th>&nbsp;</th>
+    <td>
+    <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />
+    </td></tr>
+</table>
+END
+    return;
+}
 
-sub menu_phase_two_enroll {
+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 $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;
+    if ($home ne 'no_host') {
+        $new_user = 0;
+    }
+    #
+    my $user_data_html = '';
+    my $javascript_validations = '';
+    if ($new_user) {
+        my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+        # Set up authentication forms
+        my ($krbdef,$krbdefdom) =
+            &Apache::loncommon::get_kerberos_defaults($domain);
+        $javascript_validations=&javascript_validations('auth',$krbdefdom);
+        my %param = ( formname => 'document.studentform',
+                      kerb_def_dom => $krbdefdom,
+                      kerb_def_auth => $krbdef
+                      );
+        my $krbform = &Apache::loncommon::authform_kerberos(%param);
+        my $intform = &Apache::loncommon::authform_internal(%param);
+        my $locform = &Apache::loncommon::authform_local(%param);
+        #
+        # Set up domain selection form
+        my $homeserver_form = '';
+        my %servers = &Apache::loncommon::get_library_servers($domain);
+        $homeserver_form = '<select name="lcserver" size="1">'."\n".
+            '<option value="default" selected>default</option>'."\n";
+        while (my ($servername,$serverdescription) = each (%servers)) {
+            $homeserver_form .= '<option value="'.$servername.'">'.
+                $serverdescription."</option>\n";
+        }
+        $homeserver_form .= "</select>\n";
+        #
+        #
+	my %lt=&Apache::lonlocal::texthash(
+		       'udf'  => "User Data for",
+                       'fn'   => "First Name",
+                       'mn'   => "Middle Name",
+                       'ln'   => "Last Name",
+                       'gen'  => "Generation",
+                       'hs'   => "Home Server",
+                       'pswd' => "Password",
+		       'psam' => "Please select an authentication mechanism",
+					   );
+        $user_data_html = <<END;
+<h3>$lt{'udf'} $username\@$domain</h3>
+<table>
+<tr><th>$lt{'fn'}:</th>
+    <td><input type="text" name="cfirst"  size="15"></td></tr>
+<tr><th>$lt{'mn'}:</th>
+    <td><input type="text" name="cmiddle" size="15"></td></tr>
+<tr><th>$lt{'ln'}:</th>
+    <td><input type="text" name="clast"   size="15"></td></tr>
+<tr><th>$lt{'gen'}:</th>
+    <td><input type="text" name="cgen"    size="5"> </td></tr>
+<tr><th>$lt{'hs'}:</th>
+    <td>$homeserver_form</td></tr>
+</table>
+<h3>$lt{'pswd'}</h3>
+$lt{'psam'}
+<table>
+<p>
+$krbform
+<br />
+$intform
+<br />
+$locform
+</p>
+END
+    } else {
+        # User already exists.  Do not worry about authentication
+        my %uenv = &Apache::lonnet::dump('environment',$domain,$username);
+        $javascript_validations = &javascript_validations('noauth');
+	my %lt=&Apache::lonlocal::texthash(
+		       'udf'  => "User Data for",
+                       'fn'   => "First Name",
+                       'mn'   => "Middle Name",
+                       'ln'   => "Last Name",
+                       'gen'  => "Generation",
+					   );
+        $user_data_html = <<END;
+<h3>$lt{'udf'} $username\@$domain</h3>
+<input type="hidden" name="lcserver" value="default" />
+<table>
+<tr><th>$lt{'fn'}:</th>
+    <td>
+    <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />
+    </td></tr>
+<tr><th>$lt{'mn'}:</th>
+    <td>
+    <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />
+    </td></tr>
+<tr><th>$lt{'ln'}:</th>
+    <td>
+    <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />
+    </td></tr>
+<tr><th>$lt{'gen'}:</th>
+    <td>
+    <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
+    </td></tr>
+</table>
+END
+    }
+    my $date_table = &date_setting_table();
+        # Print it all out
+    my %lt=&Apache::lonlocal::texthash(
+		   'cd'   => "Course Data",
+                   'gs'   => "Group/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",
+				       );
+    $r->print(<<END);
+<input type="hidden" name="action" value="enrollstudent" />
+<input type="hidden" name="state"  value="done" />
+<input type="hidden" name="cuname" value="$username" />
+<input type="hidden" name="lcdomain" value="$domain" />
+<script type="text/javascript" language="Javascript">
+function verify(vf) {
+    var founduname=0;
+    var foundpwd=0;
+    var foundname=0;
+    var foundid=0;
+    var foundsec=0;
+    var tw;
+    if ((typeof(vf.cuname.value) !="undefined") && (vf.cuname.value!='') && 
+	(typeof(vf.lcdomain.value)!="undefined") && (vf.lcdomain.value!='')) {
+        founduname=1;
+    }
+    if ((typeof(vf.cfirst.value)!="undefined") && (vf.cfirst.value!='') &&
+	(typeof(vf.clast.value) !="undefined") && (vf.clast.value!='')) {
+        foundname=1;
+    }
+    if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) {
+        foundsec=1;
+    }
+    if ((typeof(vf.cstid.value)!="undefined") && (vf.cstid.value!='')) {
+	foundid=1;
+    }
+    if (founduname==0) {
+	alert('You need to specify at least the username and domain fields');
+        return;
+    }
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
 }
 
-# ========================================================= Menu Phase Two Drop
+$javascript_validations
 
-sub menu_phase_two_drop {
+function clearpwd(vf) {
+    //nothing else needs clearing
+}
+
+</script>
+
+$user_data_html
+
+<h3>$lt{'cd'}</h3>
+
+<p>$lt{'gs'}: <input type="text" name="csec" size="5" />
+<p>
+$date_table
+</p>
+<h3>$lt{'idsn'}</h3>
+<p>
+$lt{'idsn'}: <input type="text" name="cstid" size="10">
+</p><p>
+<input type="checkbox" name="forceid" value="yes"> 
+$lt{'disn'}
+</p><p>
+<input type="button" onClick="verify(this.form)" value="$lt{'eas'}">
+</p>
+END
+    return;
+}
+
+# ========================================================= Menu Phase Two Drop
+sub print_drop_menu {
     my $r=shift;
+    $r->print("<h3>".&mt('Drop Students')."</h3>");
+    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");
+        return;
+    }
+    # Print out the available choices
+    &show_drop_list($r,$classlist,$keylist);
+    return;
 }
 
-# ================================================= Drop/Add from uploaded file
+# ============================================== view classlist
+sub print_html_classlist {
+    my $r=shift;
+    if (! exists($ENV{'form.sortby'})) {
+        $ENV{'form.sortby'} = 'username';
+    }
+    if ($ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+        $ENV{'form.Status'} = 'Active';
+    }
+    my $status_select = &Apache::lonhtmlcommon::StatusOptions
+        ($ENV{'form.Status'},'studentform');
+    my $CCL=&mt('Current Class List');
+    $r->print(<<END);
+<input type="hidden" name="action" value="$ENV{'form.action'}" />
+<input type="hidden" name="state"  value="" />
+<p>
+<font size="+1">$CCL</font>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+END
+    if ($ENV{'form.action'} ne 'modifystudent') {
+	my %lt=&Apache::lonlocal::texthash(
+		   'ef'   => "Excel format",
+                   'ss'   => "Student Status",
+					   );
+        $r->print(<<END);
+<font size="+1">
+<a href="javascript:document.studentform.state.value='csv';document.studentform.submit();">CSV format</a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="javascript:document.studentform.state.value='excel';document.studentform.submit();">$lt{'ef'}</a>
+</font>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+$lt{'ss'}:
+END
+    }
+    $r->print($status_select."</p>\n");
+    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");
+    } else {
+        # Print out the available choices
+        if ($ENV{'form.action'} eq 'modifystudent') {
+            &show_class_list($r,'view','modify','modifystudent',
+                             $ENV{'form.Status'},$classlist,$keylist);
+        } else {
+            &show_class_list($r,'view','aboutme','classlist',
+                             $ENV{'form.Status'},$classlist,$keylist);
+        }
+    }
+}
 
-sub upfile_drop_add {
+# ============================================== view classlist
+sub print_formatted_classlist {
     my $r=shift;
-    $r->print('<input type=hidden name=phase value=four>');
+    my $mode = shift;
+    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");
+    } else {
+        &show_class_list($r,$mode,'nolink','csv',
+                         $ENV{'form.Status'},$classlist,$keylist);
+    }
+}
+
+# =================================================== Show student list to drop
+sub show_class_list {
+    my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;
+    my $cid=$ENV{'request.course.id'};
+    #
+    # Variables for excel output
+    my ($excel_workbook, $excel_sheet, $excel_filename,$row);
+    #
+    my $sortby = $ENV{'form.sortby'};
+    if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+        $sortby = 'username';
+    }
+    # Print out header 
+    if ($mode eq 'view') {
+        if ($linkto eq 'aboutme') {
+            $r->print(&mt('Select a user name to view the users personal page.'));
+        } elsif ($linkto eq 'modify') {
+            $r->print(&mt('Select a user name to modify the students information'));
+        }
+	my %lt=&Apache::lonlocal::texthash(
+	               'usrn'   => "username",
+                       'dom'    => "domain",
+                       'sn'     => "student name",
+                       'sec'    => "section",
+					   );
+        $r->print(<<END);
+
+<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="sname"  value="" />
+<input type="hidden" name="sdom"   value="" />
+<p>
+<table border=2>
+<tr><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>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='id';document.studentform.submit();">ID</a>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='fullname';document.studentform.submit();">$lt{'sn'}</a>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='section';document.studentform.submit();">$lt{'sec'}</a>
+    </th>
+</tr>
+END
+    } elsif ($mode eq 'csv') {
+        if($statusmode eq 'Expired') {
+            $r->print(&mt('Students with expired roles'));
+        }
+        if ($statusmode eq 'Any') {
+            $r->print('"'.join('","',(&mt("username"),&mt("domain"),"ID",
+                      &mt("student name"),&mt("section"),&mt("status"))).
+                      '"'."\n");
+        } else {
+            $r->print('"'.join('","',(&mt("username"),&mt("domain"),"ID",
+                      &mt("student name"),&mt("section"))).'"'."\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');
+        $excel_sheet = $excel_workbook->addworksheet('classlist');
+        #
+        my $description = 'Class List for '.
+            $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+        $excel_sheet->write($row++,0,$description);
+        #
+        $excel_sheet->write($row++,0,["username","domain","ID",
+                                      "student name","section","status"]);
+    }
+    #
+    # Sort the students
+    my %index;
+    my $i;
+    foreach (@$keylist) {
+        $index{$_} = $i++;
+    }
+    my $index  = $index{$sortby};
+    my $second = $index{'username'};
+    my $third  = $index{'domain'};
+    my @Sorted_Students = sort {
+        lc($classlist->{$a}->[$index])  cmp lc($classlist->{$b}->[$index])
+            ||
+        lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second])
+            ||
+        lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
+        } (keys(%$classlist));
+    foreach my $student (@Sorted_Students) {
+        my $username = $classlist->{$student}->[$index{'username'}];
+        my $domain   = $classlist->{$student}->[$index{'domain'}];
+        my $section  = $classlist->{$student}->[$index{'section'}];
+        my $name     = $classlist->{$student}->[$index{'fullname'}];
+        my $id       = $classlist->{$student}->[$index{'id'}];
+        my $status   = $classlist->{$student}->[$index{'status'}];
+        next if (($statusmode ne 'Any') && ($status ne $statusmode));
+        if ($mode eq 'view') {
+            $r->print("<tr>\n    <td>\n        ");
+            if ($linkto eq 'nothing') {
+                $r->print($username);
+            } elsif ($linkto eq 'aboutme') {
+                $r->print(&Apache::loncommon::aboutmewrapper($username,
+                                                             $username,
+                                                             $domain));
+            } elsif ($linkto eq 'modify') {
+                $r->print('<a href="'.
+                          "javascript:document.studentform.sname.value='".
+                          $username.
+                          "';document.studentform.sdom.value='".$domain.
+                          "';document.studentform.state.value='selected".
+                          "';document.studentform.submit();".'">'.
+                          $username."</a>\n");
+            }
+            $r->print(<<"END");
+    </td>
+    <td>$domain</td>
+    <td>$id</td>
+    <td>$name</td>
+    <td>$section</td>
+</tr>
+END
+        } elsif ($mode eq 'csv') {
+            # no need to bother with $linkto
+            my @line = ();
+            foreach ($username,$domain,$id,$name,$section) {
+                push @line,&Apache::loncommon::csv_translate($_);
+            }
+            if ($statusmode eq 'Any') {
+                push @line,&Apache::loncommon::csv_translate($status);
+            }
+            my $tmp = $";
+            $" = '","';
+            $r->print("\"@line\"\n");
+            $" = $tmp;
+        } elsif ($mode eq 'excel') {
+            $excel_sheet->write($row++,0,[$username,$domain,$id,
+                                          $name,$section,$status]);
+        }
+    }
+    if ($mode eq 'view') {
+        $r->print('</table><br>');
+    } elsif ($mode eq 'excel') {
+        $excel_workbook->close();
+        $r->print('<p><a href="'.$excel_filename.'">'.
+                  &mt('Your Excel spreadsheet').'</a> '.&mt('is ready for download').'.</p>'."\n");
+    }
+}
+
+
+#
+# print out form for modification of a single students data
+#
+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'};
+    # determine the students name information
+    my %info=&Apache::lonnet::get('environment',
+                                  ['firstname','middlename',
+                                   'lastname','generation','id'],
+                                  $sdom, $sname);
+    my ($tmp) = keys(%info);
+    if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+        $r->print('<font color="#ff0000" size="+2">'.&mt('Error').'</font>'.
+                  '<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>');
+        return;
+    }
+    # determine the students starting and ending times and section
+    my ($starttime,$endtime,$section) = &get_enrollment_data($sname,$sdom);
+    if ($starttime =~ /^error/) {
+        $r->print('<h2>'&mt('Error').'</h2>');
+        $r->print('<p>'.$starttime.'</p>');
+        return;
+    }
+    # Deal with date forms
+    my $date_table = &date_setting_table($starttime,$endtime);
+    #
+    if (! exists($ENV{'form.Status'}) || 
+        $ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+        $ENV{'form.Status'} = 'crap';
+    }
+    # Make sure student is enrolled in course
+    my %lt=&Apache::lonlocal::texthash(
+	           'mef'   => "Modify Enrollment for",
+                   'odcc'  => "Only domain coordinators can change a users password.",
+                   'sn'    => "Student Name",
+                   'fn'    => "First",
+                   'mn'    => "Middle",
+                   'ln'    => "Last",
+                   'gen'   => "Generation",
+                   'sid'   => "Student ID",
+                   'disn'  => "Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)",
+                   'sec'   => "Section",
+                   'sm'    => "Submit Modifications",
+				       );
+    $r->print(<<END);
+<p>
+<font size="+1">
+$lt{'odcc'}
+</font>
+</p>
+<input type="hidden" name="slogin"  value="$sname"  />
+<input type="hidden" name="sdomain" value="$sdom" />
+<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'}" />
+
+<h2>$lt{'mef'} $info{'firstname'} $info{'middlename'} 
+$info{'lastname'} $info{'generation'}, $sname\@$sdom</h2>
+<p>
+<b>$lt{'sn'}</b>
+<table>
+<tr><th>$lt{'fn'}</th><th>$lt{'mn'}</th><th>$lt{'ln'}</th><th>$lt{'gen'}</th></tr>
+<tr><td>
+<input type="text" name="firstname"  value="$info{'firstname'}"  /></td><td>
+<input type="text" name="middlename" value="$info{'middlename'}" /></td><td>
+<input type="text" name="lastname"   value="$info{'lastname'}"   /></td><td>
+<input type="text" name="generation" value="$info{'generation'}" /></td></tr>
+</table>
+</p><p>
+<b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
+</p><p>
+<input type="checkbox" name="forceid" > 
+$lt{'disn'}
+</p><p>
+<b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="4"/>
+</p>
+<p>$date_table</p>
+<input type="submit" value="$lt{'sm'}" />
+</body></html>
+END
+    return;
+}
+
+#
+# modify a single students section 
+#
+sub modify_single_student {
+    my $r = shift;
+    #
+    # Remove non alphanumeric values from the section
+    $ENV{'form.section'} =~ s/\W//g;
+    #
+    # Do the date defaults first
+    my ($starttime,$endtime) = &get_dates_from_form();
+    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'};
+    #
+    # We always need this information
+    my $slogin     = $ENV{'form.slogin'};
+    my $sdom       = $ENV{'form.sdomain'};
+    #
+    # Get the old data
+    my %old=&Apache::lonnet::get('environment',
+                                 ['firstname','middlename',
+                                  'lastname','generation','id'],
+                                 $sdom, $slogin);
+    $old{'section'} = &Apache::lonnet::getsection($sdom,$slogin,
+                                                  $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.");
+        return;
+    }
+    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 $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'}))) {
+        $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'};
+    }
+    #
+    # talk to the user about what we are going to do
+    my %lt=&Apache::lonlocal::texthash(
+	           'mdu'   => "Modifying data for user",
+                   'si'    => "Student Information",
+                   'fd'    => "Field",
+                   'ov'    => "Old Value",
+                   'nv'    => "New Value",
+                   'fn'    => "First name",
+                   'mn'    => "Middle name",
+                   'ln'    => "Last name",
+                   'gen'   => "Generation",
+                   'sec'   => "Section",
+                   'ri'    => "Role Information",
+                   'st'    => "Start Time",
+                   'et'    => "End Time",
+				       );
+    $r->print(<<END);
+    <h2>$lt{'mdu'} $slogin \@ $sdom </h2>
+<h3>$lt{'si'}</h3>
+<table rules="rows" border="1" cellpadding="3" >
+<tr>
+    <th> $lt{'fd'} </th>
+    <th> $lt{'ov'} </th>
+    <th> $lt{'nv'} </th>
+</tr>
+<tr>
+    <td> <b>$lt{'fn'}</b> </td>
+    <td> $old{'firstname'} </td>
+    <td> $firstname </td>
+</tr><tr>
+    <td> <b>$lt{'mn'}</b> </td>
+    <td> $old{'middlename'} </td>
+    <td> $middlename </td>
+</tr><tr>
+    <td> <b>$lt{'ln'}</b> </td>
+    <td> $old{'lastname'} </td>
+    <td> $lastname </td>
+</tr><tr>
+    <td> <b>$lt{'gen'}</b> </td>
+    <td> $old{'generation'} </td>
+    <td> $generation </td>
+</tr><tr>
+    <td> <b>ID</b> </td>
+    <td> $old{'id'} </td>
+    <td> $sid </td>
+</tr><tr>
+    <td> <b>$lt{'sec'}</b> </td>
+    <td> $old{'section'} </td>
+    <td> $section</td>
+</tr>
+</table>
+<h3>$lt{'ri'}</h3>
+<table>
+<tr><td align="right"><b>$lt{'st'}:</b></td><td> $displayable_starttime </td></tr>
+<tr><td align="right"><b>$lt{'et'}:</b></td><td> $displayable_endtime   </td></tr>
+</table>
+<p>
+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'},
+                                                $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'});
+    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/) {
+        $r->print(&mt('An error occurred during the attempt to change the role information for this student.')."  <br />".
+                  &mt('The error reported was')." ".
+                  $roleresults);
+        &Apache::lonnet::logthis("londropadd:failed attempt to modify student".
+                                 " data for ".$slogin." \@ ".$sdom." by ".
+                                 $ENV{'user.name'}." \@ ".$ENV{'user.domain'}.
+                                 ":".$roleresults);
+    } else { # everything is okay!
+        $r->print(&mt('Student information updated successfully.')." <br />".
+                  &mt('The student must log out and log in again to see these changes.'));
+    }
+    my $Masd=&mt('Modify another students data');
+    $r->print(<<END);
+</p><p>
+<input type="hidden" name="action" value="modifystudent" />
+<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
+    return;
+}
+
+sub get_enrollment_data {
+    my ($sname,$sdomain) = @_;
+    my $courseid = $ENV{'request.course.id'};
+    $courseid =~ s:_:/:g;
+    my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);
+    my ($tmp) = keys(%roles);
+    # Bail out if we were unable to get the students roles
+    return ('error'.$tmp) if ($tmp =~ /^(con_lost|error|no_such_host)/i);
+    # Go through the roles looking for enrollment in this course
+    my ($end,$start) = (undef,undef);
+    my $section = '';
+    my $count = scalar(keys(%roles));
+    while (my ($course,$role) = each(%roles)) {
+        if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {
+            #
+            # Get active role
+            $section=$1;
+            (undef,$end,$start)=split(/\_/,$role);
+            my $now=time;
+            my $notactive=0;
+            if ($start) {
+                if ($now<$start) { $notactive=1; }
+            }
+            if ($end) {
+                if ($now>$end) { $notactive=1; }
+            } 
+            unless ($notactive) { return ($start,$end,$section); }
+        }
+    }
+    return ($start,$end,$section);
+}
+
+#################################################
+#################################################
+
+=pod
+
+=item show_drop_list
+
+Display a list of students to drop
+Inputs: 
+
+=over 4
+
+=item $r, Apache request
+
+=item $classlist, hash pointer returned from loncoursedata::get_classlist();
+
+=item $keylist, array pointer returned from loncoursedata::get_classlist() 
+which describes the order elements are stored in the %$classlist values.
+
+=item $nosort, if true, sorting links are omitted.
+
+=back
 
-    &load_tmp_file($r);
-    my @studentdata=&upfile_record_sep();
+=cut
 
-    my @keyfields=split(/\,/,$ENV{'form.keyfields'});
+#################################################
+#################################################
+sub show_drop_list {
+    my ($r,$classlist,$keylist,$nosort)=@_;
     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)$/) {
+        $sortby = 'username';
+    }
+    #
+    my $action = "drop";
+    $r->print(<<END);
+<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="action" value="$action" />
+<input type="hidden" name="state"  value="done" />
+<script>
+function checkAll(field) {
+    for (i = 0; i < field.length; i++)
+        field[i].checked = true ;
+}
+
+function uncheckAll(field) {
+    for (i = 0; i < field.length; i++)
+        field[i].checked = false ;
+}
+</script>
+<p>
+<input type="hidden" name="phase" value="four">
+END
+
+    if ($nosort) {
+	my %lt=&Apache::lonlocal::texthash(
+	               'usrn'   => "username",
+                       'dom'    => "domain",
+                       'sn'     => "student name",
+                       'sec'    => "section",
+					   );
+        $r->print(<<END);
+<table border=2>
+<tr>
+    <th>&nbsp;</th>
+    <th>$lt{'usrn'}</th>
+    <th>$lt{'dom'}</th>
+    <th>ID</th>
+    <th>$lt{'sn'}</th>
+    <th>$lt{'sec'}</th>
+</tr>
+END
+
+    } else  {
+	my %lt=&Apache::lonlocal::texthash(
+	               'usrn'   => "username",
+                       'dom'    => "domain",
+                       'sn'     => "student name",
+                       'sec'    => "section",
+					   );
+        $r->print(<<END);
+<table border=2>
+<tr><th>&nbsp;</th>
+    <th>
+       <a href="/adm/dropadd?action=$action&sortby=username">$lt{'usrn'}</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=domain">$lt{'dom'}</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=id">ID</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=fullname">$lt{'sn'}</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=section">$lt{'sec'}</a>
+    </th>
+</tr>
+END
+    }
+    #
+    # Sort the students
+    my %index;
+    my $i;
+    foreach (@$keylist) {
+        $index{$_} = $i++;
+    }
+    my $index  = $index{$sortby};
+    my $second = $index{'username'};
+    my $third  = $index{'domain'};
+    my @Sorted_Students = sort {
+        lc($classlist->{$a}->[$index])  cmp lc($classlist->{$b}->[$index])
+            ||
+        lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second])
+            ||
+        lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
+        } (keys(%$classlist));
+    foreach my $student (@Sorted_Students) {
+        my $error;
+        my $username = $classlist->{$student}->[$index{'username'}];
+        my $domain   = $classlist->{$student}->[$index{'domain'}];
+        my $section  = $classlist->{$student}->[$index{'section'}];
+        my $name     = $classlist->{$student}->[$index{'fullname'}];
+        my $id       = $classlist->{$student}->[$index{'id'}];
+        my $status   = $classlist->{$student}->[$index{'status'}];
+        next if ($status ne 'Active');
+        #
+        $r->print(<<"END");
+<tr>
+    <td><input type="checkbox" name="droplist" value="$student"></td>
+    <td>$username</td>
+    <td>$domain</td>
+    <td>$id</td>
+    <td>$name</td>
+    <td>$section</td>
+</tr>
+END
+    }
+    $r->print('</table><br>');
+    my %lt=&Apache::lonlocal::texthash(
+	               'dp'   => "Drop Students",
+                       'ca'   => "check all",
+                       'ua'   => "uncheck all",
+				       );
+    $r->print(<<"END");
+</p><p>
+<input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.droplist)"> &nbsp;
+<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.droplist)"> 
+<p><input type=submit value="$lt{'dp'}"></p>
+END
+    return;
+}
 
-             my %fields=();
-             for (my $i=0;$i<=$ENV{'form.nfields'};$i++) {
-                 $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
-             }
-             my $startdate=$ENV{'form.startdate'};
-             my $enddate=$ENV{'form.enddate'};
-             if ($startdate=~/\D/) { $startdate=''; }
-             if ($enddate=~/\D/) { $enddate=''; }
-             my $domain=$ENV{'form.lcdomain'};
-             my $amode='';
-             my $genpwd='';
-             if ($ENV{'form.login'} eq 'krb') {
-                 $amode='krb4';
-                 $genpwd=$ENV{'form.krbdom'};
-             } elsif ($ENV{'form.login'} eq 'int') {
-                 $amode='internal';
-                 if ((defined($ENV{'form.intpwd'})) && ($ENV{'form.intpwd'})) {
-		     $genpwd=$ENV{'form.intpwd'};
-                 }
-             }
-             unless (($domain=~/\W/) || ($amode eq '')) {
-              $r->print('<h3>Enrolling Students</h3>');
-              my $count=0;
-              my $flushc=0;
-              my %student=();
-# ----------------------------------------------------------- Get new classlist
-# --------------------------------------------------------- Enroll new students
-	      map {
-		  my %entries=&record_sep($_);
-
-                unless (($entries{$fields{'username'}} eq '') ||
-                        (!defined($entries{$fields{'username'}}))) {
-                  my $fname=''; my $mname=''; my $lname=''; my $gen='';
-                  if (defined($fields{'names'})) {
-		      ($lname,$fname,$mname)=
-	            ($entries{$fields{'names'}}=~/([^\,]+)\,\s*(\w+)\s*(.*)$/);
-                  } else {
-                      if (defined($fields{'fname'})) {
-		         $fname=$entries{$fields{'fname'}};
-		      }
-                      if (defined($fields{'mname'})) {
-		         $mname=$entries{$fields{'mname'}};
-		      }
-                      if (defined($fields{'lname'})) {
-		         $lname=$entries{$fields{'lname'}};
-		      }
-                      if (defined($fields{'gen'})) {
-		         $gen=$entries{$fields{'gen'}};
-		      }
-                  }
-                  if ($entries{$fields{'username'}}=~/\W/) {
-                     $r->print('<p><b>Unacceptable username: '.
-                              $entries{$fields{'username'}}.' for user '.
-                              $fname.' '.$mname.' '.$lname.' '.$gen.'</b><p>');
-		  } else {
-                      my $sec='';
-                      my $username=$entries{$fields{'username'}};
-                      if (defined($fields{'sec'})) {
-                         if (defined($entries{$fields{'sec'}})) {
-			     $sec=$entries{$fields{'sec'}};
-                         }
-                      }
-                      my $id='';
-                      if (defined($fields{'id'})) {
-                         if (defined($entries{$fields{'id'}})) {
-			     $id=$entries{$fields{'id'}};
-                         }
-                         $id=~tr/A-Z/a-z/;
-                      }
-                      my $password='';
-                      if ($genpwd) { 
-                         $password=$genpwd; 
-		      } else {
-                         if (defined($fields{'ipwd'})) {
-			     if ($entries{$fields{'ipwd'}}) {
-				 $password=$entries{$fields{'ipwd'}};
-                             }
-                         }
-                      }
-                      if ($password) {
-			 &dropstudent($domain,$username,$cid,$sec);
-                         my $reply=&Apache::lonnet::modifystudent(
-                          $domain,$username,$id,$amode,$password,
-			   $fname,$mname,$lname,$gen,$sec,$enddate,$startdate);
-                         unless ($reply eq 'ok') {
-                            $r->print(
-                             "<p><b>Error enrolling $username: $reply</b><p>");
+#
+# Print out the initial form to get the courselist file
+#
+sub print_first_courselist_upload_form {
+    my $r=shift;
+    my $str;
+    $str  = '<input type="hidden" name="phase" value="two">';
+    $str .= '<input type="hidden" name="action" value="upload" />';
+    $str .= '<input type="hidden"   name="state"  value="got_file" />';
+    $str .= "<h3>".&mt('Upload a class list')."</h3>\n";
+    $str .= &Apache::loncommon::upfile_select_html();
+    $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 .= &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";
+    $r->print($str);
+    return;
+}
+
+# ================================================= Drop/Add from uploaded file
+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'};
+    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};
+            }
+        } else {
+            $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+        }
+    }
+    #
+    my ($startdate,$enddate) = &get_dates_from_form();
+    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'};
+    if (lc($desiredhost) eq 'default') {
+        $desiredhost = undef;
+    } else {
+        my %home_servers = &Apache::loncommon::get_library_servers($domain);
+        if (! exists($home_servers{$desiredhost})) {
+            $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
+                      &mt('Invalid home server specified'));
+            $r->print("</body>\n</html>\n");
+            return;
+        }
+    }
+    # Determine authentication mechanism
+    my $amode  = '';
+    my $genpwd = '';
+    if ($ENV{'form.login'} eq 'krb') {
+        $amode='krb';
+	$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'};
+        }
+    } elsif ($ENV{'form.login'} eq 'loc') {
+        $amode='localauth';
+        if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
+            $genpwd=$ENV{'form.locarg'};
+        }
+    }
+    if ($amode =~ /^krb/) {
+        if (! defined($genpwd) || $genpwd eq '') {
+            $r->print('<font color="red" size="+1">'.
+                      &mt('Unable to enroll students').'</font>  '.
+                      &mt('No Kerberos domain was specified.').'</p>');
+            $amode = ''; # This causes the loop below to be skipped
+        }
+    }
+    unless (($domain=~/\W/) || ($amode eq '')) {
+        #######################################
+        ##         Enroll Students           ##
+        #######################################
+        $r->print('<h3>'.&mt('Enrolling Students')."</h3>\n<p>\n");
+        my $count=0;
+        my $flushc=0;
+        my %student=();
+        # Get new classlist
+        foreach (@studentdata) {
+            my %entries=&Apache::loncommon::record_sep($_);
+            # Determine student name
+            unless (($entries{$fields{'username'}} eq '') ||
+                    (!defined($entries{$fields{'username'}}))) {
+                my ($fname, $mname, $lname,$gen) = ('','','','');
+                if (defined($fields{'names'})) {
+                    ($lname,$fname,$mname)=($entries{$fields{'names'}}=~
+                                            /([^\,]+)\,\s*(\w+)\s*(.*)$/);
+                } else {
+                    if (defined($fields{'fname'})) {
+                        $fname=$entries{$fields{'fname'}};
+                    }
+                    if (defined($fields{'mname'})) {
+                        $mname=$entries{$fields{'mname'}};
+                    }
+                    if (defined($fields{'lname'})) {
+                        $lname=$entries{$fields{'lname'}};
+                    }
+                    if (defined($fields{'gen'})) {
+                        $gen=$entries{$fields{'gen'}};
+                    }
+                }
+                if ($entries{$fields{'username'}}=~/\W/) {
+                    $r->print('<br />'.
+      &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
+          $entries{$fields{'username'}},$fname,$mname,$lname,$gen).
+                              '</b>');
+                } else {
+                    # determine section number
+                    my $sec='';
+                    my $username=$entries{$fields{'username'}};
+                    if (defined($fields{'sec'})) {
+                        if (defined($entries{$fields{'sec'}})) {
+                            $sec=$entries{$fields{'sec'}};
+                        }
+                    }
+                    # remove non alphanumeric values from section
+                    $sec =~ s/\W//g;
+                    # determine student id number
+                    my $id='';
+                    if (defined($fields{'id'})) {
+                        if (defined($entries{$fields{'id'}})) {
+                            $id=$entries{$fields{'id'}};
+                        }
+                        $id=~tr/A-Z/a-z/;
+                    }
+                    # determine email address
+                    my $email='';
+                    if (defined($fields{'email'})) {
+                        if (defined($entries{$fields{'email'}})) {
+                            $email=$entries{$fields{'email'}};
+                            unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }
+                        }
+                    }
+                    # determine student password
+                    my $password='';
+                    if ($genpwd) { 
+                        $password=$genpwd; 
+                    } else {
+                        if (defined($fields{'ipwd'})) {
+                            if ($entries{$fields{'ipwd'}}) {
+                                $password=$entries{$fields{'ipwd'}};
+                            }
+                        }
+                    }
+                    # Clean up whitespace
+                    foreach (\$domain,\$username,\$id,\$fname,\$mname,
+                             \$lname,\$gen,\$sec) {
+                        $$_ =~ s/(\s+$|^\s+)//g;
+                    }
+                    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,
+                             $email);
+                        if ($reply ne 'ok') {
+                            $reply =~ s/^error://;
+                            $r->print('<br />'.
+                &mt('<b>[_1]</b>:  Unable to enroll: [_2]',$username,$reply));
          		} else {
                             $count++; $flushc++;
                             $student{$username}=1;
@@ -580,136 +1890,212 @@ sub upfile_drop_add {
                                 $flushc=0;
                             }
                         }
-                     } else {
-                            $r->print(
-                             "<p><b>No password for $username</b><p>");
-                     }
-                  }
-                 }                 
-              } @studentdata;
-              $r->print('<p>Processed Students: '.$count);
-# --------------------------------------------------------------- Drop students
-              if ($ENV{'form.fullup'} eq 'yes') {
-		 $r->print('<h3>Dropping Students</h3>');
-# ------------------------------------------------------- Get current classlist
-                 my $classlst=&Apache::lonnet::reply
-                 ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'.
-	                  $ENV{'course.'.$cid.'.num'}.':classlist',
-	                  $ENV{'course.'.$cid.'.home'});
-                 my %currentlist=();
-                 my $now=time;
-                 unless ($classlst=~/^error\:/) {
-                     map {
-                        my ($name,$value)=split(/\=/,$_);
-                        my ($end,$start)=split(/\:/,
-                                            &Apache::lonnet::unescape($value));
-                        my $active=1;
-                        if (($end) && ($now>$end)) { $active=0; }
-                        if ($active) {
-		           $currentlist{&Apache::lonnet::unescape($name)}=1;
-                        }
-                     } split(/\&/,$classlst);
-# ------------------------------------------------ Now got up-to-date classlist
-                     map {
- 	                my %entries=&record_sep($_);
-                        unless (($entries{$fields{'username'}} eq '') ||
-                          (!defined($entries{$fields{'username'}}))) {
-			   delete($currentlist{
-                            $entries{$fields{'username'}}.':'.
-                            $domain});
-		        }
-                     } @studentdata;
-# ----------------------------------------------------------- Print out choices
-                     $r->print('<table border=2>');
-                     map {
-                         my ($sname,$sdom)=split(/\:/,$_);
-                         my %reply=&Apache::lonnet::idrget($sdom,$sname);
-                         my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
-                         my @reply=split(/[\&\=]/,&Apache::lonnet::reply(
-                           'get:'.$sdom.':'.$sname.
-		      ':environment:firstname&middlename&lastname&generation',
-                           &Apache::lonnet::homeserver($sname,$sdom)));
- 			 $r->print(
-                  '<tr><td><input type=checkbox name="drop:'.$_.'"></td><td>'.
-                                   $sname.'</td><td>'.$sdom.'</td><td>'.
-                                   $reply{$sname}.'</td><td>'.
-                                   $reply[2].' '.$reply[3],', '.$reply[0].' '.
-                                   $reply[1].'</td><td>'.
-                                   $ssec."</td></tr>\n");
-                     } sort keys %currentlist;
-                     $r->print('</table><br>');
-                     $r->print('<input type=submit value="Drop Students">');
-
-	         } else {
-                     $r->print(
-                  '<font color=red><h3>Could not access classlist: '.$classlst.
-                  '</h3></font>');
-                 }
-	     }
-# ------------------------------------------------------------------------ Done
-
-	  }
+                    } else {
+                        $r->print('<br />'.
+      &mt('<b>[_1]</b>: Unable to enroll.  No password specified.',$username)
+                                  );
+                    }
+                }
+            }
+        } # end of foreach (@studentdata)
+        $r->print("</p>\n<p>\n".&mt('Processed [_1] student(s).',$count).
+                  "</p>\n");
+        $r->print("<p>\n".
+                  &mt('If active, the new role will be available when the '.
+                  'students next log in to LON-CAPA.')."</p>\n");
+        #####################################
+        #           Drop students           #
+        #####################################
+        if ($ENV{'form.fullup'} eq 'yes') {
+            $r->print('<h3>'.&mt('Dropping Students')."</h3>\n");
+            #  Get current classlist
+            my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+            if (! defined($classlist)) {
+                $r->print(&mt('There are no students currently enrolled.').
+                          "\n");
+            } else {
+                # Remove the students we just added from the list of students.
+                foreach (@studentdata) {
+                    my %entries=&Apache::loncommon::record_sep($_);
+                    unless (($entries{$fields{'username'}} eq '') ||
+                            (!defined($entries{$fields{'username'}}))) {
+                        delete($classlist->{$entries{$fields{'username'}}.
+                                                ':'.$domain});
+                    }
+                }
+                # Print out list of dropped students.
+                &show_drop_list($r,$classlist,$keylist,'nosort');
+            }
+        }
+    } # end of unless
 }
 
-# ================================================================ Main Handler
-
-sub handler {
-   my $r=shift;
-
-   if ($r->header_only) {
-      $r->content_type('text/html');
-      $r->send_http_header;
-      return OK;
-   }
+# ================================================================== Phase four
+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'});
+    }
+    foreach (@droplist) {
+        my ($uname,$udom)=split(/\:/,$_);
+        # drop student
+        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++;
+        } else {
+            $r->print(
+          &mt('Error dropping [_1]:[_2]',$uname.'@'.$udom,$result).
+                      '<br />');
+        }
+    }
+    $r->print('<p><b>'.&mt('Dropped [_1] student(s).',$count).'</b></p>');
+    $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
+}
 
-# ----------------------------------------------------- Needs to be in a course
+###################################################################
+###################################################################
 
-   if (($ENV{'request.course.fn'}) && 
-       (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) {
+=pod
 
-# ------------------------------------------------------------------ Start page
-      $r->content_type('text/html');
-      $r->send_http_header;
-      &header($r);
-
-# --------------------------------------------------- Phase one, initial screen
-      unless ($ENV{'form.phase'}) {
-	  &menu_phase_one($r);
-      }
-# ------------------------------------------------------------------- Phase two
-      if ($ENV{'form.phase'} eq 'two') {
-	 if ($ENV{'form.fileupload'}) {
-	     &menu_phase_two_upload($r);
-         } elsif ($ENV{'form.enroll'}) {
-             &menu_phase_two_enroll($r);
-         } elsif ($ENV{'form.drop'}) {
-             &menu_phase_two_drop($r);
-         }
-      }
+=item &handler
 
+The typical handler you see in all these modules.  Takes $r, the
+http request, as an argument.  
+
+The response to the request is governed by two form variables
+
+ form.action      form.state     response
+ ---------------------------------------------------
+ undefined        undefined      print main menu
+ upload           undefined      print courselist upload menu
+ upload           got_file       deal with uploaded file,
+                                 print the upload managing menu
+ upload           enrolling      enroll students based on upload
+ drop             undefined      print the classlist ready to drop
+ drop             done           drop the selected students
+ enrollstudent    undefined      print student username domain form
+ enrollstudent    gotusername    print single student enroll menu
+ enrollstudent    enrolling      enroll student
+ classlist        undefined      print html classlist
+ classlist        csv            print csv classlist
+ modifystudent    undefined      print classlist to select student to modify
+ modifystudent    selected       print modify student menu
+ modifystudent    done           make modifications to student record
 
+=cut
 
-
-# ----------------------------------------------------------------- Phase three
-      if ($ENV{'form.phase'} eq 'three') {
-	  if ($ENV{'form.datatoken'}) {
-	      &upfile_drop_add($r);
-          }
-      }
-# ------------------------------------------------------------------------- End
-      $r->print('</form></body></html>');
-   } else {
-# ----------------------------- Not in a course, or not allowed to modify parms
-      $ENV{'user.error.msg'}=
-        "/adm/dropadd:cst:0:0:Cannot drop or add students";
-      return HTTP_NOT_ACCEPTABLE; 
-   }
-   return OK;
+###################################################################
+###################################################################
+sub handler {
+    my $r=shift;
+    if ($r->header_only) {
+        &Apache::loncommon::content_type($r,'text/html');
+        $r->send_http_header;
+        return OK;
+    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['action','state']);
+    #  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";
+        return HTTP_NOT_ACCEPTABLE; 
+    }
+    #
+    # Only output the header information if they did not request csv format
+    #
+    if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) {
+        $r->content_type('text/csv');
+    } else {
+        # 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'})) {
+        &print_main_menu($r);
+    } elsif ($ENV{'form.action'} eq 'upload') {
+        if (! exists($ENV{'form.state'})) {
+            &print_first_courselist_upload_form($r);            
+        } elsif ($ENV{'form.state'} eq 'got_file') {
+            &print_upload_manager_form($r);
+        } elsif ($ENV{'form.state'} eq 'enrolling') {
+            if ($ENV{'form.datatoken'}) {
+                &upfile_drop_add($r);
+            } else {
+                # Hmmm, this is an error
+            }
+        } else {
+            &print_first_courselist_upload_form($r);            
+        }
+    } elsif ($ENV{'form.action'} eq 'drop') {
+        if (! exists($ENV{'form.state'})) {
+            &print_drop_menu($r);
+        } elsif ($ENV{'form.state'} eq 'done') {
+            &drop_student_list($r);
+        } else {
+            &print_drop_menu($r);
+        }
+    } elsif ($ENV{'form.action'} eq 'enrollstudent') {
+        if (! exists($ENV{'form.state'})) {
+            &get_student_username_domain_form($r);
+        } elsif ($ENV{'form.state'} eq 'gotusername') {
+            &print_enroll_single_student_form($r);
+        } elsif ($ENV{'form.state'} eq 'enrolling') {
+            &enroll_single_student($r);
+        } else {
+            &get_student_username_domain_form($r);
+        }
+    } elsif ($ENV{'form.action'} eq 'classlist') {
+        if (! exists($ENV{'form.state'})) {
+            &print_html_classlist($r);
+        } elsif ($ENV{'form.state'} eq 'csv') {
+            &print_formatted_classlist($r,'csv');
+        } elsif ($ENV{'form.state'} eq 'excel') {
+            &print_formatted_classlist($r,'excel');
+        } else {
+            &print_html_classlist($r);
+        }
+    } elsif ($ENV{'form.action'} eq 'modifystudent') {
+        if (! exists($ENV{'form.state'})) {
+            &print_html_classlist($r);
+        } elsif ($ENV{'form.state'} eq 'selected') {
+            &print_modify_student_form($r);
+        } elsif ($ENV{'form.state'} eq 'done') {
+            &modify_single_student($r);
+        } else {
+            &print_html_classlist($r);
+        }        
+    } 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'}.
+                                 "Someone should fix this.");
+        &print_main_menu($r);
+    }
+    #
+    # Finish up
+    if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) {
+        $r->print("\n");
+    } else {
+        $r->print('</form></body></html>');
+    }
+    return OK;
 }
 
+###################################################################
+###################################################################
+
 1;
 __END__
 
 
-
-