From ef8ed9cc2600b810d62dbccd592bd7b041a7ec84 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 16 Dec 2024 08:57:50 +0100 Subject: [PATCH] src: style sweep --- plist | 1 + src/etc/inc/XMLRPC_Client.inc | 16 +++++------ .../Core/Api/HasyncStatusController.php | 8 +++--- .../scripts/system/ha_xmlrpc_exec.php | 27 +++++++++---------- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/plist b/plist index 91199c5ad..6d9c7227e 100644 --- a/plist +++ b/plist @@ -244,6 +244,7 @@ /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/DashboardController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/HasyncController.php +/usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/HasyncStatusController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/MenuController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/ServiceController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/SnapshotsController.php diff --git a/src/etc/inc/XMLRPC_Client.inc b/src/etc/inc/XMLRPC_Client.inc index 1acf86837..54ce5d169 100644 --- a/src/etc/inc/XMLRPC_Client.inc +++ b/src/etc/inc/XMLRPC_Client.inc @@ -49,26 +49,26 @@ function xmlrpc_execute($method, $params = [], $debug = false) if (!empty($hasync['synchronizetoip'])) { // determine target url - if (substr($hasync['synchronizetoip'],0, 4) == 'http') { + if (substr($hasync['synchronizetoip'], 0, 4) == 'http') { // URL provided - if (substr($hasync['synchronizetoip'], strlen($hasync['synchronizetoip'])-1, 1) == '/') { - $synchronizeto = $hasync['synchronizetoip']."xmlrpc.php"; + if (substr($hasync['synchronizetoip'], strlen($hasync['synchronizetoip']) - 1, 1) == '/') { + $synchronizeto = $hasync['synchronizetoip'] . "xmlrpc.php"; } else { - $synchronizeto = $hasync['synchronizetoip']."/xmlrpc.php"; + $synchronizeto = $hasync['synchronizetoip'] . "/xmlrpc.php"; } } elseif (!empty($config['system']['webgui']['protocol'])) { // no url provided, assume the backup is using the same settings as our box. $port = $config['system']['webgui']['port']; if (!empty($port)) { - $synchronizeto = $config['system']['webgui']['protocol'] . '://'.$hasync['synchronizetoip'].':'.$port."/xmlrpc.php"; + $synchronizeto = $config['system']['webgui']['protocol'] . '://' . $hasync['synchronizetoip'] . ':' . $port . "/xmlrpc.php"; } else { - $synchronizeto = $config['system']['webgui']['protocol'] . '://'.$hasync['synchronizetoip']."/xmlrpc.php" ; + $synchronizeto = $config['system']['webgui']['protocol'] . '://' . $hasync['synchronizetoip'] . "/xmlrpc.php"; } } $username = empty($hasync['username']) ? "root" : $hasync['username']; - $client = new SimpleXMLRPC_Client($synchronizeto,240); - $client->debug=$debug; + $client = new SimpleXMLRPC_Client($synchronizeto, 240); + $client->debug = $debug; $client->setCredentials($username, $hasync['password']); if ($client->query($method, $params)) { return $client->getResponse(); diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/HasyncStatusController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/HasyncStatusController.php index cb181585b..3f300cabb 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/HasyncStatusController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/HasyncStatusController.php @@ -57,7 +57,7 @@ class HasyncStatusController extends ApiControllerBase return $this->searchRecordsetBase($records); } - public function stopAction($service=null, $service_id=null) + public function stopAction($service = null, $service_id = null) { if ($this->request->isPost()) { return $this->remoteServiceAction('stop', $service, $service_id); @@ -65,7 +65,7 @@ class HasyncStatusController extends ApiControllerBase return ["status" => "failed"]; } - public function startAction($service=null, $service_id=null) + public function startAction($service = null, $service_id = null) { if ($this->request->isPost()) { return $this->remoteServiceAction('start', $service, $service_id); @@ -73,7 +73,7 @@ class HasyncStatusController extends ApiControllerBase return ["status" => "failed"]; } - public function restartAction($service=null, $service_id=null) + public function restartAction($service = null, $service_id = null) { if ($this->request->isPost()) { return $this->remoteServiceAction('restart', $service, $service_id); @@ -81,7 +81,7 @@ class HasyncStatusController extends ApiControllerBase return ["status" => "failed"]; } - public function restartAllAction($service=null, $service_id=null) + public function restartAllAction($service = null, $service_id = null) { if (true || $this->request->isPost()) { $backend = new Backend(); diff --git a/src/opnsense/scripts/system/ha_xmlrpc_exec.php b/src/opnsense/scripts/system/ha_xmlrpc_exec.php index a736f020d..e60d20ff5 100755 --- a/src/opnsense/scripts/system/ha_xmlrpc_exec.php +++ b/src/opnsense/scripts/system/ha_xmlrpc_exec.php @@ -29,7 +29,7 @@ require_once 'config.inc'; require_once 'util.inc'; -require_once "XMLRPC_Client.inc" ; +require_once 'XMLRPC_Client.inc'; $action = $argv[1] ?? ''; $service = $argv[2] ?? ''; @@ -37,34 +37,31 @@ $service_id = $argv[3] ?? ''; switch ($action) { case 'stop': - $result=xmlrpc_execute('opnsense.stop_service', ["service" => $service, "id" => $service_id]); - echo json_encode(["response" => $result, 'status' => 'ok']); + $result = xmlrpc_execute('opnsense.stop_service', ['service' => $service, 'id' => $service_id]); + echo json_encode(['response' => $result, 'status' => 'ok']); break; case 'start': - $result=xmlrpc_execute('opnsense.start_service', ["service" => $service, "id" => $service_id]); - echo json_encode(["response" => $result, 'status' => 'ok']); + $result = xmlrpc_execute('opnsense.start_service', ['service' => $service, 'id' => $service_id]); + echo json_encode(['response' => $result, 'status' => 'ok']); break; case 'restart': - $result=xmlrpc_execute('opnsense.restart_service', ["service" => $service, "id" => $service_id]); - echo json_encode(["response" => $result, 'status' => 'ok']); + $result = xmlrpc_execute('opnsense.restart_service', ['service' => $service, 'id' => $service_id]); + echo json_encode(['response' => $result, 'status' => 'ok']); break; case 'reload_templates': xmlrpc_execute('opnsense.configd_reload_all_templates'); - echo json_encode(["status" => "done"]); + echo json_encode(['status' => 'done']); break; case 'exec_sync': configd_run('filter sync'); - echo json_encode(["status" => "done"]); + echo json_encode(['status' => 'done']); break; case 'version': - echo json_encode(["response" => xmlrpc_execute('opnsense.firmware_version')]); + echo json_encode(['response' => xmlrpc_execute('opnsense.firmware_version')]); break; case 'services': - echo json_encode(["response" => xmlrpc_execute('opnsense.list_services')]); + echo json_encode(['response' => xmlrpc_execute('opnsense.list_services')]); break; default: - echo json_encode(['status' => 'error', 'message' => 'usage ha_xmlrpc_exec.php action [service_id]']); + echo json_encode(['status' => 'error', 'message' => 'usage ha_xmlrpc_exec.php action [service_id]']); } - - -