Die HTML-Vorlagen werden nun ebenfalls von locales.pl uebersetzt. Dabei werden alle...

[mfinanz.git] / SL / Form.pm
diff --git a/SL/Form.pm b/SL/Form.pm

index db2cb49079b60f9c66ef6ef08373217675ec7b1e..90f412018895a6931a8815d2de8db440debf45e5 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -245,17 +245,7 @@ sub error {
      $msg =~ s/\n/<br>/g;
  
      $self->header;
      $msg =~ s/\n/<br>/g;
  
      $self->header;
-
-    print qq|
-    <body>
-
-    <h2 class=error>Error!</h2>
-
-    <p><b>$msg</b>
-
-    </body>
-    </html>
-    |;
+    $self->show_generic_error($msg);
  
      die "Error: $msg\n";
  
  
      die "Error: $msg\n";
  
@@ -421,14 +411,15 @@ function fokus(){document.$self->{fokus}.focus();}
    $main::lxdebug->leave_sub();
  }
  
    $main::lxdebug->leave_sub();
  }
  
+use Data::Dumper;
  sub parse_html_template {
    $main::lxdebug->enter_sub();
  
  sub parse_html_template {
    $main::lxdebug->enter_sub();
  
-  my ($self, $myconfig, $file) = @_;
+  my ($self, $file, $additional_params) = @_;
  
  
-  if (-f "templates/webpages/${file}_" . $myconfig->{"countrycode"} .
+  if (-f "templates/webpages/${file}_" . $main::myconfig{"countrycode"} .
        ".html") {
        ".html") {
-    $file = "templates/webpages/${file}_" . $myconfig->{"countrycode"} .
+    $file = "templates/webpages/${file}_" . $main::myconfig{"countrycode"} .
        ".html";
    } elsif (-f "templates/webpages/${file}.html") {
      $file = "templates/webpages/${file}.html";
        ".html";
    } elsif (-f "templates/webpages/${file}.html") {
      $file = "templates/webpages/${file}.html";
@@ -442,15 +433,23 @@ sub parse_html_template {
                                       "case_sensitive" => 1,
                                       "loop_context_vars" => 1,
                                       "global_vars" => 1);
                                       "case_sensitive" => 1,
                                       "loop_context_vars" => 1,
                                       "global_vars" => 1);
-  my @params = $template->param();
  
  
-  if (grep("DEBUG", @params) && $self->{"DEBUG"}) {
-    $template->param("DEBUG" => "<br><em>DEBUG INFORMATION:</em><pre>" .
-                     $self->{"DEBUG"} . "</pre>");
+  $additional_params = {} unless ($additional_params);
+  if ($self->{"DEBUG"}) {
+    $additional_params->{"DEBUG"} = $self->{"DEBUG"};
+  }
+
+  if ($additional_params->{"DEBUG"}) {
+    $additional_params->{"DEBUG"} =
+      "<br><em>DEBUG INFORMATION:</em><pre>" . $additional_params->{"DEBUG"} . "</pre>";
    }
  
    }
  
-  foreach my $key (keys(%{$self})) {
-    if (("DEBUG" ne $key) && grep(${key}, @params)) {
+  my @additional_param_names = keys(%{$additional_params});
+
+  foreach my $key ($template->param()) {
+    if (grep(/^${key}$/, @additional_param_names)) {
+      $template->param($key => $additional_params->{$key});
+    } else {
        $template->param($key => $self->{$key});
      }
    }
        $template->param($key => $self->{$key});
      }
    }
@@ -463,12 +462,13 @@ sub parse_html_template {
  }
  
  sub show_generic_error {
  }
  
  sub show_generic_error {
-  my ($self, $myconfig, $error, $title) = @_;
+  my ($self, $error, $title) = @_;
  
  
-  $self->{"title"} = $title if ($title);
+  my $add_params = {};
+  $add_params->{"title"} = $title if ($title);
    $self->{"label_error"} = $error;
  
    $self->{"label_error"} = $error;
  
-  print($self->parse_html_template($myconfig, "generic/error"));
+  print($self->parse_html_template("generic/error", $add_params));
  }
  
  # write Trigger JavaScript-Code ($qty = quantity of Triggers)
  }
  
  # write Trigger JavaScript-Code ($qty = quantity of Triggers)