Die CryptoBox
diff --git a/cryptobox.conf.d/var/www/cgi-bin/cryptobox.pl b/cryptobox.conf.d/var/www/cgi-bin/cryptobox.pl
index 480ca0d..93b627a 100755
--- a/cryptobox.conf.d/var/www/cgi-bin/cryptobox.pl
+++ b/cryptobox.conf.d/var/www/cgi-bin/cryptobox.pl
@@ -41,11 +41,7 @@ sub load_hdf()
{
my $hdf = ClearSilver::HDF->new();
- my $fname = "$LANGUAGE_DIR/$LANGUAGE" . '.hdf';
- die ("Language file ($fname) not found!") unless (-e "$fname");
- $hdf->readFile("$fname");
-
- $fname = "$TEMPLATE_DIR/main.cs";
+ my $fname = "$TEMPLATE_DIR/main.cs";
die ("Template directory is invalid ($fname not found)!") unless (-e "$fname");
$hdf->setValue("TemplateDir","$TEMPLATE_DIR");
@@ -56,10 +52,48 @@ sub load_hdf()
# set a real script name - otherwise links with a query string will break
$hdf->setValue("ScriptName", ($ENV{'SCRIPT_NAME'} eq '/')? '/cryptobox' : $ENV{'SCRIPT_NAME'});
+ &load_language_data($hdf, $LANGUAGE);
+
+ &get_available_languages($hdf);
+
return $hdf;
}
+sub load_language_data()
+# import the specified language data
+# every call overrides previously loaded values
+# it is sufficient to call it somewhere before "render"
+{
+ my $data = shift;
+ my $lang = shift;
+ my $fname = "$LANGUAGE_DIR/$lang" . '.hdf';
+ die ("Language file ($fname) not found!") unless (-e "$fname");
+ $data->readFile("$fname");
+}
+
+
+sub get_available_languages()
+# import the names of all available languages
+{
+ my $data = shift;
+ my ($file, @files, $hdf, $lang_name);
+
+ opendir(DIR, $LANGUAGE_DIR) or die ("Language directory ($LANGUAGE_DIR) not accessible!");
+ @files = grep { /.*\.hdf$/ } readdir(DIR);
+ close(DIR);
+
+ foreach $file (@files) {
+ warn "$file";
+ $hdf = ClearSilver::HDF->new();
+ $hdf->readFile("$LANGUAGE_DIR/$file");
+ substr($file, -4) = "";
+ $lang_name = $hdf->getValue("Lang.Name", "$file");
+ $data->setValue("Data.Languages." . "$file", "$lang_name");
+ }
+}
+
+
sub check_ssl
{
# BEWARE: dirty trick - is there a better way?
@@ -283,9 +317,24 @@ if ( ! &check_ssl()) {
} else {
$pagedata->setValue('Data.Action', 'config_form');
}
+ #################### set_lang ########################
+ } elsif ($action eq 'set_lang') {
+ # TODO: check for invalid file names (containing "../../.." and so on)
+ # TODO: ugly problem: can't save the setting, as long as the box is unconfigured
+ my $language = $query->param('language');
+ my $lang_file = "$LANGUAGE_DIR/$language" . ".hdf";
+ if (-e "$lang_file") {
+ system("$CB_SCRIPT", "set_config", "language", "$language");
+ &load_language_data($pagedata, $language);
+ } else {
+ # warning for user is not necessary, as this wrong value
+ # has surely been injected
+ warn ("Could not find language file ($lang_file)!");
+ }
+ $pagedata->setValue('Data.Action', 'intro');
#################### config_do #######################
} elsif ($action eq 'config_do') {
- # TODO: not implemented yet!
+ # TODO: parse for valid values
system("$CB_SCRIPT", "set_config", "language", $query->param('language'));
system("$CB_SCRIPT", "set_config", "timeout", $query->param('timeout'));
system("$CB_SCRIPT", "set_config", "ip", $query->param('ip'));
diff --git a/cryptobox.conf.d/var/www/cryptobox.css b/cryptobox.conf.d/var/www/cryptobox.css
index 346bdc8..7194251 100644
--- a/cryptobox.conf.d/var/www/cryptobox.css
+++ b/cryptobox.conf.d/var/www/cryptobox.css
@@ -94,8 +94,6 @@ body {
#words {
width: 570px;
-// warum float?
-// float: left;
padding: 1.1em 0em 1.1em 1.1em;
margin-top: 0;
}
@@ -159,6 +157,7 @@ body {
margin-bottom: 20px;
padding-top: 10px;
padding-bottom: 15px;
+ color: #707070;
}
#words .warning {
@@ -171,6 +170,10 @@ body {
font-size: 0.9em;
}
+#words div.warning h1,h2 {
+ color: #808080;
+ }
+
#words .warning a {
line-height: 5em;
color: #5e5e5e;
@@ -242,3 +245,23 @@ button:hover {
#words form p {
text-align: center;
}
+
+/* ------------=-=-=- language selection -=-=-=------------- */
+
+#lang {
+ position: absolute;
+ float: right;
+ right: 5px;
+ top: 5px;
+ text-align: right;
+ }
+
+#lang a {
+ color: #acacac;
+ font-family: verdana, lucida, arial, helvetica, sans-serif;
+ font-size: smaller;
+ }
+
+#lang a:hover {
+ color: #707070;
+ }