From 12f2089bd560430b3b805296731ad97a3e8a22b6 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Fri, 16 Sep 2005 04:02:48 +0000
Subject: [PATCH] 'password' field consistently renamed to 'crypto_password'

---
 .../usr/share/cryptobox/templates/mount_form.cs      |  2 +-
 cbox-tree.d/var/www/cgi-bin/cryptobox.pl             | 12 ++++++------
 scripts/userdocexport.sh                             |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

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 4d56209..2e5a113 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
@@ -5,7 +5,7 @@
 	    enctype="application/x-www-form-urlencoded">
 
 	<p><label for="passwort">Passwort eingeben:</label>
-	    <input type="password" name="password" size="20" tabindex="0" maxlength="40" /></p>
+	    <input type="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 19b0e02..4d84db6 100755
--- a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
+++ b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
@@ -338,19 +338,19 @@ if ( ! &check_ssl()) {
 		} elsif (&check_mounted()) {
 			$pagedata->setValue('Data.Warning', 'IsMounted');
 			$pagedata->setValue('Data.Action', 'umount_form');
-		} elsif ($query->param('password') eq '') {
+		} elsif ($query->param('crypto_password') eq '') {
 			# leeres Passwort
 			$pagedata->setValue('Data.Warning', 'EmptyPassword');
 			$pagedata->setValue('Data.Action', 'mount_form');
 		} else	{
 			# mounten
-			&mount_vol($query->param('password'));
+			&mount_vol($query->param('crypto_password'));
 			if (!&check_mounted()) {
-			$pagedata->setValue('Data.Warning', 'MountFailed');
-			$pagedata->setValue('Data.Action', 'mount_form');
+				$pagedata->setValue('Data.Warning', 'MountFailed');
+				$pagedata->setValue('Data.Action', 'mount_form');
 			} else {
-			$pagedata->setValue('Data.Success', 'MountDone');
-			$pagedata->setValue('Data.Action', 'umount_form');
+				$pagedata->setValue('Data.Success', 'MountDone');
+				$pagedata->setValue('Data.Action', 'umount_form');
 			}
 		}
 	################## mount_ask #######################
diff --git a/scripts/userdocexport.sh b/scripts/userdocexport.sh
index 1489675..1f65d31 100755
--- a/scripts/userdocexport.sh
+++ b/scripts/userdocexport.sh
@@ -32,6 +32,8 @@ for PAGE in $PAGES; do
 	PAGE_SRC="$WIKI_HOST$WIKI_URL$PAGE"
 	echo "Importing $PAGE:"
 
+	# replace sub-page-style '/' like moin does it (by '_2f')
+	#TMP_FILE=$TMP_DIR/${PAGE//\//_2f}.html
 	TMP_FILE=$TMP_DIR/${PAGE}.html
 	mkdir -p "$TMP_DIR"