From a50115856994b73b11ac04e1f8d790d2741238f7 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 30 May 2012 20:15:05 +0000
Subject: Rather than doig a string search do a proper matching of selected
 interfaces. Fixes #2378

---
 usr/local/www/services_captiveportal.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index 13bcc71..eb657b5 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -331,10 +331,11 @@ function enable_change(enable_change) {
 		<select name="cinterface[]" multiple="true" size="<?php echo count($config['interfaces']); ?>" class="formselect" id="cinterface">
 		  <?php 
 		  $interfaces = get_configured_interface_with_descr();
+		  $cselected = explode(",", $pconfig['cinterface']);
 		  foreach ($interfaces as $iface => $ifacename): ?>
-		  <option value="<?=$iface;?>" <?php if (stristr($pconfig['cinterface'], $iface)) echo "selected"; ?>>
-		  <?=htmlspecialchars($ifacename);?>
-		  </option>
+			  <option value="<?=$iface;?>" <?php if (in_array($iface, $cselected)) echo "selected"; ?>>
+			  <?=htmlspecialchars($ifacename);?>
+			  </option>
 		  <?php endforeach; ?>
 		</select> <br>
 		<span class="vexpl"><?=gettext("Select the interface(s) to enable for captive portal."); ?></span></td>
-- 
cgit v1.1