--- web/cgi-bin/docs.cgi 2004/03/21 23:59:32 1.7
+++ web/cgi-bin/docs.cgi 2004/03/25 22:51:20 1.13
@@ -6,17 +6,22 @@ use CGI;
$| = 1;
# Settings
-my ($menu) = "../nwww/menu.inc" ;
-my ($header) = "../nwww/header.inc";
-my ($footer) = "../nwww/footer.inc";
-my ($style) = "../nwww/style.inc";
+my ($incdir) = "../htdocs";
+# Include files
+my ($doctype) = "$incdir/doctype.inc";
+my ($style) = "$incdir/style.inc";
+my ($header) = "$incdir/header.inc";
+my ($footer) = "$incdir/footer.inc";
+my ($menu) = "$incdir/menu-static.inc" ;
+
my ($query) = new CGI;
# Note filenames may only have one dot in them, in the ".txt".
# This prevents malicious users using "../" to view files.
my ($doc) = ($query->param('doc') =~ /^\s*([^\.]*?\.txt)\s*$/);
+# This should be application/xhtml+xml
print "Content-type: text/html\n\n";
unless (defined $doc) {
@@ -30,61 +35,70 @@ unless ($doc =~ /^[a-zA-Z_\-0-9\.\/]+$/) {
print "Malformed request.";
exit;
}
-$doc = "../htdocs/documentation/".$doc;
+$doc = "../htdocs/cms/documentation/".$doc;
my($docname) = $doc =~ /\/([^\/]+)$/;
+&print_html($doctype);
+
print <<"END";
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-
-<head>
- <title>i-scream plain text documentation viewer</title>
+ <head>
+ <title>
+ i-scream plain text documentation viewer
+ </title>
END
&print_html($style);
print <<"END";
-</head>
-<body>
-
-<div id="container">
-
-<div id="main">
+ </head>
+ <body>
+ <div id="container">
+ <div id="main">
END
&print_html($header);
print <<"END";
-<div id="contents">
-<h1 class="top">i-scream documentation viewer</h1>
-<h2>$docname</h2>
+ <div id="contents">
+ <h1 class="top">
+ i-scream documentation viewer
+ </h1>
+ <h2>
+ $docname
+ </h2>
END
&print_file($doc);
-print "</div>";
+print <<"END";
+
+ </div>
+END
+
&print_html($footer);
-print "</div>";
+print <<"END";
+ </div>
+END
+
&print_html($menu);
print <<"END";
-</div>
-</body>
+ </div>
+ </body>
</html>
END
exit 0;
# Print a file, whilst escaping HTML: -
-sub print_file ($) {
+sub print_file {
my ($urls) = '(' . join ('|', qw{
http
telnet
@@ -95,32 +109,36 @@ my ($urls) = '(' . join ('|', qw{
} )
. ')';
-my ($ltrs) = '\w';
-my ($gunk) = '/#~:.?+=&%@!\-';
-my ($punc) = '.:?\-';
-my ($any) = "${ltrs}${gunk}${punc}";
-my ($filename) = @_;
-if(open(FILE, $filename)) {
- print "<pre>\n";
- # Use $_ implicitly throughout.
- while (<FILE>) {
- # Must do the next line first!
- s/&/&/g;
- s/</</g;
- s/>/>/g;
- s/"/"/g;
- s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/<a href="$1">$1<\/a>/igox;
- print;
+ my ($ltrs) = '\w';
+ my ($gunk) = '/#~:.?+=&%@!\-';
+ my ($punc) = '.:?\-';
+ my ($any) = "${ltrs}${gunk}${punc}";
+ my ($filename) = @_;
+ if(open(FILE, $filename)) {
+ print " <pre>\n";
+ # Use $_ implicitly throughout.
+ while (<FILE>) {
+ # Must do the next line first!
+ s/&/&/g;
+ s/</</g;
+ s/>/>/g;
+ s/"/"/g;
+ s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/<a href="$1">$1<\/a>/igox;
+ print;
+ }
+ print "\n</pre>";
}
- print "</pre>";
+ else {
+ print "Failed to open $docname.";
+ }
}
-else {
- print "Failed to open $docname.";
-}
-}
-# Print a file without escaping HTML: -
+# Print the contents of a file containing html
sub print_html ($) {
-my ($filename) = @_;
-print `cat $filename 2>&1`;
+ my ($filename) = @_;
+ open(FILE, $filename);
+ while(<FILE>) {
+ print;
+ }
+ close FILE;
}