Use a constant for the avatar base path

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

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index 5052fa68821f4c3742412366cfc7a503861e9fcf..491ac5d64b77f6b7fdce56e29be91f09bfaaae71 100644 (file)
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,6 +25,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * Expire and remove user entries
@@ -34,8 +35,8 @@ 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` = ? 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
@@ -45,21 +46,26 @@ 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` < ? AND `uid` != ?", DateTimeFormat::utcNow(), 0]);
                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
                        $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.