Merge remote-tracking branch 'upstream/main' into ipv6

CHANGELOG.md

@@ -66,11 +66,15 @@ All notable changes to this project will be documented in this file.
 - Fixed an issue with B2 and changing access keys
 - Fixed an issue with Drupal install via Quick installer (#3353 #3352)
 - Fixed issues with default state jQuery UI modals (#3344)
+- Fixed an issue with login with passwords that contains a - or -- on the first character (#3365 #3354)
+- Add option to disable ip check (#3365)
+- Replace sdocroot with docroot in default.tpl for Apache2 / PHP-FPM setups (#3360)
 
 ### Dependencies
 
 - Updated hestia-nginx to 1.23.3
-- Updated hestia-php to 8.2.3
+- Updated hestia-php to 8.2.4
+- Update OpenSSL to 3.1.0
 - Updated Roundcube to 1.6.1
 - Updated Filegator to 7.9.2
 - Updated phpMyAdmin to 5.2.21

bin/v-add-sys-rainloop

@@ -154,12 +154,12 @@ else
 	[ ! -f "${RC_INSTALL_DIR}/${RC_FILE}" ] && wget "$RL_URL" --quiet -O "${RL_INSTALL_DIR}/${RL_FILE}"
 	version=$(cat $RL_INSTALL_DIR/data/VERSION)
 
-	unzip -q -j rainloop-latest.zip "data/VERSION" -d $RL_INSTALL_DIR/
+	unzip -q -j ${RL_INSTALL_DIR}/${RL_FILE} "data/VERSION" -d $RL_INSTALL_DIR/
 	version_source=$(cat $RL_INSTALL_DIR/VERSION)
 
 	# Check version inside .zip file in case hestia didn't update yet
 	if [ "$version" != "$version_source" ]; then
-		unzip -q ${RL_INSTALL_DIR}/${RL_FILE}
+		unzip -q -o ${RL_INSTALL_DIR}/${RL_FILE} -d $RL_INSTALL_DIR/
 		rm $RL_INSTALL_DIR/$RL_FILE
 	fi
 	rm ${RL_INSTALL_DIR}/VERSION

install/deb/templates/web/apache2/php-fpm/default.tpl

@@ -23,7 +23,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    <Directory %sdocroot%>
+    <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
     </Directory>

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>