From b969e59157df2585f6cb8e6c153cda35924bef19 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Wed, 21 Sep 2005 02:26:31 +0000
Subject: [PATCH] unified form header persistent user-specific language setting
 fixed

---
 cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh       | 11 +++++++----
 .../usr/share/cryptobox/templates/config_form.cs   |  4 +---
 .../usr/share/cryptobox/templates/init_form.cs     |  2 +-
 .../usr/share/cryptobox/templates/macros.cs        | 14 +++++++++++---
 .../usr/share/cryptobox/templates/mount_form.cs    |  3 +--
 .../usr/share/cryptobox/templates/shutdown_form.cs |  3 +--
 .../usr/share/cryptobox/templates/umount_form.cs   |  3 +--
 7 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
index 79259c5..4100571 100755
--- a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
@@ -133,10 +133,6 @@ function create_crypto()
 # Parameter: device
 {
 	local device="$1"
-	# flood the crypto partition with noise
-	# TODO: do we need "wipe"?
-	#$WIPE -kq -R /dev/urandom "${device}2"
-
 	# passphrase may be passed via command line
 	$CRYPTSETUP -h "$HASH" -c "$ALGO" create "`basename $CRYPTMAPPER_DEV`" "${device}2"
 }
@@ -145,6 +141,13 @@ function create_crypto()
 function mkfs_crypto()
 # split from create_crypto to allow background execution via web interface
 {
+	local device=$(find_harddisk)
+
+	# flood the crypto partition with noise
+	# writing to the real partition is faster
+	# TODO: this takes _much_ too long - maybe add a "secure wipe" switch to the interface?
+	#dd if=/dev/urandom of="${device}2" bs=512
+
 	$MKFS_DATA "$CRYPTMAPPER_DEV"
 }
 
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
index ec9cbdf..dd815c3 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
@@ -1,9 +1,7 @@
 <div id="config">
     <h1><?cs var:Lang.Title.Config ?></h1>
 
-    <form action="<?cs call:getSelfURL('','') ?>" method="post"
-	    enctype="application/x-www-form-urlencoded">
-	
+      <?cs call:print_form_header() ?>
 	<?cs if:Data.Config.AdminPasswordIsSet ?>
 			<p><label for="current_admin_password"><?cs call:help_popUp(Lang.Text.EnterCurrentAdminPassword,"prove_admin_pw") ?></label><br/>
 				<input type="password" id="current_admin_password" name="current_admin_password" size="20" tabindex="1" maxlength="40" /> </p>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
index e5d38cd..d1c1289 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
@@ -1,7 +1,7 @@
 <h1><?cs var:Lang.Title.Init ?></h1>
 
 <div class="init">
-	<form action="<?cs call:getSelfURL('','') ?>" method="post" enctype="application/x-www-form-urlencoded">
+	<?cs call:print_form_header() ?>
 
 		<p class="note"><?cs var:Lang.Text.InitWarning ?></p>
 		<?cs if:Data.Config.AdminPasswordIsSet ?>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/macros.cs b/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
index 5ad4e48..d4d05e7 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
@@ -62,7 +62,7 @@
 	    set:tmp_concat='&' ?><?cs
 	/if ?><?cs
     /each ?><?cs
-    if:?append ?><?cs set:PostSuffix=PostSuffix + tmp_concat + append ?><?cs
+    if:(append != '') ?><?cs set:PostSuffix=PostSuffix + tmp_concat + append ?><?cs
       /if ?><?cs
     var:ScriptName ?><?cs var:PostSuffix ?><?cs
 /def ?>
@@ -77,7 +77,15 @@
 
 /def ?>
 
-<?cs def:help_popUp(text,filename) ?><?cs 
-	var:text ?><?cs
+<?cs def:help_popUp(text,filename) ?><?cs #
+# TODO: remove this, if on-screen help will die :)
+	?><?cs var:text ?><?cs
 /def ?>
 
+<?cs def:print_form_header() ?><?cs #
+# the header of a form - including Data.PostData values as hidden fields
+	?><form action="<?cs var:ScriptName ?>" method="post" enctype="application/x-www-form-urlencoded">
+	<?cs each:item = Data.PostData
+		?><input type="hidden" name="<?cs name:item ?>" value="<?cs var:item ?>" /><?cs
+	/each ?><?cs
+/def ?>
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 a7920b2..5e9eb34 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
@@ -1,8 +1,7 @@
 <h1><?cs var:Lang.Title.Mount ?></h1>
 
 <div align="center">
-    <form action="<?cs call:getSelfURL('','') ?>" method="post"
-	    enctype="application/x-www-form-urlencoded">
+    <?cs call:print_form_header() ?>
 
 	<p><label for="crypto_passwort"><?cs var:Lang.Text.EnterCurrentCryptoPassword ?></label>
 	    <input type="password" id="crypto_password" name="crypto_password" size="20" tabindex="0" maxlength="40" /></p>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
index 3ae4162..b97af50 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
@@ -1,8 +1,7 @@
 <h1><?cs var:Lang.Title.ShutDown ?></h1>
 
 <div align="center">
-    <form action="<?cs call:getSelfURL('','') ?>" method="post"
-		enctype="application/x-www-form-urlencoded">
+    <?cs call:print_form_header ?>
 	
 	<input type="hidden" name="action" value="shutdown_do" />
 
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
index 2f8a13a..c127040 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
@@ -1,8 +1,7 @@
 <h1><?cs var:Lang.Title.Umount ?></h1>
 
 <div align="center">
-    <form action="<?cs call:getSelfURL('','') ?>" method="post"
-		enctype="application/x-www-form-urlencoded">
+    <?cs call:print_form_header() ?>
 
 	<button type="submit" name="action"
 		value="umount_do"><?cs var:Lang.Button.Umount ?></button>