X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Ftor.cgi;fp=html%2Fcgi-bin%2Ftor.cgi;h=2ae9b6aebca6dbfbedd8c521ca1741d6f7eb623e;hp=6b4d9cc1b25b370905d5331f30c231dc70acd7c2;hb=005db20668d04046ad4a9b256fa17dc961258977;hpb=ae4bf64b6af924b6cace4515daca3e1eeca8184c
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 6b4d9cc1b..2ae9b6aeb 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -88,9 +88,6 @@ my $warnmessage = '';
&Header::showhttpheaders();
-# Load settings from file.
-&General::readhash("${General::swroot}/tor/settings", \%settings);
-
# Get GUI values.
&Header::getcgihash(\%settings);
@@ -132,6 +129,9 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
$settings{'ACTION'} = '';
}
+# Load settings from file.
+&General::readhash("${General::swroot}/tor/settings", \%settings);
+
&showMainBox();
# Close Tor control connection.
@@ -171,21 +171,19 @@ sub showMainBox() {
$Lang::tr{'tor enabled'}: |
- |
- |
- |
+ |
+ $Lang::tr{'tor socks port'}: |
+ |
$Lang::tr{'tor relay enabled'}: |
- |
+ |
|
- |
+ |
END
- &Header::closebox();
-
if ($settings{'TOR_ENABLED'} eq 'on') {
my @temp = split(",", $settings{'TOR_ALLOWED_SUBNETS'});
$settings{'TOR_ALLOWED_SUBNETS'} = join("\n", @temp);
@@ -193,18 +191,10 @@ END
@temp = split(",", $settings{'TOR_USE_EXIT_NODES'});
$settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp);
- &Header::openbox('100%', 'left', $Lang::tr{'tor configuration'});
-
print <
-
- $Lang::tr{'tor socks port'}: |
- |
- |
-
-
-
+
+
+
+
@@ -250,16 +242,17 @@ END
print <
-
+ |
|
+
END
-
- &Header::closebox();
}
+ &Header::closebox();
+
if ($settings{'TOR_RELAY_ENABLED'} eq 'on') {
$checked{'TOR_RELAY_NOADVERTISE'}{'on'} = '';
$checked{'TOR_RELAY_NOADVERTISE'}{'off'} = '';
@@ -678,9 +671,9 @@ sub BuildConfiguration() {
# Restart the service.
if (($settings{'TOR_ENABLED'} eq 'on') || ($settings{'TOR_RELAY_ENABLED'} eq 'on')) {
- system("/usr/local/bin/torctrl restart");
+ system("/usr/local/bin/torctrl restart &>/dev/null");
} else {
- system("/usr/local/bin/torctrl stop");
+ system("/usr/local/bin/torctrl stop &>/dev/null");
}
}