diff options
| author | Ermal <eri@pfsense.org> | 2011-07-22 08:55:10 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-07-22 08:55:28 +0000 |
| commit | 8818c188b5b924b5f72b0e88c362a6de6efa8c2b (patch) | |
| tree | 09ba12928c4e1ee78a9e6705c20d4bc50179bbfe /usr/local/www/services_captiveportal.php | |
| parent | 739e227a98c2d3c722f782a553048ee015f96fe3 (diff) | |
| download | pfsense-8818c188b5b924b5f72b0e88c362a6de6efa8c2b.zip pfsense-8818c188b5b924b5f72b0e88c362a6de6efa8c2b.tar.gz | |
Remove 'maxproc' since its unused in the code and correctly use maxprocperip to allow the GUI setting to be actually usable. Reported-by: http://forum.pfsense.org/index.php/topic,39155.0.html
Diffstat (limited to 'usr/local/www/services_captiveportal.php')
| -rwxr-xr-x | usr/local/www/services_captiveportal.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index e86a2d1..2f1db79 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -67,7 +67,6 @@ if ($_GET['act'] == "viewhtml") { } $pconfig['cinterface'] = $config['captiveportal']['interface']; -$pconfig['maxproc'] = $config['captiveportal']['maxproc']; $pconfig['maxprocperip'] = $config['captiveportal']['maxprocperip']; $pconfig['timeout'] = $config['captiveportal']['timeout']; $pconfig['idletimeout'] = $config['captiveportal']['idletimeout']; @@ -172,18 +171,13 @@ if ($_POST) { if (($_POST['radiusacctport'] && !is_port($_POST['radiusacctport']))) { $input_errors[] = sprintf(gettext("A valid port number must be specified. [%s]"), $_POST['radiusacctport']); } - if ($_POST['maxproc'] && (!is_numeric($_POST['maxproc']) || ($_POST['maxproc'] < 4) || ($_POST['maxproc'] > 100))) { - $input_errors[] = gettext("The total maximum number of concurrent connections must be between 4 and 100."); - } - $mymaxproc = $_POST['maxproc'] ? $_POST['maxproc'] : 16; - if ($_POST['maxprocperip'] && (!is_numeric($_POST['maxprocperip']) || ($_POST['maxprocperip'] > $mymaxproc))) { + if ($_POST['maxprocperip'] && (!is_numeric($_POST['maxprocperip']) || ($_POST['maxprocperip'] < 4) || $_POST['maxprocperip'] > 100)) { $input_errors[] = gettext("The maximum number of concurrent connections per client IP address may not be larger than the global maximum."); } if (!$input_errors) { 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']; $config['captiveportal']['idletimeout'] = $_POST['idletimeout']; @@ -256,7 +250,6 @@ function enable_change(enable_change) { radius_endis = !((!endis && document.iform.auth_method[2].checked) || enable_change); document.iform.cinterface.disabled = endis; - //document.iform.maxproc.disabled = endis; document.iform.maxprocperip.disabled = endis; document.iform.idletimeout.disabled = endis; document.iform.freelogins_count.disabled = endis; |
