git.shiar.nl
/
perl
/
plp
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
v2.40 release
[perl/plp/.git]
/
plpfunc.pm
diff --git
a/plpfunc.pm
b/plpfunc.pm
index a113c76615a303a0d7c6a89db19eb791c8d0d033..6d780664e817687da8bca990524e3741fe395240 100644
(file)
--- a/
plpfunc.pm
+++ b/
plpfunc.pm
@@
-1,14
+1,16
@@
#!/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
#!/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 URI::Escape;
+
use strict;
use vars qw(%header);
sub HiddenFields($@){
my $hash = shift;
my %saves;
use strict;
use vars qw(%header);
sub HiddenFields($@){
my $hash = shift;
my %saves;
-
$
saves{@_} = ();
+
@
saves{@_} = ();
for (keys %$hash){
print qq{<input type=hidden name="$_" value="$hash->{$_}">}
unless exists $saves{$_};
for (keys %$hash){
print qq{<input type=hidden name="$_" value="$hash->{$_}">}
unless exists $saves{$_};
@@
-34,7
+36,7
@@
sub Entity(@){
s/\t/ /g;
s/ / /g;
};
s/\t/ /g;
s/ / /g;
};
-
if ($@){ return defined wantarray ? @_ : undef }
+
#
if ($@){ return defined wantarray ? @_ : undef }
}
return defined wantarray ? (wantarray ? @$ref : "@$ref") : undef;
}
}
return defined wantarray ? (wantarray ? @$ref : "@$ref") : undef;
}
@@
-42,51
+44,61
@@
sub Entity(@){
# Browsers do s/ /+/ - I don't care about RFC's, but I do care about real-life
# situations.
sub DecodeURI(@){
# Browsers do s/ /+/ - I don't care about RFC's, but I do care about real-life
# situations.
sub DecodeURI(@){
- my @r;
+ my @r;
+ local $_;
for (@_){
s/\+/%20/g;
for (@_){
s/\+/%20/g;
- my $dec = uri_unescape($_);
+ 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};
if (defined wantarray){
push @r, $dec;
}else{
eval {$_ = $dec};
-
return undef if $@; # ;DecodeURI("foo");
+
#
return undef if $@; # ;DecodeURI("foo");
}
}
return defined wantarray ? (wantarray ? @r : "@r") : undef;
}
sub EncodeURI(@){
my @r;
}
}
return defined wantarray ? (wantarray ? @r : "@r") : undef;
}
sub EncodeURI(@){
my @r;
+ local $_;
for (@_){
for (@_){
- my $esc = uri_escape($_, '^;\/?:@&=\$,A-Za-z0-9\-_.!~*\'()');
+ my $esc = $_;
+ $esc =~
+ s{
+ ([^;\/?:@&=\$,A-Za-z0-9\-_.!~*\'()])
+ }{
+ sprintf("%%%02x", ord($1))
+ }xge;
if (defined wantarray){
push @r, $esc;
}else{
eval {$_ = $esc};
if (defined wantarray){
push @r, $esc;
}else{
eval {$_ = $esc};
-
return undef if $@; # ;EncodeURI("foo");
+
#
return undef if $@; # ;EncodeURI("foo");
}
}
return defined wantarray ? (wantarray ? @r : "@r") : undef;
}
sub AddCookie($){
}
}
return defined wantarray ? (wantarray ? @r : "@r") : undef;
}
sub AddCookie($){
- if ($header{'
set-c
ookie'}){
- $header{'
set-cookie'} .= "\nset-c
ookie: $_[0]";
+ if ($header{'
Set-C
ookie'}){
+ $header{'
Set-Cookie'} .= "\nSet-C
ookie: $_[0]";
}else{
}else{
- $header{'
set-c
ookie'} = $_[0];
+ $header{'
Set-C
ookie'} = $_[0];
}
}
sub ReadFile($){
}
}
sub ReadFile($){
- my $o = $/; undef $/;
- open (READFILE, $_[0]);
+ local *READFILE;
+ local $/ = undef;
+ open (READFILE, "<$_[0]");
my $r = <READFILE>;
close READFILE;
my $r = <READFILE>;
close READFILE;
- $/ = $o;
return $r;
}
sub WriteFile($$){
return $r;
}
sub WriteFile($$){
+ local *WRITEFILE;
open (WRITEFILE, ">$_[0]");
flock WRITEFILE, 2;
print WRITEFILE $_[1];
open (WRITEFILE, ">$_[0]");
flock WRITEFILE, 2;
print WRITEFILE $_[1];
@@
-94,8
+106,10
@@
sub WriteFile($$){
}
sub Counter($){
}
sub Counter($){
- my $o = $/; undef $/;
- open COUNTER, "+<$_[0]";
+ local *COUNTER;
+ local $/ = undef;
+ open COUNTER, "+<$_[0]" or
+ open COUNTER, ">$_[0]" or return undef;
flock COUNTER, 2;
seek COUNTER, 0, 0;
my $counter = <COUNTER>;
flock COUNTER, 2;
seek COUNTER, 0, 0;
my $counter = <COUNTER>;
@@
-103,7
+117,6
@@
sub Counter($){
truncate COUNTER, 0;
print COUNTER ++$counter;
close COUNTER;
truncate COUNTER, 0;
print COUNTER ++$counter;
close COUNTER;
- $/ = $o;
return $counter;
}
return $counter;
}
@@
-138,4
+151,4
@@
sub AutoURL($){
if ($@){ return defined wantarray ? @_ : undef }
return defined wantarray ? $$ref : undef;
}
if ($@){ return defined wantarray ? @_ : undef }
return defined wantarray ? $$ref : undef;
}
-1;
\ No newline at end of file
+1;