Fix call-time pass by reference for all squid packages

10 files changed, 23 insertions, 23 deletions

diff --git a/config/squid3/31/squid.inc b/config/squid3/31/squid.inc
index b8f1e3e1..ef346e1a 100644
--- a/config/squid3/31/squid.inc
+++ b/config/squid3/31/squid.inc
@@ -365,7 +365,7 @@ function squid_deinstall_command() {
 	filter_configure();
 }
 
-function squid_before_form_general($pkg) {
+function squid_before_form_general(&$pkg) {
 	$values = get_dir(SQUID_CONFBASE . '/errors/');
 	// Get rid of '..' and '.' and ...
 	array_shift($values);
@@ -389,7 +389,7 @@ function squid_before_form_general($pkg) {
 		$field['options']['option'][] = array('name' => $names[$i], 'value' => $values[$i]);
 }
 
-function squid_validate_general($post, $input_errors) {
+function squid_validate_general($post, &$input_errors) {
 	global $config;
 	if (is_array($config['installedpackages']['squid']))
 		$settings = $config['installedpackages']['squid']['config'][0];
@@ -452,7 +452,7 @@ function squid_validate_general($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_upstream($post, $input_errors) {
+function squid_validate_upstream($post, &$input_errors) {
 	if ($post['enabled'] == 'on') {
 		$addr = trim($post['proxyaddr']);
 		if (empty($addr))
@@ -474,7 +474,7 @@ function squid_validate_upstream($post, $input_errors) {
 	}
 }
 
-function squid_validate_cache($post, $input_errors) {
+function squid_validate_cache($post, &$input_errors) {
 	$num_fields = array(	'harddisk_cache_size' => 'Hard disk cache size',
 				'memory_cache_size' => 'Memory cache size',
 				'maximum_object_size' => 'Maximum object size',
@@ -513,7 +513,7 @@ function squid_validate_cache($post, $input_errors) {
 
 }
 
-function squid_validate_nac($post, $input_errors) {
+function squid_validate_nac($post, &$input_errors) {
 	$allowed_subnets = explode("\n", $post['allowed_subnets']);
 	foreach ($allowed_subnets as $subnet) {
 		$subnet = trim($subnet);
@@ -559,7 +559,7 @@ function squid_validate_nac($post, $input_errors) {
 	 }}
 }
 
-function squid_validate_traffic($post, $input_errors) {
+function squid_validate_traffic($post, &$input_errors) {
 	$num_fields = array(	'max_download_size' => 'Maximum download size',
 				'max_upload_size' => 'Maximum upload size',
 				'perhost_throttling' => 'Per-host bandwidth throttling',
@@ -590,7 +590,7 @@ function squid_validate_traffic($post, $input_errors) {
   }	
 }
 
-function squid_validate_reverse($post, $input_errors) {
+function squid_validate_reverse($post, &$input_errors) {
 
 	if(!empty($post['reverse_ip'])) {
 		$reverse_ip = explode(";", ($post['reverse_ip']));
@@ -641,7 +641,7 @@ function squid_validate_reverse($post, $input_errors) {
 
 }
 
-function squid_validate_auth($post, $input_errors) {
+function squid_validate_auth($post, &$input_errors) {
 	$num_fields = array(	array('auth_processes', 'Authentication processes', 1),
 				array('auth_ttl', 'Authentication TTL', 0),
 	);
diff --git a/config/squid3/31/squid.xml b/config/squid3/31/squid.xml
index 53293acd..a05e9427 100644
--- a/config/squid3/31/squid.xml
+++ b/config/squid3/31/squid.xml
@@ -429,13 +429,13 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_add_php_command>
 		squid_resync();
 	</custom_add_php_command>
 	<custom_php_validation_command>
-		squid_validate_general($_POST, &amp;$input_errors);
+		squid_validate_general($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_auth.xml b/config/squid3/31/squid_auth.xml
index 307669c5..8dbaae67 100644
--- a/config/squid3/31/squid_auth.xml
+++ b/config/squid3/31/squid_auth.xml
@@ -244,7 +244,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_auth($_POST, &amp;$input_errors);
+		squid_validate_auth($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_after_form_command>
 		squid_print_javascript_auth2();
diff --git a/config/squid3/31/squid_cache.xml b/config/squid3/31/squid_cache.xml
index 7f371f49..50c0dca0 100644
--- a/config/squid3/31/squid_cache.xml
+++ b/config/squid3/31/squid_cache.xml
@@ -287,7 +287,7 @@
 		}
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_cache($_POST, &amp;$input_errors);
+		squid_validate_cache($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_nac.xml b/config/squid3/31/squid_nac.xml
index 659d626f..de3d670c 100644
--- a/config/squid3/31/squid_nac.xml
+++ b/config/squid3/31/squid_nac.xml
@@ -178,7 +178,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_nac($_POST, &amp;$input_errors);
+		squid_validate_nac($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_reverse.xml b/config/squid3/31/squid_reverse.xml
index b0f6a614..b3a4c6cb 100644
--- a/config/squid3/31/squid_reverse.xml
+++ b/config/squid3/31/squid_reverse.xml
@@ -353,10 +353,10 @@
 
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_reverse_general.xml b/config/squid3/31/squid_reverse_general.xml
index 9bff5d8e..47426c8e 100644
--- a/config/squid3/31/squid_reverse_general.xml
+++ b/config/squid3/31/squid_reverse_general.xml
@@ -245,12 +245,12 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/squid3/31/squid_reverse_peer.xml b/config/squid3/31/squid_reverse_peer.xml
index abfbf19b..b5a340e7 100644
--- a/config/squid3/31/squid_reverse_peer.xml
+++ b/config/squid3/31/squid_reverse_peer.xml
@@ -156,12 +156,12 @@
 		</field>
 	</fields>
 	<custom_php_command_before_form>
-		squid_before_form_general(&amp;$pkg);
+		squid_before_form_general($pkg);
 	</custom_php_command_before_form>
 	<custom_php_validation_command>
-		squid_validate_reverse($_POST, &amp;$input_errors);
+		squid_validate_reverse($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/squid3/31/squid_traffic.xml b/config/squid3/31/squid_traffic.xml
index 62269792..786205c1 100644
--- a/config/squid3/31/squid_traffic.xml
+++ b/config/squid3/31/squid_traffic.xml
@@ -195,7 +195,7 @@
 		</field>        		
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_traffic($_POST, &amp;$input_errors);
+		squid_validate_traffic($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
diff --git a/config/squid3/31/squid_upstream.xml b/config/squid3/31/squid_upstream.xml
index 049d301c..45e5576a 100644
--- a/config/squid3/31/squid_upstream.xml
+++ b/config/squid3/31/squid_upstream.xml
@@ -349,7 +349,7 @@
 		</field>
 	</fields>
 	<custom_php_validation_command>
-		squid_validate_upstream($_POST, &amp;$input_errors);
+		squid_validate_upstream($_POST, $input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();