diff --git a/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc b/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc index d859316fc..bb8a14f9f 100644 --- a/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc +++ b/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc @@ -57,26 +57,22 @@ function udpbroadcastrelay_services() $model = new \OPNsense\UDPBroadcastRelay\UDPBroadcastRelay(); foreach ($model->udpbroadcastrelay->iterateItems() as $server) { - - if ($server->enabled == '0'){ + if ($server->enabled == '0') { continue; } $services[] = array( - 'description' => $server->description, 'id' => $server->InstanceID, 'pidfile' => "/var/run/udpbroadcastrelay_{$server->InstanceID}.pid", 'configd' => array( - 'restart' => array('udpbroadcastrelay restart '.$server->InstanceID), - 'start' => array('udpbroadcastrelay start '.$server->InstanceID), - 'stop' => array('udpbroadcastrelay stop '.$server->InstanceID), + 'restart' => array('udpbroadcastrelay restart ' . $server->InstanceID), + 'start' => array('udpbroadcastrelay start ' . $server->InstanceID), + 'stop' => array('udpbroadcastrelay stop ' . $server->InstanceID), ), - 'name' => 'udpbroadcastrelay', ); - } return $services; diff --git a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/ServiceController.php b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/ServiceController.php index d14f101f4..b64d378d5 100644 --- a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/ServiceController.php +++ b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/ServiceController.php @@ -27,9 +27,10 @@ */ namespace OPNsense\UDPBroadcastRelay\Api; -use \OPNsense\Base\ApiMutableModelControllerBase; -use \OPNsense\UDPBroadcastRelay\UDPBroadcastRelay; -use \OPNsense\Core\Backend; + +use OPNsense\Base\ApiMutableModelControllerBase; +use OPNsense\UDPBroadcastRelay\UDPBroadcastRelay; +use OPNsense\Core\Backend; /** * Class ServiceController Handles settings related API actions for the UDPBroadcastRelay @@ -38,7 +39,7 @@ use \OPNsense\Core\Backend; class ServiceController extends ApiMutableModelControllerBase { protected static $internalModelName = 'udpbroadcastrelay'; - protected static $internalModelClass = '\OPNsense\\UDPBroadcastRelay\\UDPBroadcastRelay'; + protected static $internalModelClass = '\OPNsense\UDPBroadcastRelay\UDPBroadcastRelay'; protected static $internalModelUseSafeDelete = true; public function statusAction($uuid) @@ -167,7 +168,6 @@ class ServiceController extends ApiMutableModelControllerBase } if ($action == 'reload') { return trim($backend->configdRun('udpbroadcastrelay reload')); - } return "Wrong action defined"; } diff --git a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php index 48c76094e..4f63375cc 100644 --- a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php +++ b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php @@ -28,11 +28,11 @@ namespace OPNsense\UDPBroadcastRelay\Api; +use OPNsense\Base\ApiMutableModelControllerBase; +use OPNsense\Core\Config; +use OPNsense\UDPBroadcastRelay\UDPBroadcastRelay; +use OPNsense\Base\UIModelGrid; -use \OPNsense\Base\ApiMutableModelControllerBase; -use \OPNsense\Core\Config; -use \OPNsense\UDPBroadcastRelay\UDPBroadcastRelay; -use \OPNsense\Base\UIModelGrid; /** * Class SettingsController Handles settings related API actions for the UDPBroadcastRelay * @package OPNsense\UDPBroadcastRelay @@ -115,7 +115,7 @@ class SettingsController extends ApiMutableModelControllerBase ); } if ( - $node->listenport->__toString() == $CurrentRelay['listenport'] && + $node->listenport->__toString() == $CurrentRelay['listenport'] && $uuid != $CurrentUUID ) { return array( @@ -136,7 +136,7 @@ class SettingsController extends ApiMutableModelControllerBase ) ); } - $result = count(explode(',',$node->interfaces)); + $result = count(explode(',', $node->interfaces)); if ( $result < 2 && $uuid != $CurrentUUID @@ -190,7 +190,7 @@ class SettingsController extends ApiMutableModelControllerBase if ( $node->InstanceID->__toString() == $CurrentRelay['InstanceID'] && $node->listenport->__toString() == $CurrentRelay['listenport'] - ) { + ) { return array( "result" => "failed", "validations" => array( @@ -198,9 +198,9 @@ class SettingsController extends ApiMutableModelControllerBase "udpbroadcastrelay.listenport" => "Listen port already in use." ) ); - } + } if ( - $node->listenport->__toString() == $CurrentRelay['listenport'] + $node->listenport->__toString() == $CurrentRelay['listenport'] ) { return array( "result" => "failed", @@ -220,7 +220,7 @@ class SettingsController extends ApiMutableModelControllerBase ); } - $result = count(explode(',',$node->interfaces)); + $result = count(explode(',', $node->interfaces)); if ( $result < 2 ) {