Merge remote-tracking branch 'upstream/develop' into post-thread-user

[friendica.git] / src / Worker / ExpireAndRemoveUsers.php

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index c8344b6fd956cba4b5d3f11b8d7f71333112ce95..8caaf131ed997430925dae85eea191962ea9eb14 100644 (file)
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -33,9 +33,14 @@ class ExpireAndRemoveUsers
        public static function execute()
        {
                // 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];
+               $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];
                DBA::update('user', ['account_expired' => true], $condition);
 
+               // Ensure to never remove the user with uid=0
+               DBA::update('user', ['account_expired' => false, 'account_removed' => false,
+                       'account_expires_on' => DBA::NULL_DATETIME], ['uid' => 0]);
+
                // Remove any freshly expired account
                $users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
                while ($user = DBA::fetch($users)) {
@@ -52,8 +57,17 @@ class ExpireAndRemoveUsers
                                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']]);
 
+                       // 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.
+                       // So we now delete them before all other user related entries are deleted.
+                       DBA::delete('item', ['uid' => $user['uid']]);
+                       DBA::delete('post-user', ['uid' => $user['uid']]);
+                       DBA::delete('profile_field', ['uid' => $user['uid']]);
+
                        DBA::delete('user', ['uid' => $user['uid']]);
                }
                DBA::close($users);