Remove unused code

2 files changed, 6 insertions, 9 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 17f5672..434862d 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1132,28 +1132,26 @@ function xml_safe_fieldname($fieldname) {
 }
 
 function mac_format($clientmac) {
-    $mac =explode(":", $clientmac);
-
     global $config;
 
+    $mac = explode(":", $clientmac);
     $mac_format = $config['captiveportal']['radmac_format'] ? $config['captiveportal']['radmac_format'] : false;
 
     switch($mac_format) {
-
         case 'singledash':
-        return "$mac[0]$mac[1]$mac[2]-$mac[3]$mac[4]$mac[5]";
+		return "$mac[0]$mac[1]$mac[2]-$mac[3]$mac[4]$mac[5]";
 
         case 'ietf':
-        return "$mac[0]-$mac[1]-$mac[2]-$mac[3]-$mac[4]-$mac[5]";
+		return "$mac[0]-$mac[1]-$mac[2]-$mac[3]-$mac[4]-$mac[5]";
 
         case 'cisco':
-        return "$mac[0]$mac[1].$mac[2]$mac[3].$mac[4]$mac[5]";
+		return "$mac[0]$mac[1].$mac[2]$mac[3].$mac[4]$mac[5]";
 
         case 'unformatted':
-        return "$mac[0]$mac[1]$mac[2]$mac[3]$mac[4]$mac[5]";
+		return "$mac[0]$mac[1]$mac[2]$mac[3]$mac[4]$mac[5]";
 
         default:
-        return $clientmac;
+		return $clientmac;
     }
 }
 
diff --git a/usr/local/captiveportal/radius_authentication.inc b/usr/local/captiveportal/radius_authentication.inc
index cb21a23..df9a368 100644
--- a/usr/local/captiveportal/radius_authentication.inc
+++ b/usr/local/captiveportal/radius_authentication.inc
@@ -80,7 +80,6 @@ function RADIUS_AUTHENTICATION($username,$password,$radiusservers,$clientip,$cli
     global $config, $cpzone;
 
     $retvalue = array();
-    $nas_mac = mac_format(get_interface_mac(get_real_interface("wan")));
     $clientmac = mac_format($clientmac);
     $nas_port = $ruleno;
     $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null;