diff options
| -rwxr-xr-x | LedgerSMB.pm | 48 | ||||
| -rw-r--r-- | bin/pos.pl | 8 |
2 files changed, 5 insertions, 51 deletions
diff --git a/LedgerSMB.pm b/LedgerSMB.pm index e938a660..51f10115 100755 --- a/LedgerSMB.pm +++ b/LedgerSMB.pm @@ -39,10 +39,6 @@ LedgerSMB::User at some point in the future. If $amount is a Bigfloat, it is returned as is. If it is a string, it is parsed according to the user preferences stored in the LedgerSMB::User object. -=item format_fields (fields => \@array); -This function converts fields to their appropriate representation in -HTML/SGML/XML or LaTeX. - =item is_blank (name => $string) This function returns true if $self->{$string} only consists of whitespace characters or is an empty string. @@ -136,7 +132,7 @@ sub new { } - if (($self->{script} =~ m#(\.\.|\\|/)#)){ + if (($self->{script} =~ m#(..|\\|/)#)){ $self->error("Access Denied"); } @@ -250,48 +246,6 @@ sub redirect { } } -sub format_fields { - # Based on SQL-Ledger's Form::format_string - # We should look at moving this into LedgerSMB::Template. - # And cleaning it up...... Chris - - my $self = shift @_; - my %args = @_; - my @fields = @{$args{fields}}; - - my $format = $self->{format}; - - if ($self->{format} =~ /(postscript|pdf)/) { - $format = 'tex'; - } - - my %replace = ( - 'order' => { - html => [ '<', '>', '\n', '\r' ], - txt => [ '\n', '\r' ], - tex => [ quotemeta('\\'), '&', '\n','\r', - '\$', '%', '_', '#', - quotemeta('^'), '{', '}', '<', '>', '£' - ] }, - html => { '<' => '<', '>' => '>','\n' => '<br />', - '\r' => '<br />' }, - txt => { '\n' => "\n", '\r' => "\r" }, - tex => {'&' => '\&', '$' => '\$', '%' => '\%', '_' => '\_', - '#' => '\#', quotemeta('^') => '\^\\', '{' => '\{', - '}' => '\}', '<' => '$<$', '>' => '$>$', - '\n' => '\newline ', '\r' => '\newline ', - '£' => '\pounds ', quotemeta('\\') => '/'} - ); - - my $key; - - foreach $key (@{ $replace{order}{$format} }) { - for (@fields) { $self->{$_} =~ s/$key/$replace{$format}{$key}/g } - } - -} - - # TODO: Either we should have an amount class with formats and such attached # Or maybe we should move this into the user class... sub format_amount { @@ -124,8 +124,8 @@ sub add { sub openinvoices {
- undef %column_data;
- undef %column_heading;
+ undef $column_data;
+ undef $column_heading;
$ENV{REMOTE_ADDR} =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/;
$form->{till} = $4;
@@ -139,7 +139,7 @@ sub openinvoices { }
$form->{title} = $locale->text('Open');
- transactions;
+ &transactions;
}
@@ -582,7 +582,7 @@ sub form_footer { for (sort { $button{$a}->{ndx} <=> $button{$b}->{ndx} } keys %button) { $form->print_button(\%button, $_) }
-
+
if ($form->{partsgroup}) {
$form->{partsgroup} =~ s/\r//g;
$form->{partsgroup} = $form->quote($form->{partsgroup});
|