diff options
| -rwxr-xr-x | LedgerSMB.pm | 8 | ||||
| -rwxr-xr-x | LedgerSMB/Template/HTML.pm | 4 | ||||
| -rw-r--r-- | Makefile.PL | 12 |
3 files changed, 17 insertions, 7 deletions
diff --git a/LedgerSMB.pm b/LedgerSMB.pm index 27abf20f..97e30403 100755 --- a/LedgerSMB.pm +++ b/LedgerSMB.pm @@ -116,8 +116,8 @@ non-numbers. #==================================================================== =cut -use CGI; -use Math::BigFloat lib => 'GMP'; +use CGI::Simple; +use Math::BigFloat; use LedgerSMB::Sysconfig; use Data::Dumper; use LedgerSMB::Session; @@ -137,7 +137,7 @@ sub new { $self->{version} = $VERSION; $self->{dbversion} = "1.2.0"; bless $self, $type; - my $query = ($argstr) ? new CGI($argstr) : new CGI; + my $query = ($argstr) ? new CGI::Simple($argstr) : new CGI::Simple; my $params = $query->Vars; $self->{VERSION} = $VERSION; @@ -158,7 +158,7 @@ sub new { } - if ( ( $self->{script} =~ m#(..|\\|/)# ) ) { + if ( ( $self->{script} =~ m#(\.\.|\\|/)# ) ) { $self->error("Access Denied"); } if (!$self->{login}){ diff --git a/LedgerSMB/Template/HTML.pm b/LedgerSMB/Template/HTML.pm index cb9bd2fe..340b6c94 100755 --- a/LedgerSMB/Template/HTML.pm +++ b/LedgerSMB/Template/HTML.pm @@ -40,7 +40,7 @@ holders, see the CONTRIBUTORS file. package LedgerSMB::Template::HTML; use Error qw(:try); -use CGI; +use CGI::Simple::Standard qw(:html); use Template; use LedgerSMB::Template::TTI18N; @@ -61,7 +61,7 @@ sub preprocess { push @{$vars}, preprocess( $_ ); } } elsif (!$type) { - return CGI::escapeHTML($rawvars); + return escapeHTML($rawvars); } else { # Hashes and objects for ( keys %{$rawvars} ) { $vars->{preprocess($_)} = preprocess( $rawvars->{$_} ); diff --git a/Makefile.PL b/Makefile.PL index 0ebd361e..f7950a9b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,7 +5,7 @@ use warnings; use inc::Module::Install 0.65; name 'LedgerSMB'; -version '1.2.3'; +version '1.2.99'; license 'GPL'; perl_version '5.8.1'; @@ -30,6 +30,7 @@ requires 'MIME::Lite'; requires 'Template' => '2.14'; requires 'Template::Latex'; requires 'Error'; +requires 'CGI::Simple'; build_requires 'Test::More'; build_requires 'Test::Trap'; @@ -48,5 +49,14 @@ feature 'Developer tool dependencies', 'Getopt::Long' => 0, 'FileHandle' => 0; +#feature 'Excel output', +# -default => 0, +# 'Excel::Template::Plus' => 0; +# +#feature 'OpenOffice.org output', +# -default => 0, +# 'XML::Twig' => 0, +# 'OpenOffice::OODoc' => 0; + auto_install; WriteAll; |