Update bug with ipset (hestiacp#3363)

* Update blacklist path

* Fix select buttons

Author: jaapmarcus

web/templates/pages/add_firewall.php

@@ -74,19 +74,17 @@
 		return a.name > b.name;
 	});
 
-	$(function () {
-		var targetElement = document.getElementById('quickips_list');
+	var targetElement = document.getElementById('quickips_list');
 
+	var newEl = document.createElement("option");
+	newEl.text = "IP address lists:";
+	newEl.disabled = true;
+	targetElement.appendChild(newEl);
+
+	ipLists.forEach(iplist => {
 		var newEl = document.createElement("option");
-		newEl.text = "IP address lists:";
-		newEl.disabled = true;
+		newEl.text = iplist.name;
+		newEl.value = "ipset:" + iplist.name;
 		targetElement.appendChild(newEl);
-
-		ipLists.forEach(iplist => {
-			var newEl = document.createElement("option");
-			newEl.text = iplist.name;
-			newEl.value = "ipset:" + iplist.name;
-			targetElement.appendChild(newEl);
-		});
 	});
 </script>

web/templates/pages/add_firewall_ipset.php

@@ -78,9 +78,9 @@
 	];
 
 	var blacklist_iplists = [
-		{ name: "[IPv4] Block Malicious IPs", source: "script:/usr/local/hestia/install/deb/firewall/ipset/blacklist.sh" },
+		{ name: "[IPv4] Block Malicious IPs", source: "script:/usr/local/hestia/install/common/firewall/ipset/blacklist.sh" },
 		/*
-		{name: "[IPv6] Block Malicious IPs",			 source:"script:/usr/local/hestia/install/deb/firewall/ipset/blacklist.ipv6.sh"},
+		{name: "[IPv6] Block Malicious IPs",			 source:"script:/usr/local/hestia/install/common/firewall/ipset/blacklist.ipv6.sh"},
 		*/
 	];
 

web/templates/pages/edit_firewall.php

@@ -74,19 +74,17 @@
 		return a.name > b.name;
 	});
 
-	$(function () {
-		var targetElement = document.getElementById('quickips_list');
+	var targetElement = document.getElementById('quickips_list');
 
+	var newEl = document.createElement("option");
+	newEl.text = "IP address lists:";
+	newEl.disabled = true;
+	targetElement.appendChild(newEl);
+
+	ipLists.forEach(iplist => {
 		var newEl = document.createElement("option");
-		newEl.text = "IP address lists:";
-		newEl.disabled = true;
+		newEl.text = iplist.name;
+		newEl.value = "ipset:" + iplist.name;
 		targetElement.appendChild(newEl);
-
-		ipLists.forEach(iplist => {
-			var newEl = document.createElement("option");
-			newEl.text = iplist.name;
-			newEl.value = "ipset:" + iplist.name;
-			targetElement.appendChild(newEl);
-		});
 	});
 </script>