aboutsummaryrefslogtreecommitdiffstats
path: root/include/poller.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-18 15:17:18 -0800
committerfriendica <info@friendica.com>2014-02-18 15:17:18 -0800
commit7d4916ec714d834db3493c2fc12e76b0ffdb26b2 (patch)
tree0c95efc2cb54546c4a47a4b187f69cc1ce41616b /include/poller.php
parent9a51f8ce650d295e7bc2322b9f2f10b340d8e076 (diff)
downloadvolse-hubzilla-7d4916ec714d834db3493c2fc12e76b0ffdb26b2.tar.gz
volse-hubzilla-7d4916ec714d834db3493c2fc12e76b0ffdb26b2.tar.bz2
volse-hubzilla-7d4916ec714d834db3493c2fc12e76b0ffdb26b2.zip
service class downgrade to the default service class on account expiration if using a non-default service class and account has expired.
Diffstat (limited to 'include/poller.php')
-rw-r--r--include/poller.php13
1 files changed, 3 insertions, 10 deletions
diff --git a/include/poller.php b/include/poller.php
index ce9b75eb3..1c6f68eab 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -32,16 +32,6 @@ function poller_run($argv, $argc){
proc_run('php',"include/queue.php");
- // expire any expired accounts
-
- 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)
- );
// expire any expired mail
@@ -115,6 +105,9 @@ function poller_run($argv, $argc){
q("delete from notify where seen = 1 and date < UTC_TIMESTAMP() - INTERVAL 30 DAY");
+ // expire any expired accounts
+ require_once('include/account.php');
+ downgrade_accounts();
// If this is a directory server, request a sync with an upstream
// directory at least once a day, up to once every poll interval.