|
|
|
@ -20,7 +20,7 @@ use ConfigFile;
|
|
|
|
|
|
|
|
|
|
my $CONFIG_FILE = '/etc/cryptobox/cryptobox.conf';
|
|
|
|
|
|
|
|
|
|
my ($pagedata, $pagename);
|
|
|
|
|
my $pagedata;
|
|
|
|
|
|
|
|
|
|
my ($LANGUAGE_DIR, $DEFAULT_LANGUAGE, $HTML_TEMPLATE_DIR, $DOC_DIR);
|
|
|
|
|
my ($CB_SCRIPT, $LOG_FILE, $IS_DEVEL);
|
|
|
|
@ -244,7 +244,6 @@ sub get_admin_pw
|
|
|
|
|
|
|
|
|
|
sub render
|
|
|
|
|
{
|
|
|
|
|
$pagedata->setValue("PageName","$pagename");
|
|
|
|
|
my $pagefile = "$HTML_TEMPLATE_DIR/main.cs";
|
|
|
|
|
print "Content-Type: text/html\n\n";
|
|
|
|
|
|
|
|
|
@ -320,10 +319,10 @@ sub validate_ip
|
|
|
|
|
my @octets = split /\./, $ip;
|
|
|
|
|
return 0 if ($#octets == 4);
|
|
|
|
|
# check for values and non-digits
|
|
|
|
|
return 0 if ((@octets[0] <= 0) || (@octets[0] >= 255) || (@octets[0] =~ /\D/));
|
|
|
|
|
return 0 if ((@octets[1] < 0) || (@octets[1] >= 255) || (@octets[1] =~ /\D/));
|
|
|
|
|
return 0 if ((@octets[2] < 0) || (@octets[2] >= 255) || (@octets[2] =~ /\D/));
|
|
|
|
|
return 0 if ((@octets[3] <= 0) || (@octets[3] >= 255) || (@octets[3] =~ /\D/));
|
|
|
|
|
return 0 if (($octets[0] <= 0) || ($octets[0] >= 255) || ($octets[0] =~ /\D/));
|
|
|
|
|
return 0 if (($octets[1] < 0) || ($octets[1] >= 255) || ($octets[1] =~ /\D/));
|
|
|
|
|
return 0 if (($octets[2] < 0) || ($octets[2] >= 255) || ($octets[2] =~ /\D/));
|
|
|
|
|
return 0 if (($octets[3] <= 0) || ($octets[3] >= 255) || ($octets[3] =~ /\D/));
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -663,7 +662,7 @@ if ( ! &check_ssl()) {
|
|
|
|
|
# check state of the cryptobox
|
|
|
|
|
$pagedata->setValue('Data.Status.Config', &check_config() ? 1 : 0);
|
|
|
|
|
$pagedata->setValue('Data.Status.InitRunning', &check_init_running() ? 1 : 0);
|
|
|
|
|
$pagedata->setValue('Data.Status.Mounted', &check_mounted() ? 1 : 0);
|
|
|
|
|
$pagedata->setValue('Data.Status.Mounted', &check_mounted() ? 1 : 0) if (&check_config());
|
|
|
|
|
my $output = &get_current_ip();
|
|
|
|
|
$pagedata->setValue('Data.Status.IP', "$output");
|
|
|
|
|
|
|
|
|
|