Merge pull request #317 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 d63ad7a..070e7a4
--- 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];
 
@@ -220,7 +220,7 @@ function notifier_run($argv, $argc){
                }
 
 
-               if(($cmd === 'uplink') && (intval($parent['forum_mode'])) && (! $top_level)) {
+               if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && (! $top_level)) {
                        $relay_to_owner = true;                 
                } 
 
@@ -265,10 +265,10 @@ function notifier_run($argv, $argc){
                        $deny_people  = expand_acl($parent['deny_cid']);
                        $deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
 
-                       // if our parent is a forum, uplink to the origional author causing
-                       // a delivery fork
+                       // if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
+                       // a delivery fork. private groups (forum_mode == 2) do not uplink
 
-                       if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
+                       if((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
                                proc_run('php','include/notifier','uplink',$item_id);
                        }
 
@@ -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;
@@ -345,7 +345,7 @@ function notifier_run($argv, $argc){
        if($mail) {
                $public_message = false;  // mail is  not public
 
-               $body = fix_private_photos($item['body'],$owner['uid']);
+               $body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
 
                $atom .= replace_macros($mail_template, array(
                        '$name'         => xmlify($owner['name']),
@@ -478,17 +478,42 @@ function notifier_run($argv, $argc){
                        }
                }
 
-               foreach($r as $contact) {
+
+               // This controls the number of deliveries to execute with each separate delivery process.
+               // By default we'll perform one delivery per process. Assuming a hostile shared hosting
+               // provider, this provides the greatest chance of deliveries if processes start getting 
+               // killed. We can also space them out with the delivery_interval to also help avoid them 
+               // getting whacked.
+
+               // If $deliveries_per_process > 1, we will chain this number of multiple deliveries 
+               // together into a single process. This will reduce the overall number of processes 
+               // spawned for each delivery, but they will run longer. 
+
+               $deliveries_per_process = intval(get_config('system','delivery_batch_count'));
+               if($deliveries_per_process <= 0)
+                       $deliveries_per_process = 1;
+
+               $this_batch = array();
+
+               for($x = 0; $x < count($r); $x ++) {
+                       $contact = $r[$x];
+
                        if($contact['self'])
                                continue;
 
                        // potentially more than one recipient. Start a new process and space them out a bit.
-                       // we will deliver single recipient types of message and email receipients here. 
-
+                       // we will deliver single recipient types of message and email recipients here. 
+               
                        if((! $mail) && (! $fsuggest) && (! $followup)) {
-                               proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
-                               if($interval)
-                                       @time_sleep_until(microtime(true) + (float) $interval);
+
+                               $this_batch[] = $contact['id'];
+
+                               if(count($this_batch) == $deliveries_per_process) {
+                                       proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
+                                       $this_batch = array();
+                                       if($interval)
+                                               @time_sleep_until(microtime(true) + (float) $interval);
+                               }
                                continue;
                        }
 
@@ -520,7 +545,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 +563,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 +795,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 +858,8 @@ function notifier_run($argv, $argc){
 
        }
 
+       logger('notifier: calling hooks', LOGGER_DEBUG);
+
        if($normal_mode)
                call_hooks('notifier_normal',$target_item);