diff options
| author | Simon Rettberg | 2019-03-14 16:10:30 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-14 16:10:30 +0100 |
| commit | f041514bfeacfe65d773a9d3a6300e31ad38c905 (patch) | |
| tree | 0f62f4c3bc9d755018ffe9364de1732141c98752 /modules-available/locationinfo/inc/infopanel.inc.php | |
| parent | [serversetup-bwlp-ipxe] Fix: Module name is locations, not location (diff) | |
| download | slx-admin-f041514bfeacfe65d773a9d3a6300e31ad38c905.tar.gz slx-admin-f041514bfeacfe65d773a9d3a6300e31ad38c905.tar.xz slx-admin-f041514bfeacfe65d773a9d3a6300e31ad38c905.zip | |
[locationinfo] Add black/whitelist stuff for URL panels
Diffstat (limited to 'modules-available/locationinfo/inc/infopanel.inc.php')
| -rw-r--r-- | modules-available/locationinfo/inc/infopanel.inc.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php index fdc253f0..7b0c6fe0 100644 --- a/modules-available/locationinfo/inc/infopanel.inc.php +++ b/modules-available/locationinfo/inc/infopanel.inc.php @@ -19,13 +19,14 @@ class InfoPanel return false; } + $config = LocationInfo::defaultPanelConfig($panel['paneltype']); + if ($panel['paneltype'] === 'URL') { // Shortcut for URL redirect - $config = json_decode($panel['panelconfig'], true); + $config = json_decode($panel['panelconfig'], true) + $config; return $panel['paneltype']; } - $config = LocationInfo::defaultPanelConfig($panel['paneltype']); $locations = Location::getLocationsAssoc(); $overrides = false; @@ -37,9 +38,6 @@ class InfoPanel $overrides = $json['overrides']; } unset($json['overrides']); - if (!isset($json['roomplanner'])) { - $config['roomplanner'] = false; - } $config = $json + $config; } } |