Project

General

Profile

« Previous | Next » 

Revision fe9ec12b

Added by Ermal Luçi over 10 years ago

Revert "Ticket #3932 Use array_map to get more parallelism when there are many entries. This makes it not reach the execution timeout with large entries."

This reverts commit 7077addc5a5058fab4b4dc7678270c1000d342c9.

View differences:

etc/inc/captiveportal.inc
1039 1039
	$rules = "";
1040 1040

  
1041 1041
	if (is_array($config['captiveportal'][$cpzone]['passthrumac'])) {
1042
		$tmprules = array_map('captiveportal_passthrumac_configure_entry', $config['captiveportal'][$cpzone]['passthrumac']);
1043
		$rules = implode("\n", $tmprules);
1044
		unset($tmprules);
1042
		$nentries = count($config['captiveportal'][$cpzone]['passthrumac']);
1043
		foreach ($config['captiveportal'][$cpzone]['passthrumac'] as $macent) {
1044
			if ($nentries > 100)
1045
				$rules .= captiveportal_passthrumac_configure_entry($macent, true);
1046
			else
1047
				$rules .= captiveportal_passthrumac_configure_entry($macent);
1048
		}
1045 1049
	}
1046 1050

  
1047 1051
	return $rules;

Also available in: Unified diff