nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10057 from annando/issue-10050

Browse source 
Issue 10050: Improved order of deletions
This commit is contained in:
Hypolite Petovan 2021-03-18 13:17:08 -04:00 committed by GitHub
parent fbbab822a0 437f96e573
commit c48179fbde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Worker/ExpireAndRemoveUsers.php
View file

@ -45,21 +45,26 @@ class ExpireAndRemoveUsers
// Remove any freshly expired account // Remove any freshly expired account
$users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]); $users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
while ($user = DBA::fetch($users)) { while ($user = DBA::fetch($users)) {
if ($user['uid'] != 0) {
User::remove($user['uid']); User::remove($user['uid']);
} }
}
DBA::close($users); DBA::close($users);
// delete user records for recently removed accounts // delete user records for recently removed accounts
$users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() "]); $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() AND `uid` != ?", 0]);
while ($user = DBA::fetch($users)) { while ($user = DBA::fetch($users)) {
// We have to delete photo entries by hand because otherwise the photo data won't be deleted
Photo::delete(['uid' => $user['uid']]);
// Delete the contacts of this user // Delete the contacts of this user
$self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]); $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
if (DBA::isResult($self)) { if (DBA::isResult($self)) {
DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]); 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 // Delete all contacts of this user
Photo::delete(['uid' => $user['uid']]); DBA::delete('contact', ['uid' => $user['uid']]);
// These tables contain the permissionset which will also be deleted when a user is deleted. // 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. // It seems that sometimes the system wants to delete the records in the wrong order.