Merge remote-tracking branch 'mainline/master' into inc

5 files changed, 9 insertions, 6 deletions

diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup
index 0f1ca80..3ebf32e 100755
--- a/usr/local/sbin/ovpn-linkup
+++ b/usr/local/sbin/ovpn-linkup
@@ -5,7 +5,7 @@
 
 
 ifindex="${1##?????}"
-if [ -f /dev/tun$ifindex ]; then
+if [ -e /dev/tun$ifindex ]; then
 	if [ "" != "$route_vpn_gateway" ]; then
 		/bin/echo $route_vpn_gateway > /tmp/$1_router
 	else
diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown
index 1170d2f..a20d966 100755
--- a/usr/local/sbin/ppp-linkdown
+++ b/usr/local/sbin/ppp-linkdown
@@ -6,7 +6,10 @@ fi
 if [ -f "/tmp/${interface}_defaultgw" ]; then
 	route delete default $4
 fi
-# /sbin/pfctl -b $3 -b $4
+/sbin/pfctl -k 0.0.0.0/0 -k $3
+/sbin/pfctl -k $3
+pfctl -K $3
+/sbin/pfctl -b 0.0.0.0/32 -b $4
 # delete the node just in case mpd cannot do that
 /usr/sbin/ngctl shutdown $1:
 if [ -f "/var/etc/nameserver_$1" ]; then
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 9d0f120..ee2fa9a 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -254,7 +254,7 @@ if ($_POST) {
 					if (!alias_same_type($_POST["address{$x}"], $_POST['type']))
 						// But alias type network can include alias type urltable. Feature#1603.
 						if (!($_POST['type'] == 'network' &&
-						      get_alias_type($_POST["address{$x}"]) == 'urltable'))
+						      alias_get_type($_POST["address{$x}"]) == 'urltable'))
 							$wrongaliases .= " " . $_POST["address{$x}"];
 				} else if ($_POST['type'] == "port") {
 					if (!is_port($_POST["address{$x}"]))
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index c5187ef..3eb80e4 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -198,7 +198,7 @@ if ($_POST) {
 				$fieldname  = $fields['fieldname'];
 				if ($fieldname == "interface_array") {
 					$fieldvalue = $_POST[$fieldname];
-				} elseif (is_array($fieldvalue)) {
+				} elseif (is_array($_POST[$fieldname])) {
 					$fieldvalue = implode(',', $_POST[$fieldname]);
 				} else {
 					$fieldvalue = trim($_POST[$fieldname]);
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index 3d1bd51..e86a2d1 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -593,8 +593,8 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client
 						$ipaddr = get_interface_ip($ifdesc);
 						if (is_ipaddr($ipaddr)) {
 							$selected = "";
-							if ($ipaddr == $pconfig['radiussrcip_attribute'])
-								$ifdesc = "selected";
+							if ($ifdesc == $pconfig['radiussrcip_attribute'])
+								$selected = "selected";
 							echo "<option value='{$ifdesc}' {$selected}>{$ifdescr} - {$ipaddr}</option>\n";
 						}
 					}