Staging/1.7.6 (#3549)

* Fix #3540 (#3541)

* Fix: #3547 and #3546 (#3548)

* Fix: #3547 Unset error message  only after it got displayed
* Fix: number_format issue

* Update versions

* fix typo

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.7.6] - Service release
+
+### Bugfixes
+
+- Fixed Error message "deleted" before shown due to register_shutdown_function (#3548 #3547)
+- Fixed an in issue in humanize_usage_size with number format (#3546 #3547)
+- Fixed rounding issue with humanize_usage_measure (#3540 #3541)
+
 ## [1.7.5] - Service release
 
 ### Bugfixes

install/hst-install-debian.sh

@@ -32,7 +32,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.7.5'
+HESTIA_INSTALL_VER='1.7.6'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"

install/hst-install-ubuntu.sh

@@ -32,7 +32,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.7.5'
+HESTIA_INSTALL_VER='1.7.6'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "hestia",
 	"private": true,
-	"version": "1.7.5",
+	"version": "1.7.6",
 	"description": "An open-source Linux web server control panel.",
 	"repository": "https://github.com/hestiacp/hestiacp",
 	"license": "GPL-3.0-or-later",

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.7.5
+Version: 1.7.6
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

src/rpm/hestia/hestia.spec

@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           hestia
-Version:        1.8.0
-Release:        1%~alpha{dist}
+Version:        1.7.6
+Release:        1%{dist}
 Summary:        Hestia Control Panel
 Group:          System Environment/Base
 License:        GPLv3

web/inc/main.php

@@ -344,35 +344,36 @@ function humanize_usage_size($usage, $round = 2) {
 	if ($usage == "unlimited") {
 		return "∞";
 	}
+	$display_usage = $usage;
 	if ($usage > 1024) {
 		$usage = $usage / 1024;
 		if ($usage > 1024) {
 			$usage = $usage / 1024;
 			if ($usage > 1024) {
 				$usage = $usage / 1024;
-				$usage = number_format($usage, $round);
+				$display_usage = number_format($usage, $round);
 			} else {
-				if ($usage > 1000) {
+				if ($usage > 999) {
 					$usage = $usage / 1024;
 				}
-				$usage = number_format($usage, $round);
+				$display_usage = number_format($usage, $round);
 			}
 		} else {
-			if ($usage > 1000) {
+			if ($usage > 999) {
 				$usage = $usage / 1024;
 			}
-			$usage = number_format($usage, $round);
+			$display_usage = number_format($usage, $round);
 		}
 	} else {
-		if ($usage > 1000) {
+		if ($usage > 999) {
 			$usage = $usage / 1024;
 		}
-		$usage = number_format($usage, $round);
+		$display_usage = number_format($usage, $round);
 	}
-	if (strlen($usage) > 4) {
+	if (strlen($display_usage) > 4) {
 		return number_format($usage, $round - 1);
 	}
-	return $usage;
+	return $display_usage;
 }
 
 function humanize_usage_measure($usage) {
@@ -386,11 +387,22 @@ function humanize_usage_measure($usage) {
 		if ($usage > 1024) {
 			$usage = $usage / 1024;
 			$measure = $usage < 1024 ? "tb" : "pb";
+			if ($usage > 999) {
+				$usage = $usage / 1024;
+				$measure = "pb";
+			}
 		} else {
 			$measure = $usage < 1024 ? "gb" : "tb";
+			if ($usage > 999) {
+				$usage = $usage / 1024;
+				$measure = "tb";
+			}
 		}
 	} else {
 		$measure = $usage < 1024 ? "mb" : "gb";
+		if ($usage > 999) {
+			$measure = "gb";
+		}
 	}
 	return $measure;
 }
@@ -559,11 +571,14 @@ function validate_password($password) {
 }
 
 function unset_alerts() {
-	if (!empty($_SESSION["error_msg"])) {
-		unset($_SESSION["error_msg"]);
-	}
-	if (!empty($_SESSION["ok_msg"])) {
-		unset($_SESSION["ok_msg"]);
+	if (!empty($_SESSION["unset_alerts"])) {
+		if (!empty($_SESSION["error_msg"])) {
+			unset($_SESSION["error_msg"]);
+		}
+		if (!empty($_SESSION["ok_msg"])) {
+			unset($_SESSION["ok_msg"]);
+		}
+		unset($_SESSION["unset_alerts"]);
 	}
 }
 register_shutdown_function("unset_alerts");

web/templates/includes/js.php

@@ -15,7 +15,9 @@
 		});
 	})
 </script>
-
+<?php
+$_SESSION['unset_alerts'] = true;
+?>
 
 <?php
 $customScriptDirectory = new DirectoryIterator($_SERVER["HESTIA"] . "/web/js/custom_scripts");