diff options
| author | friendica <info@friendica.com> | 2012-04-27 17:17:58 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-04-27 17:17:58 -0700 |
| commit | 26c53580d128d3ebbbc3d6172525b80690a63255 (patch) | |
| tree | 10069eae269f2530f8964d356907d83c2141fc9d /include/notifier.php | |
| parent | 0ab6b60a52fc27d8a37917b3b3e25de37c8fd372 (diff) | |
| download | volse-hubzilla-26c53580d128d3ebbbc3d6172525b80690a63255.tar.gz volse-hubzilla-26c53580d128d3ebbbc3d6172525b80690a63255.tar.bz2 volse-hubzilla-26c53580d128d3ebbbc3d6172525b80690a63255.zip | |
implement contact archival
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php index ca7c7b92e..922e869f6 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -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", @@ -769,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), |