diff options
| author | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
| commit | f14c04f3af8936f07d0efaa292ce0ea92981b1f6 (patch) | |
| tree | e1275d80fdced4f0b3d652277863150f756785a3 /modules-available/locationinfo/inc/locationinfo.inc.php | |
| parent | [serversetup-bwlp] Simplify permissions (diff) | |
| parent | [dozmod] ldapfilters: Fix list (attr/value) (diff) | |
| download | slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.gz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.xz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.zip | |
Merge branch 'master' into ipxe
Diffstat (limited to 'modules-available/locationinfo/inc/locationinfo.inc.php')
| -rw-r--r-- | modules-available/locationinfo/inc/locationinfo.inc.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index c51be666..377e960b 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -80,6 +80,7 @@ class LocationInfo 'vertical' => false, 'eco' => false, 'prettytime' => true, + 'roomplanner' => true, 'scaledaysauto' => true, 'daystoshow' => 7, 'rotation' => 0, @@ -93,9 +94,9 @@ class LocationInfo if ($type === 'SUMMARY') { return array( 'language' => defined('LANG') ? LANG : 'en', - 'calupdate' => 30, - 'roomupdate' => 15, - 'configupdate' => 180, + 'roomplanner' => true, + 'eco' => false, + 'panelupdate' => 60, ); } return array(); @@ -127,11 +128,13 @@ class LocationInfo } elseif ($row['paneltype'] === 'URL') { // Check if we should set the insecure SSL mode (accept invalid/self signed certs etc.) $data = json_decode($row['panelconfig'], true); - if ($data && $data['insecure-ssl']) { - ConfigHolder::add('SLX_BROWSER_INSECURE', '1'); - } - if ($data && $data['reload-minutes']) { - ConfigHolder::add('SLX_BROWSER_RELOAD_SECS', $data['reload-minutes'] * 60); + if (is_array($data)) { + if (isset($data['insecure-ssl']) && $data['insecure-ssl']) { + ConfigHolder::add('SLX_BROWSER_INSECURE', '1'); + } + if (isset($data['reload-minutes']) && $data['reload-minutes']) { + ConfigHolder::add('SLX_BROWSER_RELOAD_SECS', $data['reload-minutes'] * 60); + } } } ConfigHolder::add('SLX_BROWSER_URL', 'http://' . $_SERVER['SERVER_ADDR'] . '/panel/' . $panelUuid); |