From 448243f92bbed45d0708fe7753044f27401559db Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 24 Oct 2005 10:32:56 +0000 Subject: [PATCH] renamed templates from '..._form.cs' to 'form_....cs' renamed 'status.cs' to 'show_status.cs' renamed 'doc.cs' to 'show_doc.cs' --- .../{config_form.cs => form_config.cs} | 0 .../templates/{init_form.cs => form_init.cs} | 0 .../{mount_form.cs => form_mount.cs} | 0 .../{shutdown_form.cs => form_shutdown.cs} | 0 .../{umount_form.cs => form_umount.cs} | 0 .../templates/{doc.cs => show_doc.cs} | 0 .../templates/{status.cs => show_status.cs} | 0 cbox-tree.d/var/www/cgi-bin/cryptobox.pl | 96 +++++++++---------- 8 files changed, 48 insertions(+), 48 deletions(-) rename cbox-tree.d/usr/share/cryptobox/templates/{config_form.cs => form_config.cs} (100%) rename cbox-tree.d/usr/share/cryptobox/templates/{init_form.cs => form_init.cs} (100%) rename cbox-tree.d/usr/share/cryptobox/templates/{mount_form.cs => form_mount.cs} (100%) rename cbox-tree.d/usr/share/cryptobox/templates/{shutdown_form.cs => form_shutdown.cs} (100%) rename cbox-tree.d/usr/share/cryptobox/templates/{umount_form.cs => form_umount.cs} (100%) rename cbox-tree.d/usr/share/cryptobox/templates/{doc.cs => show_doc.cs} (100%) rename cbox-tree.d/usr/share/cryptobox/templates/{status.cs => show_status.cs} (100%) diff --git a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/form_config.cs similarity index 100% rename from cbox-tree.d/usr/share/cryptobox/templates/config_form.cs rename to cbox-tree.d/usr/share/cryptobox/templates/form_config.cs diff --git a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/form_init.cs similarity index 100% rename from cbox-tree.d/usr/share/cryptobox/templates/init_form.cs rename to cbox-tree.d/usr/share/cryptobox/templates/form_init.cs diff --git a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/form_mount.cs similarity index 100% rename from cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs rename to cbox-tree.d/usr/share/cryptobox/templates/form_mount.cs diff --git a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/form_shutdown.cs similarity index 100% rename from cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs rename to cbox-tree.d/usr/share/cryptobox/templates/form_shutdown.cs diff --git a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/form_umount.cs similarity index 100% rename from cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs rename to cbox-tree.d/usr/share/cryptobox/templates/form_umount.cs diff --git a/cbox-tree.d/usr/share/cryptobox/templates/doc.cs b/cbox-tree.d/usr/share/cryptobox/templates/show_doc.cs similarity index 100% rename from cbox-tree.d/usr/share/cryptobox/templates/doc.cs rename to cbox-tree.d/usr/share/cryptobox/templates/show_doc.cs diff --git a/cbox-tree.d/usr/share/cryptobox/templates/status.cs b/cbox-tree.d/usr/share/cryptobox/templates/show_status.cs similarity index 100% rename from cbox-tree.d/usr/share/cryptobox/templates/status.cs rename to cbox-tree.d/usr/share/cryptobox/templates/show_status.cs diff --git a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl index c84662a..5fe9489 100755 --- a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl +++ b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl @@ -327,20 +327,20 @@ if ( ! &check_ssl()) { } elsif ($action eq 'doc') { if ($query->param('page')) { $pagedata->setValue('Data.Doc.Page', $query->param('page')); - $pagedata->setValue('Data.Action', 'doc'); + $pagedata->setValue('Data.Action', 'show_doc'); } else { $pagedata->setValue('Data.Doc.Page', 'CryptoBoxUser'); - $pagedata->setValue('Data.Action', 'doc'); + $pagedata->setValue('Data.Action', 'show_doc'); } ##################### poweroff ###################### } elsif ($action eq 'shutdown_ask') { - $pagedata->setValue('Data.Action', 'shutdown_form'); + $pagedata->setValue('Data.Action', 'form_shutdown'); ##################### reboot ######################## } elsif ($action eq 'shutdown_do') { if ($query->param('type') eq 'reboot') { &system_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"); } else { &system_poweroff(); @@ -359,11 +359,11 @@ if ( ! &check_ssl()) { } elsif ($action eq 'umount_do') { if ( ! &check_config()) { $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } elsif (&check_init_running()) { $pagedata->setValue('Data.Warning', 'InitNotFinished'); $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"); } elsif ( ! &check_mounted()) { $pagedata->setValue('Data.Warning', 'NotMounted'); @@ -373,11 +373,11 @@ if ( ! &check_ssl()) { &umount_vol(); if (&check_mounted()) { $pagedata->setValue('Data.Warning', 'UmountFailed'); - $pagedata->setValue('Data.Action', 'umount_form'); + $pagedata->setValue('Data.Action', 'form_umount'); } else { $pagedata->setValue('Data.Success', 'UmountDone'); $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "30"); } } @@ -386,31 +386,31 @@ if ( ! &check_ssl()) { # mount requested if ( ! &check_config()) { $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } elsif (&check_init_running()) { $pagedata->setValue('Data.Warning', 'InitNotFinished'); $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"); } elsif (&check_mounted()) { $pagedata->setValue('Data.Warning', 'IsMounted'); $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "30"); } elsif ($query->param('crypto_password') eq '') { # leeres Passwort $pagedata->setValue('Data.Warning', 'EmptyCryptoPassword'); - $pagedata->setValue('Data.Action', 'mount_form'); + $pagedata->setValue('Data.Action', 'form_mount'); } else { # mounten &mount_vol($query->param('crypto_password')); if (!&check_mounted()) { $pagedata->setValue('Data.Warning', 'MountFailed'); - $pagedata->setValue('Data.Action', 'mount_form'); + $pagedata->setValue('Data.Action', 'form_mount'); } else { $pagedata->setValue('Data.Success', 'MountDone'); $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "30"); } } @@ -418,66 +418,66 @@ if ( ! &check_ssl()) { } elsif ($action eq 'mount_ask') { if ( ! &check_config()) { $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } elsif (&check_init_running()) { $pagedata->setValue('Data.Warning', 'InitNotFinished'); $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"); } elsif (&check_mounted()) { $pagedata->setValue('Data.Warning', 'IsMounted'); $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "30"); } else { - $pagedata->setValue('Data.Action', 'mount_form'); + $pagedata->setValue('Data.Action', 'form_mount'); } ################# umount_ask ######################## } elsif ($action eq 'umount_ask') { if ( ! &check_config()) { $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } elsif ( ! &check_mounted()) { $pagedata->setValue('Data.Warning', 'NotMounted'); $pagedata->setValue('Data.Action', 'empty'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "30"); } else { - $pagedata->setValue('Data.Action', 'umount_form'); + $pagedata->setValue('Data.Action', 'form_umount'); } ################## init_ask ######################### } elsif ($action eq 'init_ask') { if (&check_init_running()) { $pagedata->setValue('Data.Warning', 'InitNotFinished'); - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } elsif (&check_config()) { $pagedata->setValue('Data.Warning', 'AlreadyConfigured'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } else { - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } #################### init_do ######################## } elsif ($action eq 'init_do') { my $current_admin_pw = &get_admin_pw; if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) { $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')) { # different admin-passwords $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')) { # different crypto-passwords $pagedata->setValue('Data.Warning', 'DifferentCryptoPasswords'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } elsif ($query->param('crypto_password') eq '') { # empty password $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','')) { # wrong confirm string $pagedata->setValue('Data.Warning', 'InitNotConfirmed'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } else { # do init &box_init($query->param('crypto_password'),$query->param('admin_password')); @@ -485,36 +485,36 @@ if ( ! &check_ssl()) { $pagedata->setValue('Data.Error', 'InitFailed'); } else { $pagedata->setValue('Data.Success', 'InitRunning'); - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } } #################### config_ask ###################### } elsif ($action eq 'config_ask') { if ( ! &check_config()) { $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } else { - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } #################### config_do ####################### } elsif ($action eq 'config_do') { if ( ! &check_config()) { $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } else { my $current_admin_pw = &get_admin_pw; if ($current_admin_pw ne '' && $current_admin_pw ne $query->param('current_admin_password')) { $pagedata->setValue('Data.Warning', 'WrongAdminPassword'); - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } elsif ( ! &validate_language($query->param('language'))) { $pagedata->setValue('Data.Warning', 'InvalidLanguage'); - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } elsif ( ! &validate_ip($query->param('ip'))) { $pagedata->setValue('Data.Warning', 'InvalidIP'); - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } elsif ( ! &validate_timeout($query->param('timeout'))) { $pagedata->setValue('Data.Warning', 'InvalidTimeOut'); - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } else { system("$CB_SCRIPT", "set_config", "language", $query->param('language')); &load_selected_language($pagedata); @@ -542,8 +542,8 @@ if ( ! &check_ssl()) { } else { $pagedata->setValue('Data.Success', 'ConfigSaved'); } - $pagedata->setValue('Data.Action', 'status'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Action', 'show_status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "30"); } } @@ -551,15 +551,15 @@ if ( ! &check_ssl()) { } elsif ($action eq 'status') { if ( ! &check_config()) { $pagedata->setValue('Data.Warning', 'NotInitialized'); - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } elsif (&check_init_running()) { $pagedata->setValue('Data.Warning', 'InitNotFinished'); $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"); } else { - $pagedata->setValue('Data.Action', 'status'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Action', 'show_status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "60"); } ################### box_purge ####################### @@ -572,7 +572,7 @@ if ( ! &check_ssl()) { my $current_admin_pw = &get_admin_pw; if ($current_admin_pw ne $query->param('current_admin_password')) { $pagedata->setValue('Data.Warning', 'WrongAdminPassword'); - $pagedata->setValue('Data.Action', 'config_form'); + $pagedata->setValue('Data.Action', 'form_config'); } else { &box_purge; } @@ -590,14 +590,14 @@ if ( ! &check_ssl()) { if (&check_init_running()) { $pagedata->setValue('Data.Warning', 'InitNotFinished'); $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"); } elsif (&check_config()) { - $pagedata->setValue('Data.Action', 'status'); - $pagedata->setValue('Data.Redirect.Action', 'status'); + $pagedata->setValue('Data.Action', 'show_status'); + $pagedata->setValue('Data.Redirect.Action', 'show_status'); $pagedata->setValue('Data.Redirect.Delay', "60"); } else { - $pagedata->setValue('Data.Action', 'init_form'); + $pagedata->setValue('Data.Action', 'form_init'); } }