From 56eb247fe2b1189dab91a3c2eef4dd21735335ac Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 24 Aug 2012 11:15:30 +0200
Subject: [PATCH] Beim Anlegen der Auth-DB/-Tabellen Admin-Passwort
 mitschleifen
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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.
---
 bin/mozilla/admin.pl                              | 2 ++
 templates/webpages/admin/check_auth_database.html | 2 +-
 templates/webpages/admin/check_auth_tables.html   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 4409505c1..7581e9b34 100755
--- 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 7005759df..7f0397a88 100644
--- 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 4fc588811..816d0b18e 100644
--- 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 %]">
-- 
2.20.1