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

net/siproxy: merge cleanups from master

Browse source
This commit is contained in:
Franco Fichtner 2017-12-11 07:30:06 +01:00
parent a39b2f79bc
commit b8748efa5c
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
View file

@ -59,8 +59,10 @@ class ServiceController extends ApiControllerBase
public function startAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("siproxd start", true);
$response = $backend->configdRun("siproxd start");
return array("response" => $response);
} else {
return array("response" => array());
@ -74,6 +76,8 @@ class ServiceController extends ApiControllerBase
public function stopAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("siproxd stop");
return array("response" => $response);
@ -89,6 +93,8 @@ class ServiceController extends ApiControllerBase
public function restartAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("siproxd restart");
return array("response" => $response);
@ -122,7 +128,6 @@ class ServiceController extends ApiControllerBase
$status = "unkown";
}
return array("status" => $status);
}

1
net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/GeneralController.php
View file

@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
{
public function indexAction()
{
$this->view->title = gettext("Siproxd Settings");
$this->view->generalForm = $this->getForm("general");
$this->view->formDialogEditSiproxdUser = $this->getForm("dialogEditSiproxdUser");
$this->view->formDialogEditSiproxdDomain = $this->getForm("dialogEditSiproxdDomain");

8
net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt
View file

@ -39,9 +39,9 @@ POSSIBILITY OF SUCH DAMAGE.
<div id="general" class="tab-pane fade in active">
<div class="content-box" style="padding-bottom: 1.5em;">
{{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
<hr />
<div class="col-md-12">
<button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
<hr />
<button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress"></i></button>
</div>
</div>
</div>
@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE.
</table>
<div class="col-md-12">
<hr />
<button class="btn btn-primary" id="saveAct_user" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_user_progress" class=""></i></button>
<button class="btn btn-primary" id="saveAct_user" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_user_progress"></i></button>
<br /><br />
</div>
</div>
@ -94,7 +94,7 @@ POSSIBILITY OF SUCH DAMAGE.
</table>
<div class="col-md-12">
<hr />
<button class="btn btn-primary" id="saveAct_domain" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_domain_progress" class=""></i></button>
<button class="btn btn-primary" id="saveAct_domain" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_domain_progress"></i></button>
<br /><br />
</div>
</div>