diff options
| author | Mario <mario@mariovavti.com> | 2023-06-01 08:15:33 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-06-02 21:16:56 +0200 |
| commit | 11ca5bb7d5f0e1b6139c48f9b26cb8278d33e8de (patch) | |
| tree | b541eaf62948b993488c429938e5c79a6f8fd141 | |
| parent | e0838ff8ab3a3bd6f91a78d99512d17860ff8fa2 (diff) | |
| download | volse-hubzilla-11ca5bb7d5f0e1b6139c48f9b26cb8278d33e8de.tar.gz volse-hubzilla-11ca5bb7d5f0e1b6139c48f9b26cb8278d33e8de.tar.bz2 volse-hubzilla-11ca5bb7d5f0e1b6139c48f9b26cb8278d33e8de.zip | |
owa: workaround for friendica when using nginx until this will be fixed at their side and check prrofile uid for features instead of local channel
(cherry picked from commit 423fdc0a9618e322636a5291ed92df00115fafb0)
| -rw-r--r-- | Zotlabs/Module/Chat.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Owa.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index efe098739..fc74016ab 100644 --- a/Zotlabs/Module/Chat.php +++ b/Zotlabs/Module/Chat.php @@ -212,7 +212,7 @@ class Chat extends Controller { '$online' => t('I am online'), '$bookmark_link' => $bookmark_link, '$bookmark' => t('Bookmark this room'), - '$feature_encrypt' => ((feature_enabled(local_channel(),'content_encrypt')) ? true : false), + '$feature_encrypt' => ((feature_enabled(App::$profile['profile_uid'], 'content_encrypt')) ? true : false), '$cipher' => $cipher, '$linkurl' => t('Please enter a link URL:'), '$encrypt' => t('Encrypt text'), diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 02997d3f1..28f25e813 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -47,6 +47,10 @@ class Owa extends Controller { } if ($r) { foreach ($r as $hubloc) { + // fix friendica accept header for nginx + if (str_starts_with($keyId, 'acct:') && $_SERVER['HTTP_ACCEPT'] === 'application/x-zot+json') + $_SERVER['HTTP_ACCEPT'] = 'application/x-dfrn+json, application/x-zot+json'; + $verified = HTTPSig::verify(file_get_contents('php://input'), $hubloc['xchan_pubkey']); if ($verified && $verified['header_signed'] && $verified['header_valid'] && ($verified['content_valid'] || (! $verified['content_signed']))) { logger('OWA header: ' . print_r($verified,true),LOGGER_DATA); |