|
|
|
@ -48,6 +48,8 @@ sub load_hdf
|
|
|
|
|
(my $script_url = $ENV{'SCRIPT_NAME'}) =~ m/^[^&]*/;
|
|
|
|
|
$hdf->setValue("ScriptName", ($ENV{'SCRIPT_NAME'} eq '/')? '/cryptobox' : $script_url );
|
|
|
|
|
|
|
|
|
|
&load_selected_language($hdf);
|
|
|
|
|
|
|
|
|
|
&get_available_languages($hdf);
|
|
|
|
|
|
|
|
|
|
return $hdf;
|
|
|
|
@ -75,9 +77,9 @@ sub load_selected_language
|
|
|
|
|
# load the data
|
|
|
|
|
$config_language = "$weblang";
|
|
|
|
|
# add the setting to every link
|
|
|
|
|
$pagedata->setValue('Data.PostData.weblang', "$weblang");
|
|
|
|
|
$data->setValue('Data.PostData.weblang', "$weblang");
|
|
|
|
|
} else {
|
|
|
|
|
$pagedata->setValue('Data.Warning', 'InvalidLanguage');
|
|
|
|
|
$data->setValue('Data.Warning', 'InvalidLanguage');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
# import the configured resp. the temporarily selected language
|
|
|
|
@ -86,13 +88,13 @@ sub load_selected_language
|
|
|
|
|
########## select documentation language ##########
|
|
|
|
|
if (&validate_doc_language($config_language)) {
|
|
|
|
|
# selected web interface language
|
|
|
|
|
$pagedata->setValue('Settings.DocLang', "$config_language");
|
|
|
|
|
$data->setValue('Settings.DocLang', "$config_language");
|
|
|
|
|
} elsif (&validate_doc_language($DEFAULT_LANGUAGE)) {
|
|
|
|
|
# configured CryptoBox language
|
|
|
|
|
$pagedata->setValue('Settings.DocLang', "$DEFAULT_LANGUAGE");
|
|
|
|
|
$data->setValue('Settings.DocLang', "$DEFAULT_LANGUAGE");
|
|
|
|
|
} else {
|
|
|
|
|
# default hardcoded language (english)
|
|
|
|
|
$pagedata->setValue('Settings.DocLang', "en");
|
|
|
|
|
$data->setValue('Settings.DocLang', "en");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -175,8 +177,6 @@ sub get_admin_pw
|
|
|
|
|
|
|
|
|
|
sub render
|
|
|
|
|
{
|
|
|
|
|
&load_selected_language($pagedata);
|
|
|
|
|
|
|
|
|
|
$pagedata->setValue("PageName","$pagename");
|
|
|
|
|
my $pagefile = "$HTML_TEMPLATE_DIR/main.cs";
|
|
|
|
|
print "Content-Type: text/html\n\n";
|
|
|
|
@ -319,11 +319,11 @@ if ( ! &check_ssl()) {
|
|
|
|
|
# unmounten
|
|
|
|
|
&umount_vol();
|
|
|
|
|
if (&check_mounted()) {
|
|
|
|
|
$pagedata->setValue('Data.Warning', 'UmountFailed');
|
|
|
|
|
$pagedata->setValue('Data.Action', 'umount_form');
|
|
|
|
|
$pagedata->setValue('Data.Warning', 'UmountFailed');
|
|
|
|
|
$pagedata->setValue('Data.Action', 'umount_form');
|
|
|
|
|
} else {
|
|
|
|
|
$pagedata->setValue('Data.Success', 'UmountDone');
|
|
|
|
|
$pagedata->setValue('Data.Action', 'mount_form');
|
|
|
|
|
$pagedata->setValue('Data.Success', 'UmountDone');
|
|
|
|
|
$pagedata->setValue('Data.Action', 'mount_form');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
################ mount_do ########################
|
|
|
|
@ -450,6 +450,7 @@ if ( ! &check_ssl()) {
|
|
|
|
|
$pagedata->setValue('Data.Action', 'config_form');
|
|
|
|
|
} else {
|
|
|
|
|
system("$CB_SCRIPT", "set_config", "language", $query->param('language'));
|
|
|
|
|
&load_selected_language($pagedata);
|
|
|
|
|
system("$CB_SCRIPT", "set_config", "timeout", $query->param('timeout'));
|
|
|
|
|
# check, if the ip was reconfigured
|
|
|
|
|
if ($query->param('ip') ne `$CB_SCRIPT get_config ip`)
|
|
|
|
|