From de2fe652ca87d7c6c7db583050d3a807b034040f Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 10 Jul 2013 15:20:31 +0000 Subject: [PATCH] Use empty to cover all needed cases as suggested on #3062. Suggested from pull request #698 --- etc/inc/captiveportal.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 873dcdb250..830dbcbcaa 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -362,6 +362,7 @@ EOD; /* remove old information */ unlink_if_exists("{$g['vardb_path']}/captiveportal{$cpzone}.db"); unlink_if_exists("{$g['vardb_path']}/captiveportal_radius_{$cpzone}.db"); + unlink_if_exists("{$g['vardb_path']}/captiveportal_{$cpzone}.rules"); mwexec("/usr/local/sbin/ipfw_context -d {$cpzone}", true); @@ -1200,7 +1201,7 @@ function radius($username,$password,$clientip,$clientmac,$type, $radiusctx = nul $pipeno = captiveportal_get_next_dn_ruleno(); /* If the pool is empty, return appropriate message and fail authentication */ - if (is_null($pipeno)) { + if (empty($pipeno)) { $auth_list = array(); $auth_list['auth_val'] = 1; $auth_list['error'] = "System reached maximum login capacity";