From cfd4396321b6b03c6e099ea4117d8d3d1874c6f5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Jul 2022 10:58:27 +0200
Subject: [remoteaccess] Don't uncheck currently disabled locations in group
 edit

---
 modules-available/remoteaccess/page.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules-available/remoteaccess/page.inc.php')

diff --git a/modules-available/remoteaccess/page.inc.php b/modules-available/remoteaccess/page.inc.php
index 05816beb..fa94e193 100644
--- a/modules-available/remoteaccess/page.inc.php
+++ b/modules-available/remoteaccess/page.inc.php
@@ -93,7 +93,8 @@ class Page_RemoteAccess extends Page
 			// Edit list of groups and their settings
 			$groups = Database::queryAll("SELECT g.groupid, g.groupname, g.wolcount, g.passwd,
        			Count(l.locationid) AS locs, If(g.active, 'checked', '') AS checked, unwoken
-					FROM remoteaccess_group g LEFT JOIN remoteaccess_x_location l USING (groupid)
+					FROM remoteaccess_group g
+					LEFT JOIN remoteaccess_x_location l USING (groupid)
 					GROUP BY g.groupid, g.groupname
 					ORDER BY g.groupname ASC");
 			$data = [
@@ -109,7 +110,7 @@ class Page_RemoteAccess extends Page
 			// Edit locations for group
 			$group = $this->groupNameOrFail($groupid);
 			$locationList = Location::getLocationsAssoc();
-			$enabled = RemoteAccess::getEnabledLocations($groupid);
+			$enabled = RemoteAccess::getEnabledLocations($groupid, false);
 			$allowed = User::getAllowedLocations('group.locations');
 			foreach ($enabled as $lid) {
 				if (isset($locationList[$lid])) {
-- 
cgit v1.2.3-55-g7522