diff options
| author | Mario Vavti <mario@mariovavti.com> | 2020-12-17 11:46:22 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-12-17 14:26:32 +0100 |
| commit | 82db19d54caf374963e0c6fa5f7391b10caf9ba8 (patch) | |
| tree | 0545a16d5d4ec36f92cf786027c3f244104b3ebb /Zotlabs/Module | |
| parent | 06aa3e6b8ca66e6bcd06cb4f5bab922d40f83a16 (diff) | |
| download | volse-hubzilla-82db19d54caf374963e0c6fa5f7391b10caf9ba8.tar.gz volse-hubzilla-82db19d54caf374963e0c6fa5f7391b10caf9ba8.tar.bz2 volse-hubzilla-82db19d54caf374963e0c6fa5f7391b10caf9ba8.zip | |
restrict owa to zot6 and zot network until the hubloc madness with activitypub and possibly also diaspora will be solved
(cherry picked from commit 7ebba75fa25a51ec1d751ba3b27b8fe70f166224)
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Owa.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 0ed73c8c2..a974f2c1a 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -32,7 +32,7 @@ class Owa extends Controller { $keyId = $sigblock['keyId']; if ($keyId) { $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash - WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_deleted = 0", + WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_network IN ('zot6', 'zot')", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); @@ -40,7 +40,7 @@ class Owa extends Controller { $found = discover_by_webbie(str_replace('acct:','',$keyId)); if ($found) { $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash - WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_deleted = 0", + WHERE ( hubloc_addr = '%s' OR hubloc_id_url = '%s' ) AND hubloc_network IN ('zot6', 'zot')", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); |