<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
*/
private static function rearrangeData($data)
{
- $fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "account-type",
- "community", "keywords", "location", "about", "hide",
+ $fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "header",
+ "account-type", "community", "keywords", "location", "about", "hide",
"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
"following", "followers", "inbox", "outbox", "sharedinbox",
- "priority", "network", "pubkey", "baseurl", "gsid"];
+ "priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
+
+ $numeric_fields = ["gsid", "hide", "account-type", "manually-approve"];
$newdata = [];
foreach ($fields as $field) {
if (isset($data[$field])) {
- if (in_array($field, ["gsid", "hide", "account-type"])) {
+ if (in_array($field, $numeric_fields)) {
$newdata[$field] = (int)$data[$field];
} else {
$newdata[$field] = $data[$field];
}
- } elseif ($field != "gsid") {
+ } elseif (!in_array($field, $numeric_fields)) {
$newdata[$field] = "";
} else {
$newdata[$field] = null;
Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
$xrd = null;
- $curlResult = DI::httpRequest()->get($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $curlResult = DI::httpRequest()->get($ssl_url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody();
}
if (!is_object($xrd) && !empty($url)) {
- $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isTimeout()) {
Logger::info('Probing timeout', ['url' => $url]);
* @return string profile link
* @throws HTTPException\InternalServerErrorException
*/
- public static function webfingerDfrn($webbie, &$hcard_url)
+ public static function webfingerDfrn(string $webbie, string &$hcard_url)
{
$profile_link = '';
}
$body = $curlResult->getBody();
+ if (empty($body)) {
+ return false;
+ }
$doc = new DOMDocument();
@$doc->loadHTML($body);
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
- $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+ $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
return [];
$curlResult = DI::httpRequest()->get($noscrape_url);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
- return [];
+ return $data;
}
$content = $curlResult->getBody();
if (!$content) {
Logger::info('Empty body', ['url' => $noscrape_url]);
- return [];
+ return $data;
}
$json = json_decode($content, true);
if (!is_array($json)) {
Logger::info('No json data', ['url' => $noscrape_url]);
- return [];
+ return $data;
}
if (!empty($json["fn"])) {
return [];
}
$content = $curlResult->getBody();
- if (!$content) {
+ if (empty($content)) {
return [];
}
&& !empty($hcard_url)
) {
$data["network"] = Protocol::DIASPORA;
+ $data["manually-approve"] = false;
// The Diaspora handle must always be lowercase
if (!empty($data["addr"])) {
&& isset($data["url"])
) {
$data["network"] = Protocol::OSTATUS;
+ $data["manually-approve"] = false;
} else {
return $short ? false : [];
}
private static function pumpioProfileData($profile_link)
{
$curlResult = DI::httpRequest()->get($profile_link);
- if (!$curlResult->isSuccess()) {
+ if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
return [];
}
*/
public static function getFeedLink(string $url, string $body)
{
+ if (empty($body)) {
+ return '';
+ }
+
$doc = new DOMDocument();
if (!@$doc->loadHTML($body)) {
return false;
$hrefParts = parse_url($href);
- // Root path case (/path) including relative scheme case (//host/path)
- if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
- $path = $hrefParts['path'];
- } else {
- $path = $path . '/' . $hrefParts['path'];
-
- // Resolve arbitrary relative path
- // Lifted from https://www.php.net/manual/en/function.realpath.php#84012
- $parts = array_filter(explode('/', $path), 'strlen');
- $absolutes = array();
- foreach ($parts as $part) {
- if ('.' == $part) continue;
- if ('..' == $part) {
- array_pop($absolutes);
- } else {
- $absolutes[] = $part;
+ if (!empty($hrefParts['path'])) {
+ // Root path case (/path) including relative scheme case (//host/path)
+ if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
+ $path = $hrefParts['path'];
+ } else {
+ $path = $path . '/' . $hrefParts['path'];
+
+ // Resolve arbitrary relative path
+ // Lifted from https://www.php.net/manual/en/function.realpath.php#84012
+ $parts = array_filter(explode('/', $path), 'strlen');
+ $absolutes = array();
+ foreach ($parts as $part) {
+ if ('.' == $part) continue;
+ if ('..' == $part) {
+ array_pop($absolutes);
+ } else {
+ $absolutes[] = $part;
+ }
}
- }
- $path = '/' . implode('/', $absolutes);
+ $path = '/' . implode('/', $absolutes);
+ }
}
// Relative scheme case (//host/path)
$data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
- 'photo' => $profile['photo'], 'account-type' => $profile['contact-type'],
- 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+ 'photo' => Contact::getAvatarUrlForId($profile['id'], $profile['updated']),
+ 'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '',
+ 'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
'following' => $approfile['following'], 'followers' => $approfile['followers'],
'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
- 'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid']];
+ 'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
+ 'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])];
return self::rearrangeData($data);
}
}