aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-12-15 08:40:02 +0000
committerMario <mario@mariovavti.com>2020-12-15 08:40:02 +0000
commit006a409eb80317a89d48edb53e9d40b357badffd (patch)
tree0825ce36b1a2ffeb4262097e77710ec58a685a51
parentdec4ceabb5e036dfdab50f499dd2a26fe4eeebf7 (diff)
downloadvolse-hubzilla-006a409eb80317a89d48edb53e9d40b357badffd.tar.gz
volse-hubzilla-006a409eb80317a89d48edb53e9d40b357badffd.tar.bz2
volse-hubzilla-006a409eb80317a89d48edb53e9d40b357badffd.zip
owa: dismiss deleted hublocs
-rw-r--r--Zotlabs/Module/Owa.php12
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)
);