add owner's birthday information to feed (if allowed to)

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 8af67898c78aa0fa69e59e6bf3c05e992d84a9e0..5bc21cf13c092f185c31d81ec8d8839b6d46630f 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));
@@ -185,7 +187,8 @@
                        '$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') {
@@ -207,6 +210,7 @@
                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);
                                }
@@ -256,7 +260,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') ",