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.

1 files changed, 5 insertions, 6 deletions

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index d0984dd..fd981d9 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -501,12 +501,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'];
+						}
 					}
 				}
 			}