diff options
Diffstat (limited to 'modules-available/locationinfo/inc/locationinfo.inc.php')
-rw-r--r-- | modules-available/locationinfo/inc/locationinfo.inc.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index 38e271fe..377e960b 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -75,11 +75,12 @@ class LocationInfo { if ($type === 'DEFAULT') { return array( - 'language' => 'en', + 'language' => defined('LANG') ? LANG : 'en', 'mode' => 1, 'vertical' => false, 'eco' => false, 'prettytime' => true, + 'roomplanner' => true, 'scaledaysauto' => true, 'daystoshow' => 7, 'rotation' => 0, @@ -92,10 +93,10 @@ class LocationInfo } if ($type === 'SUMMARY') { return array( - 'language' => 'en', - 'calupdate' => 30, - 'roomupdate' => 15, - 'configupdate' => 180, + 'language' => defined('LANG') ? LANG : 'en', + '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); |