From 97c3975db3752307fbff3ac544eebcd378f2d5c2 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 7 Feb 2018 14:07:10 +0000 Subject: [PATCH] net/relayd: style part 2/2 --- .../src/etc/inc/plugins.inc.d/relayd.inc | 1 - .../OPNsense/Relayd/Api/SettingsController.php | 18 +++++++++--------- .../OPNsense/Relayd/Api/StatusController.php | 2 +- .../scripts/OPNsense/Relayd/post-install.php | 12 ++++++------ 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc index 92d26d35b..5f927f34c 100644 --- a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc +++ b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc @@ -70,7 +70,6 @@ function relayd_xmlrpc_sync() 'section' => 'OPNsense.relayd', 'id' => 'relayd', )); - } function relayd_syslog() diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php index 15d77c250..51cf2a554 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php @@ -106,11 +106,11 @@ class SettingsController extends ApiMutableModelControllerBase if ($relaydInfo[$nodeType]['transport_tablemode'] != 'least-states' && $relaydInfo[$nodeType]['transport_tablemode'] != 'roundrobin') { $result["validations"]['relayd.virtualserver.transport_tablemode'] = "Scheduler '" . $relaydInfo[$nodeType]['transport_tablemode'] . "' not supported for redirects."; - } - if ($relaydInfo[$nodeType]['backuptransport_tablemode'] != 'least-states' && + } + if ($relaydInfo[$nodeType]['backuptransport_tablemode'] != 'least-states' && $relaydInfo[$nodeType]['backuptransport_tablemode'] != 'roundrobin') { - $result["validations"]['relayd.virtualserver.backuptransport_tablemode'] = "Scheduler '" . $relaydInfo[$nodeType]['backuptransport_tablemode'] . "' not supported for redirects."; - } + $result["validations"]['relayd.virtualserver.backuptransport_tablemode'] = "Scheduler '" . $relaydInfo[$nodeType]['backuptransport_tablemode'] . "' not supported for redirects."; + } } if ($relaydInfo[$nodeType]['type'] == 'relay') { if ($relaydInfo[$nodeType]['transport_tablemode'] == 'least-states') { @@ -128,15 +128,15 @@ class SettingsController extends ApiMutableModelControllerBase } break; case 'script': - if(empty($relaydInfo[$nodeType]['path'])) { + if (empty($relaydInfo[$nodeType]['path'])) { $result["validations"]['relayd.tablecheck.path'] = "Script path cannot be empty."; } break; case 'http': - if(empty($relaydInfo[$nodeType]['path'])) { + if (empty($relaydInfo[$nodeType]['path'])) { $result["validations"]['relayd.tablecheck.path'] = "Path cannot be empty."; } - if(empty($relaydInfo[$nodeType]['code']) && empty($relaydInfo[$nodeType]['digest'])) { + if (empty($relaydInfo[$nodeType]['code']) && empty($relaydInfo[$nodeType]['digest'])) { $result["validations"]['relayd.tablecheck.code'] = "Provide one of Response Code or Message Digest."; $result["validations"]['relayd.tablecheck.digest'] = "Provide one of Response Code or Message Digest."; } @@ -160,7 +160,7 @@ class SettingsController extends ApiMutableModelControllerBase $result = array("result" => "failed"); if ($nodeType != null) { $this->validateNodeType($nodeType); - if($uuid != null) { + if ($uuid != null) { $mdlRelayd = new Relayd(); $node = $mdlRelayd->getNodeByReference($nodeType . '.' . $uuid); if ($node != null) { @@ -231,7 +231,7 @@ class SettingsController extends ApiMutableModelControllerBase */ private function validateNodeType($nodeType = null) { - if(array_search($nodeType, $this->nodeTypes) === false) { + if (array_search($nodeType, $this->nodeTypes) === false) { throw new \Exception('unknown nodeType: ' . $nodeType); } } diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php index 275fa58fe..9bd79ee5f 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php @@ -58,7 +58,7 @@ class StatusController extends ApiControllerBase $tableId = 0; $virtualserver = array(); $rows = array(); - foreach ( $output as $line) { + foreach ($output as $line) { $words = explode("\t", $line); $id = trim($words[0]); $type = trim($words[1]); diff --git a/net/relayd/src/opnsense/scripts/OPNsense/Relayd/post-install.php b/net/relayd/src/opnsense/scripts/OPNsense/Relayd/post-install.php index b72620be3..ad0771163 100755 --- a/net/relayd/src/opnsense/scripts/OPNsense/Relayd/post-install.php +++ b/net/relayd/src/opnsense/scripts/OPNsense/Relayd/post-install.php @@ -53,7 +53,7 @@ $tables = array(); $protocols = array(); $sticky = 0; -if(!empty($cfgObj->load_balancer->setting)) { +if (!empty($cfgObj->load_balancer->setting)) { $generalSetting = array(); if (!empty($cfgObj->load_balancer->setting->timeout)) { $generalSetting['timeout'] = $cfgObj->load_balancer->setting->timeout; @@ -75,7 +75,7 @@ if(!empty($cfgObj->load_balancer->setting)) { } } -if(!empty($cfgObj->load_balancer->monitor_type) && count($cfgObj->load_balancer->monitor_type)) { +if (!empty($cfgObj->load_balancer->monitor_type) && count($cfgObj->load_balancer->monitor_type)) { foreach ($cfgObj->load_balancer->monitor_type as $monitorType) { if (!empty($monitorType->name)) { $name = $monitorType->name->__toString(); @@ -134,7 +134,7 @@ if(!empty($cfgObj->load_balancer->monitor_type) && count($cfgObj->load_balancer- } } -if(!empty($cfgObj->load_balancer->lbpool) && count($cfgObj->load_balancer->lbpool)) { +if (!empty($cfgObj->load_balancer->lbpool) && count($cfgObj->load_balancer->lbpool)) { foreach ($cfgObj->load_balancer->lbpool as $lbpool) { if (!empty($lbpool->name) && !empty($lbpool->servers && @@ -182,12 +182,12 @@ if(!empty($cfgObj->load_balancer->lbpool) && count($cfgObj->load_balancer->lbpoo } $protocolDir = '/usr/local/etc/inc/plugins.inc.d/relayd'; -if(is_dir($protocolDir)) { +if (is_dir($protocolDir)) { $protocolFiles = glob($protocolDir . '/*.proto'); foreach ($protocolFiles as $protocolFile) { $content = file_get_contents($protocolFile); preg_match('/^([^\{]*)\{((.|\n|\r)*)\}((\s|\n|\r)*)$/', $content, $acontent); - if(preg_match('/^protocol\s+/', trim($acontent[1]))) { + if (preg_match('/^protocol\s+/', trim($acontent[1]))) { preg_match('/^([^\s]*)\s+([^\s]*)/', trim($acontent[1]), $protocol); } else { preg_match('/^([^\s]*)\s+([^\s]*)\s+([^\s]*)/', trim($acontent[1]), $protocol); @@ -213,7 +213,7 @@ if(is_dir($protocolDir)) { } } -if(!empty($cfgObj->load_balancer->virtual_server) && count($cfgObj->load_balancer->virtual_server)) { +if (!empty($cfgObj->load_balancer->virtual_server) && count($cfgObj->load_balancer->virtual_server)) { foreach ($cfgObj->load_balancer->virtual_server as $virtual_server) { if (!empty($virtual_server->name) && !empty($virtual_server->ipaddr) &&