diff options
author | Yorhel <git@yorhel.nl> | 2011-02-03 17:22:18 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2011-02-03 17:22:18 +0100 |
commit | 09025338975b6bf63411e848419eee802da0c128 (patch) | |
tree | 0b34763040bbeb379964169572ddee6b4fa4b48e /lib | |
parent | 7ef623807ff91258743db4d6555150fd38968eea (diff) |
TUWF: Replaced reqParam() with reqGet() or reqPost() where applicable
Cleaner this way.
Also found two occurences of manually HTML-escaping text for textareas,
which isn't necessary anymore.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/VNDB/Handler/Misc.pm | 2 | ||||
-rw-r--r-- | lib/VNDB/Handler/Users.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNEdit.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Plugin/TransAdmin.pm | 27 | ||||
-rw-r--r-- | lib/VNDB/Util/LayoutHTML.pm | 2 | ||||
-rw-r--r-- | lib/VNDB/Util/Misc.pm | 2 |
6 files changed, 15 insertions, 26 deletions
diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm index df5621d8..062e3ae4 100644 --- a/lib/VNDB/Handler/Misc.pm +++ b/lib/VNDB/Handler/Misc.pm @@ -22,7 +22,7 @@ TUWF::register( qr{u([1-9]\d*)/tags}, sub { $_[0]->resRedirect("/g/links?u=$_[1]", 'perm') }, qr{(.*[^/]+)/+}, sub { $_[0]->resRedirect("/$_[1]", 'perm') }, qr{([pv])}, sub { $_[0]->resRedirect("/$_[1]/all", 'perm') }, - qr{v/search}, sub { $_[0]->resRedirect("/v/all?q=".uri_escape($_[0]->reqParam('q')||''), 'perm') }, + qr{v/search}, sub { $_[0]->resRedirect("/v/all?q=".uri_escape($_[0]->reqGet('q')||''), 'perm') }, qr{notes}, sub { $_[0]->resRedirect('/d8', 'perm') }, qr{faq}, sub { $_[0]->resRedirect('/d6', 'perm') }, qr{v([1-9]\d*)/(?:stats|scr)}, diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm index d46d6c22..75ddb547 100644 --- a/lib/VNDB/Handler/Users.pm +++ b/lib/VNDB/Handler/Users.pm @@ -338,7 +338,7 @@ sub edit { # create the page $self->htmlHeader(title => mt('_usere_title'), noindex => 1); $self->htmlMainTabs('u', $u, 'edit'); - if($self->reqParam('d')) { + if($self->reqGet('d')) { div class => 'mainbox'; h1 mt '_usere_saved_title'; div class => 'notice'; @@ -555,7 +555,7 @@ sub notifies { # changing the notification settings my $saved; - if($self->reqMethod() eq 'POST' && $self->reqParam('set')) { + if($self->reqMethod() eq 'POST' && $self->reqPost('set')) { return if !$self->authCheckCode; my $frm = $self->formValidate( { post => 'notify_nodbedit', required => 0, default => 1, enum => [0,1] }, diff --git a/lib/VNDB/Handler/VNEdit.pm b/lib/VNDB/Handler/VNEdit.pm index 733b7ba7..844a1536 100644 --- a/lib/VNDB/Handler/VNEdit.pm +++ b/lib/VNDB/Handler/VNEdit.pm @@ -86,7 +86,7 @@ sub edit { # nothing changed? just redirect return $self->resRedirect("/v$vid", 'post') - if $vid && !$self->reqParam('img') && $image == $v->{image} + if $vid && !$self->reqPost('img') && $image == $v->{image} && !grep $frm->{$_} ne $b4{$_}, keys %b4; # perform the edit/add @@ -123,7 +123,7 @@ sub edit { sub _uploadimage { my($self, $v, $frm) = @_; - return $v ? $frm->{previmage} : 0 if $frm->{_err} || !$self->reqParam('img'); + return $v ? $frm->{previmage} : 0 if $frm->{_err} || !$self->reqPost('img'); # save to temporary location my $tmp = sprintf '%s/static/cv/00/tmp.%d.jpg', $VNDB::ROOT, $$*int(rand(1000)+1); diff --git a/lib/VNDB/Plugin/TransAdmin.pm b/lib/VNDB/Plugin/TransAdmin.pm index 5729432d..19ce336e 100644 --- a/lib/VNDB/Plugin/TransAdmin.pm +++ b/lib/VNDB/Plugin/TransAdmin.pm @@ -42,8 +42,8 @@ sub tladmin { $lang ||= ''; my $intro = $lang =~ s/intro//; return $self->resNotFound if $lang && ($lang eq 'en' || !grep $_ eq $lang, $self->{l10n}->languages); - my $sect = $self->reqParam('sect')||''; - my $doc = $self->reqParam('doc')||''; + my $sect = $self->reqGet('sect')||''; + my $doc = $self->reqGet('doc')||''; my $uid = $self->authInfo->{id}; return $self->htmlDenied if !$uid || !$self->{transadmin}{$uid}; @@ -93,14 +93,14 @@ sub _savelang { push @read, $_ while (local $_ = $f->read); $f->close; - my @keys = $self->reqParam; + my @keys = $self->reqPost; $f = LangFile->new(write => $langfile); my $key; for my $l (@read) { $key = $l->[1] if $l->[0] eq 'key'; if($l->[0] eq 'tl' && $l->[1] eq $lang && grep $key eq $_, @keys) { - $l->[2] = !$self->reqParam("check$key"); - $l->[3] = $self->reqParam($key); + $l->[2] = !$self->reqPost("check$key"); + $l->[3] = $self->reqPost($key); $l->[3] =~ s/\r?\n/\n/g; $l->[3] =~ s/\s+$//g; } @@ -224,12 +224,7 @@ sub _section { end; div style => 'float: left'; if($multi) { - $tl =~ s/&/&/g; - $tl =~ s/</</g; - $tl =~ s/>/>/g; - textarea name => $key, id => $key, rows => $multi+2, style => 'width: 700px; height: auto; white-space: nowrap; border: none', wrap => 'off'; - lit $tl; - end; + textarea name => $key, id => $key, rows => $multi+2, style => 'width: 700px; height: auto; white-space: nowrap; border: none', wrap => 'off', $tl; } else { input type => 'text', class => 'text', name => $key, id => $key, value => $tl, style => 'width: 700px; border: none'; } @@ -256,7 +251,7 @@ sub _savedoc { my $en = join '', <$f>; close $f; - my $tl = $self->reqParam('tl'); + my $tl = $self->reqPost('tl'); $tl =~ s/\r?\n/\n/g; return -e $file && unlink $file if $tl eq $en; @@ -298,10 +293,6 @@ sub _doc { $tl = join '', <$f>; close $f; } - $tl =~ s/&/&/g; - $tl =~ s/</</g; - $tl =~ s/>/>/g; - form action => "/tladmin/$lang?doc=$doc", method => 'POST', 'accept-charset' => 'utf-8'; div class => 'mainbox'; @@ -320,9 +311,7 @@ sub _doc { pre style => 'font: 12px Tahoma; border: none; background: none; margin: 0', $en; end; textarea name => 'tl', id => 'tl', rows => ($en =~ y/\n//), - style => 'border: none; float: left; width: 49%; white-space: nowrap', wrap => 'off'; - lit $tl; - end; + style => 'border: none; float: left; width: 49%; white-space: nowrap', wrap => 'off', $tl; clearfloat; if(_allowed($self, $lang)) { br; diff --git a/lib/VNDB/Util/LayoutHTML.pm b/lib/VNDB/Util/LayoutHTML.pm index f8ce275a..7c03b6a3 100644 --- a/lib/VNDB/Util/LayoutHTML.pm +++ b/lib/VNDB/Util/LayoutHTML.pm @@ -12,7 +12,7 @@ our @EXPORT = qw|htmlHeader htmlFooter|; sub htmlHeader { # %options->{ title, noindex, search, feeds, svg } my($self, %o) = @_; - my $skin = $self->reqParam('skin') || $self->authPref('skin') || $self->{skin_default}; + my $skin = $self->reqGet('skin') || $self->authPref('skin') || $self->{skin_default}; $skin = $self->{skin_default} if !$self->{skins}{$skin} || !-d "$VNDB::ROOT/static/s/$skin"; # heading diff --git a/lib/VNDB/Util/Misc.pm b/lib/VNDB/Util/Misc.pm index 15ab79b9..9f281ee7 100644 --- a/lib/VNDB/Util/Misc.pm +++ b/lib/VNDB/Util/Misc.pm @@ -106,7 +106,7 @@ sub ieCheck { return 1 if !$self->reqHeader('User-Agent') || $self->reqHeader('User-Agent') !~ /MSIE [67]/ || $self->reqCookie('ie_sucks'); - if($self->reqParam('i-still-want-access')) { + if($self->reqGet('i-still-want-access')) { (my $ref = $self->reqHeader('Referer') || '/') =~ s/^\Q$self->{url}//; $self->resRedirect($ref, 'temp'); $self->resCookie('ie_sucks' => 1); |