SL::Template: Optionen von den Contrllern zum eigentlichen Template-Modul durchleiten

diff --git a/SL/Form.pm b/SL/Form.pm
index 0d6e9ae9afcaead8515c7dcd041733f376ed7c80..ed31ddf68ecc52bd21b902c5c74d35c4a619a298 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1019,7 +1019,8 @@ sub parse_template {
                                       file_name => $self->{IN},
                                       form      => $self,
                                       myconfig  => $myconfig,
                                       file_name => $self->{IN},
                                       form      => $self,
                                       myconfig  => $myconfig,

-                                      userspath => $userspath);
+                                      userspath => $userspath,
+                                      %{ $self->{TEMPLATE_DRIVER_OPTIONS} || {} });

 
   # Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
 
   # Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };

diff --git a/SL/Template/Simple.pm b/SL/Template/Simple.pm
index 8696796bc914b40681cf5e6c379885abf8ff87b4..a4b98ca714b123934683b32fe423c7f7a17d55cf 100644 (file)
--- a/SL/Template/Simple.pm
+++ b/SL/Template/Simple.pm
@@ -34,6 +34,10 @@ sub _init {
 
   $self->{$_} = $params{$_} for keys %params;
 
 
   $self->{$_} = $params{$_} for keys %params;
 

+  $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}   = '"';
 


@@ -135,7 +139,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);
   }