netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/relayd: style part 2/2

Browse Source
This commit is contained in:
Franco Fichtner
2018-02-07 14:07:10 +00:00
parent c84ee38985
commit 97c3975db3
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
-1
View File
@@ -70,7 +70,6 @@ function relayd_xmlrpc_sync()
'section' => 'OPNsense.relayd',
'id' => 'relayd',
));
}
function relayd_syslog()
net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
+9 -9
View File
@@ -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);
}
}
net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/StatusController.php
+1 -1
View File
@@ -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]);
net/relayd/src/opnsense/scripts/OPNsense/Relayd/post-install.php
+6 -6
View File
@@ -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) &&