Network calculator, bug fix

openprotest · Dec 5, 2024 · 95fbc25 · 95fbc25
1 parent cf083b6
commit 95fbc25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/Protest/Front/ipbox.js b/Protest/Front/ipbox.js
@@ -136,7 +136,7 @@ class IpBox {
 	}
 
 	SetEnabled(option) {
-		for (let i = 0; i < 4; i++) {
+		for (let i=0; i<4; i++) {
 			this.textBoxes[i].disabled = !option;
 		}
 	}

diff --git a/Protest/Front/netcalc.js b/Protest/Front/netcalc.js
@@ -54,6 +54,11 @@ class NetCalc extends Window {
 		this.ipMask.SetIp(255,255,255,0);
 		this.ipMask.Attach(maskBox);
 
+		this.ipMask.textBoxes[0].readOnly = true;
+		this.ipMask.textBoxes[1].readOnly = true;
+		this.ipMask.textBoxes[2].readOnly = true;
+		this.ipMask.textBoxes[3].readOnly = true;
+
 		let slashLabel = document.createElement("div");
 		slashLabel.textContent = "/";
 		slashLabel.style.display = "inline-block";
@@ -216,27 +221,6 @@ class NetCalc extends Window {
 			this.Calculate();
 		};
 
-		this.ipMask.textBoxes[0].onkeyup = this.ipMask.textBoxes[0].oninput =
-		this.ipMask.textBoxes[1].onkeyup = this.ipMask.textBoxes[1].oninput =
-		this.ipMask.textBoxes[2].onkeyup = this.ipMask.textBoxes[2].oninput =
-		this.ipMask.textBoxes[3].onkeyup = this.ipMask.textBoxes[3].oninput = ()=> {
-			let bits = parseInt(this.ipMask.textBoxes[0].value).toString(2) +
-				parseInt(this.ipMask.textBoxes[1].value).toString(2) +
-				parseInt(this.ipMask.textBoxes[2].value).toString(2) +
-				parseInt(this.ipMask.textBoxes[3].value).toString(2);
-
-			let bitCount = 0;
-			for (let i = 0; i < bits; i++) {
-				if (bits[i] == "0") break;
-				bitCount++;
-			}
-
-			this.cidrRange.value = bitCount;
-			this.cidrInput.value = bitCount;
-
-			this.Calculate();
-		};
-
 		this.Calculate();
 	}
 

diff --git a/Protest/Tools/MacLookup.cs b/Protest/Tools/MacLookup.cs
@@ -23,8 +23,7 @@ public static string LookupToString(string mac) {
         mac = mac.Replace("-", String.Empty);
         mac = mac.Replace(":", String.Empty);
         mac = mac.Replace(" ", String.Empty);
-        if (mac.Length < 6)
-            return null;
+        if (mac.Length < 6) return null;
 
         byte[] t = new byte[4];
         try {
@@ -41,8 +40,7 @@ public static string LookupToString(string mac) {
 
         try {
             FileInfo file = new FileInfo(Data.FILE_MAC);
-            if (!file.Exists)
-                return null;
+            if (!file.Exists) return null;
 
             FileStream stream = new FileStream(file.FullName, FileMode.Open, FileAccess.Read);