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

renamed templates from '..._form.cs' to 'form_....cs' 

renamed 'status.cs' to 'show_status.cs'
renamed 'doc.cs' to 'show_doc.cs'
This commit is contained in:
lars 2005-10-24 10:32:56 +00:00
parent dc0ba8844a
commit 448243f92b
8 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cbox-tree.d/usr/share/cryptobox/templates/config_form.cs → cbox-tree.d/usr/share/cryptobox/templates/form_config.cs
View File

0
cbox-tree.d/usr/share/cryptobox/templates/init_form.cs → cbox-tree.d/usr/share/cryptobox/templates/form_init.cs
View File

0
cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs → cbox-tree.d/usr/share/cryptobox/templates/form_mount.cs
View File

0
cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs → cbox-tree.d/usr/share/cryptobox/templates/form_shutdown.cs
View File

0
cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs → cbox-tree.d/usr/share/cryptobox/templates/form_umount.cs
View File

0
cbox-tree.d/usr/share/cryptobox/templates/doc.cs → cbox-tree.d/usr/share/cryptobox/templates/show_doc.cs
View File

0
cbox-tree.d/usr/share/cryptobox/templates/status.cs → cbox-tree.d/usr/share/cryptobox/templates/show_status.cs
View File

96
cbox-tree.d/var/www/cgi-bin/cryptobox.pl
View File

@ -327,20 +327,20 @@ if ( ! &check_ssl()) {
} elsif ($action eq 'doc') { } elsif ($action eq 'doc') {
if ($query->param('page')) { if ($query->param('page')) {
$pagedata->setValue('Data.Doc.Page', $query->param('page')); $pagedata->setValue('Data.Doc.Page', $query->param('page'));
$pagedata->setValue('Data.Action', 'doc'); $pagedata->setValue('Data.Action', 'show_doc');
} else { } else {
$pagedata->setValue('Data.Doc.Page', 'CryptoBoxUser'); $pagedata->setValue('Data.Doc.Page', 'CryptoBoxUser');
$pagedata->setValue('Data.Action', 'doc'); $pagedata->setValue('Data.Action', 'show_doc');
} }
##################### poweroff ###################### ##################### poweroff ######################
} elsif ($action eq 'shutdown_ask') { } elsif ($action eq 'shutdown_ask') {
$pagedata->setValue('Data.Action', 'shutdown_form'); $pagedata->setValue('Data.Action', 'form_shutdown');
##################### reboot ######################## ##################### reboot ########################
} elsif ($action eq 'shutdown_do') { } elsif ($action eq 'shutdown_do') {
if ($query->param('type') eq 'reboot') { if ($query->param('type') eq 'reboot') {
&system_reboot(); &system_reboot();
$pagedata->setValue('Data.Success', 'ReBoot'); $pagedata->setValue('Data.Success', 'ReBoot');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "180"); $pagedata->setValue('Data.Redirect.Delay', "180");
} else { } else {
&system_poweroff(); &system_poweroff();
@ -359,11 +359,11 @@ if ( ! &check_ssl()) {
} elsif ($action eq 'umount_do') { } elsif ($action eq 'umount_do') {
if ( ! &check_config()) { if ( ! &check_config()) {
$pagedata->setValue('Data.Warning', 'NotInitialized'); $pagedata->setValue('Data.Warning', 'NotInitialized');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif (&check_init_running()) { } elsif (&check_init_running()) {
$pagedata->setValue('Data.Warning', 'InitNotFinished'); $pagedata->setValue('Data.Warning', 'InitNotFinished');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'config_form'); $pagedata->setValue('Data.Redirect.Action', 'form_config');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} elsif ( ! &check_mounted()) { } elsif ( ! &check_mounted()) {
$pagedata->setValue('Data.Warning', 'NotMounted'); $pagedata->setValue('Data.Warning', 'NotMounted');
@ -373,11 +373,11 @@ if ( ! &check_ssl()) {
&umount_vol(); &umount_vol();
if (&check_mounted()) { if (&check_mounted()) {
$pagedata->setValue('Data.Warning', 'UmountFailed'); $pagedata->setValue('Data.Warning', 'UmountFailed');
$pagedata->setValue('Data.Action', 'umount_form'); $pagedata->setValue('Data.Action', 'form_umount');
} else { } else {
$pagedata->setValue('Data.Success', 'UmountDone'); $pagedata->setValue('Data.Success', 'UmountDone');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} }
} }
@ -386,31 +386,31 @@ if ( ! &check_ssl()) {
# mount requested # mount requested
if ( ! &check_config()) { if ( ! &check_config()) {
$pagedata->setValue('Data.Warning', 'NotInitialized'); $pagedata->setValue('Data.Warning', 'NotInitialized');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif (&check_init_running()) { } elsif (&check_init_running()) {
$pagedata->setValue('Data.Warning', 'InitNotFinished'); $pagedata->setValue('Data.Warning', 'InitNotFinished');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'config_form'); $pagedata->setValue('Data.Redirect.Action', 'form_config');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} elsif (&check_mounted()) { } elsif (&check_mounted()) {
$pagedata->setValue('Data.Warning', 'IsMounted'); $pagedata->setValue('Data.Warning', 'IsMounted');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} elsif ($query->param('crypto_password') eq '') { } elsif ($query->param('crypto_password') eq '') {
# leeres Passwort # leeres Passwort
$pagedata->setValue('Data.Warning', 'EmptyCryptoPassword'); $pagedata->setValue('Data.Warning', 'EmptyCryptoPassword');
$pagedata->setValue('Data.Action', 'mount_form'); $pagedata->setValue('Data.Action', 'form_mount');
} else { } else {
# mounten # mounten
&mount_vol($query->param('crypto_password')); &mount_vol($query->param('crypto_password'));
if (!&check_mounted()) { if (!&check_mounted()) {
$pagedata->setValue('Data.Warning', 'MountFailed'); $pagedata->setValue('Data.Warning', 'MountFailed');
$pagedata->setValue('Data.Action', 'mount_form'); $pagedata->setValue('Data.Action', 'form_mount');
} else { } else {
$pagedata->setValue('Data.Success', 'MountDone'); $pagedata->setValue('Data.Success', 'MountDone');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} }
} }
@ -418,66 +418,66 @@ if ( ! &check_ssl()) {
} elsif ($action eq 'mount_ask') { } elsif ($action eq 'mount_ask') {
if ( ! &check_config()) { if ( ! &check_config()) {
$pagedata->setValue('Data.Warning', 'NotInitialized'); $pagedata->setValue('Data.Warning', 'NotInitialized');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif (&check_init_running()) { } elsif (&check_init_running()) {
$pagedata->setValue('Data.Warning', 'InitNotFinished'); $pagedata->setValue('Data.Warning', 'InitNotFinished');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'config_form'); $pagedata->setValue('Data.Redirect.Action', 'form_config');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} elsif (&check_mounted()) { } elsif (&check_mounted()) {
$pagedata->setValue('Data.Warning', 'IsMounted'); $pagedata->setValue('Data.Warning', 'IsMounted');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} else { } else {
$pagedata->setValue('Data.Action', 'mount_form'); $pagedata->setValue('Data.Action', 'form_mount');
} }
################# umount_ask ######################## ################# umount_ask ########################
} elsif ($action eq 'umount_ask') { } elsif ($action eq 'umount_ask') {
if ( ! &check_config()) { if ( ! &check_config()) {
$pagedata->setValue('Data.Warning', 'NotInitialized'); $pagedata->setValue('Data.Warning', 'NotInitialized');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif ( ! &check_mounted()) { } elsif ( ! &check_mounted()) {
$pagedata->setValue('Data.Warning', 'NotMounted'); $pagedata->setValue('Data.Warning', 'NotMounted');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} else { } else {
$pagedata->setValue('Data.Action', 'umount_form'); $pagedata->setValue('Data.Action', 'form_umount');
} }
################## init_ask ######################### ################## init_ask #########################
} elsif ($action eq 'init_ask') { } elsif ($action eq 'init_ask') {
if (&check_init_running()) { if (&check_init_running()) {
$pagedata->setValue('Data.Warning', 'InitNotFinished'); $pagedata->setValue('Data.Warning', 'InitNotFinished');
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} elsif (&check_config()) { } elsif (&check_config()) {
$pagedata->setValue('Data.Warning', 'AlreadyConfigured'); $pagedata->setValue('Data.Warning', 'AlreadyConfigured');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} else { } else {
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} }
#################### init_do ######################## #################### init_do ########################
} elsif ($action eq 'init_do') { } elsif ($action eq 'init_do') {
my $current_admin_pw = &get_admin_pw; my $current_admin_pw = &get_admin_pw;
if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) { if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) {
$pagedata->setValue('Data.Warning', 'WrongAdminPassword'); $pagedata->setValue('Data.Warning', 'WrongAdminPassword');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif ($query->param('admin_password') ne $query->param('admin_password2')) { } elsif ($query->param('admin_password') ne $query->param('admin_password2')) {
# different admin-passwords # different admin-passwords
$pagedata->setValue('Data.Warning', 'DifferentAdminPasswords'); $pagedata->setValue('Data.Warning', 'DifferentAdminPasswords');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif ($query->param('crypto_password') ne $query->param('crypto_password2')) { } elsif ($query->param('crypto_password') ne $query->param('crypto_password2')) {
# different crypto-passwords # different crypto-passwords
$pagedata->setValue('Data.Warning', 'DifferentCryptoPasswords'); $pagedata->setValue('Data.Warning', 'DifferentCryptoPasswords');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif ($query->param('crypto_password') eq '') { } elsif ($query->param('crypto_password') eq '') {
# empty password # empty password
$pagedata->setValue('Data.Warning', 'EmptyCryptoPassword'); $pagedata->setValue('Data.Warning', 'EmptyCryptoPassword');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif ($query->param('confirm') ne $pagedata->getValue('Lang.Text.ConfirmInit','')) { } elsif ($query->param('confirm') ne $pagedata->getValue('Lang.Text.ConfirmInit','')) {
# wrong confirm string # wrong confirm string
$pagedata->setValue('Data.Warning', 'InitNotConfirmed'); $pagedata->setValue('Data.Warning', 'InitNotConfirmed');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} else { } else {
# do init # do init
&box_init($query->param('crypto_password'),$query->param('admin_password')); &box_init($query->param('crypto_password'),$query->param('admin_password'));
@ -485,36 +485,36 @@ if ( ! &check_ssl()) {
$pagedata->setValue('Data.Error', 'InitFailed'); $pagedata->setValue('Data.Error', 'InitFailed');
} else { } else {
$pagedata->setValue('Data.Success', 'InitRunning'); $pagedata->setValue('Data.Success', 'InitRunning');
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} }
} }
#################### config_ask ###################### #################### config_ask ######################
} elsif ($action eq 'config_ask') { } elsif ($action eq 'config_ask') {
if ( ! &check_config()) { if ( ! &check_config()) {
$pagedata->setValue('Data.Warning', 'NotInitialized'); $pagedata->setValue('Data.Warning', 'NotInitialized');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} else { } else {
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} }
#################### config_do ####################### #################### config_do #######################
} elsif ($action eq 'config_do') { } elsif ($action eq 'config_do') {
if ( ! &check_config()) { if ( ! &check_config()) {
$pagedata->setValue('Data.Warning', 'NotInitialized'); $pagedata->setValue('Data.Warning', 'NotInitialized');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} else { } else {
my $current_admin_pw = &get_admin_pw; my $current_admin_pw = &get_admin_pw;
if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) { if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) {
$pagedata->setValue('Data.Warning', 'WrongAdminPassword'); $pagedata->setValue('Data.Warning', 'WrongAdminPassword');
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} elsif ( ! &validate_language($query->param('language'))) { } elsif ( ! &validate_language($query->param('language'))) {
$pagedata->setValue('Data.Warning', 'InvalidLanguage'); $pagedata->setValue('Data.Warning', 'InvalidLanguage');
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} elsif ( ! &validate_ip($query->param('ip'))) { } elsif ( ! &validate_ip($query->param('ip'))) {
$pagedata->setValue('Data.Warning', 'InvalidIP'); $pagedata->setValue('Data.Warning', 'InvalidIP');
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} elsif ( ! &validate_timeout($query->param('timeout'))) { } elsif ( ! &validate_timeout($query->param('timeout'))) {
$pagedata->setValue('Data.Warning', 'InvalidTimeOut'); $pagedata->setValue('Data.Warning', 'InvalidTimeOut');
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} else { } else {
system("$CB_SCRIPT", "set_config", "language", $query->param('language')); system("$CB_SCRIPT", "set_config", "language", $query->param('language'));
&load_selected_language($pagedata); &load_selected_language($pagedata);
@ -542,8 +542,8 @@ if ( ! &check_ssl()) {
} else { } else {
$pagedata->setValue('Data.Success', 'ConfigSaved'); $pagedata->setValue('Data.Success', 'ConfigSaved');
} }
$pagedata->setValue('Data.Action', 'status'); $pagedata->setValue('Data.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} }
} }
@ -551,15 +551,15 @@ if ( ! &check_ssl()) {
} elsif ($action eq 'status') { } elsif ($action eq 'status') {
if ( ! &check_config()) { if ( ! &check_config()) {
$pagedata->setValue('Data.Warning', 'NotInitialized'); $pagedata->setValue('Data.Warning', 'NotInitialized');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} elsif (&check_init_running()) { } elsif (&check_init_running()) {
$pagedata->setValue('Data.Warning', 'InitNotFinished'); $pagedata->setValue('Data.Warning', 'InitNotFinished');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'config_form'); $pagedata->setValue('Data.Redirect.Action', 'form_config');
$pagedata->setValue('Data.Redirect.Delay', "30"); $pagedata->setValue('Data.Redirect.Delay', "30");
} else { } else {
$pagedata->setValue('Data.Action', 'status'); $pagedata->setValue('Data.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "60"); $pagedata->setValue('Data.Redirect.Delay', "60");
} }
################### box_purge ####################### ################### box_purge #######################
@ -572,7 +572,7 @@ if ( ! &check_ssl()) {
my $current_admin_pw = &get_admin_pw; my $current_admin_pw = &get_admin_pw;
if ($current_admin_pw ne $query->param('current_admin_password')) { if ($current_admin_pw ne $query->param('current_admin_password')) {
$pagedata->setValue('Data.Warning', 'WrongAdminPassword'); $pagedata->setValue('Data.Warning', 'WrongAdminPassword');
$pagedata->setValue('Data.Action', 'config_form'); $pagedata->setValue('Data.Action', 'form_config');
} else { } else {
&box_purge; &box_purge;
} }
@ -590,14 +590,14 @@ if ( ! &check_ssl()) {
if (&check_init_running()) { if (&check_init_running()) {
$pagedata->setValue('Data.Warning', 'InitNotFinished'); $pagedata->setValue('Data.Warning', 'InitNotFinished');
$pagedata->setValue('Data.Action', 'empty'); $pagedata->setValue('Data.Action', 'empty');
$pagedata->setValue('Data.Redirect.Action', 'config_form'); $pagedata->setValue('Data.Redirect.Action', 'form_config');
$pagedata->setValue('Data.Redirect.Delay', "60"); $pagedata->setValue('Data.Redirect.Delay', "60");
} elsif (&check_config()) { } elsif (&check_config()) {
$pagedata->setValue('Data.Action', 'status'); $pagedata->setValue('Data.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Action', 'status'); $pagedata->setValue('Data.Redirect.Action', 'show_status');
$pagedata->setValue('Data.Redirect.Delay', "60"); $pagedata->setValue('Data.Redirect.Delay', "60");
} else { } else {
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'form_init');
} }
} }