diff options
Diffstat (limited to 'include/poller.php')
| -rw-r--r-- | include/poller.php | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/include/poller.php b/include/poller.php index 3052ace64..00e336453 100644 --- a/include/poller.php +++ b/include/poller.php @@ -103,18 +103,15 @@ function poller_run($argv, $argc){ ); $contacts = q("SELECT abook_id, abook_updated, abook_closeness, abook_channel - FROM abook LEFT JOIN account on abook_account = account_id + FROM abook LEFT JOIN account on abook_account = account_id where 1 $sql_extra - AND not ( abook_flags & %d ) AND not ( abook_flags & %d ) - AND not ( abook_flags & %d ) AND not ( abook_flags & %d ) - AND not ( abook_flags & %d ) AND ( account_flags & %d ) $abandon_sql ORDER BY RAND()", - - intval(ABOOK_FLAG_BLOCKED), - intval(ABOOK_FLAG_IGNORED), - intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_ARCHIVED), - intval(ABOOK_FLAG_SELF), - intval(ACCOUNT_OK) + AND (( abook_flags = %d ) OR ( abook_flags = %d )) + AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY RAND()", + + intval(ABOOK_FLAG_HIDDEN), + intval(0), + intval(ACCOUNT_OK), + intval(ACCOUNT_UNVERIFIED) // FIXME ); |