From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 19 Jan 2007 11:14:10 +0000 (+0000)
Subject: Nach einem Datenbankupgrade nicht strikt menu.pl aufrufen, sondern das beim Benutzer... 
X-Git-Tag: release-2.4.1~1^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e9b15b28d88e0ca05a7e8a948a9208d46a70b4f5;p=kivitendo-erp.git

Nach einem Datenbankupgrade nicht strikt menu.pl aufrufen, sondern das beim Benutzer eingestellte.
---

diff --git a/SL/User.pm b/SL/User.pm
index e306e7d8c..5217ef811 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;
 
diff --git a/templates/webpages/dbupgrade/footer_de.html b/templates/webpages/dbupgrade/footer_de.html
index 1bfe7c25d..18ea036bf 100644
--- a/templates/webpages/dbupgrade/footer_de.html
+++ b/templates/webpages/dbupgrade/footer_de.html
@@ -1,6 +1,6 @@
 <p>...fertig</p>
 
-<form action="menu.pl">
+<form action="<TMPL_VAR menufile>">
 
  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
  <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
diff --git a/templates/webpages/dbupgrade/footer_master.html b/templates/webpages/dbupgrade/footer_master.html
index 8e06baf1a..dbe31509d 100644
--- a/templates/webpages/dbupgrade/footer_master.html
+++ b/templates/webpages/dbupgrade/footer_master.html
@@ -1,6 +1,6 @@
 <p><translate>...done</translate></p>
 
-<form action="menu.pl">
+<form action="<TMPL_VAR menufile>">
 
  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
  <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">