ParseFilter: Bugfix bei short circuit bedingung

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

index 624c01fc8f3ebbb524ab838f84c152157f6e888e..da832f8712aa0266f02055b98d7224bcf2327643 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -722,10 +722,15 @@ sub header {
      </script>|;
    }
  
+  my  %doctypes = (
+    strict       => qq|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|,
+    transitional => qq|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|,
+    frameset     => qq|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|,
+  );
+
    # output
    print $self->create_http_response(content_type => 'text/html', charset => $db_charset);
-  print "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN' 'http://www.w3.org/TR/html4/strict.dtd'>\n"
-    if  $ENV{'HTTP_USER_AGENT'} =~ m/MSIE\s+\d/; # Other browsers may choke on menu scripts with DOCTYPE.
+  print $doctypes{$params{doctype} || 'transitional'}, $/;
    print <<EOT;
  <html>
   <head>
@@ -734,9 +739,9 @@ sub header {
  EOT
    print "  $_\n" for @header;
    print <<EOT;
-  <link rel="stylesheet" href="css/jquery.autocomplete.css" type="text/css" />
-  <meta name="robots" content="noindex,nofollow" />
-  <link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
+  <link rel="stylesheet" href="css/jquery.autocomplete.css" type="text/css">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="css/tabcontent.css">
    <script type="text/javascript" src="js/tabcontent.js">
  
    /***********************************************
@@ -1408,7 +1413,7 @@ sub parse_template {
        for my $i (1 .. $self->{copies}) {
          if ($self->{OUT}) {
            open OUT, '>', $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!");
-          print OUT while <IN>;
+          print OUT $_ while <IN>;
            close OUT;
            seek IN, 0, 0;