v2.40 release

[perl/plp/.git] / plpfunc.pm

diff --git a/plpfunc.pm b/plpfunc.pm
index ae3dd4f728529baebeda152c0c9a4f7f9effd701..6d780664e817687da8bca990524e3741fe395240 100644 (file)
--- a/plpfunc.pm
+++ b/plpfunc.pm
@@ -1,74 +1,154 @@
+#!/usr/bin/perl
+# The shebang is only there for mcedit syntax highlights, as I'm too lazy to 
+# change the configfile. It won't hurt performance
+
+#use URI::Escape;
+
+use strict;
+use vars qw(%header);
+
 sub HiddenFields($@){
-    $INTERNAL{hash} = shift;
-    $INTERNAL{saves} = $INTERNAL{q} . (join $INTERNAL{q}, @_) . $INTERNAL{q};
-#    $INTERNAL{human} = join ',', @_;
-#    print "<!-- $INTERNAL{hash}: $INTERNAL{human} -->";
-    for (keys %{$INTERNAL{hash}}){
-       print qq{<input type=hidden name="$_" value="${$INTERNAL{hash}}{$_}">}
-           unless $INTERNAL{saves} =~ /$INTERNAL{q}$_$INTERNAL{q}/;
+    my $hash = shift;
+    my %saves;
+    @saves{@_} = ();
+    for (keys %$hash){
+       print qq{<input type=hidden name="$_" value="$hash->{$_}">}
+           unless exists $saves{$_};
     }
 }
 
-sub NoHeaders($){
-    $_[0] =~ s/^.*?\n\n//;
-    return $_[0]
-}
-
-sub Entity($;$$$$){
-    $_[4] ||= 4;
-    $_[0] =~ s/&/&amp;/g;
-    $_[0] =~ s/\"/&quot;/g;
-    $_[0] =~ s/</&lt;/g;
-    $_[0] =~ s/>/&gt;/g;
-    if ($_[1]){
-       $_[0] =~ s/\n/<br>\n/g;
-    }
-    if ($_[2]){
-       $_[0] =~ s/\t/' ' x $_[4]/eg;
+sub Entity(@){
+    my $ref;
+    my @copy;    
+    if (defined wantarray){
+       @copy = @_;
+       $ref = \@copy;
+    }else{
+       $ref = \@_;
     }
-    if ($_[3]){
-       $_[0] =~ s/  /&nbsp;&nbsp;/g;
+    for (@$ref){
+       eval {
+           s/&/&amp;/g;
+           s/\"/&quot;/g;
+           s/</&lt;/g;
+           s/>/&gt;/g;
+           s/\n/<br>\n/g;
+           s/\t/&nbsp; &nbsp; &nbsp; &nbsp;&nbsp;/g;
+           s/  /&nbsp;&nbsp;/g;
+       };
+#      if ($@){ return defined wantarray ? @_ : undef }
     }
-    return $_[0]
+    return defined wantarray ? (wantarray ? @$ref : "@$ref") : undef;
 }
 
-sub DecodeURI($;$){
-    my $t = $_[0];
-    $t =~ tr{+} { } unless ($_[1] == 1);
-    $t =~ s{%([0-9A-Fa-f]{2})}
-          {pack('c',hex($1))}ge;
-    return $t;
+# Browsers do s/ /+/ - I don't care about RFC's, but I do care about real-life
+# situations.
+sub DecodeURI(@){
+    my @r;
+    local $_;    
+    for (@_){
+       s/\+/%20/g;
+       my $dec = $_;
+       $dec =~ s/%([0-9A-Fa-f][0-9A-Fa-f])/chr hex $1/ge;
+       if (defined wantarray){
+           push @r, $dec;
+       }else{
+           eval {$_ = $dec}; 
+#          return undef if $@; # ;DecodeURI("foo");
+       }
+    }
+    return defined wantarray ? (wantarray ? @r : "@r") : undef;
 }
-
-sub EncodeURI($;$){
-    my $t = $_[0];
-    $t =~ s{([^a-zA-Z0-9_\-.])}
-           {uc sprintf("%%%02x",ord($1))}ge;
-    $t =~ s{%20}{+}g if ($_[1] == 1);
-    return $t;
+sub EncodeURI(@){
+    my @r;
+    local $_;
+    for (@_){
+        my $esc = $_;
+       $esc =~ 
+           s{
+               ([^;\/?:@&=\$,A-Za-z0-9\-_.!~*\'()])
+           }{
+               sprintf("%%%02x", ord($1))
+           }xge;
+        if (defined wantarray){
+            push @r, $esc;
+        }else{
+           eval {$_ = $esc};
+#          return undef if $@; # ;EncodeURI("foo");
+       }
+    }
+    return defined wantarray ? (wantarray ? @r : "@r") : undef;
 }
 
 sub AddCookie($){
-    if ($header{'set-cookie'}){
-       $header{'set-cookie'} .= "\nset-cookie: $_[0]";
+    if ($header{'Set-Cookie'}){
+       $header{'Set-Cookie'} .= "\nSet-Cookie: $_[0]";
     }else{
-       $header{'set-cookie'} = $_[0];
+       $header{'Set-Cookie'} = $_[0];
     }
 }
 
 sub ReadFile($){
-    my $o = $/; undef $/;    
-    open (READFILE, $_[0]);
+    local *READFILE;
+    local $/ = undef;
+    open (READFILE, "<$_[0]");
     my $r = <READFILE>;
     close READFILE;
-    $/ = $o;
     return $r;
 }
 
 sub WriteFile($$){
+    local *WRITEFILE;
     open (WRITEFILE, ">$_[0]");
     flock WRITEFILE, 2;
     print WRITEFILE $_[1];
     close WRITEFILE;
 }
-1;
\ No newline at end of file
+
+sub Counter($){
+    local *COUNTER;
+    local $/ = undef;
+    open           COUNTER, "+<$_[0]" or
+    open          COUNTER, ">$_[0]"  or return undef;
+    flock          COUNTER, 2;
+    seek           COUNTER, 0, 0;
+    my $counter = <COUNTER>;
+    seek           COUNTER, 0, 0;
+    truncate       COUNTER, 0;
+    print          COUNTER ++$counter;
+    close          COUNTER;
+    return $counter;
+}
+
+sub AutoURL($){
+    # This sub assumes your string does not match /(["<>])\cC\1/
+    my $ref;    
+    if (defined wantarray){
+       $ref = \(my $copy = $_[0]);
+    }else{
+       $ref = \$_[0];
+    }
+    eval {
+       $$ref =~ s/&quot;/"\cC"/g; # Single characters are easier to match :)
+       $$ref =~ s/&gt;/>\cC>/g;   # so we can just use a character class []
+       $$ref =~ s/&lt;/<\cC</g;
+       
+       # Now this is a big, ugly regex! But hey - it works :)    
+       $$ref =~ s{((\w+://|www\.|WWW\.)[a-zA-Z0-9\.\@:-]+[^\"\'>< \r\t\n]*)}{
+           local $_ = $1;
+           my $scheme = $2;
+           s/// if (my $trailing) = /([\.,!\?\(\)\[\]]+$)/;
+           s/&(?!\x23?\w+;)/&amp;/g;
+           s/\"/&quot;/g;
+           my $href = ($scheme =~ /www\./i ? "http://$_" : $_);
+           qq{<a href="$href" target="_blank">$_</a>$trailing};
+       }eg;
+
+       $$ref =~ s/"\cC"/&quot;/g;
+       $$ref =~ s/>\cC>/&gt;/g;
+       $$ref =~ s/<\cC</&lt;/g;
+    };
+    if ($@){ return defined wantarray ? @_ : undef }
+    return defined wantarray ? $$ref : undef;
+}
+1;