--- loncom/interface/Attic/londropadd.pm	2007/05/21 23:38:40	1.160
+++ loncom/interface/Attic/londropadd.pm	2007/07/17 21:24:17	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.160 2007/05/21 23:38:40 albertel Exp $
+# $Id: londropadd.pm,v 1.163 2007/07/17 21:24:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -752,8 +752,8 @@ sub enroll_single_student {
     }
 
     $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
-    $r->print('<p>'.&mt('Enrolling').' '.$env{'form.cuname'}." \@ ".
-              $env{'form.lcdomain'}.'</p>');
+    $r->print('<p>'.&mt('Enrolling [_1] : [_2]',$env{'form.cuname'},
+			$env{'form.lcdomain'}).'</p>');
     if (($env{'form.cuname'})
 	&& ($env{'form.cuname'} 
 	    eq &LONCAPA::clean_username($env{'form.cuname'}))
@@ -1064,15 +1064,15 @@ END
 <input type="hidden" name="lcserver" value="default" />
 <table>
 <tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
-    <td><input type="text" name="cfirst"  size="15" /></td></tr>
+    <td><input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" /></td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
-    <td><input type="text" name="cmiddle" size="15" /></td></tr>
+    <td><input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" /></td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
-    <td><input type="text" name="clast"   size="15" /></td></tr>
+    <td><input type="text" name="clast" value="$uenv{'lastname'}" size="15" /></td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="cgen">$lt{'gen'}</label>:</td>
-    <td><input type="text" name="cgen"    size="5"  /> </td></tr>
+    <td><input type="text" name="cgen" value="$uenv{'generation'}" size="5"  /> </td></tr>
 <tr><td class="LC_dropadd_labeltext"><label for="emailaddress">$lt{'mail'}</label>:</td>
-    <td><input type="text" name="emailaddress" size="20" /></td></tr>
+    <td><input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" /></td></tr>
 </table>
 END
     }
@@ -1296,6 +1296,7 @@ END
                                            'start'  => "start date",
                                            'end'    => "end date",
                                            'type'   => "enroll type/action",
+					   'email'  => "email address",
                                            'photo'  => "photo",
 					   );
         unless ($mode eq 'autoenroll') {
@@ -1348,6 +1349,8 @@ function photowindow(photolink) {
        <a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='groups';document.studentform.submit();">$lt{'grp'}</a>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='email';document.studentform.submit();">$lt{'email'}</a>
     </th>
 END
         if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
@@ -1391,13 +1394,15 @@ END
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section","start date","end date","status","active groups"))
+                   "section","start date","end date","status",
+		   "active groups","email address"))
                   .'"'."\n";
         } else {
             print $CSVfile '"'.join('","',map {
 		&Apache::loncommon::csv_translate(&mt($_))
                 } ("username","domain","ID","student name",
-                   "section","start date","end date","active groups")).'"'."\n";
+                   "section","start date","end date",
+		   "active groups","email address")).'"'."\n";
         }
     } elsif ($mode eq 'excel') {
         # Create the excel spreadsheet
@@ -1413,7 +1418,7 @@ END
         $excel_sheet->write($row++,0,["username","domain","ID",
                                       "student name","section",
                                       "start date","end date","status",
-                                      "active groups"],
+                                      "active groups","email address"],
                             $format->{'bold'});
     }
     #
@@ -1452,10 +1457,21 @@ END
         my $name     = $sdata->[$index{'fullname'}];
         my $id       = $sdata->[$index{'id'}];
         my $status   = $sdata->[$index{'status'}];
+        next if (($statusmode ne 'Any') && ($status ne $statusmode));
         my $start    = $sdata->[$index{'start'}];
         my $end      = $sdata->[$index{'end'}];
         my $type     = $sdata->[$index{'type'}];
-        next if (($statusmode ne 'Any') && ($status ne $statusmode));
+
+	my %emails   = &Apache::loncommon::getemails($username,$domain);
+	my $email;
+	foreach my $type ('critnotification', 'permanentemail',
+			  'notification') {
+	    if ($emails{$type} =~ /\S/) {
+		$email = $emails{$type};
+		last;
+	    }
+	}
+
         if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
             if (! defined($start) || $start == 0) {
                 $start = &mt('none');
@@ -1515,6 +1531,7 @@ END
     <td>$start</td>
     <td>$end</td>
     <td>$active_groups</td>
+    <td>$email</td>
 END
             if ($env{'course.'.$env{'request.course.id'}.
 			 '.internal.showphoto'}) {
@@ -1551,6 +1568,7 @@ END
                 push @line,&Apache::loncommon::csv_translate($status);
             }
             push @line,&Apache::loncommon::csv_translate($active_groups);
+            push @line,&Apache::loncommon::csv_translate($email);
             print $CSVfile '"'.join('","',@line).'"'."\n";
         } elsif ($mode eq 'excel') {
             $excel_sheet->write($row,0,[$username,$domain,$id,
@@ -1567,6 +1585,7 @@ END
             }
             $excel_sheet->write($row,$col++,$status);
             $excel_sheet->write($row,$col++,$active_groups);
+            $excel_sheet->write($row,$col++,$email);
             $row++;
         }
     }
@@ -1688,7 +1707,7 @@ $lt{'odcc'}
 <input type="hidden" name="sortby"  value="$sortby" />
 <input type="hidden" name="Status"  value="$env{'form.Status'}" />
 <h2>$lt{'mef'} $info{'firstname'} $info{'middlename'} 
-$info{'lastname'} $info{'generation'}, $sname\@$sdom</h2>
+$info{'lastname'} $info{'generation'}, $sname:$sdom</h2>
 <p>
 <b>$lt{'sn'}</b>
 <table>
@@ -1749,7 +1768,7 @@ sub modify_single_student {
                                                   $env{'request.course.id'});
     my ($tmp) = keys(%old);
     if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-        $r->print(&mt('There was an error determining the environment values for')." $slogin \@ $sdom.");
+        $r->print(&mt('There was an error determining the environment values for')." $slogin : $sdom.");
         return;
     }
     undef $tmp;
@@ -1789,7 +1808,7 @@ sub modify_single_student {
                    'et'    => "End Time",
 				       );
     $r->print(<<END);
-    <h2>$lt{'mdu'} $slogin \@ $sdom </h2>
+    <h2>$lt{'mdu'} $slogin : $sdom </h2>
 <h3>$lt{'si'}</h3>
 <table rules="rows" border="1" cellpadding="3" >
 <tr>
@@ -1849,8 +1868,8 @@ END
                   &mt('The error reported was')." ".
                   $roleresults);
         &Apache::lonnet::logthis("londropadd:failed attempt to modify student".
-                                 " data for ".$slogin." \@ ".$sdom." by ".
-                                 $env{'user.name'}." \@ ".$env{'user.domain'}.
+                                 " data for ".$slogin." : ".$sdom." by ".
+                                 $env{'user.name'}." : ".$env{'user.domain'}.
                                  ":".$roleresults);
     } else { # everything is okay!
         $r->print(&mt('Student information updated successfully.')." <br />".