$system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
$system['spubkey'] = $system['upubkey'] = $system['pubkey'];
$system['nickname'] = $system['nick'];
+ $system['page-flags'] = User::PAGE_FLAGS_SOAPBOX;
+ $system['account-type'] = $system['contact-type'];
+ $system['guid'] = '';
+ $system['picdate'] = '';
+ $system['theme'] = '';
+ $system['publish'] = false;
+ $system['net-publish'] = false;
+ $system['hide-friends'] = true;
+ $system['prv_keywords'] = '';
+ $system['pub_keywords'] = '';
+ $system['address'] = '';
+ $system['locality'] = '';
+ $system['region'] = '';
+ $system['postal-code'] = '';
+ $system['country-name'] = '';
+ $system['homepage'] = DI::baseUrl()->get();
+ $system['dob'] = '0000-00-00';
// Ensure that the user contains data
- $user = DBA::selectFirst('user', ['prvkey'], ['uid' => 0]);
- if (empty($user['prvkey'])) {
+ $user = DBA::selectFirst('user', ['prvkey', 'guid'], ['uid' => 0]);
+ if (empty($user['prvkey']) || empty($user['guid'])) {
$fields = [
'username' => $system['name'],
'nickname' => $system['nick'],
'prvkey' => $system['prvkey'],
'spubkey' => $system['spubkey'],
'sprvkey' => $system['sprvkey'],
+ 'guid' => System::createUUID(),
'verified' => true,
'page-flags' => User::PAGE_FLAGS_SOAPBOX,
'account-type' => User::ACCOUNT_TYPE_RELAY,
];
DBA::update('user', $fields, ['uid' => 0]);
+
+ $system['guid'] = $fields['guid'];
+ } else {
+ $system['guid'] = $user['guid'];
}
return $system;
*/
public static function getIdForURL(string $url)
{
- // Avoid any database requests when the hostname isn't even part of the url.
- if (!strpos($url, DI::baseUrl()->getHostname())) {
+ // Avoid database queries when the local node hostname isn't even part of the url.
+ if (!Contact::isLocal($url)) {
return 0;
}
if (!DBA::exists('user', ['uid' => $uid]) || !$repairMissing) {
return false;
}
- Contact::createSelfFromUserId($uid);
+ if (!DBA::exists('profile', ['uid' => $uid])) {
+ DBA::insert('profile', ['uid' => $uid]);
+ }
+ if (!DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
+ Contact::createSelfFromUserId($uid);
+ }
$owner = self::getOwnerDataById($uid, false);
}
// Check for correct url and normalised nurl
$url = DI::baseUrl() . '/profile/' . $owner['nickname'];
- $repair = ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
+ $repair = empty($owner['network']) || ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
if (!$repair) {
// Check if "addr" is present and correct
*/
public static function getDefaultGroup($uid, $network = '')
{
- $default_group = 0;
-
- if ($network == Protocol::OSTATUS) {
- $default_group = DI::pConfig()->get($uid, "ostatus", "default_group");
- }
-
- if ($default_group != 0) {
- return $default_group;
- }
-
$user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);
-
if (DBA::isResult($user)) {
$default_group = $user["def_gid"];
+ } else {
+ $default_group = 0;
}
return $default_group;
try {
$user = self::getAuthenticationInfo($user_info);
} catch (Exception $e) {
- // Addons can create users, and creating a numeric username would create
+ $username = (is_string($user_info) ? $user_info : $user_info['nickname'] ?? '');
+
+ // Addons can create users, and since this 'catch' branch should only
+ // execute if getAuthenticationInfo can't find an existing user, that's
+ // exactly what will happen here. Creating a numeric username would create
// abiguity with user IDs, possibly opening up an attack vector.
// So let's be very careful about that.
- if (is_numeric($user_info) || is_numeric($user_info['nickname'] ?? '')) {
+ if (empty($username) || is_numeric($username)) {
throw $e;
}
- $username = (is_string($user_info) ? $user_info : $user_info['nickname'] ?? '');
-
- if (!$username) {
- throw $e;
- }
- return self::getIdFromAuthenticateHooks($user_info, $password);
+ return self::getIdFromAuthenticateHooks($username, $password);
}
if ($third_party && DI::pConfig()->get($user['uid'], '2fa', 'verified')) {
* @return int User Id if authentication is successful
* @throws HTTPException\ForbiddenException
*/
- public static function getIdFromAuthenticateHooks($username, $password) {
+ public static function getIdFromAuthenticateHooks($username, $password)
+ {
$addon_auth = [
'username' => $username,
'password' => $password,
return false;
}
+ /**
+ * Get avatar link for given user id
+ *
+ * @param integer $uid user id
+ * @param string $size One of the ProxyUtils::SIZE_* constants
+ * @return string avatar link
+ */
+ public static function getAvatarUrlForId(int $uid, string $size = ''):string
+ {
+ $url = DI::baseUrl() . '/photo/';
+
+ switch ($size) {
+ case Proxy::SIZE_MICRO:
+ $url .= 'micro/';
+ $scale = 6;
+ break;
+ case Proxy::SIZE_THUMB:
+ $url .= 'avatar/';
+ $scale = 5;
+ break;
+ default:
+ $url .= 'profile/';
+ $scale = 4;
+ break;
+ }
+
+ $updated = '';
+ $imagetype = IMAGETYPE_JPEG;
+
+ $photo = Photo::selectFirst(['type', 'created', 'edited', 'updated'], ["scale" => $scale, 'uid' => $uid, 'profile' => true]);
+ if (!empty($photo)) {
+ $updated = max($photo['created'], $photo['edited'], $photo['updated']);
+
+ switch ($photo['type']) {
+ case 'image/png':
+ $imagetype = IMAGETYPE_PNG;
+ break;
+
+ case 'image/gif':
+ $imagetype = IMAGETYPE_PNG;
+ break;
+
+ default:
+ $imagetype = IMAGETYPE_JPEG;
+ break;
+ }
+ }
+
+ return $url . $uid . image_type_to_extension($imagetype) . ($updated ? '?ts=' . strtotime($updated) : '');
+ }
+
/**
* Catch-all user creation function
*
$insert_result = DBA::insert('profile', [
'uid' => $uid,
'name' => $username,
- 'photo' => DI::baseUrl() . "/photo/profile/{$uid}.jpg",
- 'thumb' => DI::baseUrl() . "/photo/avatar/{$uid}.jpg",
+ 'photo' => self::getAvatarUrlForId($uid),
+ 'thumb' => self::getAvatarUrlForId($uid, Proxy::SIZE_THUMB),
'publish' => $publish,
'net-publish' => $netpublish,
]);
$photo_failure = false;
$filename = basename($photo);
- $curlResult = DI::httpRequest()->get($photo);
+ $curlResult = DI::httpClient()->get($photo);
if ($curlResult->isSuccess()) {
$img_str = $curlResult->getBody();
$type = $curlResult->getContentType();
Photo::update(['profile' => 1], ['resource-id' => $resource_id]);
}
}
+
+ Contact::updateSelfFromUserID($uid, true);
}
Hook::callAll('register_account', $uid);
return $return;
}
+ /**
+ * Update a user entry and distribute the changes if needed
+ *
+ * @param array $fields
+ * @param integer $uid
+ * @return boolean
+ */
+ public static function update(array $fields, int $uid): bool
+ {
+ $old_owner = self::getOwnerDataById($uid);
+ if (empty($old_owner)) {
+ return false;
+ }
+
+ if (!DBA::update('user', $fields, ['uid' => $uid])) {
+ return false;
+ }
+
+ $update = Contact::updateSelfFromUserID($uid);
+
+ $owner = self::getOwnerDataById($uid);
+ if (empty($owner)) {
+ return false;
+ }
+
+ if ($old_owner['name'] != $owner['name']) {
+ Profile::update(['name' => $owner['name']], $uid);
+ }
+
+ if ($update) {
+ Profile::publishUpdate($uid);
+ }
+
+ return true;
+ }
+
/**
* Sets block state for a given user
*
*/
public static function identities($uid)
{
+ if (empty($uid)) {
+ return [];
+ }
+
$identities = [];
$user = DBA::selectFirst('user', ['uid', 'nickname', 'username', 'parent-uid'], ['uid' => $uid]);
return $identities;
}
+ /**
+ * Check if the given user id has delegations or is delegated
+ *
+ * @param int $uid
+ * @return bool
+ */
+ public static function hasIdentities(int $uid):bool
+ {
+ if (empty($uid)) {
+ return false;
+ }
+
+ $user = DBA::selectFirst('user', ['parent-uid'], ['uid' => $uid, 'account_removed' => false]);
+ if (!DBA::isResult($user)) {
+ return false;
+ }
+
+ if ($user['parent-uid'] != 0) {
+ return true;
+ }
+
+ if (DBA::exists('user', ['parent-uid' => $uid, 'account_removed' => false])) {
+ return true;
+ }
+
+ if (DBA::exists('manage', ['uid' => $uid])) {
+ return true;
+ }
+
+ return false;
+ }
+
/**
* Returns statistical information about the current users of this node
*