From d1abcd137c2e58cb14dbe73f87e1c6c27bda6e5c Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 6 Jul 2015 09:20:23 +0000 Subject: [PATCH] (legacy) fix some more php notices --- src/etc/inc/auth.inc | 4 ++-- src/etc/inc/interfaces.inc | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 240c122ff..d7a3c58b2 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -142,14 +142,14 @@ if(function_exists("display_error_form") && !isset($config['system']['webgui'][' } } - if(is_array($config['dyndnses']['dyndns']) && !$found_host) + if(isset($config['dyndnses']['dyndns']) && is_array($config['dyndnses']['dyndns']) && !$found_host) foreach($config['dyndnses']['dyndns'] as $dyndns) if(strcasecmp($dyndns['host'], $referrer_host) == 0) { $found_host = true; break; } - if(is_array($config['dnsupdates']['dnsupdate']) && !$found_host) + if(isset($config['dnsupdates']['dnsupdate']) && is_array($config['dnsupdates']['dnsupdate']) && !$found_host) foreach($config['dnsupdates']['dnsupdate'] as $rfc2136) if(strcasecmp($rfc2136['host'], $referrer_host) == 0) { $found_host = true; diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 93f7b7549..03916ae1d 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -4332,7 +4332,12 @@ function get_real_interface($interface = "wan", $family = "all", $realv6iface = $cfg = &$config['interfaces'][$interface]; if ($family == "inet6") { - switch ($cfg['ipaddrv6']) { + if (isset($cfg['ipaddrv6'])) { + $ipaddrv6 = $cfg['ipaddrv6']; + } else { + $ipaddrv6 = ""; + } + switch ($ipaddrv6) { case "6rd": case "6to4": $wanif = "{$interface}_stf"; @@ -4743,10 +4748,11 @@ function find_interface_ipv6($interface, $flush = false) { /* Setup IP cache */ if (!isset($interface_ipv6_arr_cache[$interface]) or $flush) { $ifinfo = pfSense_get_interface_addresses($interface); - $interface_ipv6_arr_cache[$interface] = $ifinfo['ipaddr6']; - $interface_snv6_arr_cache[$interface] = $ifinfo['subnetbits6']; + if (isset($ifinfo['ipaddr6'])) { + $interface_ipv6_arr_cache[$interface] = $ifinfo['ipaddr6']; + $interface_snv6_arr_cache[$interface] = $ifinfo['subnetbits6']; + } } - return $interface_ipv6_arr_cache[$interface]; }