Allowed hostname is now working. Make bw up and down checks a bit more strict using intval() and comparing >0. Fix bw and upload checks allowing either to be set.

1 files changed, 5 insertions, 1 deletions

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index ac36407..08e325d 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -979,9 +979,13 @@ function captiveportal_passthrumac_findbyname($username) {
  */
 function captiveportal_allowedip_configure_entry($ipent) {
 
+	/* This function can deal with hostname or ipaddress */
 	if($ipent['ip']) 	
 		$ipaddress = $ipent['ip'];
 
+	/*  Instead of copying this entire function for something
+	 *  easy such as hostname vs ip address add this check
+	 */
 	if($ipent['hostname']) {
 		$ipaddress = gethostbyname($ipent['hostname']);
 		if(!is_ipaddr($ipaddress)) 
@@ -996,7 +1000,7 @@ function captiveportal_allowedip_configure_entry($ipent) {
 	$tablein = array();
 	$tableout = array();
 
-	if ($enBwup or $enBwdown)
+	if (intval($enBwup) > 0 or intval($enBwdown) > 0)
 		$ruleno = captiveportal_get_next_ipfw_ruleno(2000, 49899, true);
 	else
 		$ruleno = captiveportal_get_next_ipfw_ruleno(2000, 49899, false);