bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Ensure to never delete the "0" user

Browse source
This commit is contained in:
Michael 2020-11-18 05:24:04 +00:00
parent 81a03b137b
commit d7fa58d81c
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Database/DBStructure.php
View file

@ -1058,7 +1058,12 @@ class DBStructure
DBA::insert('user', ['uid' => 0]);
$lastid = DBA::lastInsertId();
if ($lastid != 0) {
DBA::update('user', ['uid' => 0], ['uid' => $lastid]);
$user = [
"verified" => true,
"page-flags" => User::PAGE_FLAGS_SOAPBOX,
"account-type" => User::ACCOUNT_TYPE_RELAY,
];
DBA::update('user', $user, ['uid' => $lastid]);
}
}

7
src/Worker/ExpireAndRemoveUsers.php
View file

@ -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)) {