don't make -desc so obnoxious looking

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
old mode 100755 (executable)
new mode 100644 (file)
index d63ad7a..6ce2813
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -47,7 +47,7 @@ function notifier_run($argv, $argc){
 
        $a->set_baseurl(get_config('system','url'));
 
-       logger('notifier: invoked: ' . print_r($argv,true));
+       logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
 
        $cmd = $argv[1];
 
@@ -304,7 +304,7 @@ function notifier_run($argv, $argc){
                        $conversant_str = dbesc(implode(', ',$conversants));
                }
 
-               $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
+               $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
 
                if(count($r))
                        $contacts = $r;
@@ -520,7 +520,8 @@ function notifier_run($argv, $argc){
                                                        `user`.* 
                                                        FROM `contact` 
                                                        LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
-                                                       WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                                                       WHERE `contact`.`blocked` = 0 AND `contact`.`archive` = 0
+                                                       AND `contact`.`pending` = 0
                                                        AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
                                                        $sql_extra
                                                        AND `user`.`account_expired` = 0 LIMIT 1",
@@ -537,6 +538,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);
@@ -758,7 +770,7 @@ function notifier_run($argv, $argc){
                );
                        
                $r2 = q("SELECT `id`, `name`,`network` FROM `contact` 
-                       WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
+                       WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                        AND `rel` != %d order by rand() ",
                        dbesc(NETWORK_DFRN),
                        dbesc(NETWORK_MAIL2),
@@ -821,6 +833,8 @@ function notifier_run($argv, $argc){
 
        }
 
+       logger('notifier: calling hooks', LOGGER_DEBUG);
+
        if($normal_mode)
                call_hooks('notifier_normal',$target_item);