From e5c4cb0ce868f155d44cb7fbb42a9255c62c3e16 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 6 May 2024 09:04:09 +0200 Subject: [PATCH] src: style sweep --- plist | 1 + src/opnsense/mvc/app/config/loader.php | 2 +- src/opnsense/mvc/app/library/OPNsense/Autoload/Loader.php | 4 ++-- src/opnsense/mvc/script/load_phalcon.php | 2 +- src/opnsense/mvc/tests/setup.php | 2 -- src/opnsense/www/js/widgets/BaseTableWidget.js | 6 +++--- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/plist b/plist index eaeb193dd..67ba8b9db 100644 --- a/plist +++ b/plist @@ -499,6 +499,7 @@ /usr/local/opnsense/mvc/app/library/OPNsense/Auth/Services/WebGui.php /usr/local/opnsense/mvc/app/library/OPNsense/Auth/TOTP.php /usr/local/opnsense/mvc/app/library/OPNsense/Auth/Voucher.php +/usr/local/opnsense/mvc/app/library/OPNsense/Autoload/Loader.php /usr/local/opnsense/mvc/app/library/OPNsense/Backup/BackupFactory.php /usr/local/opnsense/mvc/app/library/OPNsense/Backup/Base.php /usr/local/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php diff --git a/src/opnsense/mvc/app/config/loader.php b/src/opnsense/mvc/app/config/loader.php index 6bc777513..428f33ffd 100644 --- a/src/opnsense/mvc/app/config/loader.php +++ b/src/opnsense/mvc/app/config/loader.php @@ -1,6 +1,6 @@ application->controllersDir, diff --git a/src/opnsense/mvc/app/library/OPNsense/Autoload/Loader.php b/src/opnsense/mvc/app/library/OPNsense/Autoload/Loader.php index 964d83b02..044aca53b 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Autoload/Loader.php +++ b/src/opnsense/mvc/app/library/OPNsense/Autoload/Loader.php @@ -34,7 +34,7 @@ class Loader private $is_registered = false; private $classes_loaded = []; - public function __construct($dirs=null) + public function __construct($dirs = null) { $this->probe_dirs = $dirs; } @@ -56,7 +56,7 @@ class Loader public function register() { if (!$this->is_registered) { - spl_autoload_register([$this, "autoload"],true); + spl_autoload_register([$this, "autoload"], true); $this->is_registered = true; } } diff --git a/src/opnsense/mvc/script/load_phalcon.php b/src/opnsense/mvc/script/load_phalcon.php index 7f12eaec2..c5919ffd6 100644 --- a/src/opnsense/mvc/script/load_phalcon.php +++ b/src/opnsense/mvc/script/load_phalcon.php @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -require_once (__DIR__ . '/../app/library/OPNsense/Autoload/Loader.php'); +require_once(__DIR__ . '/../app/library/OPNsense/Autoload/Loader.php'); use OPNsense\Autoload\Loader; $phalcon_config = include("/usr/local/opnsense/mvc/app/config/config.php"); $loader_paths = [ diff --git a/src/opnsense/mvc/tests/setup.php b/src/opnsense/mvc/tests/setup.php index dd5bbc60f..5b769512e 100644 --- a/src/opnsense/mvc/tests/setup.php +++ b/src/opnsense/mvc/tests/setup.php @@ -36,5 +36,3 @@ $config = include __DIR__ . "/app/config/config.php"; * Read auto-loader */ include __DIR__ . "/../app/config/loader.php"; - - diff --git a/src/opnsense/www/js/widgets/BaseTableWidget.js b/src/opnsense/www/js/widgets/BaseTableWidget.js index 7ec53ba2a..dfb404345 100644 --- a/src/opnsense/www/js/widgets/BaseTableWidget.js +++ b/src/opnsense/www/js/widgets/BaseTableWidget.js @@ -111,7 +111,7 @@ export default class BaseTableWidget extends BaseWidget { setTableOptions(options = {}) { /** * headerPosition: top, left or none. - * top: headers are on top of the table. Headers are defined in the options. Data layout: + * top: headers are on top of the table. Headers are defined in the options. Data layout: * [ * ['x', 'y', 'z'], * ['x', 'y', 'z'] @@ -123,9 +123,9 @@ export default class BaseTableWidget extends BaseWidget { * ['y', 'y1'], * ['z', ['z1', 'z2']] <-- supports nested columns * ] - * + * * none: no headers, same data layout as 'top', without headers set as an option. - * + * * rotation: limit table entries to a certain amount, and rotate them. Only applicable for headerPosition: top. * headers: list of headers to display. Only applicable for headerPosition: top. */