Zeilenumbrueche entfernt und einmal locales.pl

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

index 124e972..fe9d2b8 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -143,7 +143,6 @@ sub new {
    $self->{action} =~ s/( |-|,|#)/_/g;
  
    $self->{version}   = "2.2.0";
-  $self->{dbversion} = "2.2.0";
  
    $main::lxdebug->leave_sub();
  
@@ -198,7 +197,7 @@ sub quote {
    my ($self, $str) = @_;
  
    if ($str && !ref($str)) {
-    $str =~ s/"/&quot;/g;
+    $str =~ s/\"/&quot;/g;
    }
  
    $str;
@@ -209,7 +208,7 @@ sub unquote {
    my ($self, $str) = @_;
  
    if ($str && !ref($str)) {
-    $str =~ s/&quot;/"/g;
+    $str =~ s/&quot;/\"/g;
    }
  
    $str;
@@ -245,17 +244,7 @@ sub error {
      $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";
  
@@ -421,26 +410,63 @@ function fokus(){document.$self->{fokus}.focus();}
    $main::lxdebug->leave_sub();
  }
  
+use Data::Dumper;
  sub parse_html_template {
    $main::lxdebug->enter_sub();
  
-  my ($self, $file) = @_;
+  my ($self, $file, $additional_params) = @_;
+  my $language;
  
-  my $template = HTML::Template->new("filename" => "templates/webpages/$file",
+  if (!defined($main::myconfig) || !defined($main::myconfig{"countrycode"})) {
+    $language = $main::language;
+  } else {
+    $language = $main::myconfig{"countrycode"};
+  }
+
+  if (-f "templates/webpages/${file}_${language}.html") {
+    if ((-f ".developer") &&
+        (-f "templates/webpages/${file}_master.html") &&
+        ((stat("templates/webpages/${file}_master.html"))[9] >
+         (stat("templates/webpages/${file}_${language}.html"))[9])) {
+      my $info = "Developper information: templates/webpages/${file}_master.html is newer than the localized version.\n" .
+        "Please re-run 'locales.pl' in 'locale/${language}'.";
+      print(qq|<pre>$info</pre>|);
+      die($info);
+    }
+
+    $file = "templates/webpages/${file}_${language}.html";
+  } elsif (-f "templates/webpages/${file}.html") {
+    $file = "templates/webpages/${file}.html";
+  } else {
+    my $info = "Web page template '${file}' not found.\n" .
+      "Please re-run 'locales.pl' in 'locale/${language}'.";
+    print(qq|<pre>$info</pre>|);
+    die($info);
+  }
+
+  my $template = HTML::Template->new("filename" => $file,
                                       "die_on_bad_params" => 0,
                                       "strict" => 0,
                                       "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"};
    }
  
-  foreach my $key (keys(%{$self})) {
-    if (("DEBUG" ne $key) && grep(${key}, @params)) {
+  if ($additional_params->{"DEBUG"}) {
+    $additional_params->{"DEBUG"} =
+      "<br><em>DEBUG INFORMATION:</em><pre>" . $additional_params->{"DEBUG"} . "</pre>";
+  }
+
+  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});
      }
    }
@@ -455,10 +481,11 @@ sub parse_html_template {
  sub show_generic_error {
    my ($self, $error, $title) = @_;
  
-  $self->{"title"} = $title if ($title);
+  my $add_params = {};
+  $add_params->{"title"} = $title if ($title);
    $self->{"label_error"} = $error;
  
-  print($self->parse_html_template("generic/error.html"));
+  print($self->parse_html_template("generic/error", $add_params));
  }
  
  # write Trigger JavaScript-Code ($qty = quantity of Triggers)
@@ -665,7 +692,7 @@ sub parse_amount {
    }
  
    if ($myconfig->{numberformat} eq "1'000.00") {
-    $amount =~ s/'//g;
+    $amount =~ s/\'//g;
    }
  
    $amount =~ s/,//g;