Revision be6f6cfd
Von Moritz Bunkus vor fast 14 Jahren hinzugefügt
| bin/mozilla/admin.pl | ||
|---|---|---|
| 767 | 767 |
} |
| 768 | 768 |
closedir SQLDIR; |
| 769 | 769 |
|
| 770 |
my $default_charset = $main::dbcharset;
|
|
| 770 |
my $default_charset = $::lx_office_conf{system}->{dbcharset};
|
|
| 771 | 771 |
$default_charset ||= Common::DEFAULT_CHARSET; |
| 772 | 772 |
|
| 773 | 773 |
my $cluster_encoding = User->dbclusterencoding($form); |
| 774 | 774 |
if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) {
|
| 775 |
if ($main::dbcharset !~ m/^UTF-?8$/i) {
|
|
| 775 |
if ($::lx_office_conf{system}->{dbcharset} !~ m/^UTF-?8$/i) {
|
|
| 776 | 776 |
$form->show_generic_error($locale->text('The selected PostgreSQL installation uses UTF-8 as its encoding. ' .
|
| 777 | 777 |
'Therefore you have to configure Lx-Office to use UTF-8 as well.'), |
| 778 | 778 |
'back_button' => 1); |
| ... | ... | |
| 934 | 934 |
|
| 935 | 935 |
map { $mail->{$_} = $form->{$_} } qw(from to cc subject message);
|
| 936 | 936 |
|
| 937 |
$mail->{charset} = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET;
|
|
| 937 |
$mail->{charset} = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
|
|
| 938 | 938 |
$mail->{attachments} = [ { "filename" => $tmp, "name" => $name } ];
|
| 939 | 939 |
$mail->send(); |
| 940 | 940 |
|
| ... | ... | |
| 958 | 958 |
$form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
|
| 959 | 959 |
} |
| 960 | 960 |
|
| 961 |
my $default_charset = $main::dbcharset;
|
|
| 961 |
my $default_charset = $::lx_office_conf{system}->{dbcharset};
|
|
| 962 | 962 |
$default_charset ||= Common::DEFAULT_CHARSET; |
| 963 | 963 |
|
| 964 | 964 |
$form->{DBENCODINGS} = [];
|
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