Revisions to GET/POST conversion limiting POSTs to save, apply, and delete functions - Interfaces

20 files changed, 38 insertions, 39 deletions

diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index 7b68440..0ba9a91 100755
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -461,7 +461,7 @@ if ($_POST['apply']) {
 		}
 	}
 	@unlink("{$g['tmp_path']}/.interfaces.apply");
-} else if ($_POST) {
+} else if ($_POST['submit]']) {
 
 	unset($input_errors);
 	$pconfig = $_POST;
@@ -1450,7 +1450,7 @@ if ($_POST['apply']) {
 		exit;
 	}
 
-} // end if ($_POST)
+} // end if ($_POST['save'])
 
 function handle_wireless_post() {
 	global $_POST, $config, $g, $wancfg, $if, $wl_countries_attr, $wlanbaseif;
diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php
index 8629f19..24f60c8 100644
--- a/src/usr/local/www/interfaces_assign.php
+++ b/src/usr/local/www/interfaces_assign.php
@@ -204,11 +204,11 @@ if (is_array($config['openvpn'])) {
 	}
 }
 
-if (isset($_POST['add']) && isset($_POST['if_add'])) {
+if (isset($_REQUEST['add']) && isset($_REQUEST['if_add'])) {
 	/* Be sure this port is not being used */
 	$portused = false;
 	foreach ($config['interfaces'] as $ifname => $ifdata) {
-		if ($ifdata['if'] == $_POST['if_add']) {
+		if ($ifdata['if'] == $_REQUEST['if_add']) {
 			$portused = true;
 			break;
 		}
@@ -521,7 +521,7 @@ display_top_tabs($tab_array);
 		}
 ?>
 		<tr>
-			<td><a href="/interfaces.php?if=<?=$ifname?>" usepost><?=$ifdescr?></a></td>
+			<td><a href="/interfaces.php?if=<?=$ifname?>"><?=$ifdescr?></a></td>
 			<td>
 				<select name="<?=$ifname?>" id="<?=$ifname?>" class="form-control">
 <?php foreach ($portlist as $portname => $portinfo):?>
diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php
index a817f6d..1d5688e 100644
--- a/src/usr/local/www/interfaces_bridge.php
+++ b/src/usr/local/www/interfaces_bridge.php
@@ -136,7 +136,7 @@ foreach ($a_bridges as $bridge) {
 							<?=htmlspecialchars($bridge['descr'])?>
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit interface bridge')?>"	href="interfaces_bridge_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit interface bridge')?>"	href="interfaces_bridge_edit.php?id=<?=$i?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete interface bridge')?>"	href="interfaces_bridge.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
@@ -151,7 +151,7 @@ foreach ($a_bridges as $bridge) {
 </div>
 
 <nav class="action-buttons">
-	<a href="interfaces_bridge_edit.php" class="btn btn-success btn-sm" usepost>
+	<a href="interfaces_bridge_edit.php" class="btn btn-success btn-sm">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php
index 5a1c23f..dbcbb2b 100644
--- a/src/usr/local/www/interfaces_bridge_edit.php
+++ b/src/usr/local/www/interfaces_bridge_edit.php
@@ -65,7 +65,7 @@ foreach ($ifacelist as $bif => $bdescr) {
 	}
 }
 
-$id = $_POST['id'];
+$id = $_REQUEST['id'];
 
 if (isset($id) && $a_bridges[$id]) {
 	$pconfig['enablestp'] = isset($a_bridges[$id]['enablestp']);
diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php
index f7a568b..7fea9e7 100644
--- a/src/usr/local/www/interfaces_gif.php
+++ b/src/usr/local/www/interfaces_gif.php
@@ -113,7 +113,7 @@ display_top_tabs($tab_array);
 							<?=htmlspecialchars($gif['descr'])?>
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit GIF interface')?>"	href="interfaces_gif_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit GIF interface')?>"	href="interfaces_gif_edit.php?id=<?=$i?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete GIF interface')?>"	href="interfaces_gif.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
@@ -125,7 +125,7 @@ display_top_tabs($tab_array);
 </div>
 
 <nav class="action-buttons">
-	<a href="interfaces_gif_edit.php" class="btn btn-success btn-sm" usepost>
+	<a href="interfaces_gif_edit.php" class="btn btn-success btn-sm">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
diff --git a/src/usr/local/www/interfaces_gif_edit.php b/src/usr/local/www/interfaces_gif_edit.php
index 8df4465..43ce4ef 100644
--- a/src/usr/local/www/interfaces_gif_edit.php
+++ b/src/usr/local/www/interfaces_gif_edit.php
@@ -33,7 +33,7 @@ if (!is_array($config['gifs']['gif'])) {
 }
 
 $a_gifs = &$config['gifs']['gif'];
-$id = $_POST['id'];
+$id = $_REQUEST['id'];
 
 
 if (isset($id) && $a_gifs[$id]) {
diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php
index 388e75d..41c71a1 100644
--- a/src/usr/local/www/interfaces_gre.php
+++ b/src/usr/local/www/interfaces_gre.php
@@ -119,7 +119,7 @@ display_top_tabs($tab_array);
 							<?=htmlspecialchars($gre['descr'])?>
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit GRE interface')?>"	href="interfaces_gre_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit GRE interface')?>"	href="interfaces_gre_edit.php?id=<?=$i?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete GRE interface')?>"	href="interfaces_gre.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
@@ -131,7 +131,7 @@ display_top_tabs($tab_array);
 </div>
 
 <nav class="action-buttons">
-	<a href="interfaces_gre_edit.php" class="btn btn-success btn-sm" usepost>
+	<a href="interfaces_gre_edit.php" class="btn btn-success btn-sm">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php
index ab739d7..05e6036 100644
--- a/src/usr/local/www/interfaces_gre_edit.php
+++ b/src/usr/local/www/interfaces_gre_edit.php
@@ -34,7 +34,7 @@ if (!is_array($config['gres']['gre'])) {
 }
 
 $a_gres = &$config['gres']['gre'];
-$id = $_POST['id'];
+$id = $_REQUEST['id'];
 
 if (isset($id) && $a_gres[$id]) {
 	$pconfig['if'] = $a_gres[$id]['if'];
diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php
index 78f300c..eb9a6e5 100644
--- a/src/usr/local/www/interfaces_groups.php
+++ b/src/usr/local/www/interfaces_groups.php
@@ -109,7 +109,7 @@ display_top_tabs($tab_array);
 							<?=htmlspecialchars($ifgroupentry['descr']);?>
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit group')?>"	href="interfaces_groups_edit.php?id=<?=$i; ?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit group')?>"	href="interfaces_groups_edit.php?id=<?=$i; ?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete group')?>"	href="interfaces_groups.php?act=del&amp;id=<?=$i; ?>" usepost></a>
 						</td>
 					</tr>
@@ -121,7 +121,7 @@ display_top_tabs($tab_array);
 </div>
 
 <nav class="action-buttons">
-	<a class="btn btn-success btn-sm" href="interfaces_groups_edit.php" role="button" usepost>
+	<a class="btn btn-success btn-sm" href="interfaces_groups_edit.php" role="button">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add");?>
 	</a>
diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php
index 8663613..3f3e979 100644
--- a/src/usr/local/www/interfaces_groups_edit.php
+++ b/src/usr/local/www/interfaces_groups_edit.php
@@ -39,7 +39,7 @@ if (!is_array($config['ifgroups']['ifgroupentry'])) {
 }
 
 $a_ifgroups = &$config['ifgroups']['ifgroupentry'];
-$id = $_POST['id'];
+$id = $_REQUEST['id'];
 
 if (isset($id) && $a_ifgroups[$id]) {
 	$pconfig['ifname'] = $a_ifgroups[$id]['ifname'];
diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php
index 72f195e..574a5b8 100644
--- a/src/usr/local/www/interfaces_lagg.php
+++ b/src/usr/local/www/interfaces_lagg.php
@@ -125,7 +125,7 @@ foreach ($a_laggs as $lagg) {
 							<?=htmlspecialchars($lagg['descr'])?>
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit LAGG interface')?>"	href="interfaces_lagg_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit LAGG interface')?>"	href="interfaces_lagg_edit.php?id=<?=$i?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete LAGG interface')?>"	href="interfaces_lagg.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
@@ -140,7 +140,7 @@ foreach ($a_laggs as $lagg) {
 </div>
 
  <nav class="action-buttons">
-	<a href="interfaces_lagg_edit.php" class="btn btn-success btn-sm" usepost>
+	<a href="interfaces_lagg_edit.php" class="btn btn-success btn-sm">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
diff --git a/src/usr/local/www/interfaces_lagg_edit.php b/src/usr/local/www/interfaces_lagg_edit.php
index 64ef97a..9ac16b8 100644
--- a/src/usr/local/www/interfaces_lagg_edit.php
+++ b/src/usr/local/www/interfaces_lagg_edit.php
@@ -107,7 +107,7 @@ foreach ($checklist as $tmpif) {
 	$realifchecklist[get_real_interface($tmpif)] = $tmpif;
 }
 
-$id = $_POST['id'];
+$id = $_REQUEST['id'];
 
 if (isset($id) && $a_laggs[$id]) {
 	$pconfig['laggif'] = $a_laggs[$id]['laggif'];
diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php
index 9aa074e..e1a5d9f 100644
--- a/src/usr/local/www/interfaces_ppps.php
+++ b/src/usr/local/www/interfaces_ppps.php
@@ -126,7 +126,7 @@ foreach ($a_ppps as $id => $ppp) {
 							<?=htmlspecialchars($ppp['descr'])?>
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit PPP interface')?>"	href="interfaces_ppps_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit PPP interface')?>"	href="interfaces_ppps_edit.php?id=<?=$i?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete PPP interface')?>"	href="interfaces_ppps.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
@@ -141,7 +141,7 @@ foreach ($a_ppps as $id => $ppp) {
 </div>
 
 <nav class="action-buttons">
-	<a href="interfaces_ppps_edit.php" class="btn btn-success btn-sm" usepost>
+	<a href="interfaces_ppps_edit.php" class="btn btn-success btn-sm">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php
index 9057d53..c772637 100644
--- a/src/usr/local/www/interfaces_ppps_edit.php
+++ b/src/usr/local/www/interfaces_ppps_edit.php
@@ -57,8 +57,8 @@ if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) {
 	$id = $_REQUEST['id'];
 }
 
-if (isset($_POST['id']) && is_numericint($_POST['id'])) {
-	$id = $_POST['id'];
+if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) {
+	$id = $_REQUEST['id'];
 }
 
 if (isset($id) && $a_ppps[$id]) {
@@ -179,7 +179,7 @@ if (isset($id) && $a_ppps[$id]) {
 	$pconfig['ptpid'] = interfaces_ptpid_next();
 }
 
-if (isset($_POST['save']) && is_array($_POST) && count($_POST) > 0) {
+if ($_POST['save']) {
 
 	unset($input_errors);
 	$pconfig = $_POST;
diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php
index 869c3cd..3ed3d17 100644
--- a/src/usr/local/www/interfaces_qinq.php
+++ b/src/usr/local/www/interfaces_qinq.php
@@ -133,7 +133,7 @@ display_top_tabs($tab_array);
 							<?=htmlspecialchars($qinq['descr'])?>&nbsp;
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit Q-in-Q interface')?>"	href="interfaces_qinq_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit Q-in-Q interface')?>"	href="interfaces_qinq_edit.php?id=<?=$i?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete Q-in-Q interface')?>"	href="interfaces_qinq.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
@@ -147,7 +147,7 @@ endforeach;
 </div>
 
 <nav class="action-buttons">
-	<a href="interfaces_qinq_edit.php" class="btn btn-success btn-sm" usepost>
+	<a href="interfaces_qinq_edit.php" class="btn btn-success btn-sm">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php
index 2b4de16..e75d02b 100644
--- a/src/usr/local/www/interfaces_qinq_edit.php
+++ b/src/usr/local/www/interfaces_qinq_edit.php
@@ -52,8 +52,8 @@ if (count($portlist) < 1) {
 	exit;
 }
 
-if (isset($_POST['id']) && is_numericint($_POST['id'])) {
-	$id = $_POST['id'];
+if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) {
+	$id = $_REQUEST['id'];
 }
 
 if (isset($id) && $a_qinqs[$id]) {
@@ -294,7 +294,7 @@ if ($members != "") {
 
 foreach ($item as $ww) {
 
-	$group = new Form_Group($counter == 0 ? 'Tag(s)':'');
+	$group = new Form_Group($counter == 0 ? '*Tag(s)':'');
 	$group->addClass('repeatable');
 
 	$group->add(new Form_Input(
diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php
index 1a63f62..5103d4c 100644
--- a/src/usr/local/www/interfaces_vlan.php
+++ b/src/usr/local/www/interfaces_vlan.php
@@ -129,8 +129,7 @@ display_top_tabs($tab_array);
 							<td><?=htmlspecialchars($vlan['pcp']);?></td>
 							<td><?=htmlspecialchars($vlan['descr']);?></td>
 							<td>
-								<a class="fa fa-pencil"	title="<?=gettext('Edit VLAN')?>"	role="button" href="interfaces_vlan_edit.php?id=<?=$i?>" usepost></a>
-<!--						<a class="btn btn-danger btn-xs" role="button" href="interfaces_vlan.php?act=del&amp;id=<?=$i?>"><?=gettext('Delete')?></a></td> -->
+								<a class="fa fa-pencil"	title="<?=gettext('Edit VLAN')?>"	role="button" href="interfaces_vlan_edit.php?id=<?=$i?>" ></a>
 								<a class="fa fa-trash no-confirm"	title="<?=gettext('Delete VLAN')?>"	role="button" id="del-<?=$i?>" usepost></a>
 							</td>
 						</tr>
@@ -145,7 +144,7 @@ display_top_tabs($tab_array);
 	</div>
 
 	<nav class="action-buttons">
-		<a class="btn btn-success btn-sm" role="button" href="interfaces_vlan_edit.php" usepost>
+		<a class="btn btn-success btn-sm" role="button" href="interfaces_vlan_edit.php">
 			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext('Add'); ?>
 		</a>
diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php
index fc794c8..23c7af0 100644
--- a/src/usr/local/www/interfaces_vlan_edit.php
+++ b/src/usr/local/www/interfaces_vlan_edit.php
@@ -47,8 +47,8 @@ if (is_array($config['laggs']['lagg']) && count($config['laggs']['lagg'])) {
 	}
 }
 
-if (is_numericint($_POST['id'])) {
-	$id = $_POST['id'];
+if (is_numericint($_REQUEST['id'])) {
+	$id = $_REQUEST['id'];
 }
 
 if (isset($id) && $a_vlans[$id]) {
diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php
index 70cb05a..2236ab4 100644
--- a/src/usr/local/www/interfaces_wireless.php
+++ b/src/usr/local/www/interfaces_wireless.php
@@ -120,7 +120,7 @@ foreach ($a_clones as $clone) {
 							<?=htmlspecialchars($clone['descr'])?>
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit WiFi interface')?>"	href="interfaces_wireless_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit WiFi interface')?>"	href="interfaces_wireless_edit.php?id=<?=$i?>"></a>
 							<a class="fa fa-trash"	title="<?=gettext('Delete WiFi interface')?>"	href="interfaces_wireless.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
@@ -135,7 +135,7 @@ foreach ($a_clones as $clone) {
 </div>
 
 <nav class="action-buttons">
-	<a href="interfaces_wireless_edit.php" class="btn btn-success btn-sm" usepost>
+	<a href="interfaces_wireless_edit.php" class="btn btn-success btn-sm">
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?></a>
 </nav>
diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php
index d6d4172..2f9a531 100644
--- a/src/usr/local/www/interfaces_wireless_edit.php
+++ b/src/usr/local/www/interfaces_wireless_edit.php
@@ -58,8 +58,8 @@ function clone_compare($a, $b) {
 
 $portlist = get_interface_list();
 
-if (is_numericint($_POST['id'])) {
-	$id = $_POST['id'];
+if (is_numericint($_REQUEST['id'])) {
+	$id = $_REQUEST['id'];
 }
 
 if (isset($id) && $a_clones[$id]) {