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

Disable validation when resource limits are not enabled.

oulfr 1 год назад
Родитель
Сommit
ebb5407e46
2 измененных файлов с 20 добавлено и 10 удалено
  1. 11 5
      web/add/package/index.php
  2. 9 5
      web/edit/package/index.php

+ 11 - 5
web/add/package/index.php

@@ -84,7 +84,7 @@ if (!empty($_POST["ok"])) {
 		$errors[] = _("Rate Limit");
 	}
 
-	if ($_SESSION['RESOURCES_LIMIT'] == 'yes') {
+	if ($_SESSION["RESOURCES_LIMIT"] == "yes") {
 		if (!isset($_POST["v_cpu_quota"])) {
 			$errors[] = _("CPU quota");
 		}
@@ -149,10 +149,16 @@ if (!empty($_POST["ok"])) {
 		$v_bandwidth = quoteshellarg($_POST["v_bandwidth"]);
 		$v_ratelimit = quoteshellarg($_POST["v_ratelimit"]);
 
-		$v_cpu_quota = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_cpu_quota"]) : '';
-		$v_cpu_quota_period = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_cpu_quota_period"]) : '';
-		$v_memory_limit = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_memory_limit"]) : '';
-		$v_swap_limit = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_swap_limit"]) : '';
+		$v_cpu_quota =
+			$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_cpu_quota"]) : "";
+		$v_cpu_quota_period =
+			$_SESSION["RESOURCES_LIMIT"] == "yes"
+				? quoteshellarg($_POST["v_cpu_quota_period"])
+				: "";
+		$v_memory_limit =
+			$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_memory_limit"]) : "";
+		$v_swap_limit =
+			$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_swap_limit"]) : "";
 
 		$v_ns1 = !empty($_POST["v_ns1"]) ? trim($_POST["v_ns1"], ".") : "";
 		$v_ns2 = !empty($_POST["v_ns2"]) ? trim($_POST["v_ns2"], ".") : "";

+ 9 - 5
web/edit/package/index.php

@@ -197,7 +197,7 @@ if (!empty($_POST["save"])) {
 		$errors[] = _("Bandwidth");
 	}
 
-	if ($_SESSION['RESOURCES_LIMIT'] == 'yes') {
+	if ($_SESSION["RESOURCES_LIMIT"] == "yes") {
 		if (!isset($_POST["v_cpu_quota"])) {
 			$errors[] = _("CPU quota");
 		}
@@ -276,10 +276,14 @@ if (!empty($_POST["save"])) {
 	$v_disk_quota = quoteshellarg($_POST["v_disk_quota"]);
 	$v_bandwidth = quoteshellarg($_POST["v_bandwidth"]);
 
-	$v_cpu_quota = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_cpu_quota"]) : '';
-	$v_cpu_quota_period = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_cpu_quota_period"]) : '';
-	$v_memory_limit = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_memory_limit"]) : '';
-	$v_swap_limit = $_SESSION['RESOURCES_LIMIT'] == 'yes' ? quoteshellarg($_POST["v_swap_limit"]) : '';
+	$v_cpu_quota =
+		$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_cpu_quota"]) : "";
+	$v_cpu_quota_period =
+		$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_cpu_quota_period"]) : "";
+	$v_memory_limit =
+		$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_memory_limit"]) : "";
+	$v_swap_limit =
+		$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_swap_limit"]) : "";
 
 	$v_ns1 = !empty($_POST["v_ns1"]) ? trim($_POST["v_ns1"], ".") : "";
 	$v_ns2 = !empty($_POST["v_ns2"]) ? trim($_POST["v_ns2"], ".") : "";