Weitere Sonderzeichen escapen.

[mfinanz.git] / SL / Template.pm

diff --git a/SL/Template.pm b/SL/Template.pm
index 27ebb36a37f02d62bcb49a0a15660243cad1a8c8..e4e940ba2d2370b005cb03321f58d89eeb3e757a 100644 (file)
--- a/SL/Template.pm
+++ b/SL/Template.pm
@@ -91,7 +91,7 @@ sub format_string {
                  '<pagebreak>',
                  '&', quotemeta("\n"),
                  '"', '\$', '%', '_', '#', quotemeta('^'),
-                 '{', '}',  '<', '>', '£', "\r"
+                 '{', '}',  '<', '>', '£', "\r", '±', '\xe1',
                  ],
      quotemeta("\\") => '\\textbackslash ',
      '<pagebreak>'   => '',
@@ -107,6 +107,8 @@ sub format_string {
      '>'             => '$>$',
      '£'             => '\pounds ',
      "\r"            => "",
+     '±'             => '$\pm$',
+     '\xe1'          => '$\bullet$',
      quotemeta('^')  => '\^\\',
      quotemeta("\n") => '\newline '
      );
@@ -124,6 +126,8 @@ sub format_string {
     $variable =~ s/\$\<\$${key}\$\>\$(.*?)\$<\$\/${key}\$>\$/\\${new}\{$1\}/gi;
   }
 
+  $variable =~ s/[\x00-\x1f]//g;
+
   return $variable;
 }
 
@@ -213,7 +217,9 @@ sub parse_foreach {
       $sum += $form->parse_amount($self->{"myconfig"},
                                   $form->{"linetotal"}->[$i]);
     }
-
+    
+    $form->{"cumulatelinetotal"}[$i] = $form->format_amount($self->{"myconfig"}, $sum, 2);
+    
     my $new_text = $self->parse_block($text, (@indices, $i));
     return undef unless (defined($new_text));
     $new_contents .= $start_tag . $new_text . $end_tag;
@@ -1305,16 +1311,17 @@ sub format_string {
 sub get_mime_type() {
   my ($self) = @_;
 
-  if ($self->{"form"}->{"format"} =~ /xml/i) {
+  if ($self->{"form"}->{"format"} =~ /elsterwinston/i) {
     return "application/xml ";
+  } elsif ($self->{"form"}->{"format"} =~ /elstertaxbird/i) {
+    return "application/x-taxbird";
   } else {
-    return "text/xml";
+    return "text";
   }
 }
 
 sub uses_temp_file {
-#  my ($self) = @_;
-  # no tempfile needet for XML Output
+  # tempfile needet for XML Output
   return 1;
 }