projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rp-patch
[kivitendo-erp.git]
/
SL
/
Template
/
Simple.pm
diff --git
a/SL/Template/Simple.pm
b/SL/Template/Simple.pm
index
b1f155b
..
c525dab
100644
(file)
--- a/
SL/Template/Simple.pm
+++ b/
SL/Template/Simple.pm
@@
-30,12
+30,16
@@
sub new {
}
sub _init {
}
sub _init {
- my $self = shift;
+ my ($self, %params) = @_;
+
+ $params{myconfig} ||= \%::myconfig;
+ $params{userspath} ||= $::lx_office_conf{paths}->{userspath};
+
+ $self->{$_} = $params{$_} for keys %params;
- $self->{source} = shift;
- $self->{form} = shift;
- $self->{myconfig} = shift;
- $self->{userspath} = shift;
+ $self->{variable_content_types} ||= {};
+ $self->{variable_content_types}->{$_} = lc $self->{variable_content_types}->{$_} for keys %{ $self->{variable_content_types} };
+ $self->{default_variable_content_type} = 'text';
$self->{error} = undef;
$self->{quot_re} = '"';
$self->{error} = undef;
$self->{quot_re} = '"';
@@
-48,6
+52,7
@@
sub set_tag_style {
my $tag_start = shift;
my $tag_end = shift;
my $tag_start = shift;
my $tag_end = shift;
+ $self->{custom_tag_style} = 1;
$self->{tag_start} = $tag_start;
$self->{tag_end} = $tag_end;
$self->{tag_start_qm} = quotemeta $tag_start;
$self->{tag_start} = $tag_start;
$self->{tag_end} = $tag_end;
$self->{tag_start_qm} = quotemeta $tag_start;
@@
-137,7
+142,7
@@
sub substitute_vars {
my $value = $self->_get_loop_variable($var, 0, @indices);
$value = $form->parse_amount({ numberformat => $::myconfig{output_numberformat} || $::myconfig{numberformat} }, $value) if $options{NOFORMAT};
my $value = $self->_get_loop_variable($var, 0, @indices);
$value = $form->parse_amount({ numberformat => $::myconfig{output_numberformat} || $::myconfig{numberformat} }, $value) if $options{NOFORMAT};
- $value = $self->format_string($value
)
unless $options{NOESCAPE};
+ $value = $self->format_string($value
, $var)
unless $options{NOESCAPE};
substr($text, $tag_pos, $tag_len, $value);
}
substr($text, $tag_pos, $tag_len, $value);
}