From 83e26cc53690c280e6afd28ff91b9cfc436ce5b7 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 24 Jan 2015 12:36:22 +0100 Subject: [PATCH] src: coding style and whitespace cleanups --- src/opnsense/mvc/app/config/services.php | 8 +++++--- .../mvc/app/controllers/OPNsense/Base/ControllerBase.php | 1 - .../mvc/app/controllers/OPNsense/Base/IndexController.php | 2 -- .../mvc/app/controllers/OPNsense/Core/IndexController.php | 2 -- .../app/controllers/OPNsense/Sample/IndexController.php | 3 +-- .../app/controllers/OPNsense/Sample/PageController.php | 1 - src/opnsense/mvc/app/models/OPNsense/Base/Model.php | 4 +--- src/opnsense/mvc/app/models/OPNsense/Sample/Sample.php | 3 +-- src/opnsense/mvc/app/views/OPNsense/Core/index.volt | 2 +- src/opnsense/mvc/app/views/OPNsense/Sample/page.show.volt | 1 - src/www/head.inc | 2 +- src/www/system_groupmanager_addprivs.php | 2 +- src/www/system_hasync.php | 2 +- .../javascripts/bootstrap-select/js/i18n/defaults-eu.js | 2 +- .../javascripts/bootstrap-select/js/i18n/defaults-eu.js | 2 +- src/www/themes/sample/build/css/bootstrap-select.css | 2 +- 16 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/opnsense/mvc/app/config/services.php b/src/opnsense/mvc/app/config/services.php index 838e9ba63..eadf9dace 100644 --- a/src/opnsense/mvc/app/config/services.php +++ b/src/opnsense/mvc/app/config/services.php @@ -86,7 +86,7 @@ $di->set('config', $config); /** * Setup router */ -$di->set('router', function() { +$di->set('router', function () { $router = new \Phalcon\Mvc\Router(false); @@ -102,9 +102,11 @@ $di->set('router', function() { // probe registered modules and create a namespace map // for example, OPNsense\Core will be mapped at http(s):\\host\core\.. - // module names should be unique in the application, unless you want to overwrite functionality (check glob's sorting). + // module names should be unique in the application, unless you want to + // overwrite functionality (check glob's sorting). // - // if the glob for probing the directories turns out to be too slow, we should consider some kind of caching here + // if the glob for probing the directories turns out to be too slow, + // we should consider some kind of caching here // $registered_modules = array(); $controller_dir = __DIR__."/../controllers/"; diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php index fdfe7ad74..f45caf058 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php @@ -44,5 +44,4 @@ class ControllerBase extends Controller { $this->view->setTemplateBefore('default'); } - } diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php index 77426a667..89b3b4f1a 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php @@ -40,6 +40,4 @@ class IndexController extends \OPNsense\Base\ControllerBase // $this->view->title = $this->request->getURI(); // $this->view->pick('OPNsense/Sample/index'); } - } - diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php index b04a6fa82..f4a622245 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php @@ -37,6 +37,4 @@ class IndexController extends \OPNsense\Base\IndexController { $this->view->pick('OPNsense/Core/index'); } - } - diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Sample/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Sample/IndexController.php index f905ddcf1..13ded5325 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Sample/IndexController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Sample/IndexController.php @@ -38,5 +38,4 @@ class IndexController extends \OPNsense\Base\IndexController $this->view->title = $this->request->getURI(); $this->view->pick('OPNsense/Sample/index'); } - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php b/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php index 525b3cdb0..acf8da865 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php @@ -64,5 +64,4 @@ class PageController extends ControllerBase // "action" => "index" // )); } - } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Model.php b/src/opnsense/mvc/app/models/OPNsense/Base/Model.php index 7a5c0a117..a7fcdaf09 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Model.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Model.php @@ -35,11 +35,9 @@ namespace OPNsense\Base; abstract class BaseModel { - public function __construct() { $class_info = new \ReflectionClass($this); $class_info->getFileName(); } - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.php b/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.php index e0fdb9b65..2f8b42e9f 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.php +++ b/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.php @@ -35,5 +35,4 @@ use OPNsense\Base\BaseModel; class Sample extends BaseModel { public $title = "123456"; - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/index.volt b/src/opnsense/mvc/app/views/OPNsense/Core/index.volt index 90532d527..84a6e7675 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Core/index.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Core/index.volt @@ -1 +1 @@ -Core index \ No newline at end of file +Core index diff --git a/src/opnsense/mvc/app/views/OPNsense/Sample/page.show.volt b/src/opnsense/mvc/app/views/OPNsense/Sample/page.show.volt index 05fc2d9b0..b74913c19 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Sample/page.show.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Sample/page.show.volt @@ -4,4 +4,3 @@ {% for item in items %} {{ partial('layout_partials/std_input_field',item) }} {% endfor %} - diff --git a/src/www/head.inc b/src/www/head.inc index 43defb9c2..a278243a4 100644 --- a/src/www/head.inc +++ b/src/www/head.inc @@ -83,7 +83,7 @@ $pagetitle = gentitle( $pgtitle ); jQuery(function () { - jQuery('[data-toggle="tooltip"]').tooltip() + jQuery('[data-toggle="tooltip"]').tooltip() }) //]]> diff --git a/src/www/system_groupmanager_addprivs.php b/src/www/system_groupmanager_addprivs.php index b8cdccec2..1cb628fc8 100644 --- a/src/www/system_groupmanager_addprivs.php +++ b/src/www/system_groupmanager_addprivs.php @@ -180,7 +180,7 @@ function update_description() {
- +