Project

General

Profile

« Previous | Next » 

Revision 5eee3755

Added by Renato Botelho almost 12 years ago

Make captiveportal_passthrumac_delete_entry() return rules instead of execute them as other similar functions do

View differences:

etc/inc/captiveportal.inc
959 959
}
960 960

  
961 961
function captiveportal_passthrumac_delete_entry($macent) {
962
	global $cpzone;
962
	$rules = "";
963 963

  
964 964
	$ruleno = captiveportal_get_ipfw_passthru_ruleno($macent['mac']);
965 965

  
966 966
	if (!$ruleno)
967
		return false;
967
		return $rules;
968 968

  
969
	$cmd = "/sbin/ipfw -x {$cpzone} delete {$ruleno}";
969
	$rules .= "delete {$ruleno}\n";
970 970
	captiveportal_free_ipfw_ruleno($ruleno, ($macent['action'] == 'block'));
971 971

  
972 972
	if ($macent['action'] == 'pass') {
973
		$cmd .= "; /sbin/ipfw -x {$cpzone} delete " . ++$ruleno;
973
		$rules .= "delete " . ++$ruleno . "\n";
974 974

  
975 975
		$pipeno = captiveportal_get_dn_passthru_ruleno($macent['mac']);
976 976

  
977 977
		if (!empty($pipeno)) {
978 978
			captiveportal_free_dn_ruleno($pipeno);
979
			$cmd .= "; /sbin/ipfw -x {$cpzone} pipe delete " . $pipeno;
980
			$cmd .= "; /sbin/ipfw -x {$cpzone} pipe delete " . ++$pipeno;
979
			$rules .= "pipe delete " . $pipeno . "\n";
980
			$rules .= "pipe delete " . ++$pipeno . "\n";
981 981
		}
982 982
	}
983 983

  
984
	mwexec($cmd);
985

  
986
	return true;
984
	return $rules;
987 985
}
988 986

  
989 987
function captiveportal_passthrumac_configure($lock = false) {

Also available in: Unified diff