diff options
| author | Simon Rettberg | 2017-12-05 16:53:24 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-05 16:53:24 +0100 |
| commit | c72f431831ffcc86da1d6c141c0724bb6a92a584 (patch) | |
| tree | 34608214300765d852c4ccf3180cdc242f9ff997 /modules-available/locationinfo/inc | |
| parent | [sysconfig] Fix typo (diff) | |
| download | slx-admin-c72f431831ffcc86da1d6c141c0724bb6a92a584.tar.gz slx-admin-c72f431831ffcc86da1d6c141c0724bb6a92a584.tar.xz slx-admin-c72f431831ffcc86da1d6c141c0724bb6a92a584.zip | |
[locationinfo] Native panels should ignore SSL errors for now ...
Until we can push self-signed certs to the client for validation
Diffstat (limited to 'modules-available/locationinfo/inc')
| -rw-r--r-- | modules-available/locationinfo/inc/locationinfo.inc.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index 64070cd4..2ed3622d 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -36,11 +36,7 @@ class LocationInfo $idArray = array_map('intval', explode(',', $panel['locationids'])); if ($panel['paneltype'] == "SUMMARY" && $recursive) { $idList = Location::getRecursiveFlat($idArray); - $idArray = array(); - - foreach ($idList as $key => $value) { - $idArray[] = $key; - } + $idArray = array_keys($idList); } return $idArray; } @@ -143,6 +139,7 @@ class LocationInfo ConfigHolder::add('SLX_SCREEN_STANDBY_TIMEOUT', '', 1000); ConfigHolder::add('SLX_SYSTEM_STANDBY_TIMEOUT', '', 1000); ConfigHolder::add('SLX_AUTOLOGIN', '1', 1000); + ConfigHolder::add('SLX_BROWSER_INSECURE', '1'); // TODO: Sat server might redirect to HTTPS, which in turn could have a self-signed cert - push to client } } |