--- loncom/interface/Attic/londropadd.pm	2003/06/23 14:38:53	1.69
+++ loncom/interface/Attic/londropadd.pm	2003/07/05 10:07:11	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.69 2003/06/23 14:38:53 matthew Exp $
+# $Id: londropadd.pm,v 1.73 2003/07/05 10:07:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,13 +79,16 @@ 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 
                 if (!($start && ($now<$start)) || !($end && ($now>$end))) {
                     my $reply=&Apache::lonnet::modifystudent
-                        ($udom,$unam,'','','','','','','',
+                        # dom  name  id mode pass     f     m     l     g
+                        ($udom,$unam,'',  '',  '',undef,undef,undef,undef,
                          $section,time,undef,undef,$desiredhost);
                     $result .= $reply.':';
                 }
@@ -215,7 +218,7 @@ sub javascript_validations {
     my $authheader = &Apache::loncommon::authform_header(%param);
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     return (<<ENDPICK);
-function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
     var foundatype=0;
     var message='';
     if (founduname==0) {
@@ -251,11 +254,12 @@ function verify_message (vf,founduname,f
         }
     }
 
-    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 (foundname==0) { message='name fields'; }
+    if (foundid==0) { if (message!='') { message+=', '; } message+='student number field'; }
+    if (foundsec==0) {  if (message!='') { message+=', '; } message+='section or group field'; }
+    if (foundemail==0) {  if (message!='') { message+=', '; } message+='email address field'; }
     if (message!='') {
-       message+='Continue enrollment?';
+       message='Not specified (optional): '+message+'.  Continue enrollment?';
        if (confirm(message)) {
           vf.state.value='enrolling';
 	  vf.submit();
@@ -281,6 +285,7 @@ function verify(vf) {
     var foundname=0;
     var foundid=0;
     var foundsec=0;
+    var foundemail=0;
     var tw;
     for (i=0;i<=vf.nfields.value;i++) {
         tw=eval('vf.f'+i+'.selectedIndex');
@@ -289,8 +294,9 @@ function verify(vf) {
         if (tw==7) { foundid=1; }
         if (tw==8) { foundsec=1; }
         if (tw==9) { foundpwd=1; }
+        if (tw==10) { foundemail=1; }
     }
-    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail);
 }
 
 //
@@ -309,7 +315,8 @@ function verify(vf) {
 // 7 = id
 // 8 = section
 // 9 = ipwd  (password)
-//
+// 10 = email address
+
 function flip(vf,tf) {
    var nw=eval('vf.f'+tf+'.selectedIndex');
    var i;
@@ -496,7 +503,8 @@ sub print_upload_manager_form {
                ['gen','Generation'],
 	       ['id','ID/Student Number'],
                ['sec','Group/Section'],
-	       ['ipwd','Initial Password']);
+	       ['ipwd','Initial Password'],
+               ['email','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,\@d);
@@ -1463,7 +1471,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=();
@@ -1492,9 +1500,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='';
@@ -1512,6 +1520,14 @@ sub upfile_drop_add {
                         }
                         $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) { 
@@ -1534,11 +1550,12 @@ sub upfile_drop_add {
                         my $reply=&Apache::lonnet::modifystudent
                             ($domain,$username,$id,$amode,$password,
                              $fname,$mname,$lname,$gen,$sec,$enddate,
-                             $startdate,$ENV{'form.forceid'},$desiredhost);
+                             $startdate,$ENV{'form.forceid'},$desiredhost,
+                             $email);
                         if ($reply ne 'ok') {
-                            $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;
@@ -1549,12 +1566,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>");
         #####################################