diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-05-14 14:41:52 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2014-05-14 14:41:52 -0400 |
| commit | d8921424a0431833d0f12ade382a2d36d4983470 (patch) | |
| tree | b58a091fdcfecf5bebb439cf88cbf43e5fd0e100 /config/suricata | |
| parent | 99b5013e94ede6ab5f3dc16a5996d4ce1f1a52b3 (diff) | |
| download | pfsense-packages-d8921424a0431833d0f12ade382a2d36d4983470.tar.gz pfsense-packages-d8921424a0431833d0f12ade382a2d36d4983470.tar.bz2 pfsense-packages-d8921424a0431833d0f12ade382a2d36d4983470.zip | |
Fix-up call-time pass-by-reference use for PHP 5.5
Diffstat (limited to 'config/suricata')
| -rw-r--r-- | config/suricata/suricata_passlist_edit.php | 7 | ||||
| -rw-r--r-- | config/suricata/suricata_suppress_edit.php | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/config/suricata/suricata_passlist_edit.php b/config/suricata/suricata_passlist_edit.php index 35c7b66e..437ae9a8 100644 --- a/config/suricata/suricata_passlist_edit.php +++ b/config/suricata/suricata_passlist_edit.php @@ -114,7 +114,12 @@ if ($_POST['save']) { /* input validation */ $reqdfields = explode(" ", "name"); $reqdfieldsn = explode(",", "Name"); - 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(strtolower($_POST['name']) == "defaultpasslist") $input_errors[] = gettext("Pass List file names may not be named defaultpasslist."); diff --git a/config/suricata/suricata_suppress_edit.php b/config/suricata/suricata_suppress_edit.php index a46e9e99..d4549e56 100644 --- a/config/suricata/suricata_suppress_edit.php +++ b/config/suricata/suricata_suppress_edit.php @@ -88,7 +88,12 @@ if ($_POST['save']) { $reqdfields = explode(" ", "name"); $reqdfieldsn = array("Name"); - 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(strtolower($_POST['name']) == "defaultwhitelist") $input_errors[] = "Whitelist file names may not be named defaultwhitelist."; |