use Friendica\Database\DBStructure;
use Friendica\Model\Photo;
use Friendica\Model\User;
use Friendica\Database\DBStructure;
use Friendica\Model\Photo;
use Friendica\Model\User;
- $condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = ? AND `uid` != ?",
- DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL, 0];
+ $condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < ? AND `page-flags` = ? AND `uid` != ?",
+ DBA::NULL_DATETIME, DateTimeFormat::utcNow(), User::PAGE_FLAGS_NORMAL, 0];
DBA::update('user', ['account_expired' => true], $condition);
// Ensure to never remove the user with uid=0
DBA::update('user', ['account_expired' => true], $condition);
// Ensure to never remove the user with uid=0
// Remove any freshly expired account
$users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
while ($user = DBA::fetch($users)) {
// Remove any freshly expired account
$users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
while ($user = DBA::fetch($users)) {
- $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() "]);
+ $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < ? AND `uid` != ?", DateTimeFormat::utcNow(), 0]);
// Delete the contacts of this user
$self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
if (DBA::isResult($self)) {
DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
}
// Delete the contacts of this user
$self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
if (DBA::isResult($self)) {
DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
}
- // We have to delete photo entries by hand because otherwise the photo data won't be deleted
- Photo::delete(['uid' => $user['uid']]);
+ // Delete all contacts of this user
+ DBA::delete('contact', ['uid' => $user['uid']]);
// These tables contain the permissionset which will also be deleted when a user is deleted.
// It seems that sometimes the system wants to delete the records in the wrong order.
// These tables contain the permissionset which will also be deleted when a user is deleted.
// It seems that sometimes the system wants to delete the records in the wrong order.