projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
admin.pl
diff --git
a/bin/mozilla/admin.pl
b/bin/mozilla/admin.pl
index
b1b2473
..
ddb12b1
100755
(executable)
--- a/
bin/mozilla/admin.pl
+++ b/
bin/mozilla/admin.pl
@@
-34,6
+34,7
@@
use DBI;
use CGI;
use DBI;
use CGI;
+use Encode;
use English qw(-no_match_vars);
use Fcntl;
use File::Copy;
use English qw(-no_match_vars);
use Fcntl;
use File::Copy;
@@
-78,7
+79,7
@@
sub run {
$form->{favicon} = "favicon.ico";
if ($form->{action}) {
$form->{favicon} = "favicon.ico";
if ($form->{action}) {
- if ($auth->authenticate_root($form->{rpw}
, 0
) != $auth->OK()) {
+ if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) {
$form->{error_message} = $locale->text('Incorrect Password!');
adminlogin();
} else {
$form->{error_message} = $locale->text('Incorrect Password!');
adminlogin();
} else {
@@
-194,6
+195,7
@@
sub create_auth_tables {
$main::auth->save_group($group);
}
$main::auth->save_group($group);
}
+ _apply_dbupgrade_scripts();
login();
}
login();
}
@@
-341,7
+343,10
@@
sub list_users {
delete $members{"root login"};
delete $members{"root login"};
- map { $_->{templates} =~ s|.*/||; } values %members;
+ for (values %members) {
+ $_->{templates} =~ s|.*/||;
+ $_->{login_url} = $::locale->is_utf8 ? Encode::encode('utf-8-strict', $_->{login}) : $_->{login_url};
+ }
$form->{title} = "Lx-Office ERP " . $locale->text('Administration');
$form->{LOCKED} = -e _nologin_file_name();
$form->{title} = "Lx-Office ERP " . $locale->text('Administration');
$form->{LOCKED} = -e _nologin_file_name();
@@
-846,7
+851,7
@@
sub backup_dataset {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
if ($::lx_office_conf{applications}->{pg_dump} eq "DISABLED") {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
if ($::lx_office_conf{applications}->{pg_dump} eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ $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);
@@
-870,7
+875,7
@@
sub backup_dataset_start {
my $pg_dump_exe = $::lx_office_conf{applications}->{pg_dump} || "pg_dump";
if ("$pg_dump_exe" eq "DISABLED") {
my $pg_dump_exe = $::lx_office_conf{applications}->{pg_dump} || "pg_dump";
if ("$pg_dump_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ $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.'));
@@
-955,7
+960,7
@@
sub restore_dataset {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
if ($::lx_office_conf{applications}->{pg_restore} eq "DISABLED") {
$form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
if ($::lx_office_conf{applications}->{pg_restore} eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ $form->error($locale->text('Database backups and restorations are disabled in
the configuration
.'));
}
my $default_charset = $::lx_office_conf{system}->{dbcharset};
}
my $default_charset = $::lx_office_conf{system}->{dbcharset};
@@
-982,7
+987,7
@@
sub restore_dataset_start {
my $pg_restore_exe = $::lx_office_conf{applications}->{pg_restore} || "pg_restore";
if ("$pg_restore_exe" eq "DISABLED") {
my $pg_restore_exe = $::lx_office_conf{applications}->{pg_restore} || "pg_restore";
if ("$pg_restore_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in
lx-erp.conf
.'));
+ $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.'));