From bcb615c5fc85451d9b6292921068a1d5444917f2 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 25 Apr 2018 09:36:58 +0000 Subject: [PATCH] sysutils/nut: fixes for @mimugmail --- .../OPNsense/Nut/Api/ServiceController.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php index 89bf1c414..fbf732f15 100644 --- a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php +++ b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php @@ -30,6 +30,7 @@ namespace OPNsense\Nut\Api; use OPNsense\Base\ApiMutableServiceControllerBase; use OPNsense\Core\Backend; +use OPNsense\Nut\Nut; class ServiceController extends ApiMutableServiceControllerBase { @@ -40,19 +41,17 @@ class ServiceController extends ApiMutableServiceControllerBase public function upsstatusAction() { - $model = new Nut(); - $cnf = Config::getInstance()->object(); - $host = "127.0.0.1"; - if (!empty((string)$cnf->netclient->address)) { - $host = (string)$cnf->netclient->address; + $mdl = new Nut(); + $host = '127.0.0.1'; + if (!empty((string)$mdl->netclient->address)) { + $host = (string)$mdl->netclient->address; } - $upsname = "UPSName"; - if (!empty((string)$cnf->general->name)) { - $upsname = (string)$cnf->general->name; + $upsname = 'UPSName'; + if (!empty((string)$mdl->general->name)) { + $upsname = (string)$mdl->general->name; } - $ups = $upsname . '@' . $host; $backend = new Backend(); - $response = $backend->configdpRun("nut upsstatus", array($ups)); + $response = $backend->configdpRun('nut upsstatus', array("{$upsname}@{$host}")); return array("response" => $response); } }