--- loncom/interface/Attic/londropadd.pm	2001/01/01 15:43:46	1.7
+++ loncom/interface/Attic/londropadd.pm	2001/01/15 14:51:18	1.9
@@ -15,7 +15,7 @@
 # 12/08,12/12 Gerd Kortemeyer)
 #
 # 12/26,12/27,12/28,
-# 01/01/01 Gerd Kortemeyer
+# 01/01/01,01/15 Gerd Kortemeyer
 
 package Apache::londropadd;
 
@@ -80,6 +80,9 @@ ENDUPFORM
 # ------------------------------------------------------------------- Phase two
       if ($ENV{'form.phase'} eq 'two') {
 	  if ($ENV{'form.fileupload'}) {
+              $ENV{'form.upfile'}=~s/\r/\n/gs;
+              $ENV{'form.upfile'}=~s/\f/\n/gs;
+              $ENV{'form.upfile'}=~s/\n+/\n/gs;
 	      my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
 		  '_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$;
 	    {
@@ -499,7 +502,7 @@ ENDPICK
                  unless ($classlst=~/^error\:/) {
                      map {
                         my ($name,$value)=split(/\=/,$_);
-                        my ($end,$start)=split(/\_/,
+                        my ($end,$start)=split(/\:/,
                                             &Apache::lonnet::unescape($value));
                         my $active=1;
                         if (($end) && ($now>$end)) { $active=0; }