--- loncom/interface/printout.pl	2013/01/31 15:09:23	1.153
+++ loncom/interface/printout.pl	2013/03/18 21:33:08	1.154
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.153 2013/01/31 15:09:23 bisitz Exp $
+# $Id: printout.pl,v 1.154 2013/03/18 21:33:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,8 +127,8 @@ sub send_error_mail {
 
 	    # Todo: Convert badurl into a url from file path:
 
-	    my $subject  = "Error [$badurl] Print failed for $user".'@'.$domain;
-	    my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n";
+	    my $subject  = "Error [$badurl] Print failed for $user".':'.$domain;
+	    my $message .= "Print failed to render LaTeX for $user".':'."$domain\n";
 	    $message    .= "  User was attempting to print: \n";
 	    foreach my $resource (split(/:/,$resources)) {
 		$message    .= "       $resource\n";
@@ -308,14 +308,14 @@ foreach $texfile (@texfile) {
   my $name;
   my $name_range='';
 
-  # $name       -> Either user's full name or username@domain
+  # $name       -> Either user's full name or username:domain
   # $name_range -> Either user's last name or usrname.
 
   if ($tempo_array[3]) {
       $name=$tempo_array[3];
       ($name_range) = split(/,/,$name, 2);
   } else {
-      $name=$tempo_array[0].'@'.$tempo_array[1];
+      $name=$tempo_array[0].':'.$tempo_array[1];
       $name_range = $tempo_array[0];
   }
 
@@ -323,7 +323,7 @@ foreach $texfile (@texfile) {
   # user is getting printed.
   #
 
-  if (($name ne "") && ($name ne '@') ) { # Could be printing codes...
+  if (($name ne "") && ($name ne ':') ) { # Could be printing codes...
       $link_text='<b>'.$name.'</b>';
       $status_statement.=$name;
   }
@@ -339,10 +339,10 @@ foreach $texfile (@texfile) {
 	  my ($lastname) = split(/,/, $name,2);
 	  $name_range .= "-".$lastname;
       } else {
-	  $name=$tempo_array[0].'@'.$tempo_array[1];
+	  $name=$tempo_array[0].':'.$tempo_array[1];
 	  $name_range .= '-'.$tempo_array[0];
       }
-      if (($name ne "") && ($name ne '@')) {
+      if (($name ne "") && ($name ne ':')) {
 	  $link_text.=' - <b>'.$name.'</b>';
 	  $status_statement.=' -  '.$name;