diff options
| author | Mario <mario@mariovavti.com> | 2020-12-15 08:40:02 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-12-17 14:25:06 +0100 |
| commit | abf985c69e902fe008b98a36f4df9e2c08249df4 (patch) | |
| tree | 4780d43ff85bf5d7de0bb31f6befe85d1c5bb1f2 | |
| parent | c176b54f6b87ce13ed410c749b0541f50e636373 (diff) | |
| download | volse-hubzilla-abf985c69e902fe008b98a36f4df9e2c08249df4.tar.gz volse-hubzilla-abf985c69e902fe008b98a36f4df9e2c08249df4.tar.bz2 volse-hubzilla-abf985c69e902fe008b98a36f4df9e2c08249df4.zip | |
owa: dismiss deleted hublocs
(cherry picked from commit 006a409eb80317a89d48edb53e9d40b357badffd)
| -rw-r--r-- | Zotlabs/Module/Owa.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 561e35754..0ed73c8c2 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -11,9 +11,9 @@ use Zotlabs\Web\Controller; * See spec/OpenWebAuth/Home.md * Requests to this endpoint should be signed using HTTP Signatures * using the 'Authorization: Signature' authentication method - * If the signature verifies a token is returned. + * If the signature verifies a token is returned. * - * This token may be exchanged for an authenticated cookie. + * This token may be exchanged for an authenticated cookie. */ class Owa extends Controller { @@ -31,16 +31,16 @@ class Owa extends Controller { if ($sigblock) { $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' ) ", + $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", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); if (! $r) { $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' ) ", + $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", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); |