From 701f5caa9721b067a40048bca38dcdb0b071b932 Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Wed, 30 Sep 2015 18:11:04 -0500 Subject: Can't use continue here as it continues the foreach, which skips the "ipfw zone" command, breaking CP for any system that doesn't have VIPs defined. --- src/etc/inc/captiveportal.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index e95cc75..ad33603 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -500,12 +500,11 @@ function captiveportal_init_rules($reinit = false) { $cpipm = get_interface_ip($cpifgrp); if (is_ipaddr($cpipm)) { $cpips[] = $cpipm; - if (!is_array($config['virtualip']) || !is_array($config['virtualip']['vip'])) { - continue; - } - foreach ($config['virtualip']['vip'] as $vip) { - if (($vip['interface'] == $cpifgrp) && (($vip['mode'] == "carp") || ($vip['mode'] == "ipalias"))) { - $cpips[] = $vip['subnet']; + if (is_array($config['virtualip']) || is_array($config['virtualip']['vip'])) { + foreach ($config['virtualip']['vip'] as $vip) { + if (($vip['interface'] == $cpifgrp) && (($vip['mode'] == "carp") || ($vip['mode'] == "ipalias"))) { + $cpips[] = $vip['subnet']; + } } } } -- cgit v1.1