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

diff --git a/SL/User.pm b/SL/User.pm
index e306e7d8cec5273d28a572227b76b8908c20807a..5217ef8111b5044e1491bfda28d2ebc1a8ecbec3 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -209,7 +209,13 @@ sub login {
       # remove lock file
       unlink("$userspath/nologin");
 
       # 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;
 
 
       $rc = -2;
 

diff --git a/templates/webpages/dbupgrade/footer_de.html b/templates/webpages/dbupgrade/footer_de.html
index 1bfe7c25da42193776cd2a881a6e154ada8543cf..18ea036bfacd7944450323a58f9414d06196cdaa 100644 (file)
--- a/templates/webpages/dbupgrade/footer_de.html
+++ b/templates/webpages/dbupgrade/footer_de.html
@@ -1,6 +1,6 @@
 <p>...fertig</p>
 
 <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>">
 
  <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 8e06baf1aed6b78e51ded434526928c8649675be..dbe31509dea35353bfca59cc2324e9584db18e8d 100644 (file)
--- a/templates/webpages/dbupgrade/footer_master.html
+++ b/templates/webpages/dbupgrade/footer_master.html
@@ -1,6 +1,6 @@
 <p><translate>...done</translate></p>
 
 <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>">
 
  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
  <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">