aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/poller.php14
1 files changed, 11 insertions, 3 deletions
diff --git a/include/poller.php b/include/poller.php
index 31ca91cfa..5fc438c8d 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -63,9 +63,14 @@ function poller_run($argv, $argc){
// expire any expired accounts
- q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
- AND `account_expires_on` != '0000-00-00 00:00:00'
- AND `account_expires_on` < UTC_TIMESTAMP() ");
+ q("UPDATE account
+ SET account_flags = account_flags | %d
+ where not account_flags & %d
+ and account_expires != '0000-00-00 00:00:00'
+ and account_expires < UTC_TIMESTAMP() ",
+ intval(ACCOUNT_EXPIRED),
+ intval(ACCOUNT_EXPIRED)
+ );
$abandon_days = intval(get_config('system','account_abandon_days'));
if($abandon_days < 1)
@@ -145,6 +150,9 @@ function poller_run($argv, $argc){
: ''
);
+// FIXME
+return;
+
$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
AND NOT `network` IN ( '%s', '%s' )