--- loncom/interface/Attic/londropadd.pm	2003/07/02 15:25:46	1.70
+++ loncom/interface/Attic/londropadd.pm	2003/07/03 19:26:20	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.70 2003/07/02 15:25:46 matthew Exp $
+# $Id: londropadd.pm,v 1.72 2003/07/03 19:26:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,7 +79,9 @@ sub modifystudent {
             # We are in this course
             my $section=$1;
             $section='' if ($course eq $courseid.'_st');
-            if ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
+            if ($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 
@@ -1464,7 +1466,7 @@ sub upfile_drop_add {
         #######################################
         ##         Enroll Students           ##
         #######################################
-        $r->print('<h3>Enrolling Students</h3>');
+        $r->print('<h3>Enrolling Students</h3>'."\n".'<p>');
         my $count=0;
         my $flushc=0;
         my %student=();
@@ -1493,9 +1495,9 @@ sub upfile_drop_add {
                     }
                 }
                 if ($entries{$fields{'username'}}=~/\W/) {
-                    $r->print('<p><b>Unacceptable username: '.
+                    $r->print('<br /><b>Unacceptable username: '.
                               $entries{$fields{'username'}}.' for user '.
-                              $fname.' '.$mname.' '.$lname.' '.$gen.'</b><p>');
+                              $fname.' '.$mname.' '.$lname.' '.$gen.'</b>');
                 } else {
                     # determine section number
                     my $sec='';
@@ -1537,9 +1539,9 @@ sub upfile_drop_add {
                              $fname,$mname,$lname,$gen,$sec,$enddate,
                              $startdate,$ENV{'form.forceid'},$desiredhost);
                         if ($reply ne 'ok') {
-                            $r->print('<p><b>'.
-                                      'Error enrolling '.$username.': '.
-                                      $reply.'</b></p>');
+                            $reply =~ s/^error://;
+                            $r->print('<br /><b>'.$username.'</b>:'.
+                                      '  Unable to enroll: '.$reply);
          		} else {
                             $count++; $flushc++;
                             $student{$username}=1;
@@ -1550,12 +1552,13 @@ sub upfile_drop_add {
                             }
                         }
                     } else {
-                        $r->print("<p><b>No password for $username</b><p>");
+                        $r->print('<br /><b>'.$username.'</b>:'.
+                           '  Unable to enroll: No password specified.');
                     }
                 }
             }
         } # end of foreach (@studentdata)
-        $r->print('<p>Processed Students: '.$count.'</p>');
+        $r->print('</p><p>Processed Students: '.$count.'</p>');
         $r->print("<p>If active, the new role will be available when the ".
                   "students next log in to LON-CAPA.</p>");
         #####################################