friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Relocate system user creation

This commit is contained in:
Michael 2020-11-18 05:33:17 +00:00
parent d7fa58d81c
commit b09ffa0697
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Database/DBStructure.php
View File

@ -1075,24 +1075,6 @@ class DBStructure
}
}
/* if (self::existsTable('user') && DBA::exists('user', ['uid' => 0])) {
$system = User::getSystemAccount();
$user = [
"username" => $system['name'],
"nickname" => $system['nick'],
"register_date" => $system['created'],
"pubkey" => $system['pubkey'],
"prvkey" => $system['prvkey'],
"spubkey" => $system['spubkey'],
"sprvkey" => $system['sprvkey'],
"verified" => true,
"page-flags" => User::PAGE_FLAGS_SOAPBOX,
"account-type" => User::ACCOUNT_TYPE_RELAY,
];
DBA::update('user', $user, ['uid' => 0]);
}
*/
if (self::existsTable('permissionset')) {
if (!DBA::exists('permissionset', ['id' => 0])) {
DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);

20
src/Model/User.php
View File

@ -144,6 +144,26 @@ class User
$system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
$system['spubkey'] = $system['upubkey'] = $system['pubkey'];
$system['nickname'] = $system['nick'];
// Ensure that the user contains data
$user = DBA::selectFirst('user', ['prvkey'], ['uid' => 0]);
if (empty($user['prvkey'])) {
$fields = [
'username' => $system['name'],
'nickname' => $system['nick'],
'register_date' => $system['created'],
'pubkey' => $system['pubkey'],
'prvkey' => $system['prvkey'],
'spubkey' => $system['spubkey'],
'sprvkey' => $system['sprvkey'],
'verified' => true,
'page-flags' => User::PAGE_FLAGS_SOAPBOX,
'account-type' => User::ACCOUNT_TYPE_RELAY,
];
DBA::update('user', $fields, ['uid' => 0]);
}
return $system;
}