Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2b339152

Von Moritz Bunkus vor mehr als 13 Jahren hinzugefügt

  • ID 2b3391521b469f9f7b2928d104a9f620dddb25d2
  • Vorgänger f2af9def
  • Nachfolger be6f6cfd

Globale Variablen für Druckvorlagen nach %::lx_office_conf verschoben

Betroffen sind:
$latex_templates
$excel_templates
$opendocument_templates
$openofficeorg_daemon
$openofficeorg_daemon_port

Unterschiede anzeigen:

bin/mozilla/io.pl
1166 1166

  
1167 1167
  push @MEDIA, grep $_,
1168 1168
      opthash("screen",              $form->{OP}{screen},              $locale->text('Screen')),
1169
    ($form->{printers} && scalar @{ $form->{printers} } && $main::latex_templates) ?
1169
    ($form->{printers} && scalar @{ $form->{printers} } && $::lx_office_conf{print_templates}->{latex}) ?
1170 1170
      opthash("printer",             $form->{OP}{printer},             $locale->text('Printer')) : undef,
1171
    ($main::latex_templates && !$options{no_queue}) ?
1171
    ($::lx_office_conf{print_templates}->{latex} && !$options{no_queue}) ?
1172 1172
      opthash("queue",               $form->{OP}{queue},               $locale->text('Queue')) : undef
1173 1173
        if ($form->{media} ne 'email');
1174 1174

  
1175 1175
  push @FORMAT, grep $_,
1176
    ($main::opendocument_templates &&     $::lx_office_conf{applications}->{openofficeorg_writer}  &&     $::lx_office_conf{applications}->{xvfb}
1177
                                   && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
1176
    ($::lx_office_conf{print_templates}->{opendocument} &&     $::lx_office_conf{applications}->{openofficeorg_writer}  &&     $::lx_office_conf{applications}->{xvfb}
1177
                                                        && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
1178 1178
     && !$options{no_opendocument_pdf}) ?
1179 1179
      opthash("opendocument_pdf",    $form->{DF}{"opendocument_pdf"},  $locale->text("PDF (OpenDocument/OASIS)")) : undef,
1180
    ($main::latex_templates) ?
1180
    ($::lx_office_conf{print_templates}->{latex}) ?
1181 1181
      opthash("pdf",                 $form->{DF}{pdf},                 $locale->text('PDF')) : undef,
1182
    ($main::latex_templates && !$options{no_postscript}) ?
1182
    ($::lx_office_conf{print_templates}->{latex} && !$options{no_postscript}) ?
1183 1183
      opthash("postscript",          $form->{DF}{postscript},          $locale->text('Postscript')) : undef,
1184 1184
    (!$options{no_html}) ?
1185 1185
      opthash("html", $form->{DF}{html}, "HTML") : undef,
1186
    ($main::opendocument_templates && !$options{no_opendocument}) ?
1186
    ($::lx_office_conf{print_templates}->{opendocument} && !$options{no_opendocument}) ?
1187 1187
      opthash("opendocument",        $form->{DF}{opendocument},        $locale->text("OpenDocument/OASIS")) : undef,
1188
    ($main::excel_templates && !$options{no_excel}) ?
1188
    ($::lx_office_conf{print_templates}->{excel} && !$options{no_excel}) ?
1189 1189
      opthash("excel",               $form->{DF}{excel},               $locale->text("Excel")) : undef;
1190 1190

  
1191 1191
  push @LANGUAGE_ID,
......
1213 1213
    );
1214 1214

  
1215 1215
  my %template_vars = (
1216
    display_copies       => scalar @{ $form->{printers} || [] } && $main::latex_templates && $form->{media} ne 'email',
1216
    display_copies       => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
1217 1217
    display_remove_draft => (!$form->{id} && $form->{draft_id}),
1218 1218
    display_groupitems   => !$dont_display_groupitems{$form->{type}},
1219 1219
    groupitems_checked   => $form->{groupitems} ? "checked" : '',

Auch abrufbar als: Unified diff