diff options
| author | Friendika <info@friendika.com> | 2011-08-14 21:23:02 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-14 21:23:02 -0700 |
| commit | d723ff47708843893956bf30669b4762a6360bcd (patch) | |
| tree | 0de7e918d66d3c67fd8a3e983b64a10619c1ce81 /include/notifier.php | |
| parent | 0729e205c8149f5634b8622654a09382b50ec678 (diff) | |
| download | volse-hubzilla-d723ff47708843893956bf30669b4762a6360bcd.tar.gz volse-hubzilla-d723ff47708843893956bf30669b4762a6360bcd.tar.bz2 volse-hubzilla-d723ff47708843893956bf30669b4762a6360bcd.zip | |
diaspora top level status posts, string update
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/include/notifier.php b/include/notifier.php index bd78d7560..332cd19e3 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -119,7 +119,8 @@ function notifier_run($argv, $argc){ $top_level = true; } - $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, + $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, + `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`, `user`.`prvnets` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", @@ -351,7 +352,7 @@ function notifier_run($argv, $argc){ $deliver_status = 0; switch($contact['network']) { - case 'dfrn': + case NETWORK_DFRN: logger('notifier: dfrndelivery: ' . $contact['name']); $deliver_status = dfrn_deliver($owner,$contact,$atom); @@ -369,7 +370,7 @@ function notifier_run($argv, $argc){ ); } break; - case 'stat': + case NETWORK_OSTATUS: // Do not send to otatus if we are not configured to send to public networks if($owner['prvnets']) @@ -419,7 +420,7 @@ function notifier_run($argv, $argc){ } break; - case 'mail': + case NETWORK_MAIL: if(get_config('system','dfrn_only')) break; @@ -496,9 +497,18 @@ function notifier_run($argv, $argc){ mail($addr, $subject, $message, $headers); } break; - case 'feed': - case 'face': - case 'dspr': + case NETWORK_DIASPORA: + if(get_config('system','dfrn_only') || (! get_config('diaspora_enabled'))) + break; + if($top_level) { + diaspora_send_status($parent_item,$owner,$contact); + break; + } + + break; + + case NETWORK_FEED: + case NETWORK_FACEBOOK: if(get_config('system','dfrn_only')) break; default: |