X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/3565beca174066a12d2d952d4b24d79a0ca55412..27b0c16f2bdec1feb77ff34f6dd3aaca9a0fb6f3:/PLP.pm?ds=sidebyside
diff --git a/PLP.pm b/PLP.pm
index ad4a227..fd9b262 100644
--- a/PLP.pm
+++ b/PLP.pm
@@ -1,8 +1,6 @@
package PLP;
-# Not to be used without the CGI script;
-
-our $VERSION = '3.03';
+use 5.006;
use PLP::Functions ();
use PLP::Fields;
@@ -10,165 +8,583 @@ use PLP::Tie::Headers;
use PLP::Tie::Delay;
use PLP::Tie::Print;
-=head1 PLP
-
-None of the functions in this module should be called by PLP scripts.
+use File::Basename ();
+use File::Spec;
+#use Cwd ();
-Functions:
+use strict;
-=over 10
+our $VERSION = '3.19';
-=item sendheaders
+# Subs in this package:
+# _default_error($plain, $html) Default error handler
+# cgi_init Initialization for CGI
+# clean Reset variables
+# error($error, $type) Handle errors
+# everything Do everything: CGI
+# handler($r) Do everything: mod_perl
+# mod_perl_init($r) Initialization for mod_perl
+# mod_perl_print Faster printing for mod_perl
+# sendheaders Send headers
+# source($path, $level, $linespec) Read and parse .plp files
+# start Start the initialized PLP script
-Sends the headers waiting in %PLP::Script::header
+# The _init subs do the following:
+# Set $PLP::code to the initial code
+# Set $ENV{PLP_*} and make PATH_INFO if needed
+# Change the CWD
-=item source
+# This gets referenced as the initial $PLP::ERROR
+sub _default_error {
+ my ($plain, $html) = @_;
+ print qq{
},
+ qq{Debug information: $html
};
+}
-Given a filename and optional level (level should be C<0> if it isn't called
-by C itself), and optional linespec (used by C),
-parses a PLP file and returns Perl code, ready to be eval'ed.
+# CGI initializer: parses PATH_TRANSLATED
+sub cgi_init {
-=item error
+ $PLP::print = 'print';
+
+ my $path = $ENV{PATH_TRANSLATED};
+ $ENV{PLP_NAME} = $ENV{PATH_INFO};
+ my $path_info;
+ while (not -f $path) {
+ if (not $path =~ s/(\/+[^\/]*)$//) {
+ print STDERR "PLP: Not found: $ENV{PATH_TRANSLATED} ($ENV{REQUEST_URI})\n";
+ PLP::error(undef, 404);
+ exit;
+ }
+ my $pi = $1;
+ $ENV{PLP_NAME} =~ s/\Q$pi\E$//;
+ $path_info = $pi . $path_info;
+ }
+
+ if (not -r $path) {
+ print STDERR "PLP: Can't read: $ENV{PATH_TRANSLATED} ($ENV{REQUEST_URI})\n";
+ PLP::error(undef, 403);
+ exit;
+ }
-Given a description OR number, returns a piece of HTML, OR prints error headers.
+ delete @ENV{
+ qw(PATH_TRANSLATED SCRIPT_NAME SCRIPT_FILENAME PATH_INFO),
+ grep /^REDIRECT_/, keys %ENV
+ };
-=item start
+ $ENV{PATH_INFO} = $path_info if defined $path_info;
+ $ENV{PLP_FILENAME} = $path;
+ my ($file, $dir) = File::Basename::fileparse($path);
+ chdir $dir;
-Inits everything, reads the first file, sets environment.
+ $PLP::code = PLP::source($file, 0, undef, $path);
+}
-=cut
+# This cleans up from previous requests, and sets the default $PLP::DEBUG
+sub clean {
+ @PLP::END = ();
+ $PLP::code = '';
+ $PLP::sentheaders = 0;
+ $PLP::DEBUG = 1;
+ $PLP::print = '';
+ $PLP::r = undef;
+ delete @ENV{ grep /^PLP_/, keys %ENV };
+}
-sub sendheaders () {
- our $sentheaders = 1;
- print STDOUT "Content-Type: text/plain\n\n" if $DEBUG & 2;
- print STDOUT map("$_: $PLP::Script::header{$_}\n", keys %PLP::Script::header), "\n";
-};
-
-sub source {
- my ($path, $level, $linespec) = @_;
- $level = 0 if not defined $level;
- $linespec = '1' if not defined $linespec;
- our ($inA, $inB);
- (my $file = $path) =~ s[.*/][];
- my $source = $level
- ? qq/\cQ;\n#line 1 "$file"\nprint q\cQ/
- : qq/\n#line 1 "$file"\nprint q\cQ/;
- my $linenr = 0;
- local *SOURCE;
- open SOURCE, $path or return $level
- ? qq{\cQ; die qq[Can't open "\Q$path\E" (\Q$!\E)]; print q\cQ}
- : qq{\n#line $linespec\ndie qq[Can't open "\Q$path\E" (\Q$!\E)];};
- LINE: while (defined (my $line = )) {
- $linenr++;
- for (;;) {
- $line =~ /
- \G # Begin where left off
- ( \z # End
- | <:=? | :> # PLP tags <:=? ... :>
- | <\(.*?\)> # Include tags <(...)>
- | <[^:(][^<:]* # Normal text
- | :[^>][^<:]* # Normal text
- | [^<:]* # Normal text
- )
- /gxs;
- next LINE unless length $1;
- my $part = $1;
- if ($part eq '<:=' and not $inA || $inB) {
- $inA = 1;
- $source .= "\cQ, ";
- } elsif ($part eq '<:' and not $inA || $inB) {
- $inB = 1;
- $source .= "\cQ; ";
- } elsif ($part eq ':>' and $inA) {
- $inA = 0;
- $source .= ", q\cQ";
- } elsif ($part eq ':>' and $inB) {
- $inB = 0;
- $source .= "; print q\cQ";
- } elsif ($part =~ /^<\((.*?)\)>\z/ and not $inA || $inB) {
- $source .= source($1, $level + 1) .
- qq/\cQ, \n#line $linenr "$file"\nq\cQ/;
- } else {
- $part =~ s/\\/\\\\/ if not $inA || $inB;
- $source .= $part;
- }
+# Handles errors, uses subref $PLP::ERROR (default: \&_default_error)
+sub error {
+ my ($error, $type) = @_;
+ if (not defined $type or $type < 100) {
+ return undef unless $PLP::DEBUG & 1;
+ my $plain = $error;
+ (my $html = $plain) =~ s/([<&>])/'' . ord($1) . ';'/ge;
+ PLP::sendheaders() unless $PLP::sentheaders;
+ $PLP::ERROR->($plain, $html);
+ } else {
+ select STDOUT;
+ my ($short, $long) = @{
+ +{
+ 404 => [
+ 'Not Found',
+ "The requested URL $ENV{REQUEST_URI} was not found " .
+ "on this server."
+ ],
+ 403 => [
+ 'Forbidden',
+ "You don't have permission to access $ENV{REQUEST_URI} " .
+ "on this server."
+ ],
+ }->{$type}
+ };
+ print "Status: $type\nContent-Type: text/html\n\n",
+ qq{\n},
+ "\n$type $short\n\n