From 4f890b2de1e3eb87f22615146239d8d7dd370a76 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 11 Dec 2017 07:25:04 +0100
Subject: [PATCH] net-mgmt/collectd: merge cleanups from master

---
 .../OPNsense/Collectd/Api/ServiceController.php          | 9 +++++++--
 .../controllers/OPNsense/Collectd/GeneralController.php  | 1 -
 .../mvc/app/views/OPNsense/Collectd/general.volt         | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
index 6ae1bb15c..63355dc4d 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
@@ -48,8 +48,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("collectd start", true);
+            $response = $backend->configdRun("collectd start");
             return array("response" => $response);
         } else {
             return array("response" => array());
@@ -63,6 +65,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("collectd stop");
             return array("response" => $response);
@@ -78,6 +82,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("collectd restart");
             return array("response" => $response);
@@ -111,7 +117,6 @@ class ServiceController extends ApiControllerBase
             $status = "unkown";
         }
 
-
         return array("status" => $status);
     }
 
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
index 56e7bebfa..402315275 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
@@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Collectd Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->pick('OPNsense/Collectd/general');
     }
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
index 15bb6d3a2..d093033e2 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
@@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #}
 <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>