diff --git a/sysutils/sftp-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Sftp.php b/sysutils/sftp-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Sftp.php index 75846a652..dc09fe342 100644 --- a/sysutils/sftp-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Sftp.php +++ b/sysutils/sftp-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Sftp.php @@ -187,13 +187,13 @@ class Sftp extends Base implements IBackupProvider /** * @return list of files on remote location */ - private function ls($pattern='') + private function ls($pattern = '') { $result = []; - foreach (explode("\n", $this->sftpCmd('ls -lnt '. $pattern)['stdout']) as $line) { + foreach (explode("\n", $this->sftpCmd('ls -lnt ' . $pattern)['stdout']) as $line) { $parts = preg_split('/\s+/', $line, -1, PREG_SPLIT_NO_EMPTY); if (count($parts) >= 7) { - $result[] = $parts[count($parts)-1]; + $result[] = $parts[count($parts) - 1]; } } return $result; @@ -249,7 +249,7 @@ class Sftp extends Base implements IBackupProvider /* cleanup */ rsort($remote_backups); if (count($remote_backups) > (int)$this->model->backupcount->getCurrentValue()) { - for ($i = $this->model->backupcount->getCurrentValue() ; $i < count($remote_backups); $i++) { + for ($i = $this->model->backupcount->getCurrentValue(); $i < count($remote_backups); $i++) { $this->del($remote_backups[$i]); } $remote_backups = $this->ls('config-*.xml'); diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml index 87ee5a58f..b6f0c86d1 100644 --- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml +++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml @@ -262,4 +262,4 @@ general-settings - \ No newline at end of file + diff --git a/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php b/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php index f4b43e0de..a6494eb97 100755 --- a/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php +++ b/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php @@ -93,7 +93,6 @@ foreach ((new Caddy())->reverseproxy->reverse->iterateItems() as $reverseItem) { if (!empty($caCertField)) { $refs = array_map('trim', explode(',', $caCertField)); foreach ($refs as $ref) { - if (!empty($ref)) { $caCertRefs[] = $ref; }