projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hochgeladene Dateien nicht mittels _recode_recursively umcodieren
[kivitendo-erp.git]
/
bin
/
mozilla
/
admin.pl
diff --git
a/bin/mozilla/admin.pl
b/bin/mozilla/admin.pl
index
acaae17
..
b89487c
100755
(executable)
--- a/
bin/mozilla/admin.pl
+++ b/
bin/mozilla/admin.pl
@@
-194,6
+194,7
@@
sub create_auth_tables {
$main::auth->save_group($group);
}
$main::auth->save_group($group);
}
+ _apply_dbupgrade_scripts();
login();
}
login();
}
@@
-767,12
+768,12
@@
sub create_dataset {
}
closedir SQLDIR;
}
closedir SQLDIR;
- my $default_charset = $
main::dbcharset
;
+ my $default_charset = $
::lx_office_conf{system}->{dbcharset}
;
$default_charset ||= Common::DEFAULT_CHARSET;
my $cluster_encoding = User->dbclusterencoding($form);
if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) {
$default_charset ||= Common::DEFAULT_CHARSET;
my $cluster_encoding = User->dbclusterencoding($form);
if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) {
- if ($
main::dbcharset
!~ m/^UTF-?8$/i) {
+ if ($
::lx_office_conf{system}->{dbcharset}
!~ m/^UTF-?8$/i) {
$form->show_generic_error($locale->text('The selected PostgreSQL installation uses UTF-8 as its encoding. ' .
'Therefore you have to configure Lx-Office to use UTF-8 as well.'),
'back_button' => 1);
$form->show_generic_error($locale->text('The selected PostgreSQL installation uses UTF-8 as its encoding. ' .
'Therefore you have to configure Lx-Office to use UTF-8 as well.'),
'back_button' => 1);
@@
-845,8
+846,8
@@
sub backup_dataset {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
- if (
"$main::pg_dump_exe"
eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ if (
$::lx_office_conf{applications}->{pg_dump}
eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in
the configuration
.'));
}
my @dbsources = sort User->dbsources($form);
}
my @dbsources = sort User->dbsources($form);
@@
-867,10
+868,10
@@
sub backup_dataset_start {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
-
$main::pg_dump_exe ||=
"pg_dump";
+
my $pg_dump_exe = $::lx_office_conf{applications}->{pg_dump} ||
"pg_dump";
- if ("$
main::
pg_dump_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ if ("$pg_dump_exe" eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in
the configuration
.'));
}
$form->isblank("dbname", $locale->text('The dataset name is missing.'));
}
$form->isblank("dbname", $locale->text('The dataset name is missing.'));
@@
-895,7
+896,7
@@
sub backup_dataset_start {
push @args, ("-p", $form->{dbport}) if ($form->{dbport});
push @args, $form->{dbname};
push @args, ("-p", $form->{dbport}) if ($form->{dbport});
push @args, $form->{dbname};
- my $cmd = "$
main::
pg_dump_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+ my $cmd = "$pg_dump_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
my $name = "dataset_backup_$form->{dbname}_" . strftime("%Y%m%d", localtime()) . ".tar";
if ($form->{destination} ne "email") {
my $name = "dataset_backup_$form->{dbname}_" . strftime("%Y%m%d", localtime()) . ".tar";
if ($form->{destination} ne "email") {
@@
-934,7
+935,7
@@
sub backup_dataset_start {
map { $mail->{$_} = $form->{$_} } qw(from to cc subject message);
map { $mail->{$_} = $form->{$_} } qw(from to cc subject message);
- $mail->{charset} = $
main::dbcharset ? $main::dbcharset :
Common::DEFAULT_CHARSET;
+ $mail->{charset} = $
::lx_office_conf{system}->{dbcharset} ||
Common::DEFAULT_CHARSET;
$mail->{attachments} = [ { "filename" => $tmp, "name" => $name } ];
$mail->send();
$mail->{attachments} = [ { "filename" => $tmp, "name" => $name } ];
$mail->send();
@@
-954,11
+955,11
@@
sub restore_dataset {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
- if (
"$main::pg_restore_exe"
eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ if (
$::lx_office_conf{applications}->{pg_restore}
eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in
the configuration
.'));
}
}
- my $default_charset = $
main::dbcharset
;
+ my $default_charset = $
::lx_office_conf{system}->{dbcharset}
;
$default_charset ||= Common::DEFAULT_CHARSET;
$form->{DBENCODINGS} = [];
$default_charset ||= Common::DEFAULT_CHARSET;
$form->{DBENCODINGS} = [];
@@
-979,10
+980,10
@@
sub restore_dataset_start {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
-
$main::pg_restore_exe ||=
"pg_restore";
+
my $pg_restore_exe = $::lx_office_conf{applications}->{pg_restore} ||
"pg_restore";
- if ("$
main::
pg_restore_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ if ("$pg_restore_exe" eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in
the configuration
.'));
}
$form->isblank("new_dbname", $locale->text('The dataset name is missing.'));
}
$form->isblank("new_dbname", $locale->text('The dataset name is missing.'));
@@
-1068,7
+1069,7
@@
sub restore_dataset_start {
push @args, ("-p", $form->{dbport}) if ($form->{dbport});
push @args, $tmp;
push @args, ("-p", $form->{dbport}) if ($form->{dbport});
push @args, $tmp;
- my $cmd = "$
main::
pg_restore_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+ my $cmd = "$pg_restore_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
my $in = IO::File->new("$cmd 2>&1 |");
my $in = IO::File->new("$cmd 2>&1 |");