URL's are actually linked now... which is nice :-)

[www.i-scream.org.git] / cgi-bin / docs.cgi
diff --git a/cgi-bin/docs.cgi b/cgi-bin/docs.cgi

index ea7fdf8b3e1c7883318d764bfc8e9a833ef407c0..cb6c3d2bbe8dbb9fa83e81024156f0a96e7b5586 100755 (executable)
--- a/cgi-bin/docs.cgi
+++ b/cgi-bin/docs.cgi
@@ -19,10 +19,10 @@ my ($bottom) = "../bottom.inc";
  
  
  my ($query) = new CGI;
-my ($doci) = ($query->param('doc') =~ /^\s*(.*?\.txt)\s*$/);
-my ($doc) = "../documentation/$doci";
+my ($doc) = ($query->param('doc') =~ /^\s*(.*?\.txt)\s*$/);
+$doc = "../documentation/".$doc;
  
-print "content-type: text/html\n\n";
+print "Content-type: text/html\n\n";
  
  print <<"END";
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -31,7 +31,7 @@ print <<"END";
      docs.cgi
      Web-based text file viewer and formatter.
      Created by pjm2 19/10/2000
-    Last modified 19/10/2000
+    Last modified 02/11/2000
  -->
  
  <html>
@@ -50,7 +50,7 @@ print <<"END";
    <td valign="top">
  END
  
-&print_file($left);
+&print_html($left);
  
  print <<"END";
  
@@ -58,13 +58,9 @@ print <<"END";
    <td valign="top">
  END
  
-&print_file($title);
-
-print "<PRE>\n";
+&print_html($title);
  &print_file($doc);
-print "</PRE>\n";
-
-&print_file($bottom);
+&print_html($bottom);
  
  print <<"END";
  
@@ -79,16 +75,40 @@ END
  
  exit 0;
  
+# Print a file, whilst escaping HTML: -
  sub print_file ($) {
-    my ($filename) = @_;
-    print `cat $filename`;
-}
-
-sub print_file_old ($) {
+    my ($urls) = '(' . join ('|', qw{
+                       http
+                       telnet
+                       gopher
+                       file
+                       wais
+                       ftp
+                       } )
+                   . ')';
+    
+    my ($ltrs) = '\w';
+    my ($gunk) = '/#~:.?+=&%@!\-';
+    my ($punc) = '.:?\-';
+    my ($any) = "${ltrs}${gunk}${punc}";
      my ($filename) = @_;
      open(FILE, $filename) or die "Cannot open $filename: $!\n";
-    while (my ($line) = <FILE>) {
-        print $line;
+    print "<pre>\n";
+    # Use $_ implicitly throughout.
+    while (<FILE>) {
+        # Must do the next line first!
+        s/&/&amp;/g;
+        s/</&lt;/g;
+        s/>/&gt;/g;
+        s/"/&quot;/g;
+        s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/<a href="$1">$1<\/a>/igox;
+        print;
      }
+    print "</pre>";
  }
  
+# Print a file without escaping HTML: -
+sub print_html ($) {
+    my ($filename) = @_;
+    print `cat $filename`;
+}