Merge pull request #3034 from annando/1612-no-archive

Only distribute items to active contacts

diff --combined include/notifier.php
index 2f9599d07255934c9c9792182b7a043c5ef62eb5,58240557bb87f6ebe67867c49e11ba1dc0030d8d..7221fa376db154eba4656d2e4f1049cade18ab36
--- 1/include/notifier.php
--- 2/include/notifier.php
+++ b/include/notifier.php
@@@ -170,7 -170,7 +170,7 @@@ function notifier_run(&$argv, &$argc)
                        intval($item_id)
                );
  
 -              if((! count($r)) || (! intval($r[0]['parent']))) {
 +              if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
                        return;
                }
  
@@@ -210,7 -210,7 +210,7 @@@
                intval($uid)
        );
  
 -      if(! count($r))
 +      if(! dbm::is_result($r))
                return;
  
        $owner = $r[0];
@@@ -321,7 -321,7 +321,7 @@@
                                                intval($uid),
                                                dbesc(NETWORK_DFRN)
                                        );
 -                                      if(count($r))
 +                                      if (dbm::is_result($r))
                                                foreach($r as $rr)
                                                        $recipients_followup[] = $rr['id'];
                                }
@@@ -445,7 -445,7 +445,7 @@@
  
                $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
  
 -              if(count($r))
 +              if (dbm::is_result($r))
                        $contacts = $r;
  
        } else
@@@ -463,7 -463,7 +463,7 @@@
                                intval($uid),
                                dbesc(NETWORK_MAIL)
                        );
 -                      if(count($r)) {
 +                      if (dbm::is_result($r)) {
                                foreach($r as $rr)
                                        $recipients[] = $rr['id'];
                        }
@@@ -491,7 -491,7 +491,7 @@@
  
        // delivery loop
  
 -      if(count($r)) {
 +      if (dbm::is_result($r)) {
  
                foreach($r as $contact) {
                        if(!$contact['self']) {
@@@ -575,7 -575,7 +575,7 @@@
                        $r0 = array();
  
                $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-                       AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+                       AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
                        dbesc(NETWORK_DIASPORA),
                        intval($owner['uid']),
                        intval(CONTACT_IS_SHARING)
@@@ -592,7 -592,7 +592,7 @@@
  
                $r = array_merge($r2,$r1,$r0);
  
 -              if(count($r)) {
 +              if (dbm::is_result($r)) {
                        logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
  
                        // throw everything into the queue in case we get killed