clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue 10640: Use consistent settings to enable protocol support

Browse Source
This commit is contained in:
Michael
2021-08-30 19:46:10 +00:00
parent 0448070069
commit e3c7cd25e1
9 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Worker/Delivery.php
View File

@@ -394,7 +394,7 @@ class Delivery
Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) {
if (!DI::config()->get('system', 'diaspora_enabled')) {
return;
}
@@ -477,7 +477,7 @@ class Delivery
*/
private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
{
if (DI::config()->get('system','dfrn_only')) {
if (DI::config()->get('system','imap_disabled')) {
return;
}

2
src/Worker/Notifier.php
View File

@@ -615,7 +615,7 @@ class Notifier
$url_recipients = array_filter($url_recipients);
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
// They are especially used for notifications to OStatus users that don't follow us.
if (!DI::config()->get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
if (count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
$slap = OStatus::salmon($target_item, $owner);
foreach ($url_recipients as $url) {
Logger::info('Salmon delivery', ['item' => $target_id, 'to' => $url]);