X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/720e78a4f8351eedac26b196aa9f3922fd5bd0ee..b7a10718f1c1e5d0028cd367c337e9f85dc56618:/plp.cgi

diff --git a/plp.cgi b/plp.cgi
index 4c6e41e..2158b60 100755
--- a/plp.cgi
+++ b/plp.cgi
@@ -1,8 +1,20 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
+
+use vars qw(%INTERNAL %get %post %fields %header %cookie %BLOCK $DEBUG $output);
 use strict;
-use vars qw($VERSION %INTERNAL %get %post %fields %header %cookie %BLOCK $DEBUG $output);
 
-$VERSION = '2.22';
+sub SendHeaders(){
+    $INTERNAL{sentheaders} = 1;
+    print STDOUT "Content-Type: text/plain\n\n" if $DEBUG & 2;
+    print STDOUT map("$_: $header{$_}\n", keys %header), "\n";
+};
+
+sub rawprint(@){
+    print STDOUT (@_);
+}
+
+
+$ENV{PLP_VERSION} = '2.40';
 $DEBUG = 1;
 
 # We put most everything in %INTERNAL, just so the user won't screw it.
@@ -11,7 +23,7 @@ $DEBUG = 1;
 $INTERNAL{file} = $ENV{PATH_TRANSLATED};
 unless (-e $INTERNAL{file}){
     $ENV{REDIRECT_STATUS} = '404';
-    print STDERR "htmpl: Not found: $INTERNAL{file}\n";
+    print STDERR "PLP: Not found: $INTERNAL{file}\n";
 
     #Change this if you have an error handling script.
     print `/vhost/COMMON/err.cgi` || "Status: 404 Not found\n\nFile not found";
@@ -19,41 +31,41 @@ unless (-e $INTERNAL{file}){
     exit;
 }
 
-($INTERNAL{dir} = $INTERNAL{file}) =~ s{^(.*)/.*?$}[$1];
+require plp;
+
+($INTERNAL{dir} = $INTERNAL{file}) =~ s{^(.*)/(.*?)$}[$1];
+$ENV{FILE_NAME} = $2;
 chdir $INTERNAL{dir};
 
 ($ENV{PLP_NAME} = $ENV{REQUEST_URI}) =~ s/\?.*$//;
 
-use plp;
 
 $INTERNAL{qq} = ""; #^P
 $INTERNAL{q}  = ""; #^Q
 
-$header{'Content-Type'} = 'text/html';
-$header{Status} = '200 OK';
-
 $INTERNAL{code} = ReadFile($INTERNAL{file});
 
 while ($INTERNAL{code} =~ /<\((.*?)\)>/ ){
-    ($INTERNAL{file} = $1) =~ s/[<>\|]//g;
-    $INTERNAL{code} =~ s//ReadFile($INTERNAL{file})/e;
+    (my $file = $1) =~ tr/[<>|//d;
+    $INTERNAL{code} =~ s//ReadFile($file)/e;
 }
 
 $INTERNAL{code} =~ s(<:)($INTERNAL{q};)g;
 $INTERNAL{code} =~ s(:>)(;\nprint q$INTERNAL{q})g;
 
 while ($INTERNAL{code} =~ /(<\[1(.*?)\]>(.*?)<\[2\]>(.*?)<\[3\]>)/s){
-    $INTERNAL{naam} = $2;
-    $BLOCK{"$INTERNAL{naam}-1"} = $3;
-    $BLOCK{"$INTERNAL{naam}-2"} = $4;
+    $BLOCK{"$2-1"} = $3;
+    $BLOCK{"$2-2"} = $4;
     $INTERNAL{code} =~ s///;  #Redo last match
 }
 $INTERNAL{code} =~ s(\\\\\r?\n)()g;
+
+# This is bad and subject to removal.
 $INTERNAL{code} =~ s(<\[([^>]*?):(.*?)\]>)($BLOCK{"${1}-1"}$2$BLOCK{"${1}-2"})g;
 $INTERNAL{code} =~ s(<\[(?!/)(.*?)\]>)($BLOCK{"${1}-1"})g;
 $INTERNAL{code} =~ s(<\[/(.*?)\]>)($BLOCK{"${1}-2"})g;
 
-
+# This too is bad and subject to removal.
 $INTERNAL{code} =~ s(<{[ \08\09]*)($INTERNAL{q};print qq$INTERNAL{qq})g;
 $INTERNAL{code} =~ s([ \08\09]*}>)($INTERNAL{qq};print q$INTERNAL{q})g;
 $INTERNAL{code} = "print q$INTERNAL{q}$INTERNAL{code}$INTERNAL{q};";
@@ -61,38 +73,29 @@ $INTERNAL{code} = "print q$INTERNAL{q}$INTERNAL{code}$INTERNAL{q};";
 $INTERNAL{code} =~ s{print qq$INTERNAL{qq}$INTERNAL{qq};}[]g;
 $INTERNAL{code} =~ s{print q$INTERNAL{q}$INTERNAL{q};}[]g;
 
+tie %header, 'PLP::Headers';
+tie *PLPOUT, 'PLP::Print';
 
+# This is VERY bad, and will probably be removed. Use <: BEGIN { ... } 
+# :> instead
 while ($INTERNAL{code} =~ s/<_(.*?)_>//s){
     $INTERNAL{pre} = $1;    
     {
 	no strict;
 	eval $INTERNAL{pre};
-	if ($@ && $DEBUG){
+	if ($@ && $DEBUG & 1){
 	    print "\nDebug:\n $@";
 	}
     }
 }
 
-print "\n\n" if $DEBUG == 2;
-
-{
-    my %HEADER;
-    for (sort keys %header){ # Sort, so lowercase and underscores come first)
-	my $copy = $_;
-	tr/_/-/;
-	s/\b(\w)(\w*)/\U$1\E\L$2\E/g;
-	$HEADER{$_} = $header{$copy};
-    }
-    for (keys %HEADER){
-        print "$_: $HEADER{$_}\n";
-    }
-    print "\n";
-}
-
+#$INTERNAL{headers}->();
+select PLPOUT;
 {
     no strict;
     eval $INTERNAL{code};
-    if ($@ && $DEBUG){
+    SendHeaders() unless $INTERNAL{sentheaders};
+    if ($@ && $DEBUG & 1){
 	print "<hr><b>Debug</b><br>", Entity($@);
     }
 }