Skip to content

Commit 4be3f43

Browse files
jaapmarcusjaapmarcus
authored
Merge pull request hestiacp#4372 from oulfr/main
Disable validation when resource limits are not enabled.
2 parents 18bb58a + ebb5407 commit 4be3f43

File tree

3 files changed

+52
-34
lines changed

3 files changed

+52
-34
lines changed

‎bin/v-add-user-package‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ is_package_consistent() {
5555
if [ "$DISK_QUOTA" != 'unlimited' ]; then
5656
is_int_format_valid "$DISK_QUOTA" 'DISK_QUOTA'
5757
fi
58-
if [ "$CPU_QUOTA" != 'unlimited' ]; then
58+
if [ "$CPU_QUOTA" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
5959
is_valid_cpu_quota "$CPU_QUOTA" 'CPU_QUOTA'
6060
fi
61-
if [ "$CPU_QUOTA_PERIOD" != 'unlimited' ]; then
61+
if [ "$CPU_QUOTA_PERIOD" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
6262
is_valid_cpu_quota_period "$CPU_QUOTA_PERIOD" 'CPU_QUOTA_PERIOD'
6363
fi
64-
if [ "$MEMORY_LIMIT" != 'unlimited' ]; then
64+
if [ "$MEMORY_LIMIT" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
6565
is_valid_memory_size "$MEMORY_LIMIT" 'MEMORY_LIMIT'
6666
fi
67-
if [ "$SWAP_LIMIT" != 'unlimited' ]; then
67+
if [ "$SWAP_LIMIT" != 'unlimited' ] && [ "$RESOURCES_LIMIT" = 'yes' ]; then
6868
is_valid_swap_size "$SWAP_LIMIT" 'SWAP_LIMIT'
6969
fi
7070
if [ "$BANDWIDTH" != 'unlimited' ]; then

‎web/add/package/index.php‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,19 @@
8484
$errors[] = _("Rate Limit");
8585
}
8686

87-
if (!isset($_POST["v_cpu_quota"])) {
88-
$errors[] = _("CPU quota");
89-
}
90-
if (!isset($_POST["v_cpu_quota_period"])) {
91-
$errors[] = _("CPU quota period");
92-
}
93-
if (!isset($_POST["v_memory_limit"])) {
94-
$errors[] = _("Memory Limit");
95-
}
96-
if (!isset($_POST["v_swap_limit"])) {
97-
$errors[] = _("Swap Limit");
87+
if ($_SESSION["RESOURCES_LIMIT"] == "yes") {
88+
if (!isset($_POST["v_cpu_quota"])) {
89+
$errors[] = _("CPU quota");
90+
}
91+
if (!isset($_POST["v_cpu_quota_period"])) {
92+
$errors[] = _("CPU quota period");
93+
}
94+
if (!isset($_POST["v_memory_limit"])) {
95+
$errors[] = _("Memory Limit");
96+
}
97+
if (!isset($_POST["v_swap_limit"])) {
98+
$errors[] = _("Swap Limit");
99+
}
98100
}
99101

100102
// Check if name server entries are blank if DNS server is installed
@@ -146,10 +148,18 @@
146148
$v_disk_quota = quoteshellarg($_POST["v_disk_quota"]);
147149
$v_bandwidth = quoteshellarg($_POST["v_bandwidth"]);
148150
$v_ratelimit = quoteshellarg($_POST["v_ratelimit"]);
149-
$v_cpu_quota = quoteshellarg($_POST["v_cpu_quota"]);
150-
$v_cpu_quota_period = quoteshellarg($_POST["v_cpu_quota_period"]);
151-
$v_memory_limit = quoteshellarg($_POST["v_memory_limit"]);
152-
$v_swap_limit = quoteshellarg($_POST["v_swap_limit"]);
151+
152+
$v_cpu_quota =
153+
$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_cpu_quota"]) : "";
154+
$v_cpu_quota_period =
155+
$_SESSION["RESOURCES_LIMIT"] == "yes"
156+
? quoteshellarg($_POST["v_cpu_quota_period"])
157+
: "";
158+
$v_memory_limit =
159+
$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_memory_limit"]) : "";
160+
$v_swap_limit =
161+
$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_swap_limit"]) : "";
162+
153163
$v_ns1 = !empty($_POST["v_ns1"]) ? trim($_POST["v_ns1"], ".") : "";
154164
$v_ns2 = !empty($_POST["v_ns2"]) ? trim($_POST["v_ns2"], ".") : "";
155165
$v_ns3 = !empty($_POST["v_ns3"]) ? trim($_POST["v_ns3"], ".") : "";

‎web/edit/package/index.php‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,19 @@
197197
$errors[] = _("Bandwidth");
198198
}
199199

200-
if (!isset($_POST["v_cpu_quota"])) {
201-
$errors[] = _("CPU quota");
202-
}
203-
if (!isset($_POST["v_cpu_quota_period"])) {
204-
$errors[] = _("CPU quota period");
205-
}
206-
if (!isset($_POST["v_memory_limit"])) {
207-
$errors[] = _("Memory Limit");
208-
}
209-
if (!isset($_POST["v_swap_limit"])) {
210-
$errors[] = _("Swap Limit");
200+
if ($_SESSION["RESOURCES_LIMIT"] == "yes") {
201+
if (!isset($_POST["v_cpu_quota"])) {
202+
$errors[] = _("CPU quota");
203+
}
204+
if (!isset($_POST["v_cpu_quota_period"])) {
205+
$errors[] = _("CPU quota period");
206+
}
207+
if (!isset($_POST["v_memory_limit"])) {
208+
$errors[] = _("Memory Limit");
209+
}
210+
if (!isset($_POST["v_swap_limit"])) {
211+
$errors[] = _("Swap Limit");
212+
}
211213
}
212214

213215
// Check if name server entries are blank if DNS server is installed
@@ -273,10 +275,16 @@
273275
$v_backups = quoteshellarg($_POST["v_backups"]);
274276
$v_disk_quota = quoteshellarg($_POST["v_disk_quota"]);
275277
$v_bandwidth = quoteshellarg($_POST["v_bandwidth"]);
276-
$v_cpu_quota = quoteshellarg($_POST["v_cpu_quota"]);
277-
$v_cpu_quota_period = quoteshellarg($_POST["v_cpu_quota_period"]);
278-
$v_memory_limit = quoteshellarg($_POST["v_memory_limit"]);
279-
$v_swap_limit = quoteshellarg($_POST["v_swap_limit"]);
278+
279+
$v_cpu_quota =
280+
$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_cpu_quota"]) : "";
281+
$v_cpu_quota_period =
282+
$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_cpu_quota_period"]) : "";
283+
$v_memory_limit =
284+
$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_memory_limit"]) : "";
285+
$v_swap_limit =
286+
$_SESSION["RESOURCES_LIMIT"] == "yes" ? quoteshellarg($_POST["v_swap_limit"]) : "";
287+
280288
$v_ns1 = !empty($_POST["v_ns1"]) ? trim($_POST["v_ns1"], ".") : "";
281289
$v_ns2 = !empty($_POST["v_ns2"]) ? trim($_POST["v_ns2"], ".") : "";
282290
$v_ns3 = !empty($_POST["v_ns3"]) ? trim($_POST["v_ns3"], ".") : "";

0 commit comments

Comments
 (0)