lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 18:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

vpn: is_array($x) && is_array($x) -> isset($x)

Browse Source 
I guess this is a typo.  It makes sense to preceede is_array() with
isset() here since PHP throws a warning on unset variables nowadays.
However, is_array() should not be used if the following operation is
`foreach' as it would mask the fact that the array that is set is not
an array at all (maybe due to a bug).  Rather want to catch it instead.

A bit of style along the way and `lint' target fixing.
This commit is contained in:
Franco Fichtner 2015-03-24 07:54:34 +01:00
parent fe5ae1b7b2
commit f1d7efc661
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -29,7 +29,7 @@ lint:
! -name "*.svg" ! -name "*.woff" ! -name "*.woff2" \
! -name "*.otf" ! -name "*.png" ! -name "*.js" \
! -name "*.scss" ! -name "*.py" ! -name "*.ttf" \
-type f -print0 | xargs -0 -n1 php -l
! -name "*.tgz" -type f -print0 | xargs -0 -n1 php -l
sweep:
find ${.CURDIR}/src ! -name "*.min.*" ! -name "*.svg" \

17
src/etc/inc/vpn.inc
View File

@ -193,27 +193,31 @@ function vpn_ipsec_configure($ipchg = false)
}
$rgmap[$ph1ent['remote-gateway']] = $rg;
if (is_array($a_phase2) && is_array($a_phase2)) {
if (isset($a_phase2)) {
/* step through each phase2 entry */
foreach ($a_phase2 as $ph2ent) {
if (isset($ph2ent['disabled']))
if (isset($ph2ent['disabled'])) {
continue;
}
if ($ikeid != $ph2ent['ikeid'])
if ($ikeid != $ph2ent['ikeid']) {
continue;
}
/* add an ipsec pinghosts entry */
if ($ph2ent['pinghost']) {
if (!is_array($iflist))
if (!is_array($iflist)) {
$iflist = get_configured_interface_list();
}
$viplist = get_configured_vips_list();
$srcip = null;
$local_subnet = ipsec_idinfo_to_cidr($ph2ent['localid'], true, $ph2ent['mode']);
if(is_ipaddrv6($ph2ent['pinghost'])) {
foreach ($iflist as $ifent => $ifname) {
$interface_ip = get_interface_ipv6($ifent);
if(!is_ipaddrv6($interface_ip))
if (!is_ipaddrv6($interface_ip)) {
continue;
}
if (ip_in_subnet($interface_ip, $local_subnet)) {
$srcip = $interface_ip;
break;
@ -222,8 +226,9 @@ function vpn_ipsec_configure($ipchg = false)
} else {
foreach ($iflist as $ifent => $ifname) {
$interface_ip = get_interface_ip($ifent);
if(!is_ipaddrv4($interface_ip))
if (!is_ipaddrv4($interface_ip)) {
continue;
}
if ($local_subnet == "0.0.0.0/0" || ip_in_subnet($interface_ip, $local_subnet)) {
$srcip = $interface_ip;
break;