Просмотр исходного кода

Fix issue with redirect to subfolder (#3623)

* Fix issue with redirect to subfolder

https://forum.hestiacp.com/t/problem-with-request-uri-in-redirections-double-slash/9687/2

* Fix: Issue with number format

https://forum.hestiacp.com/t/domains-disappeared-from-admin-panel/9680/5
Jaap Marcus 2 лет назад
Родитель
Сommit
7f966da91f
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 0
      bin/v-add-web-domain-redirect
  2. 3 1
      web/inc/main.php

+ 1 - 0
bin/v-add-web-domain-redirect

@@ -97,6 +97,7 @@ if [ -n "$path" ]; then
 	lastchr=${path#${path%?}}
 	if [ "$lastchr" = "/" ]; then
 		requesturi=1
+		redirect=${redirect:0:-1}
 	fi
 else
 	requesturi=1

+ 3 - 1
web/inc/main.php

@@ -365,7 +365,9 @@ function humanize_usage_size($usage, $round = 2) {
 		$display_usage = number_format($usage, $round);
 	}
 	if (strlen($display_usage) > 4) {
-		return number_format($usage, $round - 1);
+		if (is_float($display_usage)) {
+			return number_format($usage, $round - 1);
+		}
 	}
 	return $display_usage;
 }