Correct some problems with the filter code where we were calling foreach

on data that wasn't necessarily a valid array.

Modify the OpenVPN code to stop passing the array index around and then
immediately obtaining a reference to the array entry. We already have a
reference to the data, just pass it instead. Also add some check to make
certain tap configuration steps more conditional. Make sure we remove
configuration and pid files when they are no longer required. Fix a few
other OpenVPN related bugs.

3 files changed, 8 insertions, 8 deletions

diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index 107edf3..3b2a62e 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -59,7 +59,7 @@ if ($_GET['act'] == "del") {
 		exit;
 	}
 
-	openvpn_delete('client', $id);
+	openvpn_delete('client', $a_client[$id]);
 	unset($a_client[$id]);
 	write_config();
 	$savemsg = gettext("Client successfully deleted")."<br/>";
@@ -106,8 +106,8 @@ if ($_POST) {
 	unset($input_errors);
 	$pconfig = $_POST;
 
-	if (isset($id) && $a_server[$id])
-		$vpnid = $a_server[$id]['vpnid'];
+	if (isset($id) && $a_client[$id])
+		$vpnid = $a_client[$id]['vpnid'];
 	else
 		$vpnid = 0;
 
@@ -195,7 +195,7 @@ if ($_POST) {
 		else
 			$a_client[] = $client;
 
-		openvpn_resync('client', $id);
+		openvpn_resync('client', $client);
 		write_config();
 		
 		header("Location: vpn_openvpn_client.php");
diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php
index 1866f75..1469d4e 100644
--- a/usr/local/www/vpn_openvpn_csc.php
+++ b/usr/local/www/vpn_openvpn_csc.php
@@ -59,7 +59,7 @@ if ($_GET['act'] == "del") {
 		exit;
 	}
 
-	openvpn_delete_csc($id);
+	openvpn_delete_csc($$a_csc[$id]);
 	unset($a_csc[$id]);
 	write_config();
 	$savemsg = gettext("Client Specific Override successfully deleted")."<br/>";
@@ -212,7 +212,7 @@ if ($_POST) {
 		else
 			$a_csc[] = $csc;
 
-		openvpn_resync_csc($id);
+		openvpn_resync_csc($csc);
 		write_config();
 		
 		header("Location: vpn_openvpn_csc.php");
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index b4db40c..6cd2ad7 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -59,7 +59,7 @@ if ($_GET['act'] == "del") {
 		exit;
 	}
 
-	openvpn_delete('server', $id);
+	openvpn_delete('server', $a_server[$id]);
 	unset($a_server[$id]);
 	write_config();
 	$savemsg = gettext("Server successfully deleted")."<br/>";
@@ -284,7 +284,7 @@ if ($_POST) {
 		else
 			$a_server[] = $server;
 
-		openvpn_resync('server', $id);
+		openvpn_resync('server', $server);
 		write_config();
 		
 		header("Location: vpn_openvpn_server.php");