From 0afd23823323197063dc1c1c61f141e786eb4d19 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 22 Jul 2020 10:58:23 +0200
Subject: [remoteaccess] Fix: "active" flag was not honored in getconfig hook

---
 modules-available/remoteaccess/baseconfig/getconfig.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules-available/remoteaccess/baseconfig/getconfig.inc.php b/modules-available/remoteaccess/baseconfig/getconfig.inc.php
index 384f498f..8aa6430e 100644
--- a/modules-available/remoteaccess/baseconfig/getconfig.inc.php
+++ b/modules-available/remoteaccess/baseconfig/getconfig.inc.php
@@ -4,7 +4,9 @@
 $locationId = ConfigHolder::get('SLX_LOCATIONS');
 if ($locationId !== false) {
 	$locationId = (int)$locationId;
-	$ret = Database::queryFirst("SELECT locationid FROM remoteaccess_x_location WHERE locationid = :lid",
+	$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
-- 
cgit v1.2.3-55-g7522