X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=c99201244d27da3ecee42fe8ec005edc39c07800;hb=3dd73b25e1edb61144b0fa97d04dac046f81121e;hp=3b36f310c28be9c229ea34c792309c243ee016c8;hpb=61bd0898baf098032eef7635ae814bf2dde1b5c5;p=kivitendo-erp.git

diff --git a/SL/User.pm b/SL/User.pm
index 3b36f310c..c99201244 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -209,7 +209,13 @@ sub login {
       # remove lock file
       unlink("$userspath/nologin");
 
-      print($form->parse_html_template("dbupgrade/footer"));
+      my $menufile =
+        $self->{"menustyle"} eq "v3" ? "menuv3.pl" :
+        $self->{"menustyle"} eq "neu" ? "menunew.pl" :
+        "menu.pl";
+
+      print($form->parse_html_template("dbupgrade/footer",
+                                       { "menufile" => $menufile }));
 
       $rc = -2;
 
@@ -430,7 +436,7 @@ sub dbcreate {
 sub process_perl_script {
   $main::lxdebug->enter_sub();
 
-  my ($self, $form, $dbh, $filename, $version) = @_;
+  my ($self, $form, $dbh, $filename, $version_or_control) = @_;
 
   open(FH, "$filename") or $form->error("$filename : $!\n");
   my $contents = join("", <FH>);
@@ -464,8 +470,13 @@ sub process_perl_script {
     exit(0);
   }
 
-  if ($version) {
-    $dbh->do("UPDATE defaults SET version = " . $dbh->quote($version));
+  if (ref($version_or_control) eq "HASH") {
+    $dbh->do("INSERT INTO schema_info (tag, login) VALUES (" .
+             $dbh->quote($version_or_control->{"tag"}) . ", " .
+             $dbh->quote($form->{"login"}) . ")");
+  } elsif ($version_or_control) {
+    $dbh->do("UPDATE defaults SET version = " .
+             $dbh->quote($version_or_control));
   }
   $dbh->commit();
 
@@ -1083,10 +1094,10 @@ sub config_vars {
 
   my @conf = qw(acs address admin businessnumber charset company countrycode
     currency dateformat dbconnect dbdriver dbhost dbport dboptions
-    dbname dbuser dbpasswd email fax name numberformat in_numberformat password
+    dbname dbuser dbpasswd email fax name numberformat password
     printer role sid signature stylesheet tel templates vclimit angebote bestellungen rechnungen
     anfragen lieferantenbestellungen einkaufsrechnungen taxnumber co_ustid duns menustyle
-    template_format copies);
+    template_format default_media default_printer_id copies show_form_details);
 
   $main::lxdebug->leave_sub();