cryptonas/cryptonas
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mount_form: minor design fix

Browse source 
cryptobox.pl: handling of admin_pw and crypto_pw finally fixed
minor language improvements
This commit is contained in:
lars 2005-09-16 07:25:37 +00:00
parent f1421dcaae
commit b0f6d79006
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cbox-tree.d/usr/share/cryptobox/lang/de.hdf
View file

@ -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Ö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.
}

4
cbox-tree.d/usr/share/cryptobox/lang/en.hdf
View file

@ -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:

4
cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
View file

@ -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>

7
cbox-tree.d/var/www/cgi-bin/cryptobox.pl
View file

@ -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 {