From 5c671cd2f6b8a721c98ad0afccb5ccbf6d65926d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 4 Jan 2018 08:35:06 +0100 Subject: [PATCH] sysutils/scp-backup: whitespace and style sweep --- sysutils/scp-backup/pkg-descr | 2 +- .../OPNsense/ScpBackup/Api/GeneralController.php | 11 +++++------ .../OPNsense/ScpBackup/GeneralController.php | 1 - .../mvc/app/models/OPNsense/ScpBackup/General.php | 1 - .../mvc/app/models/OPNsense/ScpBackup/General.xml | 1 - .../mvc/app/models/OPNsense/ScpBackup/Menu/Menu.xml | 1 - .../opnsense/scripts/OPNsense/ScpBackup/ScpBackup.php | 8 ++++---- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/sysutils/scp-backup/pkg-descr b/sysutils/scp-backup/pkg-descr index e2c3d466a..82e29f558 100644 --- a/sysutils/scp-backup/pkg-descr +++ b/sysutils/scp-backup/pkg-descr @@ -1 +1 @@ -A simple plugin to perform config backups using SCP. +A simple plugin to perform config backups using SCP. diff --git a/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/Api/GeneralController.php b/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/Api/GeneralController.php index e989fad11..5f8b15fbe 100644 --- a/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/Api/GeneralController.php +++ b/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/Api/GeneralController.php @@ -48,7 +48,7 @@ class GeneralController extends ApiMutableModelControllerBase if ($this->request->isGet()) { $mdlGeneral = $this->getModel(); $publicKey = fopen("/conf/sshd/ssh_host_rsa_key.pub", "r"); - if($publicKey) { + if ($publicKey) { $mdlGeneral->publickey = fread($publicKey, filesize("/conf/sshd/ssh_host_rsa_key.pub")); fclose($publicKey); } @@ -70,11 +70,11 @@ class GeneralController extends ApiMutableModelControllerBase foreach ($valMsgs as $field => $msg) { if (!array_key_exists("validation", $result)) { $result["validations"] = array(); - } + } $result["validations"][$msg->getField()] = $msg->getMessage(); } - if($valMsgs->count() == 0) { - if($mdlGeneral->cronuuid->__toString() == "" and $mdlGeneral->enabled->__toString() == "1") { + if ($valMsgs->count() == 0) { + if ($mdlGeneral->cronuuid->__toString() == "" and $mdlGeneral->enabled->__toString() == "1") { // First Time Save $cronUuid = $mdlCron->newDailyJob("ScpBackup", "scpbackup perform", "Backup config using SCP", "*", "1"); if ($mdlCron->performValidation()->count() == 0) { @@ -89,7 +89,7 @@ class GeneralController extends ApiMutableModelControllerBase } elseif ($mdlGeneral->cronuuid->__toString() != "" and $mdlGeneral->enabled->__toString() == "0") { // Removal of Cron Job and deactivation of the backup $cronUuid = $mdlGeneral->cronuuid->__toString(); - if($mdlCron->jobs->job->del($cronUuid)) { + if ($mdlCron->jobs->job->del($cronUuid)) { $mdlCron->serializeToConfig(); $mdlGeneral->cronuuid = null; $mdlGeneral->serializeToConfig($validateFullModel = false, $disable_validation = true); @@ -109,5 +109,4 @@ class GeneralController extends ApiMutableModelControllerBase } return $result; } - } diff --git a/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/GeneralController.php b/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/GeneralController.php index bde85aadf..a537bb530 100644 --- a/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/GeneralController.php +++ b/sysutils/scp-backup/src/opnsense/mvc/app/controllers/OPNsense/ScpBackup/GeneralController.php @@ -39,4 +39,3 @@ class GeneralController extends \OPNsense\Base\IndexController $this->view->generalForm = $this->getForm("general"); } } - diff --git a/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.php b/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.php index 4e5f1004f..997aa7a2b 100644 --- a/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.php +++ b/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.php @@ -37,4 +37,3 @@ class General extends BaseModel { } - diff --git a/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.xml b/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.xml index 0d3b7f46d..bb20a879c 100644 --- a/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.xml +++ b/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/General.xml @@ -41,4 +41,3 @@ - diff --git a/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/Menu/Menu.xml b/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/Menu/Menu.xml index 91002c4a3..2eedcc788 100644 --- a/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/Menu/Menu.xml +++ b/sysutils/scp-backup/src/opnsense/mvc/app/models/OPNsense/ScpBackup/Menu/Menu.xml @@ -5,4 +5,3 @@ - diff --git a/sysutils/scp-backup/src/opnsense/scripts/OPNsense/ScpBackup/ScpBackup.php b/sysutils/scp-backup/src/opnsense/scripts/OPNsense/ScpBackup/ScpBackup.php index 3193998a0..4c6623331 100755 --- a/sysutils/scp-backup/src/opnsense/scripts/OPNsense/ScpBackup/ScpBackup.php +++ b/sysutils/scp-backup/src/opnsense/scripts/OPNsense/ScpBackup/ScpBackup.php @@ -36,10 +36,10 @@ require_once("config.inc"); use OPNsense\Base; use OPNsense\Core\Config; -$config = Config::getInstance()->object(); +$config = Config::getInstance()->object(); $scpBackup = $config->OPNsense->ScpBackup; -if(isset($scpBackup) && isset($scpBackup->enabled) && $scpBackup->enabled == 1) { +if (isset($scpBackup) && isset($scpBackup->enabled) && $scpBackup->enabled == 1) { $hostname = escapeshellarg($scpBackup->hostname); $username = escapeshellarg($scpBackup->username); $port = $scpBackup->port; @@ -47,7 +47,7 @@ if(isset($scpBackup) && isset($scpBackup->enabled) && $scpBackup->enabled == 1) $identifyFile = "/conf/sshd/ssh_host_rsa_key"; $configFile = "/conf/config.xml"; - if(!substr($remoteDirectory, -1) == "/") { + if (!substr($remoteDirectory, -1) == "/") { $remoteDirectory = $remoteDirectory . "/"; } @@ -59,7 +59,7 @@ if(isset($scpBackup) && isset($scpBackup->enabled) && $scpBackup->enabled == 1) exec(escapeshellcmd($command), $output, $returnCode); - if($returnCode != 0) { + if ($returnCode != 0) { syslog(LOG_ERR, "scp_backup command: return code [$returnCode]"); } }