X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fdocs.cgi;h=91e99f009a74f9c0ac06355cd8924c3256b6e413;hb=1e7294c9609fdb0d4b5665b511f721cfb6b42d5d;hp=402c9e505ba29cb49bd023f9ed76ce1ed741b7ca;hpb=044ce3d999326b8748cd8f2821ed593298bb07ba;p=www.i-scream.org.git diff --git a/cgi-bin/docs.cgi b/cgi-bin/docs.cgi index 402c9e5..91e99f0 100755 --- a/cgi-bin/docs.cgi +++ b/cgi-bin/docs.cgi @@ -6,10 +6,14 @@ 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; @@ -17,6 +21,7 @@ my ($query) = new CGI; # 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 <<"END"; - +&print_html($doctype); - +print <<"END"; - - i-scream plain text documentation viewer + + + i-scream plain text documentation viewer + END &print_html($style); print <<"END"; - - - - -
-
+ + +
+
END &print_html($header); print <<"END"; -
-

i-scream documentation viewer

-

$docname

+
+

+ i-scream documentation viewer +

+

+ $docname +

END &print_file($doc); -print "
"; + +print <<"END"; + +
+END &print_html($footer); -print "
"; +print <<"END"; + +
+END &print_html($menu); print <<"END"; -
- +
+ 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 "
\n";
-    # Use $_ implicitly throughout.
-    while () {
-        # Must do the next line first!
-        s/&/&/g;
-        s//>/g;
-        s/"/"/g;
-        s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/$1<\/a>/igox;
-        print;
+    my ($ltrs) = '\w';
+    my ($gunk) = '/#~:.?+=&%@!\-';
+    my ($punc) = '.:?\-';
+    my ($any) = "${ltrs}${gunk}${punc}";
+    my ($filename) = @_;
+    if(open(FILE, $filename)) {
+        print "          
\n";
+        # Use $_ implicitly throughout.
+        while () {
+            # Must do the next line first!
+            s/&/&/g;
+            s//>/g;
+            s/"/"/g;
+            s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/$1<\/a>/igox;
+            print;
+        }
+        print "\n
";
+    }
+    else {
+        print "Failed to open $docname.";
     }
-    print "
"; -} -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() { + print; + } + close FILE; }