Diff for /loncom/cgi/plot.gif between versions 1.11 and 1.17

version 1.11, 2004/06/21 20:04:29 version 1.17, 2020/02/19 18:53:17
Line 37  foreach (split/&/,$ENV{'QUERY_STRING'}) Line 37  foreach (split/&/,$ENV{'QUERY_STRING'})
 my $filename = $data{'file'};  my $filename = $data{'file'};
 # unescape filename  # unescape filename
 $filename =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;  $filename =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
   
 die if ($filename =~ /\// || $filename !~ /_plot.data$/);  die if ($filename =~ /\// || $filename !~ /_plot.data$/);
 $filename = $tmpdir . $filename;  $filename = $tmpdir . $filename;
 die "$data{'file'} does not exist\n" if (! -e $filename);  die "$data{'file'} does not exist\n" if (! -e $filename);
   
 my $output = $data{'output'};  my $output = $data{'output'};
   if ($output eq '') {
       $output = (split('\.',$0))[-1];
   }
   
 if ($output eq 'gif' || $output eq 'png') {  if ($output eq 'gif' || $output eq 'png') {
     open PLOT, "gnuplot $filename |";      if (open(my $plot, "export LANG='en_US.UTF-8'; gnuplot $filename |")) {
     print <<"END";  
           print <<"END";
 Content-type: image/$output  Content-type: image/$output
   
 END  END
     while ($_=<PLOT>) {          while (my $line = <$plot>) {
  print;      print($line);
           }
           close($plot);
       } else {
           die "failed to open pipe to run gnuplot\n";        
     }      }
   
 } elsif ($output eq 'eps') {  } elsif ($output eq 'eps') {
     print <<"END";      print <<"END";
 Content-type: text/html  Content-type: text/html
Line 61  Content-type: text/html Line 70  Content-type: text/html
 <h2>Creating eps plot</h2>  <h2>Creating eps plot</h2>
   
 END  END
     if (! system ("gnuplot $filename")) {      if (! system ("export LANG='en_US.UTF-8'; gnuplot $filename")) {
         print "<h2>An error occured.</h2>\n".          print "<h2>An error occurred.</h2>\n".
             "I am not going to tell you about it as I have not bothered ".              "I am not going to tell you about it as I have not bothered ".
             "to figure out how to get you the error text.\n";              "to figure out how to get you the error text.\n";
     } else {      } else {

Removed from v.1.11  
changed lines
  Added in v.1.17


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>