Disable validation when resource limits are not enabled.

Author: codebyoul

bin/v-add-user-package

@@ -55,16 +55,16 @@ is_package_consistent() {
 	if [ "$DISK_QUOTA" != 'unlimited' ]; then
 		is_int_format_valid "$DISK_QUOTA" 'DISK_QUOTA'
 	fi
-	if [ "$CPU_QUOTA" != 'unlimited' ]; then
+	if [ "$CPU_QUOTA" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
 		is_valid_cpu_quota "$CPU_QUOTA" 'CPU_QUOTA'
 	fi
-	if [ "$CPU_QUOTA_PERIOD" != 'unlimited' ]; then
+	if [ "$CPU_QUOTA_PERIOD" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
 		is_valid_cpu_quota_period "$CPU_QUOTA_PERIOD" 'CPU_QUOTA_PERIOD'
 	fi
-	if [ "$MEMORY_LIMIT" != 'unlimited' ]; then
+	if [ "$MEMORY_LIMIT" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
 		is_valid_memory_size "$MEMORY_LIMIT" 'MEMORY_LIMIT'
 	fi
-	if [ "$SWAP_LIMIT" != 'unlimited' ]; then
+	if [ "$SWAP_LIMIT" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
 		is_valid_swap_size "$SWAP_LIMIT" 'SWAP_LIMIT'
 	fi
 	if [ "$BANDWIDTH" != 'unlimited' ]; then

web/add/package/index.php

@@ -84,17 +84,19 @@
 		$errors[] = _("Rate Limit");
 	}
 
-	if (!isset($_POST["v_cpu_quota"])) {
-		$errors[] = _("CPU quota");
-	}
-	if (!isset($_POST["v_cpu_quota_period"])) {
-		$errors[] = _("CPU quota period");
-	}
-	if (!isset($_POST["v_memory_limit"])) {
-		$errors[] = _("Memory Limit");
-	}
-	if (!isset($_POST["v_swap_limit"])) {
-		$errors[] = _("Swap Limit");
+	if ($_SESSION['RESOURCES_LIMIT'] == 'yes') {
+		if (!isset($_POST["v_cpu_quota"])) {
+			$errors[] = _("CPU quota");
+		}
+		if (!isset($_POST["v_cpu_quota_period"])) {
+			$errors[] = _("CPU quota period");
+		}
+		if (!isset($_POST["v_memory_limit"])) {
+			$errors[] = _("Memory Limit");
+		}
+		if (!isset($_POST["v_swap_limit"])) {
+			$errors[] = _("Swap Limit");
+		}
 	}
 
 	// Check if name server entries are blank if DNS server is installed
@@ -146,10 +148,12 @@
 		$v_disk_quota = quoteshellarg($_POST["v_disk_quota"]);
 		$v_bandwidth = quoteshellarg($_POST["v_bandwidth"]);
 		$v_ratelimit = quoteshellarg($_POST["v_ratelimit"]);
-		$v_cpu_quota = quoteshellarg($_POST["v_cpu_quota"]);
-		$v_cpu_quota_period = quoteshellarg($_POST["v_cpu_quota_period"]);
-		$v_memory_limit = quoteshellarg($_POST["v_memory_limit"]);
-		$v_swap_limit = 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"], ".") : "";
 		$v_ns3 = !empty($_POST["v_ns3"]) ? trim($_POST["v_ns3"], ".") : "";

web/edit/package/index.php

@@ -197,17 +197,19 @@
 		$errors[] = _("Bandwidth");
 	}
 
-	if (!isset($_POST["v_cpu_quota"])) {
-		$errors[] = _("CPU quota");
-	}
-	if (!isset($_POST["v_cpu_quota_period"])) {
-		$errors[] = _("CPU quota period");
-	}
-	if (!isset($_POST["v_memory_limit"])) {
-		$errors[] = _("Memory Limit");
-	}
-	if (!isset($_POST["v_swap_limit"])) {
-		$errors[] = _("Swap Limit");
+	if ($_SESSION['RESOURCES_LIMIT'] == 'yes') {
+		if (!isset($_POST["v_cpu_quota"])) {
+			$errors[] = _("CPU quota");
+		}
+		if (!isset($_POST["v_cpu_quota_period"])) {
+			$errors[] = _("CPU quota period");
+		}
+		if (!isset($_POST["v_memory_limit"])) {
+			$errors[] = _("Memory Limit");
+		}
+		if (!isset($_POST["v_swap_limit"])) {
+			$errors[] = _("Swap Limit");
+		}
 	}
 
 	// Check if name server entries are blank if DNS server is installed
@@ -273,10 +275,12 @@
 	$v_backups = quoteshellarg($_POST["v_backups"]);
 	$v_disk_quota = quoteshellarg($_POST["v_disk_quota"]);
 	$v_bandwidth = quoteshellarg($_POST["v_bandwidth"]);
-	$v_cpu_quota = quoteshellarg($_POST["v_cpu_quota"]);
-	$v_cpu_quota_period = quoteshellarg($_POST["v_cpu_quota_period"]);
-	$v_memory_limit = quoteshellarg($_POST["v_memory_limit"]);
-	$v_swap_limit = 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"], ".") : "";
 	$v_ns3 = !empty($_POST["v_ns3"]) ? trim($_POST["v_ns3"], ".") : "";