diff options
| author | jim-p <jimp@pfsense.org> | 2014-05-09 14:12:58 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-05-09 14:12:58 -0400 |
| commit | b13b4acd7be6aef3cb5eed0f086b8cccb5bca21c (patch) | |
| tree | 359180a7b25ff03622ac7ec47fc3cc913e00f69f | |
| parent | d371fb794e94ea826515229d10c3dc1fccdec777 (diff) | |
| download | pfsense-packages-b13b4acd7be6aef3cb5eed0f086b8cccb5bca21c.tar.gz pfsense-packages-b13b4acd7be6aef3cb5eed0f086b8cccb5bca21c.tar.bz2 pfsense-packages-b13b4acd7be6aef3cb5eed0f086b8cccb5bca21c.zip | |
Fix call-time pass-by-reference in clamav (not used)
| -rw-r--r-- | config/archive/clamsmtp.inc | 2 | ||||
| -rw-r--r-- | config/archive/viralator.inc | 2 | ||||
| -rw-r--r-- | config/clamav.inc | 8 | ||||
| -rw-r--r-- | config/clamav.xml | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/config/archive/clamsmtp.inc b/config/archive/clamsmtp.inc index f23a35c1..cc16cf82 100644 --- a/config/archive/clamsmtp.inc +++ b/config/archive/clamsmtp.inc @@ -20,7 +20,7 @@ function clamsmtp_install_command() { clamsmtp_resync(); } -function clamsmtp_validate_input($post, $input_errors) { +function clamsmtp_validate_input($post, &$input_errors) { if (!is_ipaddr(trim($post['smtp_server']))) $input_errors[] = 'The field \'SMTP server\' must contain a valid IP address.'; $port = trim($post['smtp_port']); diff --git a/config/archive/viralator.inc b/config/archive/viralator.inc index dc4e6041..36ceb37f 100644 --- a/config/archive/viralator.inc +++ b/config/archive/viralator.inc @@ -24,7 +24,7 @@ EOD; make_dirs(VIRALATOR_DOWNLOADDIR); } -function viralator_validate_input($post, $input_errors) { +function viralator_validate_input($post, &$input_errors) { if (trim($post['http_otherexts'])) { foreach (explode(',', $post['http_otherexts']) as $ext) { $ext = trim($ext); diff --git a/config/clamav.inc b/config/clamav.inc index 3aaaf71d..036f69cb 100644 --- a/config/clamav.inc +++ b/config/clamav.inc @@ -108,7 +108,7 @@ EOD; } } -function clamav_before_form($pkg) { +function clamav_before_form(&$pkg) { global $config; if (is_package_installed('p3scan')) { @@ -203,15 +203,15 @@ function clamav_before_form($pkg) { } } -function clamav_validate_input($post, $input_errors) { +function clamav_validate_input($post, &$input_errors) { if ($post['scan_smtp'] == 'on') { require_once('clamsmtp.inc'); - clamsmtp_validate_input($post, &$input_errors); + clamsmtp_validate_input($post, $input_errors); } if (is_package_installed('viralator')) { require_once('viralator.inc'); - viralator_validate_input($post, &$input_errors); + viralator_validate_input($post, $input_errors); } } diff --git a/config/clamav.xml b/config/clamav.xml index 94f8c74f..aac32d1e 100644 --- a/config/clamav.xml +++ b/config/clamav.xml @@ -116,13 +116,13 @@ </field> </fields> <custom_php_command_before_form> - clamav_before_form(&$pkg); + clamav_before_form($pkg); </custom_php_command_before_form> <custom_php_resync_config_command> clamav_resync(); </custom_php_resync_config_command> <custom_php_validation_command> - clamav_validate_input($post, &$input_errors); + clamav_validate_input($post, $input_errors); </custom_php_validation_command> <custom_php_install_command> clamav_install_command(); |