From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 24 May 2007 09:07:40 +0000 (+0000)
Subject: Mehr Optionen für print_options(), um bestimmte Einträge zu deaktivieren.
X-Git-Tag: release-2.4.3^2~265
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=250a086bfcb9cb51fce6f347b295b3de6166ad83;p=kivitendo-erp.git

Mehr Optionen für print_options(), um bestimmte Einträge zu deaktivieren.
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index d696dd200..7b5d3fe0b 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1379,14 +1379,16 @@ sub print_options {
         if ($form->{media} ne 'email');
 
   push @FORMAT, grep $_,
-    ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) ?
+    ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)
+     && !$options->{no_opendocument}) ?
       opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
-    ($latex_templates) ? (
-      opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')),
-      opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript'))
-    ) : undef,
-      opthash("html", $form->{DF}{html}, "HTML"),
-    ($opendocument_templates) ?
+    ($latex_templates) ?
+      opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
+    ($latex_templates && !$options->{no_postscript}) ?
+      opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
+    (!$options->{no_html}) ?
+      opthash("html", $form->{DF}{html}, "HTML") : undef,
+    ($opendocument_templates && !$options->{no_opendocument}) ?
       opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
 
   push @LANGUAGE_ID,