summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2020-02-27 12:14:56 +0100
committerSimon Rettberg2020-02-27 12:14:56 +0100
commite378104867d8710af1a0afb404ff3bdcd6ea9135 (patch)
tree07ec8f35f98db9cc1d806b9efc929f84c3e296e5
parent[rebootcontrol] Add debug output to WOL job status page (diff)
downloadslx-admin-e378104867d8710af1a0afb404ff3bdcd6ea9135.tar.gz
slx-admin-e378104867d8710af1a0afb404ff3bdcd6ea9135.tar.xz
slx-admin-e378104867d8710af1a0afb404ff3bdcd6ea9135.zip
[baseconfig] Allow disabling override for shadowed fields
-rw-r--r--modules-available/baseconfig/page.inc.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php
index 498fd166..1566464b 100644
--- a/modules-available/baseconfig/page.inc.php
+++ b/modules-available/baseconfig/page.inc.php
@@ -54,8 +54,7 @@ class Page_BaseConfig extends Page
BaseConfigUtil::markShadowedVars($vars, $newValues);
// Validate input
foreach ($vars as $key => $var) {
- if (isset($var['shadowed']))
- continue;
+ // Delete entries where we disabled override
if ($this->targetModule !== false) {
// Module mode
if (is_array($override) && (!isset($override[$key]) || $override[$key] !== 'on')) {
@@ -65,6 +64,9 @@ class Page_BaseConfig extends Page
continue;
}
}
+ // Only after that, check if variable is shadowed (disabled)
+ if (isset($var['shadowed']))
+ continue;
$validator = $var['validator'];
$displayValue = (isset($newValues[$key]) ? $newValues[$key] : '');
// Validate data first!