Revision be6f6cfd
Von Moritz Bunkus vor fast 14 Jahren hinzugefügt
| SL/Form.pm | ||
|---|---|---|
| 262 | 262 |
$self->_request_to_hash($content); |
| 263 | 263 |
} |
| 264 | 264 |
|
| 265 |
my $db_charset = $main::dbcharset;
|
|
| 265 |
my $db_charset = $::lx_office_conf{system}->{dbcharset};
|
|
| 266 | 266 |
$db_charset ||= Common::DEFAULT_CHARSET; |
| 267 | 267 |
|
| 268 | 268 |
my $encoding = $self->{INPUT_ENCODING} || $db_charset;
|
| ... | ... | |
| 636 | 636 |
# extra code is currently only used by menuv3 and menuv4 to set their css. |
| 637 | 637 |
# it is strongly deprecated, and will be changed in a future version. |
| 638 | 638 |
my ($self, $extra_code) = @_; |
| 639 |
my $db_charset = $::dbcharset || Common::DEFAULT_CHARSET;
|
|
| 639 |
my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
|
|
| 640 | 640 |
my @header; |
| 641 | 641 |
|
| 642 | 642 |
$::lxdebug->leave_sub and return if !$ENV{HTTP_USER_AGENT} || $self->{header}++;
|
| ... | ... | |
| 720 | 720 |
|
| 721 | 721 |
my ($self) = @_; |
| 722 | 722 |
|
| 723 |
my $db_charset = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET;
|
|
| 723 |
my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
|
|
| 724 | 724 |
my $cgi = $main::cgi || CGI->new('');
|
| 725 | 725 |
my $output = $cgi->header('-charset' => $db_charset);
|
| 726 | 726 |
|
| ... | ... | |
| 761 | 761 |
my $language; |
| 762 | 762 |
|
| 763 | 763 |
if (!%::myconfig || !$::myconfig{"countrycode"}) {
|
| 764 |
$language = $main::language;
|
|
| 764 |
$language = $::lx_office_conf{system}->{language};
|
|
| 765 | 765 |
} else {
|
| 766 | 766 |
$language = $main::myconfig{"countrycode"};
|
| 767 | 767 |
} |
| ... | ... | |
| 802 | 802 |
map { $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys %::myconfig;
|
| 803 | 803 |
} |
| 804 | 804 |
|
| 805 |
$additional_params->{"conf_dbcharset"} = $::dbcharset;
|
|
| 806 |
$additional_params->{"conf_webdav"} = $::webdav;
|
|
| 807 |
$additional_params->{"conf_lizenzen"} = $::lizenzen;
|
|
| 805 |
$additional_params->{"conf_dbcharset"} = $::lx_office_conf{system}->{dbcharset};
|
|
| 806 |
$additional_params->{"conf_webdav"} = $::lx_office_conf{system}->{webdav};
|
|
| 807 |
$additional_params->{"conf_lizenzen"} = $::lx_office_conf{system}->{lizenzen};
|
|
| 808 | 808 |
$additional_params->{"conf_latex_templates"} = $::lx_office_conf{print_templates}->{latex};
|
| 809 | 809 |
$additional_params->{"conf_opendocument_templates"} = $::lx_office_conf{print_templates}->{opendocument};
|
| 810 |
$additional_params->{"conf_vertreter"} = $::vertreter;
|
|
| 811 |
$additional_params->{"conf_show_best_before"} = $::show_best_before;
|
|
| 812 |
$additional_params->{"conf_parts_image_css"} = $::parts_image_css;
|
|
| 813 |
$additional_params->{"conf_parts_listing_images"} = $::parts_listing_images;
|
|
| 814 |
$additional_params->{"conf_parts_show_image"} = $::parts_show_image;
|
|
| 810 |
$additional_params->{"conf_vertreter"} = $::lx_office_conf{system}->{vertreter};
|
|
| 811 |
$additional_params->{"conf_show_best_before"} = $::lx_office_conf{system}->{show_best_before};
|
|
| 812 |
$additional_params->{"conf_parts_image_css"} = $::lx_office_conf{features}->{parts_image_css};
|
|
| 813 |
$additional_params->{"conf_parts_listing_images"} = $::lx_office_conf{features}->{parts_listing_images};
|
|
| 814 |
$additional_params->{"conf_parts_show_image"} = $::lx_office_conf{features}->{parts_show_image};
|
|
| 815 | 815 |
|
| 816 | 816 |
if (%main::debug_options) {
|
| 817 | 817 |
map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
|
| ... | ... | |
| 1311 | 1311 |
|
| 1312 | 1312 |
map { $mail->{$_} = $self->{$_} }
|
| 1313 | 1313 |
qw(cc bcc subject message version format); |
| 1314 |
$mail->{charset} = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET;
|
|
| 1314 |
$mail->{charset} = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
|
|
| 1315 | 1315 |
$mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};
|
| 1316 | 1316 |
$mail->{from} = qq|"$myconfig->{name}" <$myconfig->{email}>|;
|
| 1317 | 1317 |
$mail->{fileid} = "$fileid.";
|
Auch abrufbar als: Unified diff
Globale Variablen für Systemeinstellungen und Features nach %::lx_office_conf verschoben
Betroffen sind:
$webdav
$vertreter
$lizenzen
$show_best_before
$parts_show_image
$parts_image_css
$parts_listing_images
$eur
$dbcharset
$language