Merge pull request #243 from CatoTH/master

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
old mode 100755 (executable)
new mode 100644 (file)
index 07edc70..ca7c7b9
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -337,7 +337,9 @@ function notifier_run($argv, $argc){
                        '$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)) ,
-                       '$birthday'     => $birthday
+                       '$birthday'     => $birthday,
+                       '$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
+
        ));
 
        if($mail) {
@@ -535,6 +537,17 @@ function notifier_run($argv, $argc){
                                                                $x[0]['writable'] = 1;
                                                        }
 
+                                                       // if contact's ssl policy changed, which we just determined
+                                                       // is on our own server, update our contact links
+                                                       
+                                                       $ssl_policy = get_config('system','ssl_policy');
+                                                       fix_contact_ssl_policy($x[0],$ssl_policy);
+
+                                                       // If we are setup as a soapbox we aren't accepting input from this person
+
+                                                       if($x[0]['page-flags'] == PAGE_SOAPBOX)
+                                                               break;
+
                                                        require_once('library/simplepie/simplepie.inc');
                                                        logger('mod-delivery: local delivery');
                                                        local_delivery($x[0],$atom);