Remove duplicate function portal_mac_fixed()

2 files changed, 17 insertions, 38 deletions

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 9474133..c41894d 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -1100,24 +1100,24 @@ function getNasIP()
 }
 
 function portal_mac_fixed($clientmac) {
-	global $g ;
+    global $g ;
 
-	/* open captive portal mac db */
-	if (file_exists("{$g['vardb_path']}/captiveportal_mac.db")) {
-		$fd = @fopen("{$g['vardb_path']}/captiveportal_mac.db","r") ;
-		if (!$fd) {
-			return FALSE;
-		}
-		while (!feof($fd)) {
-			$mac = trim(fgets($fd)) ;
-			if(strcasecmp($clientmac, $mac) == 0) {
-				fclose($fd) ;
-				return TRUE ;
-			}
-		}
-		fclose($fd) ;
-	}
-	return FALSE ;
+    /* open captive portal mac db */
+    if (file_exists("{$g['vardb_path']}/captiveportal_mac.db")) {
+        $fd = @fopen("{$g['vardb_path']}/captiveportal_mac.db","r") ;
+        if (!$fd) {
+            return FALSE;
+        }
+        while (!feof($fd)) {
+            $mac = trim(fgets($fd)) ;
+            if(strcasecmp($clientmac, $mac) == 0) {
+                fclose($fd) ;
+                return TRUE ;
+            }
+        }
+        fclose($fd) ;
+    }
+    return FALSE ;
 }
 
 ?>
\ No newline at end of file
diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php
index 71a2d53..034dfa5 100755
--- a/usr/local/captiveportal/index.php
+++ b/usr/local/captiveportal/index.php
@@ -200,27 +200,6 @@ function portal_reply_page($redirurl, $type = null, $message = null) {
     echo $htmltext;
 }
 
-function portal_mac_fixed($clientmac) {
-    global $g ;
-
-    /* open captive portal mac db */
-    if (file_exists("{$g['vardb_path']}/captiveportal_mac.db")) {
-        $fd = @fopen("{$g['vardb_path']}/captiveportal_mac.db","r") ;
-        if (!$fd) {
-            return FALSE;
-        }
-        while (!feof($fd)) {
-            $mac = trim(fgets($fd)) ;
-            if(strcasecmp($clientmac, $mac) == 0) {
-                fclose($fd) ;
-                return TRUE ;
-            }
-        }
-        fclose($fd) ;
-    }
-    return FALSE ;
-}
-
 function portal_mac_radius($clientmac,$clientip) {
     global $config ;