Merge pull request #66 from netniV/Issue-65

cigamit · web-flow · commit df4eaba219b4 · 2018-02-15T19:35:43.000-06:00
Fix for issue #65: Extra separator on mac address
diff --git a/lib/mactrack_functions.php b/lib/mactrack_functions.php
@@ -1817,7 +1817,7 @@ function xform_mac_address($mac_address) {
 		}else{ /* return is hex */
 			$mac = "";
 			for ($j = 0; $j < strlen($mac_address); $j++) {
-				$mac .= bin2hex($mac_address[$j]) . read_config_option("mt_mac_delim");
+				$mac .= bin2hex($mac_address[$j]) . ($j == strlen($mac_address) ? '' : read_config_option("mt_mac_delim"));
 			}
 			$mac_address = $mac;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1817,7 +1817,7 @@ function xform_mac_address($mac_address) {`
`1817`	`1817`	`}else{ /* return is hex */`
`1818`	`1818`	`$mac = "";`
`1819`	`1819`	`for ($j = 0; $j < strlen($mac_address); $j++) {`
`1820`		`- $mac .= bin2hex($mac_address[$j]) . read_config_option("mt_mac_delim");`
	`1820`	`+ $mac .= bin2hex($mac_address[$j]) . ($j == strlen($mac_address) ? '' : read_config_option("mt_mac_delim"));`
`1821`	`1821`	`}`
`1822`	`1822`	`$mac_address = $mac;`
`1823`	`1823`	`}`