diff options
author | Mario Vavti <mario@mariovavti.com> | 2021-07-09 11:31:26 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2021-07-09 11:31:26 +0200 |
commit | 2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd (patch) | |
tree | 8fd238ebca4b124916eb31a6760bb227b7bb57ba /Zotlabs/Module/Wfinger.php | |
parent | 6de327402bb90b3f09ccb0c92ffb112755dbd5a0 (diff) | |
parent | a92ad512bbcfc367f17739886cdeada13c20e66a (diff) | |
download | volse-hubzilla-2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd.tar.gz volse-hubzilla-2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd.tar.bz2 volse-hubzilla-2dd47a9f596106bfe8ea5d95a5f20597ed8bf0cd.zip |
Merge branch '6.0RC'
Diffstat (limited to 'Zotlabs/Module/Wfinger.php')
-rw-r--r-- | Zotlabs/Module/Wfinger.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php index 46da7f007..6dedc1ef1 100644 --- a/Zotlabs/Module/Wfinger.php +++ b/Zotlabs/Module/Wfinger.php @@ -1,8 +1,6 @@ <?php namespace Zotlabs\Module; -require_once('include/zot.php'); - use Zotlabs\Lib\Keyutils; use Zotlabs\Lib\Libzot; @@ -21,7 +19,7 @@ class Wfinger extends \Zotlabs\Web\Controller { elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) $scheme = 'https'; elseif(x($_SERVER,'HTTP_X_FORWARDED_PROTO') && ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) - $scheme = 'https'; + $scheme = 'https'; $zot = intval($_REQUEST['zot']); @@ -69,7 +67,7 @@ class Wfinger extends \Zotlabs\Web\Controller { $channel = substr($channel,1); $channel = substr($channel,0,-1); $pchan = true; - $r = q("select * from pchan left join xchan on pchan_hash = xchan_hash + $r = q("select * from pchan left join xchan on pchan_hash = xchan_hash where pchan_guid = '%s' limit 1", dbesc($channel) ); @@ -78,7 +76,7 @@ class Wfinger extends \Zotlabs\Web\Controller { } } else { - $r = q("select * from channel left join xchan on channel_hash = xchan_hash + $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1", dbesc($channel) ); |