From 173c5007b5f863fb642bc86bf906c9eb80ac32e7 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 9 May 2014 14:46:24 -0400 Subject: Fix call-time pass-by-reference in Squidguard, bump --- config/squidGuard/squidguard.inc | 50 +++++++++++++-------------- config/squidGuard/squidguard.xml | 6 ++-- config/squidGuard/squidguard_acl.xml | 4 +-- config/squidGuard/squidguard_configurator.inc | 50 +++++++++++++-------------- config/squidGuard/squidguard_default.xml | 4 +-- config/squidGuard/squidguard_dest.xml | 4 +-- config/squidGuard/squidguard_log.php | 8 ++--- config/squidGuard/squidguard_rewr.xml | 2 +- config/squidGuard/squidguard_time.xml | 2 +- 9 files changed, 65 insertions(+), 65 deletions(-) (limited to 'config/squidGuard') diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc index d58dfb79..0fd450b7 100644 --- a/config/squidGuard/squidguard.inc +++ b/config/squidGuard/squidguard.inc @@ -101,26 +101,26 @@ sg_init(convert_pfxml_to_sgxml()); # ============================================================================== # Validations # ============================================================================== -function squidguard_validate($post, $input_errors) +function squidguard_validate(&$post, &$input_errors) { $submit = isset($_GET['submit']) ? $_GET['submit'] : $_POST['submit']; # check config if 'Apply' - if ($submit === APPLY_BTN) sg_check_config_data(&$input_errors); + if ($submit === APPLY_BTN) sg_check_config_data($input_errors); } # ------------------------------------------------------------------------------ # validate default # ------------------------------------------------------------------------------ -function squidguard_validate_default($post, $input_errors) +function squidguard_validate_default(&$post, &$input_errors) { - squidguard_validate_acl($post, &$input_errors); + squidguard_validate_acl($post, $input_errors); } # ------------------------------------------------------------------------------ # validate acl # ------------------------------------------------------------------------------ -function squidguard_validate_acl($post, $input_errors) +function squidguard_validate_acl(&$post, &$input_errors) { $pass_up = array(); $deny_up = array(); @@ -134,7 +134,7 @@ function squidguard_validate_acl($post, $input_errors) $name = trim($post[F_NAME]); if(!empty($name)) { # validate name format - check_name_format($name, &$input_errors); + check_name_format($name, $input_errors); # check unique name if (!sg_check_unique_name(F_ACLS, $name)) @@ -148,7 +148,7 @@ function squidguard_validate_acl($post, $input_errors) $sgx = array(); $sgx[F_NAME] = $post[F_NAME]; $sgx[F_SOURCE] = $post[F_SOURCE]; - sg_check_src($sgx, &$input_errors); + sg_check_src($sgx, $input_errors); } # store destinations to 'dest' value @@ -192,7 +192,7 @@ function squidguard_validate_acl($post, $input_errors) # check redirect $errmsg = ''; - if (!sg_check_redirect($post[F_RMOD], $post[F_REDIRECT], &$errmsg)) { + if (!sg_check_redirect($post[F_RMOD], $post[F_REDIRECT], $errmsg)) { $input_errors[] = "Redirect info error. $errmsg"; } } @@ -203,14 +203,14 @@ function squidguard_validate_acl($post, $input_errors) # date: