diff options
| author | Simon Rettberg | 2022-04-19 11:23:34 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2022-04-19 11:23:34 +0200 |
| commit | f00ef43187777414800fdc06c465afb551cbf437 (patch) | |
| tree | 8bad0305923dc88710d47c2580b4bf60d9650fa7 /modules-available/remoteaccess | |
| parent | [statistics] Fix query builder (diff) | |
| download | slx-admin-f00ef43187777414800fdc06c465afb551cbf437.tar.gz slx-admin-f00ef43187777414800fdc06c465afb551cbf437.tar.xz slx-admin-f00ef43187777414800fdc06c465afb551cbf437.zip | |
Formatting/minor refactoring
Diffstat (limited to 'modules-available/remoteaccess')
| -rw-r--r-- | modules-available/remoteaccess/baseconfig/getconfig.inc.php | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/modules-available/remoteaccess/baseconfig/getconfig.inc.php b/modules-available/remoteaccess/baseconfig/getconfig.inc.php index 23e623d0..3d0c4470 100644 --- a/modules-available/remoteaccess/baseconfig/getconfig.inc.php +++ b/modules-available/remoteaccess/baseconfig/getconfig.inc.php @@ -3,34 +3,34 @@ (function ($machineUuid) { // Leave clients in any runmode alone $res = Database::queryFirst('SELECT machineuuid FROM runmode WHERE machineuuid = :uuid', - array('uuid' => $machineUuid), true); + ['uuid' => $machineUuid], true); if (is_array($res)) return; // Locations from closest to furthest (order) $locationId = ConfigHolder::get('SLX_LOCATIONS'); - if ($locationId !== false) { - $locationId = (int)$locationId; - $ret = Database::queryFirst("SELECT l.locationid FROM remoteaccess_x_location l - INNER JOIN remoteaccess_group g USING (groupid) - WHERE locationid = :lid AND g.active = 1", - ['lid' => $locationId], true); // TODO Remove true after next point release (2020-05-12) - if ($ret !== false) { - // TODO Properly merge - if (Property::get(RemoteAccess::PROP_TRY_VIRT_HANDOVER)) { - ConfigHolder::add("SLX_REMOTE_VNC", 'vmware virtualbox'); - } else { - ConfigHolder::add("SLX_REMOTE_VNC", 'x11vnc'); - } - ConfigHolder::add("SLX_REMOTE_HOST_ACCESS", Property::get(RemoteAccess::PROP_ALLOWED_VNC_NET)); - ConfigHolder::add('SLX_REMOTE_VNC_PORT', Property::get(RemoteAccess::PROP_VNC_PORT, 5900)); - ConfigHolder::add('SLX_RUNMODE_MODULE', 'remoteaccess'); - // No saver - $saverTimeout = ConfigHolder::get('SLX_SCREEN_SAVER_TIMEOUT'); - if (!is_numeric($saverTimeout) || $saverTimeout < 1800) { - ConfigHolder::add('SLX_SCREEN_SAVER_TIMEOUT', '1800', 1000); - } - ConfigHolder::add('SLX_SCREEN_SAVER_GRACE_TIME', '86400', 1000); - } + if ($locationId === false) + return; + $locationId = (int)$locationId; + $ret = Database::queryFirst("SELECT l.locationid FROM remoteaccess_x_location l + INNER JOIN remoteaccess_group g USING (groupid) + WHERE locationid = :lid AND g.active = 1", + ['lid' => $locationId], true); // TODO Remove true after next point release (2020-05-12) + if ($ret === false) + return; + // TODO Properly merge + if (Property::get(RemoteAccess::PROP_TRY_VIRT_HANDOVER)) { + ConfigHolder::add("SLX_REMOTE_VNC", 'vmware virtualbox'); + } else { + ConfigHolder::add("SLX_REMOTE_VNC", 'x11vnc'); + } + ConfigHolder::add("SLX_REMOTE_HOST_ACCESS", Property::get(RemoteAccess::PROP_ALLOWED_VNC_NET)); + ConfigHolder::add('SLX_REMOTE_VNC_PORT', Property::get(RemoteAccess::PROP_VNC_PORT, 5900)); + ConfigHolder::add('SLX_RUNMODE_MODULE', 'remoteaccess'); + // No saver + $saverTimeout = ConfigHolder::get('SLX_SCREEN_SAVER_TIMEOUT'); + if (!is_numeric($saverTimeout) || $saverTimeout < 1800) { + ConfigHolder::add('SLX_SCREEN_SAVER_TIMEOUT', '1800', 1000); } + ConfigHolder::add('SLX_SCREEN_SAVER_GRACE_TIME', '86400', 1000); })($uuid); |