Merge pull request #8652 from annando/annando/issue8582

Issue 8582: "cid" in "network" is now "contactid"

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index bc189af9d6bb7567ff531884ed214a2aaaca44c9..f750ed99ea778b31034135c02850e3ad941c2622 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -353,6 +353,15 @@ class GServer
                        return;
                }
 
+               // Sanitize incoming data, see https://github.com/friendica/friendica/issues/8565
+               $data['subscribe'] = (bool)$data['subscribe'] ?? false;
+
+               if (!$data['subscribe'] || empty($data['scope']) || !in_array(strtolower($data['scope']), ['all', 'tags'])) {
+                       $data['scope'] = '';
+                       $data['subscribe'] = false;
+                       $data['tags'] = [];
+               }
+
                $gserver = DBA::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
                if (!DBA::isResult($gserver)) {
                        return;