From b27f1caf39f866b30093d6cbb5ffbfb9434cfbef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Thu, 21 May 2009 23:02:04 +0000
Subject: [PATCH] Make the CP interface check code more buller proof.

---
 etc/inc/captiveportal.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index ef793e71d9..0047524fa2 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -57,13 +57,15 @@ function captiveportal_configure() {
 		foreach ($cpinterfaces as $cpifgrp) {
 			if (!isset($ifaces[$cpifgrp]))
 				continue;
-			if ($firsttime > 0)
-				$cpinterface .= " or ";
-			$firsttime = 1;
 			$tmpif = get_real_interface($cpifgrp);
 			if (!empty($tmpif)) {
+				if ($firsttime > 0)
+					$cpinterface .= " or ";
 				$cpinterface .= "via {$tmpif}"; 
-				$cpips[] = get_interface_ip($cpifgrp);
+				$firsttime = 1;
+				$cpipm = get_interface_ip($cpifgrp);
+				if (is_ipaddr($cpipm))
+					$cpips[] = $cpipm;
 			}
 		}
 		if (count($cpips) > 0) {