diff --git a/bin/cryptobox.pl b/bin/cryptobox.pl index 15efd52..9eb7ccb 100755 --- a/bin/cryptobox.pl +++ b/bin/cryptobox.pl @@ -282,6 +282,12 @@ sub check_init_running { } +# Parameter: device +sub check_device_plaintext { + return (system("$CB_SCRIPT","is_plaintext",$1) == 0); +} + + # Parameter: device sub check_device_encryption { return (system("$CB_SCRIPT","is_encrypted",$1) == 0); @@ -884,26 +890,30 @@ $pagedata->setValue('Data.QueryString', "$querystring") if ($querystring ne ''); $pagedata->setValue('Data.Version', CRYPTOBOX_VERSION); -my ($one_disk, $one_name, $isActive, $isEncrypted); +my ($one_disk, $one_name, $isActive, $isEncrypted, $isPlaintext); my $avail_counter = 0; my $active_counter = 0; my $passive_counter = 0; for $one_disk (&get_available_disks()) { $one_name = &get_disk_name($one_disk); $isEncrypted = &check_device_encryption($one_disk); + $isPlaintext = &check_device_plaintext($one_disk); $pagedata->setValue("Data.Disks.available.${avail_counter}.device",$one_disk); $pagedata->setValue("Data.Disks.available.${avail_counter}.name",$one_name); $pagedata->setValue("Data.Disks.available.${avail_counter}.encryption", $isEncrypted? 1 : 0); + $pagedata->setValue("Data.Disks.available.${avail_counter}.plaintext", $isPlaintext? 1 : 0); $isActive = &check_mounted($one_disk); if ($isActive) { $pagedata->setValue("Data.Disks.available.${avail_counter}.isActive",1); $pagedata->setValue("Data.Disks.active.${active_counter}.device",$one_disk); $pagedata->setValue("Data.Disks.active.${active_counter}.name",$one_name); - $pagedata->setValue("Data.Disks.active.${avail_counter}.encryption", $isEncrypted? 1 : 0); + $pagedata->setValue("Data.Disks.active.${active_counter}.encryption", $isEncrypted? 1 : 0); + $pagedata->setValue("Data.Disks.active.${active_counter}.plaintext", $isPlaintext? 1 : 0); $active_counter++; } else { $pagedata->setValue("Data.Disks.available.${avail_counter}.isActive",0); $pagedata->setValue("Data.Disks.passive.${passive_counter}.device",$one_disk); $pagedata->setValue("Data.Disks.passive.${passive_counter}.name",$one_name); - $pagedata->setValue("Data.Disks.passive.${avail_counter}.encryption", $isEncrypted? 1 : 0); + $pagedata->setValue("Data.Disks.passive.${passive_counter}.encryption", $isEncrypted? 1 : 0); + $pagedata->setValue("Data.Disks.passive.${passive_counter}.plaintext", $isPlaintext? 1 : 0); $passive_counter++; } if ($device eq $one_disk) { @@ -911,6 +921,7 @@ for $one_disk (&get_available_disks()) { $pagedata->setValue('Data.CurrentDisk.name', $one_name); $pagedata->setValue('Data.CurrentDisk.active', $isActive? 1 : 0); $pagedata->setValue("Data.CurrentDisk.encryption", $isEncrypted? 1 : 0); + $pagedata->setValue("Data.CurrentDisk.plaintext", $isPlaintext? 1 : 0); # retrieve capacity information if the device is mounted if (&check_mounted($device)) { my $cap_info = &exec_cb_script("get_capacity_info",$device); diff --git a/templates/footer.cs b/templates/footer.cs index 5039dae..a784024 100644 --- a/templates/footer.cs +++ b/templates/footer.cs @@ -1,7 +1,7 @@ -
+ @@ -13,7 +13,7 @@ v - CryptoBox-Home sense.lab + CryptoBox-Home sense.lab diff --git a/templates/form_config.cs b/templates/form_config.cs index 75e94d2..4b94e31 100644 --- a/templates/form_config.cs +++ b/templates/form_config.cs @@ -1,7 +1,7 @@
+
@@ -13,7 +13,7 @@ -
+