X-Git-Url: http://git.shiar.nl/perl/plp/.git/blobdiff_plain/6b971262dcda8586066379c1b3fcea9c457ce575..756d5de12d15296e7689a7c5c7b5e35bd0bccb0e:/plp.cgi

diff --git a/plp.cgi b/plp.cgi
index c281fc0..e9961f6 100755
--- a/plp.cgi
+++ b/plp.cgi
@@ -1,74 +1,35 @@
-#!/usr/bin/perl
-
-$VERSION = '2.01';
-
-$INTERNAL{file} = $ENV{PATH_TRANSLATED};
-unless (-e $INTERNAL{file}){
-    $ENV{REDIRECT_STATUS} = '404';
-    print STDERR "htmpl: 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";
-    
-    exit;
+#!/usr/local/bin/perl
+use v5.6.0;
+use PLP;
+use strict;
+
+die 'Wrong module version' if $PLP::VERSION ne '3.04';
+
+{
+    $PLP::code = '';
+    $PLP::sentheaders = 0;
+    $PLP::inA = 0;
+    $PLP::inB = 0;
+    $PLP::DEBUG = 1;
+    delete @ENV{ grep /^PLP_/, keys %ENV };
 }
 
-($INTERNAL{dir} = $INTERNAL{file}) =~ s{^(.*)/.*?$}[$1];
-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;
+PLP::start();
+
+{
+    no strict;
+    PLP::Fields::doit();
+    {
+	package PLP::Script;
+	*headers = \%header;
+	*cookies = \%cookie;
+	PLP::Functions->import();
+	# No lexicals may exist at this point.
+	eval qq{package PLP::Script; $PLP::code};
+    }
+    PLP::error($@, 1) if $@;
+    select STDOUT;
+    undef *{"PLP::Script::$_"} for keys %PLP::Script::;
+    PLP::sendheaders() unless $PLP::sentheaders;
 }
 
-$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;
-    $INTERNAL{code} =~ s///;  #Redo last match
-}
-$INTERNAL{code} =~ s(\\\\\r?\n)()g;
-$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;
-$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};";
-
-$INTERNAL{code} =~ s{print qq$INTERNAL{qq}$INTERNAL{qq};}[]g;
-$INTERNAL{code} =~ s{print q$INTERNAL{q}$INTERNAL{q};}[]g;
-
-
-while ($INTERNAL{code} =~ s/<_(.*?)_>//s){
-    $INTERNAL{pre} = $1;    
-    eval $INTERNAL{pre};
-}
-
-for (keys %header){
-    print "$_: $header{$_}\n";
-}
-print "\n";
-
-eval $INTERNAL{code};
-if ($@){
-    print "<hr><b>Debug</b><br>", Entity($@);
-}
-
-if ($Debug){
-    print "<hr>Debug:<pre>$INTERNAL{code}<hr>$output";
-}