Die Warnung bzgl. des Datenbankupgrades darf am Anfang natürlich nur einmal gezeigt...

diff --git a/SL/User.pm b/SL/User.pm
index 57e8644..f331ca4 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -179,7 +179,7 @@ sub login {
       $form->{dbupdate} = "db$myconfig{dbname}";
       $form->{ $form->{dbupdate} } = 1;
 
-      if (!$form->{"confirm_dbupdate"}) {
+      if ($form->{"show_dbupdate_warning"}) {
         print($form->parse_html_template("dbupgrade/warning"));
         exit(0);
       }

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index fc17057..770df5c 100644 (file)
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -91,6 +91,8 @@ sub login_screen {
 
 <form method=post name=loginscreen action=$form->{script}>
 
+  <input type="hidden" name="show_dbupdate_warning" value="1">
+
       <table width=100%>
        <tr>
          <td align=center>

diff --git a/templates/webpages/dbupgrade/warning_de.html b/templates/webpages/dbupgrade/warning_de.html
index 73611e5..16ceed6 100644 (file)
--- a/templates/webpages/dbupgrade/warning_de.html
+++ b/templates/webpages/dbupgrade/warning_de.html
@@ -4,7 +4,6 @@
  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
  <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
  <input type="hidden" name="action" value="login">
- <input type="hidden" name="confirm_dbupdate" value="1">
 
  <p>
   Lx-Office wird gleich die Datenbank <b><TMPL_VAR dbname ESCAPE=HTML></b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.

diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html
index 2c92f1d..edd7803 100644 (file)
--- a/templates/webpages/dbupgrade/warning_master.html
+++ b/templates/webpages/dbupgrade/warning_master.html
@@ -4,7 +4,6 @@
  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
  <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
  <input type="hidden" name="action" value="login">
- <input type="hidden" name="confirm_dbupdate" value="1">
 
  <p>
   <translate>Lx-Office is about to update the