Beim Login wird jetzt vor der eigentlichen Datenbankaktualisierung eine Warnmeldung...

diff --git a/SL/User.pm b/SL/User.pm
index 62bc94f6d6b71290d82a9dbfaa6248359580937b..57e8644db31f15acaa188db00d5269cb67957a76 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -168,21 +168,25 @@ sub login {
 
     if (&update_available($myconfig{"dbdriver"}, $dbversion)) {
 
 
     if (&update_available($myconfig{"dbdriver"}, $dbversion)) {
 

-      # update the tables
-      open FH, ">$userspath/nologin" or die "
-$!";
-

       map { $form->{$_} = $myconfig{$_} }
         qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect);
 
       map { $form->{$_} = $myconfig{$_} }
         qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect);
 

-      $form->{dbupdate} = "db$myconfig{dbname}";
-      $form->{ $form->{dbupdate} } = 1;
-

       $form->{"stylesheet"} = "lx-office-erp.css";
       $form->{"title"} = $main::locale->text("Dataset upgrade");
       $form->header();
       $form->{"stylesheet"} = "lx-office-erp.css";
       $form->{"title"} = $main::locale->text("Dataset upgrade");
       $form->header();

-      print($form->parse_html_template("dbupgrade/header",
-                                       { "dbname" => $myconfig{dbname} }));
+      print($form->parse_html_template("dbupgrade/header"));
+
+      $form->{dbupdate} = "db$myconfig{dbname}";
+      $form->{ $form->{dbupdate} } = 1;
+
+      if (!$form->{"confirm_dbupdate"}) {
+        print($form->parse_html_template("dbupgrade/warning"));
+        exit(0);
+      }
+
+      # update the tables
+      open FH, ">$userspath/nologin" or die "
+$!";

 
       # required for Oracle
       $form->{dbdefault} = $sid;
 
       # required for Oracle
       $form->{dbdefault} = $sid;

diff --git a/locale/de/all b/locale/de/all
index 65daf6de5d99eec70ce1ae5b87490ed588166dc5..609e65f6062ee48be700c6adbc5a6b2078bea446 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -604,6 +604,7 @@ gestartet',
   'Logout'                      => 'Abmeldung',
   'Long Description'            => 'Langtext',
   'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' => 'Lx-Office 2.4.0 führt zwei neue Konzepte ein: Steuerzonen und Buchungsgruppen.',
   'Logout'                      => 'Abmeldung',
   'Long Description'            => 'Langtext',
   'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' => 'Lx-Office 2.4.0 führt zwei neue Konzepte ein: Steuerzonen und Buchungsgruppen.',

+  'Lx-Office is about to update the database <b><TMPL_VAR dbname ESCAPE=HTML></b>. You should create a backup of the database before proceeding because the backup might not be reversible.' => '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.',

   'Make'                        => 'Hersteller',
   'Manager'                     => 'Manager',
   'Mandantennummer'             => 'Mandantennummer',
   'Make'                        => 'Hersteller',
   'Manager'                     => 'Manager',
   'Mandantennummer'             => 'Mandantennummer',

diff --git a/templates/webpages/dbupgrade/warning_de.html b/templates/webpages/dbupgrade/warning_de.html
new file mode 100644 (file)
index 0000000..73611e5
--- /dev/null
+++ b/templates/webpages/dbupgrade/warning_de.html
@@ -0,0 +1,14 @@
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>">
+ <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.
+ </p>
+
+ <input type="submit" name="dummy" value="Weiter">
+</form>

diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html
new file mode 100644 (file)
index 0000000..2c92f1d
--- /dev/null
+++ b/templates/webpages/dbupgrade/warning_master.html
@@ -0,0 +1,17 @@
+<form name="Form" method="post" action="login.pl">
+
+ <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>">
+ <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
+   database <b><TMPL_VAR dbname ESCAPE=HTML></b>. You should create a
+   backup of the database before proceeding because the backup might not
+   be reversible.</translate>
+ </p>
+
+ <input type="submit" name="dummy" value="<translate>Continue</translate>">
+</form>