--- loncom/interface/Attic/londropadd.pm	2004/12/02 19:00:38	1.122
+++ loncom/interface/Attic/londropadd.pm	2005/01/31 11:27:14	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.122 2004/12/02 19:00:38 matthew Exp $
+# $Id: londropadd.pm,v 1.124 2005/01/31 11:27:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -770,7 +770,7 @@ sub enroll_single_student {
                  $ENV{'form.clast'},$ENV{'form.cgen'},
                  $ENV{'form.csec'},$enddate,
                  $startdate,$ENV{'form.forceid'},
-                 $desiredhost);
+                 $desiredhost,$ENV{'form.emailaddress'});
             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>");
@@ -937,8 +937,8 @@ sub print_enroll_single_student_form {
     #
     my $username = $ENV{'form.cuname'};
     my $domain   = $ENV{'form.cudomain'};
-    $username=~s/[\W|_]//gs;
-    $domain=~s/[\W|_]//gs;
+    $username=~s/\W//gs;
+    $domain=~s/\W//gs;
     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;
@@ -983,6 +983,7 @@ sub print_enroll_single_student_form {
                        'hs'   => "Home Server",
                        'pswd' => "Password",
 		       'psam' => "Please select an authentication mechanism",
+                       'mail' => "Email Address"
 					   );
         $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>
@@ -997,6 +998,8 @@ sub print_enroll_single_student_form {
     <td><input type="text" name="cgen"    size="5"> </td></tr>
 <tr><th>$lt{'hs'}:</th>
     <td>$homeserver_form</td></tr>
+<tr><th>$lt{'mail'}:</th>
+    <td><input type="text" name="emailaddress" size="20" /></td></tr>
 </table>
 <h3>$lt{'pswd'}</h3>
 $lt{'psam'}
@@ -1019,6 +1022,7 @@ END
                        'mn'   => "Middle Name",
                        'ln'   => "Last Name",
                        'gen'  => "Generation",
+                       'mail' => "Email Address",
 					   );
         $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>
@@ -1040,6 +1044,10 @@ END
     <td>
     <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
     </td></tr>
+<tr><th>$lt{'mail'}:</th>
+    <td>
+    <input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" />
+    </td></tr>
 </table>
 END
     }