GET/POST conversion vpn_l2tp*

3 files changed, 11 insertions, 13 deletions

diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php
index 67b1ba1..6e7e2e6 100644
--- a/src/usr/local/www/vpn_l2tp.php
+++ b/src/usr/local/www/vpn_l2tp.php
@@ -50,7 +50,7 @@ $pconfig['n_l2tp_units'] = $l2tpcfg['n_l2tp_units'];
 $pconfig['paporchap'] = $l2tpcfg['paporchap'];
 $pconfig['secret'] = $l2tpcfg['secret'];
 
-if ($_POST) {
+if ($_POST['save']) {
 
 	unset($input_errors);
 	$pconfig = $_POST;
diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php
index 5810789..77ae8c9 100644
--- a/src/usr/local/www/vpn_l2tp_users.php
+++ b/src/usr/local/www/vpn_l2tp_users.php
@@ -55,9 +55,9 @@ if ($_POST) {
 	}
 }
 
-if ($_GET['act'] == "del") {
-	if ($a_secret[$_GET['id']]) {
-		unset($a_secret[$_GET['id']]);
+if ($_POST['act'] == "del") {
+	if ($a_secret[$_POST['id']]) {
+		unset($a_secret[$_POST['id']]);
 		write_config();
 		mark_subsystem_dirty('l2tpusers');
 		pfSenseHeader("vpn_l2tp_users.php");
@@ -108,8 +108,8 @@ display_top_tabs($tab_array);
 							<?=htmlspecialchars($secretent['ip'])?>&nbsp;
 						</td>
 						<td>
-							<a class="fa fa-pencil"	title="<?=gettext('Edit user')?>"	href="vpn_l2tp_users_edit.php?id=<?=$i?>"></a>
-							<a class="fa fa-trash"	title="<?=gettext('Delete user')?>"	href="vpn_l2tp_users.php?act=del&amp;id=<?=$i?>"></a>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit user')?>"	href="vpn_l2tp_users_edit.php?id=<?=$i?>" usepost></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete user')?>"	href="vpn_l2tp_users.php?act=del&amp;id=<?=$i?>" usepost></a>
 						</td>
 					</tr>
 <?php $i++; endforeach?>
@@ -119,7 +119,7 @@ display_top_tabs($tab_array);
 	</div>
 </div>
 <nav class="action-buttons">
-	<a class="btn btn-success btn-sm" href="vpn_l2tp_users_edit.php">
+	<a class="btn btn-success btn-sm" href="vpn_l2tp_users_edit.php" usepost>
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php
index f889307..ee79f02 100644
--- a/src/usr/local/www/vpn_l2tp_users_edit.php
+++ b/src/usr/local/www/vpn_l2tp_users_edit.php
@@ -50,11 +50,9 @@ require_once("vpn.inc");
 if (!is_array($config['l2tp']['user'])) {
 	$config['l2tp']['user'] = array();
 }
+
 $a_secret = &$config['l2tp']['user'];
 
-if (is_numericint($_GET['id'])) {
-	$id = $_GET['id'];
-}
 if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
 }
@@ -62,13 +60,13 @@ if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 if (isset($id) && $a_secret[$id]) {
 	$pconfig['usernamefld'] = $a_secret[$id]['name'];
 	$pconfig['ip'] = $a_secret[$id]['ip'];
+	$pconfig['passwordfld'] = $a_secret[$id]['passwordfld'];
 	$pwd_required = "";
 } else {
 	$pwd_required = "*";
 }
 
-if ($_POST) {
-
+if ($_POST['save']) {
 	unset($input_errors);
 	$pconfig = $_POST;
 
@@ -181,7 +179,7 @@ if (isset($id) && $a_secret[$id]) {
 		'id',
 		null,
 		'hidden',
-		$i
+		$id
 	));
 }