From 32db6a53a65f34e0e01f213ea6ecf9d1112b3b9d Mon Sep 17 00:00:00 2001 From: heper Date: Mon, 2 Nov 2015 15:47:30 +0100 Subject: [PATCH 01/13] convert interfaces_groups to fa --- src/usr/local/www/interfaces_groups.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index 2550d9702b..b5034faad0 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -146,12 +146,8 @@ print_info_box(gettext('Interface Groups allow you to setup rules for multiple i - - - - - - + + ')"> @@ -167,4 +163,4 @@ print_info_box(gettext('Interface Groups allow you to setup rules for multiple i Date: Mon, 2 Nov 2015 15:48:46 +0100 Subject: [PATCH 02/13] Update interfaces_groups.php --- src/usr/local/www/interfaces_groups.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index b5034faad0..b0b9d44e21 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -146,7 +146,7 @@ print_info_box(gettext('Interface Groups allow you to setup rules for multiple i - + ')"> From 2acf113ad02aa4000ae59e4bb53f041aa99f1a8c Mon Sep 17 00:00:00 2001 From: heper Date: Mon, 2 Nov 2015 15:52:50 +0100 Subject: [PATCH 03/13] convert interfaces_wireless to fa --- src/usr/local/www/interfaces_wireless.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php index 0c53d374a7..3cb4f209df 100644 --- a/src/usr/local/www/interfaces_wireless.php +++ b/src/usr/local/www/interfaces_wireless.php @@ -156,8 +156,8 @@ foreach ($a_clones as $clone) { - - + + ')"> Date: Mon, 2 Nov 2015 16:51:11 +0100 Subject: [PATCH 04/13] convert interfaces_vlan to fa this page used $_POST instead on $_GET. no clue why. changed it to $_GET like every other page i've come across thus far. (it only seems to complicate things, without an actual benefit??) --- src/usr/local/www/interfaces_vlan.php | 56 ++++++++++----------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index bdd789800a..4d01bd1694 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -88,19 +88,19 @@ function vlan_inuse($num) { return false; } -if ($_POST['act'] == "del") { - if (!isset($_POST['id'])) { +if ($_GET['act'] == "del") { + if (!isset($_GET['id'])) { $input_errors[] = gettext("Wrong parameters supplied"); - } else if (empty($a_vlans[$_POST['id']])) { + } else if (empty($a_vlans[$_GET['id']])) { $input_errors[] = gettext("Wrong index supplied"); /* check if still in use */ - } else if (vlan_inuse($_POST['id'])) { + } else if (vlan_inuse($_GET['id'])) { $input_errors[] = gettext("This VLAN cannot be deleted because it is still being used as an interface."); } else { - if (does_interface_exist($a_vlans[$_POST['id']]['vlanif'])) { - pfSense_interface_destroy($a_vlans[$_POST['id']]['vlanif']); + if (does_interface_exist($a_vlans[$_GET['id']]['vlanif'])) { + pfSense_interface_destroy($a_vlans[$_GET['id']]['vlanif']); } - unset($a_vlans[$_POST['id']]); + unset($a_vlans[$_GET['id']]); write_config(); @@ -134,17 +134,15 @@ print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '. 'tagging will still work, but the reduced MTU may cause problems.
See the '. '%s handbook for information on supported cards.'),$g['product_name'])); ?> -
- - - -
- +
+
+ + + + ')"> - -
- - -
- -
-
+ + + - Date: Mon, 2 Nov 2015 17:02:23 +0100 Subject: [PATCH 05/13] convert interfaces_qinq to fa --- src/usr/local/www/interfaces_qinq.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index 6581c6e1c0..513c2321fa 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -169,8 +169,8 @@ print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging   - - + + ')"> Date: Mon, 2 Nov 2015 17:08:25 +0100 Subject: [PATCH 06/13] convert interfaces_ppps to fa --- src/usr/local/www/interfaces_ppps.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php index 3da5b38e24..530fb78f69 100644 --- a/src/usr/local/www/interfaces_ppps.php +++ b/src/usr/local/www/interfaces_ppps.php @@ -155,8 +155,8 @@ foreach ($a_ppps as $id => $ppp) { - - + + ')"> Date: Mon, 2 Nov 2015 17:09:39 +0100 Subject: [PATCH 07/13] Update interfaces_qinq.php --- src/usr/local/www/interfaces_qinq.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index 513c2321fa..f0b27bf184 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -169,8 +169,8 @@ print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging   - - ')"> + + ')"> Date: Mon, 2 Nov 2015 17:14:47 +0100 Subject: [PATCH 08/13] convert interfaces_gre to fa --- src/usr/local/www/interfaces_gre.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php index 7d8ed9eea9..0ec2d1393d 100644 --- a/src/usr/local/www/interfaces_gre.php +++ b/src/usr/local/www/interfaces_gre.php @@ -148,12 +148,8 @@ display_top_tabs($tab_array); - - - - - - + + ')"> @@ -167,4 +163,4 @@ display_top_tabs($tab_array); Date: Mon, 2 Nov 2015 17:17:23 +0100 Subject: [PATCH 09/13] convert interfaces_gif to fa --- src/usr/local/www/interfaces_gif.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php index 3bd43951d7..4d35922297 100644 --- a/src/usr/local/www/interfaces_gif.php +++ b/src/usr/local/www/interfaces_gif.php @@ -149,8 +149,8 @@ display_top_tabs($tab_array); - - + + ')"> @@ -164,4 +164,4 @@ display_top_tabs($tab_array); - Date: Mon, 2 Nov 2015 17:20:21 +0100 Subject: [PATCH 10/13] convert interfaces_bridge to fa --- src/usr/local/www/interfaces_bridge.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php index 6b79deefc6..cc7c887768 100644 --- a/src/usr/local/www/interfaces_bridge.php +++ b/src/usr/local/www/interfaces_bridge.php @@ -172,8 +172,8 @@ foreach ($a_bridges as $bridge) { - - + + ')"> - Date: Mon, 2 Nov 2015 17:22:54 +0100 Subject: [PATCH 11/13] convert interfaces_lagg to fa --- src/usr/local/www/interfaces_lagg.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php index 654962f524..3cd0b4c1c0 100644 --- a/src/usr/local/www/interfaces_lagg.php +++ b/src/usr/local/www/interfaces_lagg.php @@ -160,8 +160,8 @@ foreach ($a_laggs as $lagg) { - - + + ')"> Date: Mon, 2 Nov 2015 18:00:52 +0100 Subject: [PATCH 12/13] revert back to $_POST after request from Steve_B note: onclick="return confirm" does not function as expected. vlan still removed when choosing "cancel" --- src/usr/local/www/interfaces_vlan.php | 68 +++++++++++++++++---------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index 4d01bd1694..9c6c197e26 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -88,19 +88,19 @@ function vlan_inuse($num) { return false; } -if ($_GET['act'] == "del") { - if (!isset($_GET['id'])) { +if ($_POST['act'] == "del") { + if (!isset($_POST['id'])) { $input_errors[] = gettext("Wrong parameters supplied"); - } else if (empty($a_vlans[$_GET['id']])) { + } else if (empty($a_vlans[$_POST['id']])) { $input_errors[] = gettext("Wrong index supplied"); /* check if still in use */ - } else if (vlan_inuse($_GET['id'])) { + } else if (vlan_inuse($_POST['id'])) { $input_errors[] = gettext("This VLAN cannot be deleted because it is still being used as an interface."); } else { - if (does_interface_exist($a_vlans[$_GET['id']]['vlanif'])) { - pfSense_interface_destroy($a_vlans[$_GET['id']]['vlanif']); + if (does_interface_exist($a_vlans[$_POST['id']]['vlanif'])) { + pfSense_interface_destroy($a_vlans[$_POST['id']]['vlanif']); } - unset($a_vlans[$_GET['id']]); + unset($a_vlans[$_POST['id']]); write_config(); @@ -134,15 +134,19 @@ print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '. 'tagging will still work, but the reduced MTU may cause problems.
See the '. '%s handbook for information on supported cards.'),$g['product_name'])); ?> -
- - - - - - - - + + + + +
+
+ + + + + + + - -
- - ')"> + + + ')">
- -
+ + + + + Date: Mon, 2 Nov 2015 18:04:16 +0100 Subject: [PATCH 13/13] fix tabstops --- src/usr/local/www/interfaces_vlan.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index 9c6c197e26..81e3b4b717 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -151,17 +151,17 @@ print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '. $i = 0; foreach ($a_vlans as $vlan) { ?> - - - - - - - - ')"> - - - + + + + + + + ')"> + + +