Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 4cc6d7a99a204b565f488c30ca0c768e404a37d5..59e57376222287dc041d24aadb5be14ad42d81ab 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -20,6 +20,11 @@ function notifier_run($argv, $argc){
        require_once('include/items.php');
        require_once('include/bbcode.php');
 
+       load_config('config');
+       load_config('system');
+
+       load_hooks();
+
        if($argc < 3)
                return;
 
@@ -69,6 +74,16 @@ function notifier_run($argv, $argc){
                if(! count($items))
                        return;
        }
+       elseif($cmd === 'suggest') {
+               $suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+                       intval($item_id)
+               );
+               if(! count($suggest))
+                       return;
+               $uid = $suggest[0]['uid'];
+               $recipients[] = $suggest[0]['cid'];
+               $item = $suggest[0];
+       }
        else {
 
                // find ancestors
@@ -104,7 +119,8 @@ function notifier_run($argv, $argc){
                        $top_level = true;
        }
 
-       $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` 
+       $r = q("SELECT `contact`.*, `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",
                intval($uid)
@@ -123,7 +139,7 @@ function notifier_run($argv, $argc){
        // fill this in with a single salmon slap if applicable
        $slap = '';
 
-       if($cmd != 'mail') {
+       if($cmd != 'mail' && $cmd != 'suggest') {
 
                require_once('include/group.php');
 
@@ -189,8 +205,8 @@ function notifier_run($argv, $argc){
                        $contacts = $r;
        }
 
-       $feed_template = load_view_file('view/atom_feed.tpl');
-       $mail_template = load_view_file('view/atom_mail.tpl');
+       $feed_template = get_markup_template('atom_feed.tpl');
+       $mail_template = get_markup_template('atom_mail.tpl');
 
        $atom = '';
        $slaps = array();
@@ -222,6 +238,8 @@ function notifier_run($argv, $argc){
        if($cmd === 'mail') {
                $notify_hub = false;  // mail is  not public
 
+               $body = fix_private_photos($item['body'],$owner['uid']);
+
                $atom .= replace_macros($mail_template, array(
                        '$name'         => xmlify($owner['name']),
                        '$profile_page' => xmlify($owner['url']),
@@ -229,10 +247,30 @@ function notifier_run($argv, $argc){
                        '$item_id'      => xmlify($item['uri']),
                        '$subject'      => xmlify($item['title']),
                        '$created'      => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
-                       '$content'      => xmlify($item['body']),
+                       '$content'      => xmlify($body),
                        '$parent_id'    => xmlify($item['parent-uri'])
                ));
        }
+       elseif($cmd === 'suggest') {
+               $notify_hub = false;  // suggestions are not public
+
+               $sugg_template = get_markup_template('atom_suggest.tpl');
+
+               $atom .= replace_macros($sugg_template, array(
+                       '$name'         => xmlify($item['name']),
+                       '$url'          => xmlify($item['url']),
+                       '$photo'        => xmlify($item['photo']),
+                       '$request'      => xmlify($item['request']),
+                       '$note'         => xmlify($item['note'])
+               ));
+
+               // We don't need this any more
+
+               q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+                       intval($item['id'])
+               );
+
+       }
        else {
                if($followup) {
                        foreach($items as $item) {  // there is only one item
@@ -327,6 +365,13 @@ function notifier_run($argv, $argc){
                                        }
                                        break;
                                case 'stat':
+
+                                       // Do not send to otatus if we are not configured to send to public networks
+                                       if($owner['prvnets'])
+                                               break;
+                                       if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
+                                               break;
+
                                        if($followup && $contact['notify']) {
                                                logger('notifier: slapdelivery: ' . $contact['name']);
                                                $deliver_status = slapper($owner,$contact['notify'],$slap);
@@ -342,8 +387,6 @@ function notifier_run($argv, $argc){
                                                        );
 
                                                }
-       
-
                                        }
                                        else {
 
@@ -370,7 +413,11 @@ function notifier_run($argv, $argc){
                                                }
                                        }
                                        break;
+
                                case 'mail':
+                                               
+                                       if(get_config('system','dfrn_only'))
+                                               break;
 
                                        // WARNING: does not currently convert to RFC2047 header encodings, etc.
 
@@ -444,9 +491,11 @@ function notifier_run($argv, $argc){
                                                mail($addr, $subject, $message, $headers);
                                        }
                                        break;
-                               case 'dspr':
                                case 'feed':
                                case 'face':
+                               case 'dspr':
+                                       if(get_config('system','dfrn_only'))
+                                               break;
                                default:
                                        break;
                        }
@@ -456,11 +505,13 @@ function notifier_run($argv, $argc){
        // send additional slaps to mentioned remote tags (@foo@example.com)
 
        if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
-               foreach($url_recipients as $url) {
-                       if($url) {
-                               logger('notifier: urldelivery: ' . $url);
-                               $deliver_status = slapper($owner,$url,$slap);
-                               // TODO: redeliver/queue these items on failure, though there is no contact record
+               if(! get_config('system','dfrn_only')) {
+                       foreach($url_recipients as $url) {
+                               if($url) {
+                                       logger('notifier: urldelivery: ' . $url);
+                                       $deliver_status = slapper($owner,$url,$slap);
+                                       // TODO: redeliver/queue these items on failure, though there is no contact record
+                               }
                        }
                }
        }
@@ -509,6 +560,8 @@ function notifier_run($argv, $argc){
 
                if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
 
+                       logger('pubdeliver: ' . print_r($r,true));
+
                        foreach($r as $rr) {
 
                                /* Don't deliver to folks who have already been delivered to */
@@ -534,7 +587,6 @@ function notifier_run($argv, $argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  echo "run!";
   notifier_run($argv,$argc);
   killme();
 }