diff options
| author | Martin Fuchs <trendchiller@users.noreply.github.com> | 2014-06-10 15:48:33 +0200 |
|---|---|---|
| committer | Martin Fuchs <trendchiller@users.noreply.github.com> | 2014-06-10 15:48:33 +0200 |
| commit | 0ef20f92b5bea3d3487c249d515f905d09f859a7 (patch) | |
| tree | 76101c20efe2f68b0f455070f1f077058e52868d /config/haproxy/haproxy_global.php | |
| parent | ff5060af8732ef9bd55a95537f3705c7382e19e0 (diff) | |
| parent | b2bea6eac166ab17ed1e5776ea32d822f459a914 (diff) | |
| download | pfsense-packages-0ef20f92b5bea3d3487c249d515f905d09f859a7.tar.gz pfsense-packages-0ef20f92b5bea3d3487c249d515f905d09f859a7.tar.bz2 pfsense-packages-0ef20f92b5bea3d3487c249d515f905d09f859a7.zip | |
Merge pull request #1 from pfsense/master
update fork
Diffstat (limited to 'config/haproxy/haproxy_global.php')
| -rwxr-xr-x | config/haproxy/haproxy_global.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php index 16f5152d..40b5cd90 100755 --- a/config/haproxy/haproxy_global.php +++ b/config/haproxy/haproxy_global.php @@ -59,7 +59,11 @@ if ($_POST) { if ($_POST['carpdev'] == "disabled") unset($_POST['carpdev']); - do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pf_version < 2.1) + $input_errors = eval('do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); return $input_errors;'); + else + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); if ($_POST['maxconn'] && (!is_numeric($_POST['maxconn']))) $input_errors[] = "The maximum number of connections should be numeric."; |