X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ae1b5cbad92eb30f55747d2aa986b9a0b7a433b5..be5bef700de4d193b55c32b7d00b79591bdabb4e:/SL/User.pm diff --git a/SL/User.pm b/SL/User.pm index 24774db20..f331ca4af 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -168,21 +168,25 @@ sub login { if (&update_available($myconfig{"dbdriver"}, $dbversion)) { - # update the tables - open FH, ">$userspath/nologin" or die " -$!"; - map { $form->{$_} = $myconfig{$_} } qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect); - $form->{dbupdate} = "db$myconfig{dbname}"; - $form->{ $form->{dbupdate} } = 1; - $form->{"stylesheet"} = "lx-office-erp.css"; $form->{"title"} = $main::locale->text("Dataset upgrade"); $form->header(); - print($form->parse_html_template("dbupgrade/header", - { "dbname" => $myconfig{dbname} })); + print($form->parse_html_template("dbupgrade/header")); + + $form->{dbupdate} = "db$myconfig{dbname}"; + $form->{ $form->{dbupdate} } = 1; + + if ($form->{"show_dbupdate_warning"}) { + print($form->parse_html_template("dbupgrade/warning")); + exit(0); + } + + # update the tables + open FH, ">$userspath/nologin" or die " +$!"; # required for Oracle $form->{dbdefault} = $sid; @@ -388,6 +392,9 @@ sub dbcreate { $filename = qq|sql/$form->{chart}-chart.sql|; $self->process_query($form, $dbh, $filename); + $query = "UPDATE defaults SET coa = " . $dbh->quote($form->{"chart"}); + $dbh->do($query) || $form->dberror($query); + $dbh->disconnect; $main::lxdebug->leave_sub();