mount_form: minor design fix
cryptobox.pl: handling of admin_pw and crypto_pw finally fixed minor language improvements
This commit is contained in:
parent
f1421dcaae
commit
b0f6d79006
|
@ -17,9 +17,9 @@ Lang {
|
||||||
Text {
|
Text {
|
||||||
EnterNewCryptoPassword = Das neue Crypto-Passwort eingeben:
|
EnterNewCryptoPassword = Das neue Crypto-Passwort eingeben:
|
||||||
EnterSameCryptoPassword = Das Crypto-Passwort wiederholen:
|
EnterSameCryptoPassword = Das Crypto-Passwort wiederholen:
|
||||||
EnterAdminPassword = Das Admin-Passwort eingeben:
|
EnterAdminPassword = Das bisherige Admin-Passwort eingeben:
|
||||||
EnterNewAdminPassword = Das neue 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ÖSCHT!
|
InitWarning = Bei der Initialisierung werden ALLE DATEN auf der Festplatte GELÖSCHT!
|
||||||
InitDescription = Dieser Schritt ist nur einmalig vor der ersten Nutzung notwendig.<br>Für den täglichen Gebrauch muessen sie das verschlüsselte Dateisystem lediglich aktivieren und deaktivieren
|
InitDescription = Dieser Schritt ist nur einmalig vor der ersten Nutzung notwendig.<br>Für den täglichen Gebrauch muessen sie das verschlüsselte Dateisystem lediglich aktivieren und deaktivieren
|
||||||
ConfirmInitHint = Um zu bestätigen, dass sie wissen, was sie tun, tippen sie hier bitte exakt Folgendes ein:
|
ConfirmInitHint = Um zu bestätigen, dass sie wissen, was sie tun, tippen sie hier bitte exakt Folgendes ein:
|
||||||
|
@ -72,7 +72,7 @@ Lang {
|
||||||
}
|
}
|
||||||
|
|
||||||
WrongAdminPassword {
|
WrongAdminPassword {
|
||||||
Title = Falsches Administratons-Passwort
|
Title = Falsches Administrations-Passwort
|
||||||
Text = Das eingegebene Administrations-Passwort ist falsch. Versuchen sie es noch einmal.
|
Text = Das eingegebene Administrations-Passwort ist falsch. Versuchen sie es noch einmal.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,9 @@ Lang {
|
||||||
Text {
|
Text {
|
||||||
EnterNewCryptoPassword = Enter the new crypto password:
|
EnterNewCryptoPassword = Enter the new crypto password:
|
||||||
EnterSameCryptoPassword = Repeat 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:
|
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!
|
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.
|
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:
|
ConfirmInitHint = To confirm that you know what you are doing, please enter exactly the following sequence:
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
<form action="<?cs call:getSelfURL('','') ?>" method="post"
|
<form action="<?cs call:getSelfURL('','') ?>" method="post"
|
||||||
enctype="application/x-www-form-urlencoded">
|
enctype="application/x-www-form-urlencoded">
|
||||||
|
|
||||||
<p><label for="passwort">Passwort eingeben:</label>
|
<p><label for="crypto_passwort">Passwort eingeben:</label>
|
||||||
<input type="password" name="crypto_password" size="20" tabindex="0" maxlength="40" /></p>
|
<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>
|
<button type="submit" name="action" value="mount_do">Dateisystem aktivieren</button>
|
||||||
|
|
||||||
|
|
|
@ -183,8 +183,7 @@ sub umount_vol
|
||||||
|
|
||||||
sub box_init
|
sub box_init
|
||||||
{
|
{
|
||||||
my $admin_pw = shift;
|
my ($crypto_pw, $admin_pw) = @_;
|
||||||
my $crypto_pw = shift;
|
|
||||||
|
|
||||||
# partitioning, config and initial cryptsetup
|
# partitioning, config and initial cryptsetup
|
||||||
open(PW_INPUT, "|$CB_SCRIPT box-init-fg");
|
open(PW_INPUT, "|$CB_SCRIPT box-init-fg");
|
||||||
|
@ -340,7 +339,7 @@ if ( ! &check_ssl()) {
|
||||||
$pagedata->setValue('Data.Action', 'umount_form');
|
$pagedata->setValue('Data.Action', 'umount_form');
|
||||||
} elsif ($query->param('crypto_password') eq '') {
|
} elsif ($query->param('crypto_password') eq '') {
|
||||||
# leeres Passwort
|
# leeres Passwort
|
||||||
$pagedata->setValue('Data.Warning', 'EmptyPassword');
|
$pagedata->setValue('Data.Warning', 'EmptyCryptoPassword');
|
||||||
$pagedata->setValue('Data.Action', 'mount_form');
|
$pagedata->setValue('Data.Action', 'mount_form');
|
||||||
} else {
|
} else {
|
||||||
# mounten
|
# mounten
|
||||||
|
@ -413,7 +412,7 @@ if ( ! &check_ssl()) {
|
||||||
$pagedata->setValue('Data.Action', 'init_form');
|
$pagedata->setValue('Data.Action', 'init_form');
|
||||||
} else {
|
} else {
|
||||||
# do init
|
# 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()) {
|
if (!&check_init_running()) {
|
||||||
$pagedata->setValue('Data.Error', 'InitFailed');
|
$pagedata->setValue('Data.Error', 'InitFailed');
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue