From a7ae494b2e73b5a2aa38f650ff5d136362071692 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 15 Dec 2006 13:32:42 +0000
Subject: [PATCH] =?utf8?q?Die=20Warnung=20bzgl.=20des=20Datenbankupgrades?=
 =?utf8?q?=20darf=20am=20Anfang=20nat=C3=BCrlich=20nur=20einmal=20gezeigt?=
 =?utf8?q?=20werden.=20Ansonsten=20m=C3=BCsste=20man=20in=20jedem=20intera?=
 =?utf8?q?ktiven=20Datenbankupgrade=20den=20Parameter=20"confirm=5Fdbupdat?=
 =?utf8?q?e"=20=C3=BCbergeben.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/User.pm                                       | 2 +-
 bin/mozilla/login.pl                             | 2 ++
 templates/webpages/dbupgrade/warning_de.html     | 1 -
 templates/webpages/dbupgrade/warning_master.html | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SL/User.pm b/SL/User.pm
index 57e8644db..f331ca4af 100644
--- 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 fc17057b5..770df5ce3 100644
--- 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 73611e5df..16ceed64a 100644
--- 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 2c92f1dd7..edd78039f 100644
--- 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
-- 
2.20.1