webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

tor.cgi: Minor functionality fixes and layout improvements.

Browse Source
This commit is contained in:
Michael Tremer
2013-07-31 19:11:59 +02:00
parent ae4bf64b6a
commit 005db20668
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
html/cgi-bin/tor.cgi
View File

@@ -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() {
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor enabled'}:</td>
<td width='20%'><input type='checkbox' name='TOR_ENABLED' $checked{'TOR_ENABLED'}{'on'} /></td>
<td width='25%' class='base'></td>
<td width='30%'></td>
<td width='30%'><input type='checkbox' name='TOR_ENABLED' $checked{'TOR_ENABLED'}{'on'} /></td>
<td width='25%' class='base'>$Lang::tr{'tor socks port'}:</td>
<td width='20%'><input type='text' name='TOR_SOCKS_PORT' value='$settings{'TOR_SOCKS_PORT'}' size='5' /></td>
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor relay enabled'}:</td>
<td width='20%'><input type='checkbox' name='TOR_RELAY_ENABLED' $checked{'TOR_RELAY_ENABLED'}{'on'} /></td>
<td width='30%'><input type='checkbox' name='TOR_RELAY_ENABLED' $checked{'TOR_RELAY_ENABLED'}{'on'} /></td>
<td width='25%' class='base'></td>
<td width='30%'></td>
<td width='20%'></td>
</tr>
</table>
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 <<END;
<table width='100%'>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor socks port'}:</td>
<td width='30%'><input type='text' name='TOR_SOCKS_PORT' value='$settings{'TOR_SOCKS_PORT'}' size='5' /></td>
<td width='50%' class='base' colspan='2'></td>
</tr>
</table>
<br>
<hr size='1'>
<br>
<table width='100%'>
<tr>
@@ -224,7 +214,9 @@ END
</tr>
</table>
<br>
<hr size='1'>
<br>
<table width='100%'>
<tr>
@@ -250,16 +242,17 @@ END
print <<END;
</select>
</td>
<td colspan='2'>
<td width='50%' colspan='2'>
<textarea name='TOR_USE_EXIT_NODES' cols='32' rows='3' wrap='off'>$settings{'TOR_USE_EXIT_NODES'}</textarea>
</td>
</tr>
</table>
<br><br>
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");
}
}