- // expire any expired accounts
- q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
- AND `account_expires_on` > '%s'
- AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE));
+ // expire any expired regular accounts. Don't expire forums.
+ $condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", DBA::NULL_DATETIME];
+ DBA::update('user', ['account_expired' => true], $condition);
+
+ // Remove any freshly expired account
+ $users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
+ while ($user = DBA::fetch($users)) {
+ User::remove($user['uid']);
+ }