From 5e9ab6d8561e00f6f6bcd208babfcf358ac047f6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 11 Jan 2015 10:07:23 +0100 Subject: [PATCH] src: apply whitespace cleanups --- src/etc/inc/interfaces.inc | 2 +- .../models/OPNsense/CaptivePortal/Rules.php | 2 +- src/opnsense/service/execute_command.py | 3 -- src/opnsense/service/modules/__init__.py | 2 +- src/opnsense/service/modules/config.py | 2 +- .../service/modules/ph_inline_actions.py | 2 +- src/opnsense/service/modules/template.py | 3 -- .../templates/OPNsense/Sample/+TARGETS | 2 +- .../OPNsense/Sample/example_config.txt | 1 - .../OPNsense/Sample/example_simple_page.txt | 2 -- src/www/system_gateway_groups_edit.php | 28 +++++++++---------- 11 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index e9125c792..bc3112415 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3527,7 +3527,7 @@ function interface_6to4_configure($interface = "wan", $wancfg){ mwexec("/sbin/route delete -host 192.88.99.1"); mwexec("/sbin/route add -host 192.88.99.1 {$ip4gateway}"); } - + if (!$g['booting']) link_interface_to_track6($interface, "update"); diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Rules.php b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Rules.php index 863c90af3..e53abf218 100644 --- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Rules.php +++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Rules.php @@ -333,7 +333,7 @@ class Rules $this->rules[] = "add 65534 deny all from any to any"; } - + /** * load ruleset * @param string $filename target filename diff --git a/src/opnsense/service/execute_command.py b/src/opnsense/service/execute_command.py index 717440505..f73ebc118 100755 --- a/src/opnsense/service/execute_command.py +++ b/src/opnsense/service/execute_command.py @@ -66,6 +66,3 @@ try: print ('response:%s'% sock.recv(4096)) finally: sock.close() - - - diff --git a/src/opnsense/service/modules/__init__.py b/src/opnsense/service/modules/__init__.py index 2f428d884..987a98c62 100644 --- a/src/opnsense/service/modules/__init__.py +++ b/src/opnsense/service/modules/__init__.py @@ -30,4 +30,4 @@ -""" \ No newline at end of file +""" diff --git a/src/opnsense/service/modules/config.py b/src/opnsense/service/modules/config.py index 9a9d95bda..a6eb05228 100644 --- a/src/opnsense/service/modules/config.py +++ b/src/opnsense/service/modules/config.py @@ -119,4 +119,4 @@ class Config(object): # refresh config if source xml is changed self._load() - return self._config_data \ No newline at end of file + return self._config_data diff --git a/src/opnsense/service/modules/ph_inline_actions.py b/src/opnsense/service/modules/ph_inline_actions.py index f10d51063..e9695cf1e 100644 --- a/src/opnsense/service/modules/ph_inline_actions.py +++ b/src/opnsense/service/modules/ph_inline_actions.py @@ -61,4 +61,4 @@ def execute(action,parameters): return 'OK' - return 'ERR' \ No newline at end of file + return 'ERR' diff --git a/src/opnsense/service/modules/template.py b/src/opnsense/service/modules/template.py index 35f28ea1c..a8eb4d0e0 100644 --- a/src/opnsense/service/modules/template.py +++ b/src/opnsense/service/modules/template.py @@ -241,6 +241,3 @@ class Template(object): return result - - - diff --git a/src/opnsense/service/templates/OPNsense/Sample/+TARGETS b/src/opnsense/service/templates/OPNsense/Sample/+TARGETS index 997a5e802..678718e76 100644 --- a/src/opnsense/service/templates/OPNsense/Sample/+TARGETS +++ b/src/opnsense/service/templates/OPNsense/Sample/+TARGETS @@ -1,2 +1,2 @@ example_config.txt:/tmp/template_sample/test_[interfaces.%.if]_[version].conf -example_simple_page.txt:/tmp/template_sample/simple_page.txt \ No newline at end of file +example_simple_page.txt:/tmp/template_sample/simple_page.txt diff --git a/src/opnsense/service/templates/OPNsense/Sample/example_config.txt b/src/opnsense/service/templates/OPNsense/Sample/example_config.txt index 46488444f..e77234524 100644 --- a/src/opnsense/service/templates/OPNsense/Sample/example_config.txt +++ b/src/opnsense/service/templates/OPNsense/Sample/example_config.txt @@ -16,4 +16,3 @@ For example, only use this interfaces data: {% endfor %} {% endblock %} - diff --git a/src/opnsense/service/templates/OPNsense/Sample/example_simple_page.txt b/src/opnsense/service/templates/OPNsense/Sample/example_simple_page.txt index adeaba81f..565a0f51c 100644 --- a/src/opnsense/service/templates/OPNsense/Sample/example_simple_page.txt +++ b/src/opnsense/service/templates/OPNsense/Sample/example_simple_page.txt @@ -30,5 +30,3 @@ and a short list of firewall rules created (multiple rule items in filter sectio The full documentation for the template engine can be found at : http://jinja.pocoo.org/docs/dev/templates/ A sample with multiple output files ( for example based on interface ) can be found in the example_config.txt template - - diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php index 7349e9838..443e81e16 100644 --- a/src/www/system_gateway_groups_edit.php +++ b/src/www/system_gateway_groups_edit.php @@ -218,22 +218,22 @@ jQuery(function ($) {
-

-
-
+

+ +
-
-
- - - - - + +
+
- -
+ + + + - - +
+ +
+
Gateway