'password' field consistently renamed to 'crypto_password'
This commit is contained in:
parent
f9efbead42
commit
12f2089bd5
|
@ -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>
|
||||
|
||||
|
|
|
@ -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 #######################
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in a new issue