Beim Anlegen der Auth-DB/-Tabellen Admin-Passwort mitschleifen

Solange die Auth-Strukturen nicht existieren, muss das Admin-Passwort
als Zeichen des gültigen Logins als Hiddens mitgeschliffen werden. Das
war auch vorher schon so, nur steht das vom Benutzer eingegebene
Passwort seit 670f76a für die Controller nicht mehr als Formvariable
zur Verfügung.

Behebt #1987.

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 4409505c1f86f184ed69332aaafc5e3a52c5bb92..7581e9b34ad2fc9cf9eabb6c8594fbe489da3762 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -146,6 +146,8 @@ sub check_auth_db_and_tables {
 
   map { $params{"db_${_}"} = $main::auth->{DB_config}->{$_} } keys %{ $auth->{DB_config} };
 
+  $params{admin_password} = $::lx_office_conf{authentication}->{admin_password};
+
   if (!$main::auth->check_database()) {
     $form->{title} = $locale->text('Authentification database creation');
     $form->header();

diff --git a/templates/webpages/admin/check_auth_database.html b/templates/webpages/admin/check_auth_database.html
index 7005759df3de68523346a3606ce98dce603b826d..7f0397a88415989da32322f016b817e87c29b4c1 100644 (file)
--- a/templates/webpages/admin/check_auth_database.html
+++ b/templates/webpages/admin/check_auth_database.html
@@ -50,7 +50,7 @@
    </tr>
   </table>
 
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
+  <input type="hidden" name="{AUTH}admin_password" value="[% HTML.escape(admin_password) %]">
   <input type="hidden" name="action" value="create_auth_db">
 
   <input type="submit" class="submit" value="[% 'Create Dataset' | $T8 %]">

diff --git a/templates/webpages/admin/check_auth_tables.html b/templates/webpages/admin/check_auth_tables.html
index 4fc58881149e0f6771d19c76d679f2b2b90dca8b..816d0b18e1a4ee38ef574c1aec69261994c2642b 100644 (file)
--- a/templates/webpages/admin/check_auth_tables.html
+++ b/templates/webpages/admin/check_auth_tables.html
@@ -32,7 +32,7 @@
 
  <form method="post" action="admin.pl">
 
-  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
+  <input type="hidden" name="{AUTH}admin_password" value="[% HTML.escape(admin_password) %]">
   <input type="hidden" name="action" value="create_auth_tables">
 
   <input type="submit" class="submit" value="[% 'Create tables' | $T8 %]">