From 74d65827db40936f016b5efb71b0a55a75488196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= Date: Sun, 31 Aug 2008 14:44:02 +0000 Subject: Fix detection if an interface is part of bridge. --- usr/local/www/services_captiveportal.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'usr/local/www/services_captiveportal.php') diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index fa85300..8fa01f9 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -100,14 +100,8 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); /* make sure no interfaces are bridged */ - $iflist = get_configured_interface_list(true); - foreach ($iflist as $if) { - $coptif = &$config['interfaces'][$if]; - if ($coptif['bridge'] == $pconfig['cinterface']) { - $input_errors[] = "The captive portal cannot be used when one or more interfaces are bridged."; - break; - } - } + if (link_int_to_bridge_interface($pconfig['cinterface'])) + $input_errors[] = "The captive portal cannot be used when one or more interfaces are bridged."; if ($_POST['httpslogin_enable']) { if (!$_POST['cert'] || !$_POST['key']) { -- cgit v1.1