work in progress js_uploader plugin, turn java uploader into plugin - not done yet

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 8af67898c78aa0fa69e59e6bf3c05e992d84a9e0..4efdad4ce4fd480b864932b7c7ee0f2f083ad35e 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -20,6 +20,8 @@
 
        $a->set_baseurl(get_config('system','url'));
 
+       logger('notifier: invoked: ' . print_r($argv,true));
+
        $cmd = $argv[1];
 
        switch($cmd) {
@@ -136,11 +138,11 @@
 
                        logger('notifier: url_recipients' . print_r($url_recipients,true));
 
-                       $conversants = array_unique($conversants,SORT_NUMERIC);
+                       $conversants = array_unique($conversants);
 
 
-                       $recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups),SORT_NUMERIC);
-                       $deny = array_unique(array_merge($deny_people,$deny_groups),SORT_NUMERIC);
+                       $recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups));
+                       $deny = array_unique(array_merge($deny_people,$deny_groups));
                        $recipients = array_diff($recipients,$deny);
 
                        $conversant_str = dbesc(implode(', ',$conversants));
@@ -174,18 +176,20 @@
        }
 
        $atom .= replace_macros($feed_template, array(
+                       '$version'      => xmlify(FRIENDIKA_VERSION),
                        '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
                        '$feed_title'   => xmlify($owner['name']),
                        '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
                        '$hub'          => $hubxml,
-                       '$salmon'       => '',   // private feed, we don't use salmon here
+                       '$salmon'       => '',  // private feed, we don't use salmon here
                        '$name'         => xmlify($owner['name']),
                        '$profile_page' => xmlify($owner['url']),
                        '$photo'        => xmlify($owner['photo']),
                        '$thumb'        => xmlify($owner['thumb']),
                        '$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
                        '$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
-                       '$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME))
+                       '$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
+                       '$birthday'     => ''
        ));
 
        if($cmd === 'mail') {
@@ -203,10 +207,10 @@
                ));
        }
        else {
-
                if($followup) {
                        foreach($items as $item) {  // there is only one item
                                if($item['id'] == $item_id) {
+                                       logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
                                        $slap  = atom_entry($item,'html',$owner,$owner,false);
                                        $atom .= atom_entry($item,'text',$owner,$owner,false);
                                }
@@ -219,7 +223,13 @@
                                        continue;
 
                                $atom   .= atom_entry($item,'text',$contact,$owner,true);
-                               $slaps[] = atom_entry($item,'html',$contact,$owner,true);
+
+                               // There's a problem here - we *were* going to use salmon to provide semi-authenticated
+                               // communication to OStatus, but unless we're the item author they won't verify.
+                               // commented out for now, though we'll still send local replies (and any mentions 
+                               // that they contain) upstream. Rethinking the problem space.
+ 
+//                             $slaps[] = atom_entry($item,'html',$contact,$owner,true);
                        }
                }
        }
@@ -227,7 +237,7 @@
 
        logger('notifier: ' . $atom, LOGGER_DATA);
 
-       logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
+//     logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
 
        if($followup)
                $recip_str = $parent['contact-id'];
@@ -256,7 +266,10 @@
                                logger('notifier: dfrndelivery: ' . $contact['name']);
                                $deliver_status = dfrn_deliver($owner,$contact,$atom);
 
+                               logger('notifier: dfrn_delivery returns ' . $deliver_status);
+
                                if($deliver_status == (-1)) {
+                                       logger('notifier: delivery failed: queuing message');
                                        // queue message for redelivery
                                        q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
                                                VALUES ( %d, '%s', '%s', '%s') ",
@@ -267,7 +280,7 @@
                                        );
                                }
                                break;
-                       default:
+                       case 'stat':
                                if($followup && $contact['notify']) {
                                        logger('notifier: slapdelivery: ' . $contact['name']);
                                        $deliver_status = slapper($owner,$contact['notify'],$slap);
@@ -311,19 +324,22 @@
                                        }
                                }
                                break;
+                       case 'mail':
+                       case 'dspr':
+                       case 'feed':
+                       default:
+                               break;
                }
        }
                
        // send additional slaps to mentioned remote tags (@foo@example.com)
 
-       if(count($slaps) && count($url_recipients) && $notify_hub) {
+       if($slap && count($url_recipients) && $followup && $notify_hub) {
                foreach($url_recipients as $url) {
-                       logger('notifier: urldelivery: ' . $url);
-                       foreach($slaps as $slappy) {
-                               if($url) {
-                                       $deliver_status = slapper($owner,$url,$slappy);
-                                       // TODO: redeliver/queue these items on failure, though there is no contact record
-                               }
+                       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
                        }
                }
        }