aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-16 20:43:34 -0700
committerFriendika <info@friendika.com>2011-08-16 20:43:34 -0700
commitfafcab70e1e56327ef39f22ccd915f41b75b81f2 (patch)
treeea2beeaf441a92aaa3cb937d5fe24916934416f2 /include
parentb28b468b2182493b958afecb388501fd66de230f (diff)
downloadvolse-hubzilla-fafcab70e1e56327ef39f22ccd915f41b75b81f2.tar.gz
volse-hubzilla-fafcab70e1e56327ef39f22ccd915f41b75b81f2.tar.bz2
volse-hubzilla-fafcab70e1e56327ef39f22ccd915f41b75b81f2.zip
fill in framework for d* outgoing
Diffstat (limited to 'include')
-rw-r--r--include/network.php6
-rw-r--r--include/notifier.php36
2 files changed, 32 insertions, 10 deletions
diff --git a/include/network.php b/include/network.php
index 9871b9edc..bbf1d6a63 100644
--- a/include/network.php
+++ b/include/network.php
@@ -536,8 +536,10 @@ function fetch_xrd_links($url) {
$aliases = array($alias);
else
$aliases = $alias;
- foreach($aliases as $alias) {
- $links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias);
+ if(count($aliases)) {
+ foreach($aliases as $alias) {
+ $links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias);
+ }
}
}
diff --git a/include/notifier.php b/include/notifier.php
index b8aa07dc7..15fb38534 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -50,8 +50,10 @@ function notifier_run($argv, $argc){
$recipients = array();
$url_recipients = array();
- if($cmd === 'mail') {
+ $normal_mode = true;
+ if($cmd === 'mail') {
+ $normal_mode = false;
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
@@ -64,6 +66,7 @@ function notifier_run($argv, $argc){
}
elseif($cmd === 'expire') {
+ $normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 10 MINUTE",
@@ -75,6 +78,7 @@ function notifier_run($argv, $argc){
return;
}
elseif($cmd === 'suggest') {
+ $normal_mode = false;
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
@@ -95,7 +99,7 @@ function notifier_run($argv, $argc){
return;
}
- $parent_item = $r[0];
+ $target_item = $r[0];
$parent_id = intval($r[0]['parent']);
$uid = $r[0]['uid'];
$updated = $r[0]['edited'];
@@ -317,9 +321,9 @@ function notifier_run($argv, $argc){
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
if(! $mail_disabled) {
- if((! strlen($parent_item['allow_cid'])) && (! strlen($parent_item['allow_gid']))
- && (! strlen($parent_item['deny_cid'])) && (! strlen($parent_item['deny_gid']))
- && (intval($parent_item['pubmail']))) {
+ if((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
+ && (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid']))
+ && (intval($target_item['pubmail']))) {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
intval($uid),
dbesc(NETWORK_MAIL)
@@ -498,10 +502,26 @@ function notifier_run($argv, $argc){
}
break;
case NETWORK_DIASPORA:
- if(get_config('system','dfrn_only') || (! get_config('diaspora_enabled')))
+ if(get_config('system','dfrn_only') || (! get_config('diaspora_enabled')) || (! $normal_mode))
+ break;
+
+ if($target_item['deleted']) {
+ // diaspora delete, (check for like)
+
+ break;
+ }
+ elseif($followup) {
+ // send to owner to relay
+
+ break;
+ }
+ elseif($target_item['parent'] != $target_item['id']) {
+ // we are the relay
+
break;
- if($top_level) {
- diaspora_send_status($parent_item,$owner,$contact);
+ }
+ elseif($top_level) {
+ diaspora_send_status($target_item,$owner,$contact);
break;
}