diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
commit | e73b001e2585b55973faaf0be199a5f438c4ae89 (patch) | |
tree | 6dc08100313fe95ab4ca2dfa9883c23152dd4538 /usr/local/www/services_captiveportal.php | |
parent | 3e6ec5dfba9679f6b521962269aca9570e391abb (diff) | |
parent | 3e4f5a3359ebcc46710f37466620d0c0cdfd7293 (diff) | |
download | pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.zip pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.tar.gz |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php
Diffstat (limited to 'usr/local/www/services_captiveportal.php')
-rwxr-xr-x | usr/local/www/services_captiveportal.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index b3b2f97..08adf7d 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -117,9 +117,10 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); /* make sure no interfaces are bridged */ - foreach ($pconfig['cinterface'] as $cpbrif) - if (link_interface_to_bridge($cpbrif)) - $input_errors[] = sprintf(gettext("The captive portal cannot be used on interface %s since it is part of a bridge."), $cpbrif); + if (is_array($_POST['cinterface'])) + foreach ($pconfig['cinterface'] as $cpbrif) + if (link_interface_to_bridge($cpbrif)) + $input_errors[] = sprintf(gettext("The captive portal cannot be used on interface %s since it is part of a bridge."), $cpbrif); if ($_POST['httpslogin_enable']) { if (!$_POST['cert'] || !$_POST['key']) { @@ -169,7 +170,8 @@ if ($_POST) { } if (!$input_errors) { - $config['captiveportal']['interface'] = implode(",", $_POST['cinterface']); + if (is_array($_POST['cinterface'])) + $config['captiveportal']['interface'] = implode(",", $_POST['cinterface']); $config['captiveportal']['maxproc'] = $_POST['maxproc']; $config['captiveportal']['maxprocperip'] = $_POST['maxprocperip'] ? $_POST['maxprocperip'] : false; $config['captiveportal']['timeout'] = $_POST['timeout']; @@ -222,7 +224,8 @@ if ($_POST) { $savemsg = get_std_save_message($retval); - $pconfig['cinterface'] = implode(",", $_POST['cinterface']); + if (is_array($_POST['cinterface'])) + $pconfig['cinterface'] = implode(",", $_POST['cinterface']); } } include("head.inc"); |