friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

more friendika-z

This commit is contained in:
Friendika 2011-07-06 20:16:40 -07:00
parent 474156b15c
commit 3f25830076
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/notifier.php
View File

@ -365,8 +365,13 @@ function notifier_run($argv, $argc){
} }
break; break;
case 'stat': case 'stat':
// Do not send to otatus if we are not configured to send to public networks
if($owner['prvnets']) if($owner['prvnets'])
break; break;
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
break;
if($followup && $contact['notify']) { if($followup && $contact['notify']) {
logger('notifier: slapdelivery: ' . $contact['name']); logger('notifier: slapdelivery: ' . $contact['name']);
$deliver_status = slapper($owner,$contact['notify'],$slap); $deliver_status = slapper($owner,$contact['notify'],$slap);
@ -382,8 +387,6 @@ function notifier_run($argv, $argc){
); );
} }
} }
else { else {
@ -413,6 +416,9 @@ function notifier_run($argv, $argc){
case 'mail': case 'mail':
if(get_config('system','dfrn_only'))
break;
// WARNING: does not currently convert to RFC2047 header encodings, etc. // WARNING: does not currently convert to RFC2047 header encodings, etc.
$addr = $contact['addr']; $addr = $contact['addr'];
@ -488,6 +494,8 @@ function notifier_run($argv, $argc){
case 'feed': case 'feed':
case 'face': case 'face':
case 'dspr': case 'dspr':
if(get_config('system','dfrn_only'))
break;
default: default:
break; break;
} }
@ -497,11 +505,13 @@ function notifier_run($argv, $argc){
// send additional slaps to mentioned remote tags (@foo@example.com) // send additional slaps to mentioned remote tags (@foo@example.com)
if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) { if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
foreach($url_recipients as $url) { if(! get_config('system','dfrn_only')) {
if($url) { foreach($url_recipients as $url) {
logger('notifier: urldelivery: ' . $url); if($url) {
$deliver_status = slapper($owner,$url,$slap); logger('notifier: urldelivery: ' . $url);
// TODO: redeliver/queue these items on failure, though there is no contact record $deliver_status = slapper($owner,$url,$slap);
// TODO: redeliver/queue these items on failure, though there is no contact record
}
} }
} }
} }
@ -577,7 +587,6 @@ function notifier_run($argv, $argc){
} }
if (array_search(__file__,get_included_files())===0){ if (array_search(__file__,get_included_files())===0){
echo "run!";
notifier_run($argv,$argc); notifier_run($argv,$argc);
killme(); killme();
} }

11
mod/follow.php
View File

@ -34,6 +34,13 @@ function follow_post(&$a) {
// NOTREACHED // NOTREACHED
} }
else {
if(get_config('system','dfrn_only')) {
notice( t('This site is not configured to allow communications with other networks.') . EOL);
notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
goaway($_SESSION['return_url']);
}
}
// do we have enough information? // do we have enough information?
@ -50,6 +57,10 @@ function follow_post(&$a) {
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} }
if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
notice( t('Communication options with this network have been restricted.') . EOL);
$ret['notify'] = '';
}
if(! $ret['notify']) { if(! $ret['notify']) {
notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL); notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);