*/
public static function webfinger_dfrn($webbie, &$hcard) {
- if (!strstr($webbie, '@'))
- return $webbie;
$profile_link = '';
- $links = self::webfinger($webbie);
+ $links = self::lrdd($webbie);
logger('webfinger_dfrn: '.$webbie.':'.print_r($links,true), LOGGER_DATA);
if (count($links)) {
foreach ($links as $link) {
if ($link['@attributes']['rel'] === NAMESPACE_DFRN)
$profile_link = $link['@attributes']['href'];
- if ($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB)
+ if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == ""))
$profile_link = 'stat:'.$link['@attributes']['template'];
if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
$hcard = $link['@attributes']['href'];
$path = str_replace('{uri}', urlencode($uri), $link);
$webfinger = self::webfinger($path);
+
+ if (!$webfinger AND (strstr($uri, "@"))) {
+ $path = str_replace('{uri}', urlencode("acct:".$uri), $link);
+ $webfinger = self::webfinger($path);
+ }
}
if (!is_array($webfinger["links"]))
}
/**
- * @brief Fetch information about a given uri
+ * @brief Fetch information (protocol endpoints and user information) about a given uri
*
* @param string $uri Address that should be probed
* @param string $network Test for this specific network
if ($cache) {
$result = Cache::get("probe_url:".$network.":".$uri);
if (!is_null($result)) {
- $result = unserialize($result);
return $result;
}
}
// Only store into the cache if the value seems to be valid
if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
- Cache::set("probe_url:".$network.":".$uri,serialize($data), CACHE_DAY);
+ Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);
/// @todo temporary fix - we need a real contact update function that updates only changing fields
/// The biggest problem is the avatar picture that could have a reduced image size.
}
/**
- * @brief Detect information about a given uri
+ * @brief Fetch information (protocol endpoints and user information) about a given uri
+ *
+ * This function is only called by the "uri" function that adds caching and rearranging of data.
*
* @param string $uri Address that should be probed
* @param string $network Test for this specific network
*/
private function detect($uri, $network, $uid) {
if (strstr($uri, '@')) {
- // If the URI starts with "mailto:" then jum directly to the mail detection
+ // If the URI starts with "mailto:" then jump directly to the mail detection
if (strpos($url,'mailto:') !== false) {
$uri = str_replace('mailto:', '', $url);
return self::mail($uri, $uid);
return array("network" => NETWORK_TWITTER);
$lrdd = self::xrd($host);
+
if (!$lrdd)
return self::mail($uri, $uid);
!isset($parts["path"]))
return false;
- // todo: Ports?
+ /// @todo: Ports?
$host = $parts["host"];
if ($host == 'twitter.com')
$path = str_replace('{uri}', urlencode($addr), $link);
$webfinger = self::webfinger($path);
+ // Mastodon needs to have it with "acct:"
+ if (!$webfinger) {
+ $path = str_replace('{uri}', urlencode("acct:".$addr), $link);
+ $webfinger = self::webfinger($path);
+ }
+
// If webfinger wasn't successful then try it with the URL - possibly in the format https://...
if (!$webfinger AND ($uri != $addr)) {
$path = str_replace('{uri}', urlencode($uri), $link);
}
/**
- * @brief Do a webfinger request
+ * @brief Perform a webfinger request.
+ *
+ * For details see RFC 7033: <https://tools.ietf.org/html/rfc7033>
*
* @param string $url Address that should be probed
*
}
/**
- * @brief Poll the noscrape page (Friendica specific)
+ * @brief Poll the Friendica specific noscrape page.
+ *
+ * "noscrape" is a faster alternative to fetch the data from the hcard.
+ * This functionality was originally created for the directory.
*
* @param string $noscrape Link to the noscrape page
* @param array $data The already fetched data
}
/**
- * @brief Fetch data from a DFRN profile page
+ * @brief Fetch data from a DFRN profile page and via "noscrape"
*
* @param string $profile Link to the profile page
*
$data = array();
+ logger("Check profile ".$profile, LOGGER_DEBUG);
+
// Fetch data via noscrape - this is faster
$noscrape = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile);
$data = self::poll_noscrape($noscrape, $data);
$prof_data["fn"] = $data["name"];
$prof_data["key"] = $data["pubkey"];
+ logger("Result for profile ".$profile.": ".print_r($prof_data, true), LOGGER_DEBUG);
+
return $prof_data;
}
*/
private function poll_hcard($hcard, $data, $dfrn = false) {
+ $content = fetch_url($hcard);
+ if (!$content)
+ return false;
+
$doc = new DOMDocument();
- if (!@$doc->loadHTMLFile($hcard))
+ if (!@$doc->loadHTML($content))
return false;
$xpath = new DomXPath($doc);
if (!is_object($vcards))
return false;
- if ($vcards->length == 0)
- return false;
+ if ($vcards->length > 0) {
+ $vcard = $vcards->item(0);
- $vcard = $vcards->item(0);
+ // We have to discard the guid from the hcard in favour of the guid from lrdd
+ // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
+ if (($search->length > 0) AND ($data["guid"] == ""))
+ $data["guid"] = $search->item(0)->nodeValue;
- // We have to discard the guid from the hcard in favour of the guid from lrdd
- // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
- $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
- if (($search->length > 0) AND ($data["guid"] == ""))
- $data["guid"] = $search->item(0)->nodeValue;
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
+ if ($search->length > 0)
+ $data["nick"] = $search->item(0)->nodeValue;
- $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
- if ($search->length > 0)
- $data["nick"] = $search->item(0)->nodeValue;
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
+ if ($search->length > 0)
+ $data["name"] = $search->item(0)->nodeValue;
- $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
- if ($search->length > 0)
- $data["name"] = $search->item(0)->nodeValue;
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
+ if ($search->length > 0)
+ $data["searchable"] = $search->item(0)->nodeValue;
- $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
- if ($search->length > 0)
- $data["searchable"] = $search->item(0)->nodeValue;
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
+ if ($search->length > 0) {
+ $data["pubkey"] = $search->item(0)->nodeValue;
+ if (strstr($data["pubkey"], 'RSA '))
+ $data["pubkey"] = rsatopem($data["pubkey"]);
+ }
- $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
- if ($search->length > 0) {
- $data["pubkey"] = $search->item(0)->nodeValue;
- if (strstr($data["pubkey"], 'RSA '))
- $data["pubkey"] = rsatopem($data["pubkey"]);
+ $search = $xpath->query("//*[@id='pod_location']", $vcard); // */
+ if ($search->length > 0)
+ $data["baseurl"] = trim($search->item(0)->nodeValue, "/");
}
- $search = $xpath->query("//*[@id='pod_location']", $vcard); // */
- if ($search->length > 0)
- $data["baseurl"] = trim($search->item(0)->nodeValue, "/");
-
$avatar = array();
$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
foreach ($photos AS $photo) {
isset($data["pubkey"]) AND ($hcard != "")) {
$data["network"] = NETWORK_DIASPORA;
+ // The Diaspora handle must always be lowercase
+ $data["addr"] = strtolower($data["addr"]);
+
// We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
$data["notify"] = $data["baseurl"]."/receive/users/".$data["guid"];
$data["batch"] = $data["baseurl"]."/receive/public";
if (strstr($alias, "@"))
$data["addr"] = str_replace('acct:', '', $alias);
+ if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@"))
+ $data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
+
$pubkey = "";
foreach ($webfinger["links"] AS $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
$pubkey = substr($pubkey, strpos($pubkey, ',') + 1);
else
$pubkey = substr($pubkey, 5);
- } else
+ } elseif (normalise_link($pubkey) == 'http://')
$pubkey = fetch_url($pubkey);
$key = explode(".", $pubkey);
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
- if(count($x) && count($r)) {
+ if (dbm::is_result($x) && dbm::is_result($r)) {
$mailbox = construct_mailbox_name($r[0]);
$password = '';
openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']);
projects / friendica.git / blobdiff