From e46f634c49aa4e174d6cc351b25a60d33c251b25 Mon Sep 17 00:00:00 2001 From: Yorhel Date: Tue, 25 Jan 2011 16:45:45 +0100 Subject: TUWF: Initial convert from YAWF to TUWF There may still be some bugs present and I've only converted the points where TUWF is incompatible with YAWF. The new TUWF features are not in use yet, I'll do that later on. Note that, in order to run the new code, TUWF must be installed on your system. The configuration for the TransAdmin plugin has also changed. Other than that there shouldn't be any issues. --- lib/VNDB/Plugin/TransAdmin.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/VNDB/Plugin/TransAdmin.pm') diff --git a/lib/VNDB/Plugin/TransAdmin.pm b/lib/VNDB/Plugin/TransAdmin.pm index fa8e98ef..35dd10ce 100644 --- a/lib/VNDB/Plugin/TransAdmin.pm +++ b/lib/VNDB/Plugin/TransAdmin.pm @@ -1,9 +1,9 @@ # This plugin provides a quick and dirty user interface to editing lang.txt, # to use it, add the following to your data/config.pl: # -# if($INC{"YAWF.pm"}) { -# require VNDB::Plugin::TransAdmin; -# $VNDB::S{transadmin} = { +# if($TUWF::OBJ) { +# TUWF::load('VNDB::Plugin::TransAdmin'); +# $TUWF::OBJ->{transadmin} = { # => 'all' || || # }; # } @@ -16,7 +16,7 @@ package VNDB::Plugin::TransAdmin; use strict; use warnings; -use YAWF ':html'; +use TUWF ':html'; use LangFile; use VNDB::Func; @@ -24,7 +24,7 @@ use VNDB::Func; my $langfile = "$VNDB::ROOT/data/lang.txt"; -YAWF::register( +TUWF::register( qr{tladmin(?:/([a-z]+))?} => \&tladmin ); @@ -41,7 +41,7 @@ sub tladmin { $lang ||= ''; my $intro = $lang =~ s/intro//; - return 404 if $lang && ($lang eq 'en' || !grep $_ eq $lang, $self->{l10n}->languages); + return $self->resNotFound if $lang && ($lang eq 'en' || !grep $_ eq $lang, $self->{l10n}->languages); my $sect = $self->reqParam('sect')||''; my $doc = $self->reqParam('doc')||''; -- cgit v1.2.3 From 78f364130abe51a4baeeef1e20a7292c3a1a28dd Mon Sep 17 00:00:00 2001 From: Yorhel Date: Thu, 27 Jan 2011 10:43:19 +0100 Subject: TUWF: Use the uri_escape() provided by TUWF --- lib/VNDB/Plugin/TransAdmin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/VNDB/Plugin/TransAdmin.pm') diff --git a/lib/VNDB/Plugin/TransAdmin.pm b/lib/VNDB/Plugin/TransAdmin.pm index 35dd10ce..5729432d 100644 --- a/lib/VNDB/Plugin/TransAdmin.pm +++ b/lib/VNDB/Plugin/TransAdmin.pm @@ -16,7 +16,7 @@ package VNDB::Plugin::TransAdmin; use strict; use warnings; -use TUWF ':html'; +use TUWF ':html', 'uri_escape'; use LangFile; use VNDB::Func; -- cgit v1.2.3 From 09025338975b6bf63411e848419eee802da0c128 Mon Sep 17 00:00:00 2001 From: Yorhel Date: Thu, 3 Feb 2011 17:22:18 +0100 Subject: 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. --- lib/VNDB/Plugin/TransAdmin.pm | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'lib/VNDB/Plugin/TransAdmin.pm') 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; - 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; - 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; -- cgit v1.2.3