--- loncom/interface/printout.pl	2013/03/18 21:33:08	1.154
+++ loncom/interface/printout.pl	2016/01/28 19:37:42	1.161
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.154 2013/03/18 21:33:08 raeburn Exp $
+# $Id: printout.pl,v 1.161 2016/01/28 19:37:42 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,8 +209,10 @@ if ($student_names=~/_END_/) {
     @names_pack=split(/_ENDPERSON_/,$student_names);
 }
 if ($backref) {
-    print('<p>'.&mt("[_1]Return[_2] to editing resource.",
+    print('<p>'.&mt("[_1]Return[_2] to resource.",
 		    "<a href=\"$backref\"><b>","</b></a>").'</p>');
+    print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.
+        &mt("Change Printing Options").'</a></p>'."\n");
 }
 my $figfile = $texfile;
 $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;
@@ -309,11 +311,20 @@ foreach $texfile (@texfile) {
   my $name_range='';
 
   # $name       -> Either user's full name or username:domain
-  # $name_range -> Either user's last name or usrname.
+  # $name_range -> Either user's last name or username.
 
   if ($tempo_array[3]) {
       $name=$tempo_array[3];
-      ($name_range) = split(/,/,$name, 2);
+      $name =~ s{^\s+|\s+$}{}g;
+      if ($name =~ /,/) { 
+          ($name_range) = split(/,/,$name, 2);
+      } elsif ($name =~ /\s/) {
+          $name_range = $name;
+          $name_range =~ s/\s+/_/;
+      } else {
+          $name_range = $name;  
+      }
+      $name_range =~ s/[^\w\:\-]+//g;
   } else {
       $name=$tempo_array[0].':'.$tempo_array[1];
       $name_range = $tempo_array[0];
@@ -336,8 +347,18 @@ foreach $texfile (@texfile) {
       @tempo_array=split(/:/,$stud_info[-1]);
       if ($tempo_array[3]) {
 	  $name=$tempo_array[3];
-	  my ($lastname) = split(/,/, $name,2);
+          $name =~ s{^\s+|\s+$}{}g;
+          my $lastname;
+          if ($name =~ /,/) {
+	      ($lastname) = split(/,/, $name,2);
+          } elsif ($name =~ /\s/) {
+              $lastname = $name;
+              $lastname =~ s/\s+/_/;
+          } else {
+              $lastname = $name;
+          }
 	  $name_range .= "-".$lastname;
+          $name_range =~ s/[^\w\:\-]+//g;
       } else {
 	  $name=$tempo_array[0].':'.$tempo_array[1];
 	  $name_range .= '-'.$tempo_array[0];
@@ -914,7 +935,7 @@ sub convert_figure {
 
     # Spaces are problematic for system commands and LaTeX, replace with _
 
-    $eps_f  =~ s/ /\_/g; 
+    $eps_f  =~ s/ /\_/g;
 
     # 
     # If the file is already an .eps or .ps file (eps_f still has the original
@@ -958,11 +979,12 @@ sub convert_figure {
 	} else {
 	    system("convert $not_eps $eps_f");
         if($? and $advanced_role){
-            print "<p class=\"LC_warning\">"
-                  .mt("An error occured during the conversion of [_1].[_2]"
-                  ."If possible try to save this image using different settings and republish it.",
-                  "<span class=\"LC_filename\">".$prettyname."</span>", "<br/>")
-                  ."</p>";
+            print '<p class="LC_warning">'
+                 .&mt('An error occurred during the conversion of [_1].',
+                          '<span class="LC_filename">'.$prettyname.'</span>')
+                 .'<br />'
+                 .&mt('If possible try to save this image using different settings and republish it.')
+                 .'</p>';
         }
 	}
 
@@ -1051,7 +1073,7 @@ sub analyze_logfile {
 	    print "<h2>".&mt('LaTeX could not successfully parse your TeX file.')."</h2>";
 	    print &mt('It probably has errors in it.')."<br />";
 	    if ($badtext) {
-                print &mt('With very high probability this error occured in [_1].',$badtext)
+                print &mt('With very high probability this error occurred in [_1].',$badtext)
                      ."<br /><br />";
             }
 	    print &mt('Here are the error messages in the LaTeX log file:')
@@ -1140,7 +1162,7 @@ sub analyze_logfile {
 	    my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
 	    print "<br />"
                  .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n";
-	    print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n";
+	    print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement necessary corrections by yourself.')."\n";
 	    $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;
 	}