From b0f6d7900657e88bff18fe5ed2359f5123d44f8a Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Fri, 16 Sep 2005 07:25:37 +0000
Subject: [PATCH] mount_form: minor design fix cryptobox.pl: handling of
 admin_pw and crypto_pw finally fixed minor language improvements

---
 cbox-tree.d/usr/share/cryptobox/lang/de.hdf             | 6 +++---
 cbox-tree.d/usr/share/cryptobox/lang/en.hdf             | 4 ++--
 cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs | 4 ++--
 cbox-tree.d/var/www/cgi-bin/cryptobox.pl                | 7 +++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cbox-tree.d/usr/share/cryptobox/lang/de.hdf b/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
index 258be8b..f66fbc1 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
+++ b/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
@@ -17,9 +17,9 @@ Lang {
 	Text {
 		EnterNewCryptoPassword	= Das neue Crypto-Passwort eingeben:
 		EnterSameCryptoPassword	= Das Crypto-Passwort wiederholen:
-		EnterAdminPassword	= Das Admin-Passwort eingeben:
+		EnterAdminPassword	= Das bisherige Admin-Passwort eingeben:
 		EnterNewAdminPassword	= Das neue Admin-Passwort eingeben:
-		EnterSameAdminPassword	= Das Admin-Passwort wiederholen:
+		EnterSameAdminPassword	= Das neue Admin-Passwort wiederholen:
 		InitWarning		= Bei der Initialisierung werden ALLE DATEN auf der Festplatte GEL&Ouml;SCHT!
 		InitDescription		= Dieser Schritt ist nur einmalig vor der ersten Nutzung notwendig.<br>F&uuml;r den t&auml;glichen Gebrauch muessen sie das verschl&uuml;sselte Dateisystem lediglich aktivieren und deaktivieren
 		ConfirmInitHint		= Um zu best&auml;tigen, dass sie wissen, was sie tun, tippen sie hier bitte exakt Folgendes ein:
@@ -72,7 +72,7 @@ Lang {
 		}
 
 		WrongAdminPassword {
-			Title	= Falsches Administratons-Passwort
+			Title	= Falsches Administrations-Passwort
 			Text	= Das eingegebene Administrations-Passwort ist falsch. Versuchen sie es noch einmal.
 		}
 
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/en.hdf b/cbox-tree.d/usr/share/cryptobox/lang/en.hdf
index 6a0cdc8..f919068 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/en.hdf
+++ b/cbox-tree.d/usr/share/cryptobox/lang/en.hdf
@@ -17,9 +17,9 @@ Lang {
 	Text {
 		EnterNewCryptoPassword	= Enter the new crypto password:
 		EnterSameCryptoPassword	= Repeat the new crypto password:
-		EnterAdminPassword	= Enter the administration password:
+		EnterAdminPassword	= Enter the current administration password:
 		EnterNewAdminPassword	= Enter the new administration password:
-		EnterSameAdminPassword	= Repeat the administration password:
+		EnterSameAdminPassword	= Repeat the new administration password:
 		InitWarning		= During the process of initialization ALL DATA on the hard drive WILL BE DELETED!
 		InitDescription		= This step is only required on first use.<br>For daily use you just have to activate and deactivate the encrypted filesystem.
 		ConfirmInitHint		= To confirm that you know what you are doing, please enter exactly the following sequence:
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
index 2e5a113..a7180f2 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
@@ -4,8 +4,8 @@
     <form action="<?cs call:getSelfURL('','') ?>" method="post"
 	    enctype="application/x-www-form-urlencoded">
 
-	<p><label for="passwort">Passwort eingeben:</label>
-	    <input type="password" name="crypto_password" size="20" tabindex="0" maxlength="40" /></p>
+	<p><label for="crypto_passwort">Passwort eingeben:</label>
+	    <input type="password" id="crypto_password" name="crypto_password" size="20" tabindex="0" maxlength="40" /></p>
 
 	<button type="submit" name="action" value="mount_do">Dateisystem aktivieren</button>
 
diff --git a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
index 4d84db6..6315103 100755
--- a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
+++ b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
@@ -183,8 +183,7 @@ sub umount_vol
 
 sub box_init
 {
-	my $admin_pw = shift;
-	my $crypto_pw = shift;
+	my ($crypto_pw, $admin_pw) = @_;
 
 	# partitioning, config and initial cryptsetup
 	open(PW_INPUT, "|$CB_SCRIPT box-init-fg");
@@ -340,7 +339,7 @@ if ( ! &check_ssl()) {
 			$pagedata->setValue('Data.Action', 'umount_form');
 		} elsif ($query->param('crypto_password') eq '') {
 			# leeres Passwort
-			$pagedata->setValue('Data.Warning', 'EmptyPassword');
+			$pagedata->setValue('Data.Warning', 'EmptyCryptoPassword');
 			$pagedata->setValue('Data.Action', 'mount_form');
 		} else	{
 			# mounten
@@ -413,7 +412,7 @@ if ( ! &check_ssl()) {
 			$pagedata->setValue('Data.Action', 'init_form');
 		} else {
 			# do init
-			&box_init($query->param('admin_password'),$query->param('crypto_password'));
+			&box_init($query->param('crypto_password'),$query->param('admin_password'));
 			if (!&check_init_running()) {
 				$pagedata->setValue('Data.Error', 'InitFailed');
 			} else {