* @brief Get the basepath for a given contact link
*
* @param string $url The contact link
+ * @param boolean $dont_update Don't update the contact
*
* @return string basepath
- * @return boolean $dont_update Don't update the contact
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function getBasepath($url, $dont_update = false)
{
- $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+ $contact = DBA::selectFirst('contact', ['id', 'baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+ if (!DBA::isResult($contact)) {
+ return '';
+ }
+
if (!empty($contact['baseurl'])) {
return $contact['baseurl'];
} elseif ($dont_update) {
return '';
}
- self::updateFromProbeByURL($url, true);
+ // Update the existing contact
+ self::updateFromProbe($contact['id'], '', true);
- $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
- if (!empty($contact['baseurl'])) {
- return $contact['baseurl'];
+ // And fetch the result
+ $contact = DBA::selectFirst('contact', ['baseurl'], ['id' => $contact['id']]);
+ if (empty($contact['baseurl'])) {
+ Logger::info('No baseurl for contact', ['url' => $url]);
+ return '';
}
- return '';
+ Logger::info('Found baseurl for contact', ['url' => $url, 'baseurl' => $contact['baseurl']]);
+ return $contact['baseurl'];
}
/**
*/
public static function isLocal($url)
{
- return Strings::compareLink(self::getBasepath($url, true), System::baseUrl());
+ return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl());
+ }
+
+ /**
+ * Check if the given contact ID is on the same server
+ *
+ * @param string $url The contact link
+ *
+ * @return boolean Is it the same server?
+ */
+ public static function isLocalById(int $cid)
+ {
+ $contact = DBA::selectFirst('contact', ['url', 'baseurl'], ['id' => $cid]);
+ if (!DBA::isResult($contact)) {
+ return false;
+ }
+
+ if (empty($contact['baseurl'])) {
+ $baseurl = self::getBasepath($contact['url'], true);
+ } else {
+ $baseurl = $contact['baseurl'];
+ }
+
+ return Strings::compareLink($baseurl, DI::baseUrl());
}
/**
'self' => 1,
'name' => $user['username'],
'nick' => $user['nickname'],
- 'photo' => System::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
- 'thumb' => System::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
- 'micro' => System::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg',
+ 'photo' => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
+ 'thumb' => DI::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
+ 'micro' => DI::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg',
'blocked' => 0,
'pending' => 0,
- 'url' => System::baseUrl() . '/profile/' . $user['nickname'],
- 'nurl' => Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']),
- 'addr' => $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3),
- 'request' => System::baseUrl() . '/dfrn_request/' . $user['nickname'],
- 'notify' => System::baseUrl() . '/dfrn_notify/' . $user['nickname'],
- 'poll' => System::baseUrl() . '/dfrn_poll/' . $user['nickname'],
- 'confirm' => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
- 'poco' => System::baseUrl() . '/poco/' . $user['nickname'],
+ 'url' => DI::baseUrl() . '/profile/' . $user['nickname'],
+ 'nurl' => Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']),
+ 'addr' => $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3),
+ 'request' => DI::baseUrl() . '/dfrn_request/' . $user['nickname'],
+ 'notify' => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'],
+ 'poll' => DI::baseUrl() . '/dfrn_poll/' . $user['nickname'],
+ 'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
+ 'poco' => DI::baseUrl() . '/poco/' . $user['nickname'],
'name-date' => DateTimeFormat::utcNow(),
'uri-date' => DateTimeFormat::utcNow(),
'avatar-date' => DateTimeFormat::utcNow(),
// We are adding a timestamp value so that other systems won't use cached content
$timestamp = strtotime($fields['avatar-date']);
- $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-';
+ $prefix = DI::baseUrl() . '/photo/' .$avatar['resource-id'] . '-';
$suffix = '.' . $file_suffix . '?ts=' . $timestamp;
$fields['photo'] = $prefix . '4' . $suffix;
$fields['micro'] = $prefix . '6' . $suffix;
} else {
// We hadn't found a photo entry, so we use the default avatar
- $fields['photo'] = System::baseUrl() . '/images/person-300.jpg';
- $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg';
- $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
+ $fields['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+ $fields['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
+ $fields['micro'] = DI::baseUrl() . '/images/person-48.jpg';
}
- $fields['avatar'] = System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
+ $fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
$fields['unsearchable'] = $user['hidewall'] || !$profile['net-publish'];
// it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
- $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];
+ $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname'];
$fields['nurl'] = Strings::normaliseLink($fields['url']);
- $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
- $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname'];
- $fields['notify'] = System::baseUrl() . '/dfrn_notify/' . $user['nickname'];
- $fields['poll'] = System::baseUrl() . '/dfrn_poll/'. $user['nickname'];
- $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
- $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname'];
+ $fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
+ $fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname'];
+ $fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname'];
+ $fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname'];
+ $fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
+ $fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname'];
$update = false;
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
// Update the profile
- $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
- 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
+ $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
+ 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
}
}
$sparkle = false;
if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
$sparkle = true;
- $profile_link = System::baseUrl() . '/redir/' . $contact['id'];
+ $profile_link = DI::baseUrl() . '/redir/' . $contact['id'];
} else {
$profile_link = $contact['url'];
}
}
if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {
- $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
+ $pm_url = DI::baseUrl() . '/message/new/' . $contact['id'];
}
if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
- $poke_link = System::baseUrl() . '/poke/?c=' . $contact['id'];
+ $poke_link = DI::baseUrl() . '/poke/?c=' . $contact['id'];
}
- $contact_url = System::baseUrl() . '/contact/' . $contact['id'];
+ $contact_url = DI::baseUrl() . '/contact/' . $contact['id'];
- $posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
+ $posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
if (!$contact['self']) {
- $contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
+ $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
}
$follow_link = '';
}
if (empty($data) || ($data['network'] == Protocol::PHANTOM)) {
+ Logger::info('No valid network found', ['url' => $url, 'data' => $data, 'callstack' => System::callstack(20)]);
return 0;
}
$cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
}
- $pager = new Pager($a->query_string);
+ $pager = new Pager(DI::args()->getQueryString());
$params = ['order' => ['received' => true],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
$data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
}
+ foreach ($data as $image_uri) {
+ $image_rid = Photo::ridFromURI($image_uri);
+ if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+ Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+ $force = true;
+ }
+ }
+
if (($contact["avatar"] != $avatar) || $force) {
$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
if ($force) {
self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
}
+
+ // Update the public contact
+ if ($uid != 0) {
+ self::updateFromProbeByURL($ret['url']);
+ }
+
return true;
}
{
$result = ['cid' => -1, 'success' => false, 'message' => ''];
- $a = \get_app();
+ $a = DI::app();
// remove ajax junk, e.g. Twitter
$url = str_replace('/#!/', '/', $url);
if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
if ($interactive) {
if (strlen(DI::baseUrl()->getUrlPath())) {
- $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
+ $myaddr = bin2hex(DI::baseUrl() . '/profile/' . $a->user['nickname']);
} else {
- $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName());
+ $myaddr = bin2hex($a->user['nickname'] . '@' . DI::baseUrl()->getHostname());
}
DI::baseUrl()->redirect($ret['request'] . "&addr=$myaddr");
'to_name' => $user['username'],
'to_email' => $user['email'],
'uid' => $user['uid'],
- 'link' => System::baseUrl() . '/notifications/intro',
+ 'link' => DI::baseUrl() . '/notifications/intro',
'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
'source_link' => $contact_record['url'],
'source_photo' => $contact_record['photo'],
* Remove the unavailable contact ids from the provided list
*
* @param array $contact_ids Contact id list
+ * @return array
* @throws \Exception
*/
- public static function pruneUnavailable(array &$contact_ids)
+ public static function pruneUnavailable(array $contact_ids)
{
if (empty($contact_ids)) {
- return;
- }
-
- $str = DBA::escape(implode(',', $contact_ids));
-
- $stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
-
- $return = [];
- while($contact = DBA::fetch($stmt)) {
- $return[] = $contact['id'];
+ return [];
}
- DBA::close($stmt);
+ $contacts = Contact::selectToArray(['id'], [
+ 'id' => $contact_ids,
+ 'blocked' => false,
+ 'pending' => false,
+ 'archive' => false,
+ ]);
- $contact_ids = $return;
+ return array_column($contacts, 'id');
}
/**