diff --git a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php index 3fa2f25a5..5caae55f4 100644 --- a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php +++ b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php @@ -84,8 +84,6 @@ class ServiceController extends ApiMutableServiceControllerBase public function resetAction() { if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); $backend = new Backend(); return array('status' => $backend->configdRun('proxy reset')); } else { @@ -101,8 +99,6 @@ class ServiceController extends ApiMutableServiceControllerBase public function refreshTemplateAction() { if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); $backend = new Backend(); return array('status' => $backend->configdRun('template reload OPNsense/Proxy')); } else { @@ -118,9 +114,6 @@ class ServiceController extends ApiMutableServiceControllerBase public function fetchaclsAction() { if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); - $backend = new Backend(); // generate template $backend->configdRun('template reload OPNsense/Proxy'); @@ -140,9 +133,6 @@ class ServiceController extends ApiMutableServiceControllerBase public function downloadaclsAction() { if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); - $backend = new Backend(); // generate template $backend->configdRun('template reload OPNsense/Proxy'); diff --git a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php index e6f33dba0..faa8cfc6c 100644 --- a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php +++ b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php @@ -50,7 +50,6 @@ class SettingsController extends ApiMutableModelControllerBase */ public function searchRemoteBlacklistsAction() { - $this->sessionClose(); $mdlProxy = $this->getModel(); $grid = new UIModelGrid($mdlProxy->forward->acl->remoteACLs->blacklists->blacklist); return $grid->fetchBindRequest( @@ -153,7 +152,6 @@ class SettingsController extends ApiMutableModelControllerBase */ public function searchPACRuleAction() { - $this->sessionClose(); return $this->searchBase('pac.rule', array("enabled", "description", "proxies", "matches"), "description"); } @@ -164,7 +162,6 @@ class SettingsController extends ApiMutableModelControllerBase */ public function getPACRuleAction($uuid = null) { - $this->sessionClose(); return array("pac" => $this->getBase('rule', 'pac.rule', $uuid)); } @@ -217,7 +214,6 @@ class SettingsController extends ApiMutableModelControllerBase */ public function searchPACProxyAction() { - $this->sessionClose(); return $this->searchBase('pac.proxy', array("enabled","proxy_type", "name", "url", "description"), "description"); } @@ -228,7 +224,6 @@ class SettingsController extends ApiMutableModelControllerBase */ public function getPACProxyAction($uuid = null) { - $this->sessionClose(); return array("pac" => $this->getBase('proxy', 'pac.proxy', $uuid)); } @@ -270,7 +265,6 @@ class SettingsController extends ApiMutableModelControllerBase */ public function searchPACMatchAction() { - $this->sessionClose(); return $this->searchBase('pac.match', array("enabled", "name", "description", "negate", "match_type"), "name"); } @@ -281,7 +275,6 @@ class SettingsController extends ApiMutableModelControllerBase */ public function getPACMatchAction($uuid = null) { - $this->sessionClose(); return array("pac" => $this->getBase('match', 'pac.match', $uuid)); } diff --git a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/TemplateController.php b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/TemplateController.php index 2f241f1cc..aab6b0ced 100644 --- a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/TemplateController.php +++ b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/TemplateController.php @@ -50,7 +50,6 @@ class TemplateController extends ApiMutableModelControllerBase public function setAction() { if ($this->request->isPost() && $this->request->hasPost("content")) { - $this->sessionClose(); $mdl = $this->getModel(); $mdl->error_pages->template = $this->request->getPost("content", "striptags"); $result = $this->validate();