diff options
| author | Mario Vavti <mario@mariovavti.com> | 2023-06-02 13:30:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2023-06-02 13:30:36 +0200 |
| commit | f9ca9565108f528c8397b422573923a661f73480 (patch) | |
| tree | 6e2f83f6503426fb3da4e5cd0954aa75091d1b44 | |
| parent | 65a472c113b0ad93465e2698fafe388e739bdacb (diff) | |
| parent | 423fdc0a9618e322636a5291ed92df00115fafb0 (diff) | |
| download | volse-hubzilla-f9ca9565108f528c8397b422573923a661f73480.tar.gz volse-hubzilla-f9ca9565108f528c8397b422573923a661f73480.tar.bz2 volse-hubzilla-f9ca9565108f528c8397b422573923a661f73480.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -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 920a92240..4de4d32d6 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -49,6 +49,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); |