use Friendica\Protocol\Salmon;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Object\Image;
use dba;
require_once 'boot.php';
return $return;
}
+ /**
+ * Updates the self-contact for the provided user id
+ *
+ * @param int $uid
+ * @param boolean $update_avatar Force the avatar update
+ */
+ public static function updateSelfFromUserID($uid, $update_avatar = false)
+ {
+ $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
+ 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl'];
+ $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+ if (!DBM::is_result($self)) {
+ return;
+ }
+
+ $fields = ['nickname', 'page-flags', 'account-type'];
+ $user = dba::selectFirst('user', $fields, ['uid' => $uid]);
+ if (!DBM::is_result($user)) {
+ return;
+ }
+
+ $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
+ 'country-name', 'gender', 'pub_keywords', 'xmpp'];
+ $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ if (!DBM::is_result($profile)) {
+ return;
+ }
+
+ $fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
+ 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
+ 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
+ 'gender' => $profile['gender'], 'avatar' => $profile['photo'],
+ 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']];
+
+ $avatar = dba::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
+ if (DBM::is_result($avatar)) {
+ if ($update_avatar) {
+ $fields['avatar-date'] = DateTimeFormat::utcNow();
+ }
+
+ // Creating the path to the avatar, beginning with the file suffix
+ $types = Image::supportedTypes();
+ if (isset($types[$avatar['type']])) {
+ $file_suffix = $types[$avatar['type']];
+ } else {
+ $file_suffix = 'jpg';
+ }
+
+ // 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'] . '-';
+ $suffix = '.' . $file_suffix . '?ts=' . $timestamp;
+
+ $fields['photo'] = $prefix . '4' . $suffix;
+ $fields['thumb'] = $prefix . '5' . $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-175.jpg';
+ $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg';
+ $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
+ }
+
+ $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
+ $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+
+ // 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['nurl'] = normalise_link($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'];
+
+ $update = false;
+
+ foreach ($fields as $field => $content) {
+ if ($self[$field] != $content) {
+ $update = true;
+ }
+ }
+
+ if ($update) {
+ $fields['name-date'] = DateTimeFormat::utcNow();
+ dba::update('contact', $fields, ['id' => $self['id']]);
+
+ // Update the public contact as well
+ dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
+
+ // Update the profile
+ $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.jpg',
+ 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.jpg'];
+ dba::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ }
+ }
+
/**
* @brief Marks a contact for removal
*
*/
/// @todo Check for contact vitality via probing
- $expiry = $contact['term-date'] . ' + 32 days ';
+ $archival_days = Config::get('system', 'archival_days', 32);
+
+ $expiry = $contact['term-date'] . ' + ' . $archival_days . ' days ';
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
/* Relationship is really truly dead. archive them rather than
* delete, though if the owner tries to unarchive them we'll start
$fields = ['term-date' => NULL_DATE, 'archive' => false];
dba::update('contact', $fields, ['id' => $contact['id']]);
- if ($contact['url'] != '') {
+ if (!empty($contact['url'])) {
dba::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
}
+
+ if (!empty($contact['batch'])) {
+ $condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY];
+ dba::update('contact', $fields, $condition);
+ }
}
/**
// Fetch the data from the gcontact table
if (!DBM::is_result($r)) {
$s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `nurl` = ?", normalise_link($url));
$r = dba::inArray($s);
}
if ($contact['uid'] != $uid) {
if ($uid == 0) {
- $profile_link = Profile::zrl($contact['url']);
+ $profile_link = self::magicLink($contact['url']);
$menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
return $menu;
if (DBM::is_result($contact_own)) {
return self::photoMenu($contact_own, $uid);
} else {
- $profile_link = Profile::zrl($contact['url']);
+ $profile_link = self::magicLink($contact['url']);
$connlnk = 'follow/?url=' . $contact['url'];
$menu = [
'profile' => [L10n::t('View Profile'), $profile_link, true],
* @param string $url Contact URL
* @param integer $uid The user id for the contact (0 = public contact)
* @param boolean $no_update Don't update the contact
+ * @param array $default Default value for creating the contact when every else fails
*
* @return integer Contact ID
*/
- public static function getIdForURL($url, $uid = 0, $no_update = false)
+ public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [])
{
logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG);
$data = Probe::uri($url, "", $uid);
// Last try in gcontact for unsupported networks
- if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL])) {
+ if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) {
if ($uid != 0) {
return 0;
}
// Get data from the gcontact table
- $gcontact = dba::selectFirst('gcontact', ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'], ['nurl' => normalise_link($url)]);
- if (!DBM::is_result($gcontact)) {
- return 0;
+ $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
+ $contact = dba::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
+ if (!DBM::is_result($contact)) {
+ $contact = dba::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+ }
+
+ if (!DBM::is_result($contact)) {
+ $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+ 'photo', 'keywords', 'location', 'about', 'network',
+ 'priority', 'batch', 'request', 'confirm', 'poco'];
+ $contact = dba::selectFirst('contact', $fields, ['addr' => $url]);
+ }
+
+ if (!DBM::is_result($contact)) {
+ // The link could be provided as http although we stored it as https
+ $ssl_url = str_replace('http://', 'https://', $url);
+ $condition = ['alias' => [$url, normalise_link($url), $ssl_url]];
+ $contact = dba::selectFirst('contact', $fields, $condition);
+ }
+
+ if (!DBM::is_result($contact)) {
+ $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+ 'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
+ $condition = ['url' => [$url, normalise_link($url), $ssl_url]];
+ $contact = dba::selectFirst('fcontact', $fields, $condition);
}
- $data = array_merge($data, $gcontact);
+ if (!empty($default)) {
+ $contact = $default;
+ }
+
+ if (!DBM::is_result($contact)) {
+ return 0;
+ } else {
+ $data = array_merge($data, $contact);
+ }
}
if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) {
'name' => $data['name'],
'nick' => $data['nick']];
- // Only fill the pubkey if it was empty before. We have to prevent identity theft.
- if (!empty($contact['pubkey'])) {
- unset($contact['pubkey']);
- } else {
- $updated['pubkey'] = $data['pubkey'];
- }
-
if ($data['keywords'] != '') {
$updated['keywords'] = $data['keywords'];
}
if ($data['location'] != '') {
$updated['location'] = $data['location'];
}
- if ($data['about'] != '') {
- $updated['about'] = $data['about'];
+
+ // Update the technical stuff as well - if filled
+ if ($data['notify'] != '') {
+ $updated['notify'] = $data['notify'];
+ }
+ if ($data['poll'] != '') {
+ $updated['poll'] = $data['poll'];
+ }
+ if ($data['batch'] != '') {
+ $updated['batch'] = $data['batch'];
+ }
+ if ($data['request'] != '') {
+ $updated['request'] = $data['request'];
+ }
+ if ($data['confirm'] != '') {
+ $updated['confirm'] = $data['confirm'];
+ }
+ if ($data['poco'] != '') {
+ $updated['poco'] = $data['poco'];
+ }
+
+ // Only fill the pubkey if it had been empty before. We have to prevent identity theft.
+ if (empty($contact['pubkey'])) {
+ $updated['pubkey'] = $data['pubkey'];
}
if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
}
if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
- $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND NOT `item`.`global`))";
+ $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
} else {
- $sql = "`item`.`uid` = %d";
+ $sql = "`item`.`uid` = ?";
}
$author_id = intval($r[0]["author-id"]);
$contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
- $r = q(item_query() . " AND `item`.`" . $contact . "` = %d AND " . $sql .
- " AND `item`.`verb` = '%s' ORDER BY `item`.`created` DESC LIMIT %d, %d",
- intval($author_id), intval(local_user()), dbesc(ACTIVITY_POST),
- intval($a->pager['start']), intval($a->pager['itemspage'])
- );
+ $condition = ["`$contact` = ? AND `verb` = ? AND " . $sql,
+ $author_id, ACTIVITY_POST, local_user()];
+ $params = ['order' => ['created' => true],
+ 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+ $r = Item::select(local_user(), [], $condition, $params);
- $o = conversation($a, $r, 'contact-posts', false);
+ $items = dba::inArray($r);
+
+ $o = conversation($a, $items, 'contact-posts', false);
- $o .= alt_pager($a, count($r));
+ $o .= alt_pager($a, count($items));
return $o;
}
if (($network != '') && ($ret['network'] != $network)) {
logger('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
- return result;
+ return $result;
}
// check if we already have a contact
}
// send email notification to owner?
} else {
+ if (dba::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
+ logger('ignoring duplicated connection request from pending contact ' . $url);
+ return;
+ }
+
// create contact record
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
`blocked`, `readonly`, `pending`, `writable`)
}
}
}
+
+ /**
+ * Remove the unavailable contact ids from the provided list
+ *
+ * @param array $contact_ids Contact id list
+ */
+ public static function pruneUnavailable(array &$contact_ids)
+ {
+ if (empty($contact_ids)) {
+ return;
+ }
+
+ $str = dbesc(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'];
+ }
+
+ dba::close($stmt);
+
+ $contact_ids = $return;
+ }
+
+ /**
+ * @brief Returns a magic link to authenticate remote visitors
+ *
+ * @param string $contact_url The address of the target contact profile
+ * @param integer $url An url that we will be redirected to after the authentication
+ *
+ * @return string with "redir" link
+ */
+ public static function magicLink($contact_url, $url = '')
+ {
+ $cid = self::getIdForURL($contact_url, 0, true);
+ if (empty($cid)) {
+ return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
+ }
+
+ return self::magicLinkbyId($cid, $url);
+ }
+
+ /**
+ * @brief Returns a magic link to authenticate remote visitors
+ *
+ * @param integer $cid The contact id of the target contact profile
+ * @param integer $url An url that we will be redirected to after the authentication
+ *
+ * @return string with "redir" link
+ */
+ public static function magicLinkbyId($cid, $url = '')
+ {
+ $contact = dba::selectFirst('contact', ['network', 'url', 'uid'], ['id' => $cid]);
+
+ if ($contact['network'] != NETWORK_DFRN) {
+ return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
+ }
+
+ // Only redirections to the same host do make sense
+ if (($url != '') && (parse_url($url, PHP_URL_HOST) != parse_url($contact['url'], PHP_URL_HOST))) {
+ return $url;
+ }
+
+ if ($contact['uid'] != 0) {
+ return self::magicLink($contact['url'], $url);
+ }
+
+ $redirect = 'redir/' . $cid;
+
+ if ($url != '') {
+ $redirect .= '?url=' . $url;
+ }
+
+ return $redirect;
+ }
}
projects / friendica.git / blobdiff