--- web/cgi-bin/docs.cgi 2001/02/08 21:17:47 1.4 +++ web/cgi-bin/docs.cgi 2004/03/21 23:59:32 1.7 @@ -1,23 +1,16 @@ #!/usr/bin/perl -w -#------------------------------------------------------------ -# docs.cgi -# -# Web-based text file viewer. -# Copyright Paul Mutton, 2000. -#------------------------------------------------------------ - use strict; use CGI; $| = 1; # Settings -my ($left) = "../left.inc" ; -my ($title) = "../title.inc"; -my ($bottom) = "../bottom.inc"; +my ($menu) = "../nwww/menu.inc" ; +my ($header) = "../nwww/header.inc"; +my ($footer) = "../nwww/footer.inc"; +my ($style) = "../nwww/style.inc"; - my ($query) = new CGI; # Note filenames may only have one dot in them, in the ".txt". @@ -34,57 +27,57 @@ unless (defined $doc) { # Prevent hackers from supplying a malformed document string. # I.e. only allow normal characters, slashes and dots. unless ($doc =~ /^[a-zA-Z_\-0-9\.\/]+$/) { - print "Go Away, you nasty hax0r!"; + print "Malformed request."; exit; } -$doc = "../documentation/".$doc; +$doc = "../htdocs/documentation/".$doc; +my($docname) = $doc =~ /\/([^\/]+)$/; + print <<"END"; - + - - - The i-scream Project Documentation Viewer - - - + i-scream plain text documentation viewer +END + +&print_html($style); + +print <<"END"; - + - - - - - -
+
+ +
END -&print_html($left); +&print_html($header); print <<"END"; +
+

i-scream documentation viewer

-
+

$docname

END -&print_html($title); &print_file($doc); -&print_html($bottom); +print ""; -print <<"END"; +&print_html($footer); -
+print ""; - +&print_html($menu); +print <<"END"; + + + END @@ -92,22 +85,22 @@ exit 0; # Print a file, whilst escaping HTML: - sub print_file ($) { - 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"; +my ($urls) = '(' . join ('|', qw{ + http + telnet + gopher + file + wais + ftp + } ) + . ')'; + +my ($ltrs) = '\w'; +my ($gunk) = '/#~:.?+=&%@!\-'; +my ($punc) = '.:?\-'; +my ($any) = "${ltrs}${gunk}${punc}"; +my ($filename) = @_; +if(open(FILE, $filename)) { print "
\n";
     # Use $_ implicitly throughout.
     while () {
@@ -121,9 +114,13 @@ sub print_file ($) {
     }
     print "
"; } +else { + print "Failed to open $docname."; +} +} # Print a file without escaping HTML: - sub print_html ($) { - my ($filename) = @_; - print `cat $filename`; +my ($filename) = @_; +print `cat $filename 2>&1`; }