From 2aef98f71d95ba5c2caae7637002daef0bce6de5 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 19 Sep 2011 01:17:12 -0700
Subject: cripple account when expired

---
 include/poller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index e80b696bf..dbae1deec 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -86,11 +86,12 @@ function poller_run($argv, $argc){
 	// and which have a polling address and ignore Diaspora since 
 	// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
 
-	$contacts = q("SELECT `id` FROM `contact` 
+	$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
 		AND `network` != '%s'
 		$sql_extra 
-		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()",
+		AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
+		AND `user`.`account_expired` = 0 ORDER BY RAND()",
 		intval(CONTACT_IS_SHARING),
 		intval(CONTACT_IS_FRIEND),
 		dbesc(NETWORK_DIASPORA)
-- 
cgit v1.2.3