$system['page-flags'] = User::PAGE_FLAGS_SOAPBOX;
$system['account-type'] = $system['contact-type'];
$system['guid'] = '';
- $system['nickname'] = $system['nick'];
- $system['pubkey'] = $system['pubkey'];
+ $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['net-publish'] = false;
+ $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;
$system['closeness'] = 0;
$system['baseurl'] = DI::baseUrl();
$system['gsid'] = GServer::getID($system['baseurl']);
- DBA::insert('contact', $system);
+ Contact::insert($system);
}
/**
*/
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;
{
$cache = new CacheItemPool();
$cache->changeConfig([
- 'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
+ 'cacheDirectory' => System::getTempPath() . '/password-exposed-cache/',
]);
try {
return false;
}
+ /**
+ * Get avatar link for given user
+ *
+ * @param array $user
+ * @param string $size One of the Proxy::SIZE_* constants
+ * @return string avatar link
+ * @throws Exception
+ */
+ public static function getAvatarUrl(array $user, string $size = ''):string
+ {
+ if (empty($user['nickname'])) {
+ DI::logger()->warning('Missing user nickname key', ['trace' => System::callstack(20)]);
+ }
+
+ $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' => $user['uid'], 'profile' => true]);
+ if (!empty($photo)) {
+ $updated = max($photo['created'], $photo['edited'], $photo['updated']);
+
+ if (in_array($photo['type'], ['image/png', 'image/gif'])) {
+ $imagetype = IMAGETYPE_PNG;
+ }
+ }
+
+ return $url . $user['nickname'] . image_type_to_extension($imagetype) . ($updated ? '?ts=' . strtotime($updated) : '');
+ }
+
/**
* Catch-all user creation function
*
$using_invites = DI::config()->get('system', 'invitation_only');
- $invite_id = !empty($data['invite_id']) ? Strings::escapeTags(trim($data['invite_id'])) : '';
- $username = !empty($data['username']) ? Strings::escapeTags(trim($data['username'])) : '';
- $nickname = !empty($data['nickname']) ? Strings::escapeTags(trim($data['nickname'])) : '';
- $email = !empty($data['email']) ? Strings::escapeTags(trim($data['email'])) : '';
- $openid_url = !empty($data['openid_url']) ? Strings::escapeTags(trim($data['openid_url'])) : '';
- $photo = !empty($data['photo']) ? Strings::escapeTags(trim($data['photo'])) : '';
- $password = !empty($data['password']) ? trim($data['password']) : '';
- $password1 = !empty($data['password1']) ? trim($data['password1']) : '';
- $confirm = !empty($data['confirm']) ? trim($data['confirm']) : '';
+ $invite_id = !empty($data['invite_id']) ? trim($data['invite_id']) : '';
+ $username = !empty($data['username']) ? trim($data['username']) : '';
+ $nickname = !empty($data['nickname']) ? trim($data['nickname']) : '';
+ $email = !empty($data['email']) ? trim($data['email']) : '';
+ $openid_url = !empty($data['openid_url']) ? trim($data['openid_url']) : '';
+ $photo = !empty($data['photo']) ? trim($data['photo']) : '';
+ $password = !empty($data['password']) ? trim($data['password']) : '';
+ $password1 = !empty($data['password1']) ? trim($data['password1']) : '';
+ $confirm = !empty($data['confirm']) ? trim($data['confirm']) : '';
$blocked = !empty($data['blocked']);
$verified = !empty($data['verified']);
- $language = !empty($data['language']) ? Strings::escapeTags(trim($data['language'])) : 'en';
+ $language = !empty($data['language']) ? trim($data['language']) : 'en';
$netpublish = $publish = !empty($data['profile_publish_reg']);
$username_max_length = max(1, min(64, intval(DI::config()->get('system', 'username_max_length', 48))));
if ($username_min_length > $username_max_length) {
- Logger::log(DI::l10n()->t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length), Logger::WARNING);
+ Logger::error(DI::l10n()->t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length));
$tmp = $username_min_length;
$username_min_length = $username_max_length;
$username_max_length = $tmp;
$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::getAvatarUrl($user),
+ 'thumb' => self::getAvatarUrl($user, 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();
$resource_id = Photo::newResource();
- $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 4);
+ // Not using Photo::PROFILE_PHOTOS here, so that it is discovered as translateble string
+ $profile_album = DI::l10n()->t('Profile Photos');
+
+ $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 4);
if ($r === false) {
$photo_failure = true;
$Image->scaleDown(80);
- $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 5);
+ $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 5);
if ($r === false) {
$photo_failure = true;
$Image->scaleDown(48);
- $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 6);
+ $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 6);
if ($r === false) {
$photo_failure = true;
}
if (!$photo_failure) {
- Photo::update(['profile' => 1], ['resource-id' => $resource_id]);
+ Photo::update(['profile' => true, 'photo-type' => Photo::USER_AVATAR], ['resource-id' => $resource_id]);
}
}
return false;
}
- Logger::log('Removing user: ' . $uid);
+ Logger::notice('Removing user', ['user' => $uid]);
$user = DBA::selectFirst('user', [], ['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
*
projects / friendica.git / blobdiff