upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #390 from fabianfrz/tor_block_page

Browse source 
block page if no socket exists
This commit is contained in:
Fabian Franz, BSc 2017-11-25 06:49:59 +01:00 committed by GitHub
commit 11d1881e4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
View file

@ -31,6 +31,8 @@
namespace OPNsense\Tor;
use OPNsense\Tor\General;
/**
* Class IndexController
* @package OPNsense/Tor
@ -57,8 +59,9 @@ class IndexController extends \OPNsense\Base\IndexController
}
public function diagnosticsAction()
{
$general = new General();
$this->view->title = gettext("The Onion Router - Diagnostics");
if ($this->is_tor_running()) {
if ($this->is_tor_running() && (int)((string)$general->control_port) > 0) {
$this->view->pick('OPNsense/Tor/diagnostics');
}
else {

2
security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/error.volt
View file

@ -28,5 +28,5 @@
#}
<div class="alert alert-warning" role="alert">
{{ lang._('This page is not available because Tor is not running. Please go to the %sconfiguration page%s and enable Tor.')|format('<a href="/ui/tor/">','</a>') }}
{{ lang._('This page is not available because Tor is not running or the control socket is not configured. Please go to the %sconfiguration page%s and enable Tor.')|format('<a href="/ui/tor/">','</a>') }}
</div>