Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 19:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace references to UTC_TIMESTAMP in SQL queries with a DateTimeFormat generated parameter

Browse source
This commit is contained in:
Hypolite Petovan 2021-12-02 09:19:01 -05:00
parent ecaed2a845
commit 80da47921e
14 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Worker/ExpireAndRemoveUsers.php
View file

@ -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
@ -52,7 +53,7 @@ class ExpireAndRemoveUsers
DBA::close($users);
// delete user records for recently removed accounts
$users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() AND `uid` != ?", 0]);
$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']]);