improvement: new mac format with colons and lower case hex digits

rafaliex · Feb 10, 2023 · 09f37a4 · 09f37a4
1 parent 980a30d
commit 09f37a4
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/js/common.js b/js/common.js
@@ -598,7 +598,8 @@ function changeMacFormat(id)
 	}
 	var curmac = elem.innerHTML.trim();
 	var macpatterns = [
-		/^([0-9a-f]{2}:){5}[0-9a-f]{2}$/gi,
+		/^([0-9A-F]{2}:){5}[0-9A-F]{2}$/g,
+		/^([0-9a-f]{2}:){5}[0-9a-f]{2}$/g,
 		/^([0-9a-f]{2}-){5}[0-9a-f]{2}$/gi,
 		/^([0-9a-f]{4}\.){2}[0-9a-f]{4}$/gi,
 		/^([0-9a-f]{4}-){2}[0-9a-f]{4}$/gi,
@@ -615,21 +616,25 @@ function changeMacFormat(id)
 	i = parseInt(i);
 	switch (i) {
 		case 0:
-			curmac = curmac.replace(/:/g, '-');
+			curmac = curmac.toLowerCase();
 			break;
 		case 1:
+			curmac = curmac.replace(/:/g, '-');
+			curmac = curmac.toUpperCase();
+			break;
+		case 2:
 			curmac = curmac.replace(/-/g, '');
 			curmac = curmac.toLowerCase();
 			curmac = curmac.replace(/^([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})$/gi, '$1.$2.$3');
 			break;
-		case 2:
+		case 3:
 			curmac = curmac.replace(/\./g, '-');
 			break;
-		case 3:
+		case 4:
 			curmac = curmac.replace(/-/g, '');
 			curmac = curmac.toUpperCase();
 			break;
-		case 4:
+		case 5:
 			curmac = curmac.replace(/^([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/gi, '$1:$2:$3:$4:$5:$6');
 			break;
 	}