--- loncom/interface/Attic/londropadd.pm	2000/12/28 16:32:10	1.5
+++ loncom/interface/Attic/londropadd.pm	2001/02/14 22:51:48	1.12
@@ -14,7 +14,8 @@
 # 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28,
 # 12/08,12/12 Gerd Kortemeyer)
 #
-# 12/26,12/27,12/28 Gerd Kortemeyer
+# 12/26,12/27,12/28,
+# 01/01/01,01/15,02/10,02/13,02/14 Gerd Kortemeyer
 
 package Apache::londropadd;
 
@@ -22,27 +23,11 @@ use strict;
 use Apache::lonnet;
 use Apache::Constants qw(:common :http REDIRECT);
 
+# ================================================================ Print header
 
-# ================================================================ Main Handler
-
-sub handler {
-   my $r=shift;
-
-   if ($r->header_only) {
-      $r->content_type('text/html');
-      $r->send_http_header;
-      return OK;
-   }
-
-# ----------------------------------------------------- Needs to be in a course
-
-   if (($ENV{'request.course.fn'}) && 
-       (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) {
-
-# ------------------------------------------------------------------ Start page
-      $r->content_type('text/html');
-      $r->send_http_header;
-      $r->print(<<ENDHEAD);
+sub header {
+    my $r=shift;
+    $r->print(<<ENDHEAD);
 <html>
 <head>
 <title>LON-CAPA Student Drop/Add</title>
@@ -54,9 +39,141 @@ sub handler {
 action="/adm/dropadd" name="studentform">
 <h2>Course: $ENV{'course.'.$ENV{'request.course.id'}.'.description'}</h2>
 ENDHEAD
-# --------------------------------------------------- Phase one, initial screen
-    unless ($ENV{'form.phase'}) {
-	$r->print(<<ENDUPFORM);
+}
+
+# ========================================================= 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>;
+      }
+    }
+    $ENV{'form.upfile'}=join('',@studentdata);
+}
+
+# ========================================= 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);
+            }
+	  }
+        }
+    } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles',
+                                 &Apache::lonnet::homeserver($unam,$udom)));
+}
+
+# ============================================================== Menu Phase One
+
+sub menu_phase_one {
+    my $r=shift;
+    $r->print(<<ENDUPFORM);
 <input type=hidden name=phase value=two>
 <hr>
 <h3>Upload a courselist</h3>
@@ -72,46 +189,38 @@ ENDHEAD
 <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">
+<h3>Drop students</h3>
+<p><input type=submit name=drop value="Selection List">
 ENDUPFORM
-      }
-# ------------------------------------------------------------------- Phase two
-      if ($ENV{'form.phase'} eq 'two') {
-	  if ($ENV{'form.fileupload'}) {
-	      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'};
-	    }
-             my $separator='';
-             my $remove='';
-             if ($ENV{'form.upfiletype'} eq 'csv') {
-		 $separator='\"\,\s*\"';
-                 $remove='"';
-             } elsif ($ENV{'form.upfiletype'} eq 'space') {
-                 $separator='\s+';
-             } elsif ($ENV{'form.upfiletype'} eq 'tab') {
-                 $separator='\t+';
-             } elsif ($ENV{'form.upfiletype'} eq 'xml') {
-             }
-             my @lines=split(/\n/,$ENV{'form.upfile'});
-             my $total=$#lines;
-             $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');
-	     $r->print(<<ENDPICK);
+}
+
+# ======================================================= Menu Phase Two Upload
+
+sub menu_phase_two_upload {
+    my $r=shift;
+
+    my $datatoken=&upfile_store($r);
+
+    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');
+
+    $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: $total
+Total number of records found in file: $distotal
 <script>
 function verify(vf) {
     var founduname=0;
@@ -162,7 +271,7 @@ function verify(vf) {
         message+='No ending date set. ';
     }
     if ((vf.enddate.value!='') && (vf.startdate.value!='')) {
-       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;
        }
@@ -276,26 +385,19 @@ function clickint(vf) {
 </script>
 <table border=2><tr><th>Field</th><th>Samples</th></tr>
 ENDPICK
-             my @sone; my @stwo; my @sthree; my $nfields=0;
-             if ($#lines>=0) {
-		$lines[0]=~s/^$remove//;
-                $lines[0]=~s/$remove$//;
-                @sone=split(/$separator/,$lines[0]);
-                $nfields=$#sone;
-                if ($#lines>=1) {
-        	   $lines[1]=~s/^$remove//;
-                   $lines[1]=~s/$remove$//;
-                   @stwo=split(/$separator/,$lines[1]);
-                   $nfields=$#stwo;
+             my %sone; my %stwo; my %sthree;
+             my $i=0;
+
+             if ($total>=0) {
+                %sone=&record_sep($records[0]);
+                if ($total>=1) {
+                   %stwo=&record_sep($records[1]);
+                   
 	        }
-                if ($#lines>=2) {
-		   $lines[2]=~s/^$remove//;
-                   $lines[2]=~s/$remove$//;
-                   @sthree=split(/$separator/,$lines[2]);
-                   $nfields=$#sthree;
+                if ($total>=2) {
+                   %sthree=&record_sep($records[2]);
 	        }
-                my $i;
-                for ($i=0;$i<=$nfields;$i++) {
+                map {
                    $r->print('<tr><td><select name=f'.$i.
                        ' onChange="flip(this.form,'.$i.');">');
                    map {
@@ -309,22 +411,27 @@ ENDPICK
                       '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($sone{$i})) { 
+                      $r->print($sone{$i}."</br>\n"); 
                    }
-	           if (defined($stwo[$i])) { 
-                      $r->print($stwo[$i]."</br>\n"); 
+	           if (defined($stwo{$i})) { 
+                      $r->print($stwo{$i}."</br>\n"); 
                    }
-	           if (defined($sthree[$i])) { 
-                      $r->print($sthree[$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=$nfields>
+<input type=hidden name=nfields value=$i>
+<input type=hidden name=keyfields value="$keyfields">
 <h3>Login Type</h3>
+Note: this will not take effect if the user already exists<p>
 <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>
@@ -348,30 +455,302 @@ LON-CAPA domain: <input type=text size=1
 >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="Submit Selection">
+(also print list of users not enrolled anymore)<p>
+<input type=button onClick="verify(this.form)" value="Update Courselist"><br>
+Note: for large courses, this operation might be time consuming.
 ENDPICK
-         } elsif ($ENV{'form.enroll'}) {
-         } elsif ($ENV{'form.drop'}) {
-         }
-      }
-# ----------------------------------------------------------------- Phase three
-      if ($ENV{'form.phase'} eq 'three') {
-	  if ($ENV{'form.datatoken'}) {
-             my $separator='';
-             my $remove='';
-             if ($ENV{'form.upfiletype'} eq 'csv') {
-		 $separator='\"\,\s*\"';
-                 $remove='"';
-             } elsif ($ENV{'form.upfiletype'} eq 'space') {
-                 $separator='\s+';
-             } elsif ($ENV{'form.upfiletype'} eq 'tab') {
-                 $separator='\t+';
-             } elsif ($ENV{'form.upfiletype'} eq 'xml') {
-             }
+}
+
+# ======================================================= Enroll single student
+
+sub enroll_single_student {
+    my $r=shift;
+    $r->print('<h3>Enrolling Student</h3>');
+    if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
+        ($ENV{'form.cdomain'})&&($ENV{'form.cdomain'}!~/\W/)) {
+	my $amode='';
+        my $genpwd='';
+        if ($ENV{'form.login'} eq 'krb') {
+           $amode='krb4';
+           $genpwd=$ENV{'form.krbdom'};
+        } elsif ($ENV{'form.login'} eq 'int') {
+           $amode='internal';
+           $genpwd=$ENV{'form.intpwd'};
+        }
+        if (($amode) && ($genpwd)) {
+ 	  &dropstudent($ENV{'form.cdomain'},$ENV{'form.cuname'},
+		       $ENV{'request.course.id'},$ENV{'form.csec'});
+          $r->print(&Apache::lonnet::modifystudent(
+                      $ENV{'form.cdomain'},$ENV{'form.cuname'},
+                      $ENV{'form.cstid'},$amode,$genpwd,
+ 	              $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
+                      $ENV{'form.clast'},$ENV{'form.cgen'},
+                      $ENV{'form.csec'},$ENV{'form.enddate'},
+                      $ENV{'form.startdate'}));
+	} else {
+           $r->print('Invalid login mode or password');    
+        }          
+    } else {
+        $r->print('Invalid username or domain');
+    }    
+}
+
+# ======================================================= Menu Phase Two Enroll
+
+sub menu_phase_two_enroll {
+    my $r=shift;
+    
+    $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');
+
+    $r->print(<<ENDSENROLL);
+<script>
+function verify(vf) {
+    var founduname=0;
+    var foundpwd=0;
+    var foundname=0;
+    var foundid=0;
+    var foundsec=0;
+    var foundatype=0;
+    var tw;
+    var message='';
+    if ((vf.cuname.value!=undefined) && (vf.cuname.value!='') && 
+	(vf.cdomain.value!=undefined) && (vf.cdomain.value!='')) {
+        founduname=1;
+    }
+    if ((vf.cfirst.value!=undefined) && (vf.cfirst.value!='') &&
+	(vf.clast.value!=undefined) && (vf.clast.value!='')) {
+        foundname=1;
+    }
+    if ((vf.csec.value!=undefined) && (vf.csec.value!='')) {
+        foundsec=1;
+    }
+    if ((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;
+    }
+    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 first and last name 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();
+    }   
+}
+
+function setkrb(vf) {
+    if (vf.krbdom.value!='') {
+       vf.login[0].checked=true;
+       vf.krbdom.value=vf.krbdom.value.toUpperCase();
+       vf.intpwd.value='';
+   }
+}
+
+function setint(vf) {
+    if (vf.intpwd.value!='') {
+       vf.login[1].checked=true;
+       vf.krbdom.value='';
+   }
+}
+
+function clickkrb(vf) {
+    vf.krbdom.value='$krbdefdom';
+    vf.intpwd.value='';
+}
+
+function clickint(vf) {
+    vf.krbdom.value='';
+}
+
+    function pclose() {
+        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
+                 "height=350,width=350,scrollbars=no,menubar=no");
+        parmwin.close();
+    }
+
+    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");
+
+    }
+
+    function dateset() {
+        if (document.studentform.pres_marker.value=='end') {
+           document.studentform.enddate.value=
+	       document.studentform.pres_value.value;
+        }
+        if (document.studentform.pres_marker.value=='start') {
+           document.studentform.startdate.value=
+	       document.studentform.pres_value.value;
+        }
+        pclose();
+    }
+
+</script>
+<h3>Personal Data</h3>
+First Name: <input type=text name=cfirst size=15><br>
+Middle Name: <input type=text name=cmiddle size=15><br>
+Last Name: <input type=text name=clast size=15><br>
+Generation: <input type=text name=cgen size=5><p>
+
+ID/Student Number: <input type=text name=cstid size=10><p>
+
+Group/Section: <input type=text name=csec size=5><p>
+
+<h3>Login Data</h3>
+Username: <input type=text name=cuname size=15><p>
+Domain: <input type=text size=10 value=$defdom name=cdomain><p>
+Note: login settings below  will not take effect if the user already exists<p>
+
+<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>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>
+<input type=button onClick="verify(this.form)" value="Enroll as student"><br>
+<input type=hidden name=phase value=five>
+ENDSENROLL
+}
+
+# ========================================================= Menu Phase Two Drop
+
+sub menu_phase_two_drop {
+    my $r=shift;
+    my $cid=$ENV{'request.course.id'};
+                 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);
+# ----------------------------------------------------------- Print out choices
+                     &show_drop_list($r,%currentlist);
+	         } else {
+                     $r->print(
+                  '<font color=red><h3>Could not access classlist: '.$classlst.
+                  '</h3></font>');
+                 }
+}
+
+# =================================================== Show student list to drop
+
+sub show_drop_list {
+    my ($r,%currentlist)=@_;
+    my $cid=$ENV{'request.course.id'};
+
+    $r->print('<input type=hidden name=phase value=four>');
+                     $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>'.
+                                   &Apache::lonnet::unescape($reply[2]).' '.
+                                   &Apache::lonnet::unescape($reply[3]).', '.
+                                   &Apache::lonnet::unescape($reply[0]).' '.
+                                   &Apache::lonnet::unescape($reply[1]).
+                                   '</td><td>'.
+                                   $ssec."</td></tr>\n");
+                     } sort keys %currentlist;
+                     $r->print('</table><br>');
+                     $r->print('<input type=submit value="Drop Students">');
+}
+
+# ================================================= Drop/Add from uploaded file
+
+sub upfile_drop_add {
+    my $r=shift;
+
+    &load_tmp_file($r);
+    my @studentdata=&upfile_record_sep();
+
+    my @keyfields=split(/\,/,$ENV{'form.keyfields'});
+    my $cid=$ENV{'request.course.id'};
+
              my %fields=();
              for (my $i=0;$i<=$ENV{'form.nfields'};$i++) {
-                 $fields{$ENV{'form.f'.$i}}=$i;
+                 $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
              }
              my $startdate=$ENV{'form.startdate'};
              my $enddate=$ENV{'form.enddate'};
@@ -391,59 +770,50 @@ ENDPICK
              }
              unless (($domain=~/\W/) || ($amode eq '')) {
               $r->print('<h3>Enrolling Students</h3>');
-              my $count=1;
+              my $count=0;
+              my $flushc=0;
+              my %student=();
 # ----------------------------------------------------------- Get new classlist
-              my @studentdata=();
-             {
-                my $fh;
-                if ($fh=Apache::File->new($r->dir_config('lonDaemons').
-		              '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) {
-		    @studentdata=<$fh>;
-                }
-	     }
 # --------------------------------------------------------- Enroll new students
 	      map {
-                my $line=$_;
-                chomp($line);
-                $line=~s/^$remove//;
-                $line=~s/$remove$//;
-	        my @entries=split(/$separator/,$line);
-                unless (($entries[$fields{'username'}] eq '') ||
-                        (!defined($entries[$fields{'username'}]))) {
+		  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*(.*)$/);
+	            ($entries{$fields{'names'}}=~/([^\,]+)\,\s*(\w+)\s*(.*)$/);
                   } else {
                       if (defined($fields{'fname'})) {
-		         $fname=$entries[$fields{'fname'}];
+		         $fname=$entries{$fields{'fname'}};
 		      }
                       if (defined($fields{'mname'})) {
-		         $mname=$entries[$fields{'mname'}];
+		         $mname=$entries{$fields{'mname'}};
 		      }
                       if (defined($fields{'lname'})) {
-		         $lname=$entries[$fields{'lname'}];
+		         $lname=$entries{$fields{'lname'}};
 		      }
                       if (defined($fields{'gen'})) {
-		         $gen=$entries[$fields{'gen'}];
+		         $gen=$entries{$fields{'gen'}};
 		      }
                   }
-                  if ($entries[$fields{'username'}]=~/\W/) {
+                  if ($entries{$fields{'username'}}=~/\W/) {
                      $r->print('<p><b>Unacceptable username: '.
-                              $entries[$fields{'username'}].' for user '.
+                              $entries{$fields{'username'}}.' for user '.
                               $fname.' '.$mname.' '.$lname.' '.$gen.'</b><p>');
 		  } else {
                       my $sec='';
-                      my $username=$entries[$fields{'username'}];
+                      my $username=$entries{$fields{'username'}};
                       if (defined($fields{'sec'})) {
-                         if (defined($entries[$fields{'sec'}])) {
-			     $sec=$entries[$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'}];
+                         if (defined($entries{$fields{'id'}})) {
+			     $id=$entries{$fields{'id'}};
                          }
                          $id=~tr/A-Z/a-z/;
                       }
@@ -452,19 +822,28 @@ ENDPICK
                          $password=$genpwd; 
 		      } else {
                          if (defined($fields{'ipwd'})) {
-			     if ($entries[$fields{'ipwd'}]) {
-				 $password=$entries[$fields{'ipwd'}];
+			     if ($entries{$fields{'ipwd'}}) {
+				 $password=$entries{$fields{'ipwd'}};
                              }
                          }
                       }
-                      if ($password) { 
+                      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>");
-			 }
+         		} else {
+                            $count++; $flushc++;
+                            $student{$username}=1;
+                            $r->print('. ');
+                            if ($flushc>15) {
+				$r->rflush;
+                                $flushc=0;
+                            }
+                        }
                      } else {
                             $r->print(
                              "<p><b>No password for $username</b><p>");
@@ -472,11 +851,11 @@ ENDPICK
                   }
                  }                 
               } @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 $cid=$ENV{'request.course.id'};
                  my $classlst=&Apache::lonnet::reply
                  ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'.
 	                  $ENV{'course.'.$cid.'.num'}.':classlist',
@@ -484,6 +863,28 @@ ENDPICK
                  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
+                     &show_drop_list($r,%currentlist);
 	         } else {
                      $r->print(
                   '<font color=red><h3>Could not access classlist: '.$classlst.
@@ -491,8 +892,79 @@ ENDPICK
                  }
 	     }
 # ------------------------------------------------------------------------ Done
-          }
+
+	  }
+}
+
+# ================================================================== Phase four
+
+sub drop_student_list {
+    my $r=shift;
+    my $count=0;
+    map {
+	if ($_=~/^form\.drop\:/) {
+	    my ($dummy,$uname,$udom)=split(/\:/,$_);
+            &dropstudent($udom,$uname,$ENV{'request.course.id'});
+            $r->print('Dropped '.$uname.' at '.$udom.'<br>');
+            $count++;
         }
+    } keys %ENV;
+    $r->print('<p><b>Dropped '.$count.' student(s).</b>');
+    $r->print('<p>Re-enrollment will re-activate data.');
+}
+
+# ================================================================ Main Handler
+
+sub handler {
+   my $r=shift;
+
+   if ($r->header_only) {
+      $r->content_type('text/html');
+      $r->send_http_header;
+      return OK;
+   }
+
+# ----------------------------------------------------- Needs to be in a course
+
+   if (($ENV{'request.course.fn'}) && 
+       (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) {
+
+# ------------------------------------------------------------------ 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);
+         }
+      }
+
+
+
+
+# ----------------------------------------------------------------- Phase three
+      if ($ENV{'form.phase'} eq 'three') {
+	  if ($ENV{'form.datatoken'}) {
+	      &upfile_drop_add($r);
+          }
+      }
+# ------------------------------------------------------------------ Phase four
+      if ($ENV{'form.phase'} eq 'four') {
+	  &drop_student_list($r);
+      }
+# ------------------------------------------------------------------ Phase four
+      if ($ENV{'form.phase'} eq 'five') {
+	  &enroll_single_student($r);
       }
 # ------------------------------------------------------------------------- End
       $r->print('</form></body></html>');
