From b55ae5717ba77786e03901bb14d8327d81523eda Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 18 Mar 2021 15:44:02 +0000 Subject: [PATCH 1/2] Issue 10050: Improved deletion order --- src/Worker/ExpireAndRemoveUsers.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php index 5052fa6882..949b7dea9f 100644 --- a/src/Worker/ExpireAndRemoveUsers.php +++ b/src/Worker/ExpireAndRemoveUsers.php @@ -45,22 +45,21 @@ class ExpireAndRemoveUsers // 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']); + if ($user['uid'] != 0) { + User::remove($user['uid']); + } } DBA::close($users); // 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)) { - // 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 the 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. // So when the permissionset is deleted and these tables are still filled then an error is thrown. From 437f96e57345639d5f455ec7e22db36b4ccca994 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 18 Mar 2021 15:56:50 +0000 Subject: [PATCH 2/2] Partly restored functionality --- src/Worker/ExpireAndRemoveUsers.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php index 949b7dea9f..0941480d44 100644 --- a/src/Worker/ExpireAndRemoveUsers.php +++ b/src/Worker/ExpireAndRemoveUsers.php @@ -58,6 +58,12 @@ class ExpireAndRemoveUsers Photo::delete(['uid' => $user['uid']]); // 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 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.