*
* @return array Ordered data
*/
- private function rearrangeData($data) {
+ private static function rearrangeData($data) {
$fields = array("name", "nick", "guid", "url", "addr", "alias",
"photo", "community", "keywords", "location", "about",
"batch", "notify", "poll", "request", "confirm", "poco",
return $newdata;
}
+ /**
+ * @brief Check if the hostname belongs to the own server
+ *
+ * @param string $host The hostname that is to be checked
+ *
+ * @return bool Does the testes hostname belongs to the own server?
+ */
+ private static function ownHost($host) {
+ $own_host = get_app()->get_hostname();
+
+ $parts = parse_url($host);
+
+ if (!isset($parts['scheme'])) {
+ $parts = parse_url('http://'.$host);
+ }
+
+ if (!isset($parts['host'])) {
+ return false;
+ }
+ return $parts['host'] == $own_host;
+ }
+
/**
* @brief Probes for XRD data
*
* 'lrdd-xml' => Link to LRDD endpoint in XML format
* 'lrdd-json' => Link to LRDD endpoint in JSON format
*/
- private function xrd($host) {
+ private static function xrd($host) {
// Reset the static variable
self::$baseurl = '';
$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0;
+ logger("Probing for ".$host, LOGGER_DEBUG);
+
$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
- if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+ if (($ret['errno'] == CURLE_OPERATION_TIMEDOUT) && !self::ownHost($ssl_url)) {
+ logger("Probing timeout for ".$ssl_url, LOGGER_DEBUG);
return false;
}
$xml = $ret['body'];
if (!is_object($xrd)) {
$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+ logger("Probing timeout for ".$url, LOGGER_DEBUG);
return false;
}
$xml = $ret['body'];
$xrd = parse_xml_string($xml, false);
}
if (!is_object($xrd)) {
- return false;
+ logger("No xrd object found for ".$host, LOGGER_DEBUG);
+ return array();
}
$links = xml::element_to_array($xrd);
if (!isset($links["xrd"]["link"])) {
- return false;
+ logger("No xrd data found for ".$host, LOGGER_DEBUG);
+ return array();
}
$xrd_data = array();
foreach ($links["xrd"]["link"] as $value => $link) {
- if (isset($link["@attributes"])) {
+ if (!empty($link["@attributes"])) {
$attributes = $link["@attributes"];
} elseif ($value == "@attributes") {
$attributes = $link;
}
if (($attributes["rel"] == "lrdd")
- AND ($attributes["type"] == "application/xrd+xml")
+ && ($attributes["type"] == "application/xrd+xml")
) {
$xrd_data["lrdd-xml"] = $attributes["template"];
} elseif (($attributes["rel"] == "lrdd")
- AND ($attributes["type"] == "application/json")
+ && ($attributes["type"] == "application/json")
) {
$xrd_data["lrdd-json"] = $attributes["template"];
} elseif ($attributes["rel"] == "lrdd") {
self::$baseurl = "http://".$host;
+ logger("Probing successful for ".$host, LOGGER_DEBUG);
+
return $xrd_data;
}
*
* @return string profile link
*/
-
public static function webfingerDfrn($webbie, &$hcard_url) {
$profile_link = '';
if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
$profile_link = $link['@attributes']['href'];
}
- if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) {
+ if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) && ($profile_link == "")) {
$profile_link = 'stat:'.$link['@attributes']['template'];
}
if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
$lrdd = self::xrd($uri);
$webfinger = null;
+ if (is_bool($lrdd)) {
+ return array();
+ }
+
if (!$lrdd) {
$parts = @parse_url($uri);
if (!$parts) {
}
$host = $parts["host"];
- if (isset($parts["port"])) {
+ if (!empty($parts["port"])) {
$host .= ':'.$parts["port"];
}
do {
$lrdd = self::xrd($host);
$host .= "/".array_shift($path_parts);
- } while (!$lrdd AND (sizeof($path_parts) > 0));
+ } while (!$lrdd && (sizeof($path_parts) > 0));
}
if (!$lrdd) {
+ logger("No lrdd data found for ".$uri, LOGGER_DEBUG);
return array();
}
$path = str_replace('{uri}', urlencode($uri), $link);
$webfinger = self::webfinger($path);
- if (!$webfinger AND (strstr($uri, "@"))) {
+ if (!$webfinger && (strstr($uri, "@"))) {
$path = str_replace('{uri}', urlencode("acct:".$uri), $link);
$webfinger = self::webfinger($path);
}
// Special treatment for Mastodon
// Problem is that Mastodon uses an URL format like http://domain.tld/@nick
// But the webfinger for this format fails.
- if (!$webfinger AND isset($nick)) {
+ if (!$webfinger && !empty($nick)) {
// Mastodon uses a "@" as prefix for usernames in their url format
$nick = ltrim($nick, '@');
}
if (!is_array($webfinger["links"])) {
+ logger("No webfinger links found for ".$uri, LOGGER_DEBUG);
return false;
}
$data["photo"] = App::get_baseurl().'/images/person-175.jpg';
}
- if (!isset($data["name"]) OR ($data["name"] == "")) {
- if (isset($data["nick"])) {
+ if (empty($data["name"])) {
+ if (!empty($data["nick"])) {
$data["name"] = $data["nick"];
}
}
}
- if (!isset($data["nick"]) OR ($data["nick"] == "")) {
+ if (empty($data["nick"])) {
$data["nick"] = strtolower($data["name"]);
if (strpos($data['nick'], ' ')) {
/// It should only be updated if the existing picture isn't existing anymore.
/// We only update the contact when it is no probing for a specific network.
if (($data['network'] != NETWORK_FEED)
- AND ($network == "")
- AND $data["name"]
- AND $data["nick"]
- AND $data["url"]
- AND $data["addr"]
- AND $data["poll"]
+ && ($network == "")
+ && $data["name"]
+ && $data["nick"]
+ && $data["url"]
+ && $data["addr"]
+ && $data["poll"]
) {
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s',
`notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s'
return $data;
}
+ /**
+ * @brief Switch the scheme of an url between http and https
+ *
+ * @param string $url URL
+ *
+ * @return string switched URL
+ */
+ private static function switchScheme($url) {
+ $parts = parse_url($url);
+
+ if (!isset($parts['scheme'])) {
+ return $url;
+ }
+
+ if ($parts['scheme'] == 'http') {
+ $url = str_replace('http://', 'https://', $url);
+ } elseif ($parts['scheme'] == 'https') {
+ $url = str_replace('https://', 'http://', $url);
+ }
+
+ return $url;
+ }
+
+ /**
+ * @brief Checks if a profile url should be OStatus but only provides partial information
+ *
+ * @param array $webfinger Webfinger data
+ * @param string $lrdd Path template for webfinger request
+ *
+ * @return array fixed webfinger data
+ */
+ private static function fixOstatus($webfinger, $lrdd) {
+ if (empty($webfinger['links']) || empty($webfinger['subject'])) {
+ return $webfinger;
+ }
+
+ $is_ostatus = false;
+ $has_key = false;
+
+ foreach ($webfinger['links'] as $link) {
+ if ($link['rel'] == NAMESPACE_OSTATUSSUB) {
+ $is_ostatus = true;
+ }
+ if ($link['rel'] == 'magic-public-key') {
+ $has_key = true;
+ }
+ }
+
+ if (!$is_ostatus || $has_key) {
+ return $webfinger;
+ }
+
+ $url = self::switchScheme($webfinger['subject']);
+ $path = str_replace('{uri}', urlencode($url), $lrdd);
+ $webfinger2 = self::webfinger($path);
+
+ // Is the new webfinger detectable as OStatus?
+ if (self::ostatus($webfinger2, true)) {
+ $webfinger = $webfinger2;
+ }
+
+ return $webfinger;
+ }
+
/**
* @brief Fetch information (protocol endpoints and user information) about a given uri
*
*
* @return array uri data
*/
- private function detect($uri, $network, $uid) {
+ private static function detect($uri, $network, $uid) {
$parts = parse_url($uri);
- if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) {
+ if (!empty($parts["scheme"]) && !empty($parts["host"]) && !empty($parts["path"])) {
$host = $parts["host"];
- if (isset($parts["port"])) {
+ if (!empty($parts["port"])) {
$host .= ':'.$parts["port"];
}
}
$lrdd = self::xrd($host);
+ if (is_bool($lrdd)) {
+ return array();
+ }
+
$path_parts = explode("/", trim($parts["path"], "/"));
- while (!$lrdd AND (sizeof($path_parts) > 1)) {
+ while (!$lrdd && (sizeof($path_parts) > 1)) {
$host .= "/".array_shift($path_parts);
$lrdd = self::xrd($host);
}
if (!$lrdd) {
+ logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
return self::feed($uri);
}
$nick = array_pop($path_parts);
}
$lrdd = self::xrd($host);
+ if (is_bool($lrdd)) {
+ return array();
+ }
+
if (!$lrdd) {
+ logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
return self::mail($uri, $uid);
}
$addr = $uri;
} else {
+ logger("Uri ".$uri." was not detectable", LOGGER_DEBUG);
return false;
}
$path = str_replace('{uri}', urlencode($uri), $link);
$webfinger = self::webfinger($path);
+ // Fix possible problems with GNU Social probing to wrong scheme
+ $webfinger = self::fixOstatus($webfinger, $link);
+
// We cannot be sure that the detected address was correct, so we don't use the values
- if ($webfinger AND ($uri != $addr)) {
+ if ($webfinger && ($uri != $addr)) {
$nick = "";
$addr = "";
}
if (in_array($network, array("", NETWORK_DFRN))) {
$result = self::dfrn($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) {
$result = self::diaspora($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_OSTATUS)) {
$result = self::ostatus($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
$result = self::pumpio($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
$result = self::feed($uri);
} else {
// We overwrite the detected nick with our try if the previois routines hadn't detected it.
// Additionally it is overwritten when the nickname doesn't make sense (contains spaces).
- if ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != "")) {
+ if ((empty($result["nick"]) || (strstr($result["nick"], " "))) && ($nick != "")) {
$result["nick"] = $nick;
}
- if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != "")) {
+ if (empty($result["addr"]) && ($addr != "")) {
$result["addr"] = $addr;
}
}
logger($uri." is ".$result["network"], LOGGER_DEBUG);
- if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) {
+ if (empty($result["baseurl"])) {
$pos = strpos($result["url"], $host);
if ($pos) {
$result["baseurl"] = substr($result["url"], 0, $pos).$host;
*
* @return array webfinger data
*/
- private function webfinger($url) {
+ private static function webfinger($url) {
$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0;
$webfinger = json_decode($data, true);
if (!isset($webfinger["links"])) {
+ logger("No json webfinger links for ".$url, LOGGER_DEBUG);
return false;
}
$xrd_arr = xml::element_to_array($xrd);
if (!isset($xrd_arr["xrd"]["link"])) {
+ logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
return false;
}
$webfinger = array();
- if (isset($xrd_arr["xrd"]["subject"])) {
+ if (!empty($xrd_arr["xrd"]["subject"])) {
$webfinger["subject"] = $xrd_arr["xrd"]["subject"];
}
- if (isset($xrd_arr["xrd"]["alias"])) {
+ if (!empty($xrd_arr["xrd"]["alias"])) {
$webfinger["aliases"] = $xrd_arr["xrd"]["alias"];
}
$webfinger["links"] = array();
foreach ($xrd_arr["xrd"]["link"] as $value => $data) {
- if (isset($data["@attributes"])) {
+ if (!empty($data["@attributes"])) {
$attributes = $data["@attributes"];
} elseif ($value == "@attributes") {
$attributes = $data;
*
* @return array noscrape data
*/
- private function pollNoscrape($noscrape_url, $data) {
+ private static function pollNoscrape($noscrape_url, $data) {
$ret = z_fetch_url($noscrape_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$content = $ret['body'];
if (!$content) {
+ logger("Empty body for ".$noscrape_url, LOGGER_DEBUG);
return false;
}
$json = json_decode($content, true);
if (!is_array($json)) {
+ logger("No json data for ".$noscrape_url, LOGGER_DEBUG);
return false;
}
- if (isset($json["fn"])) {
+ if (!empty($json["fn"])) {
$data["name"] = $json["fn"];
}
- if (isset($json["addr"])) {
+ if (!empty($json["addr"])) {
$data["addr"] = $json["addr"];
}
- if (isset($json["nick"])) {
+ if (!empty($json["nick"])) {
$data["nick"] = $json["nick"];
}
- if (isset($json["comm"])) {
+ if (!empty($json["comm"])) {
$data["community"] = $json["comm"];
}
- if (isset($json["tags"])) {
+ if (!empty($json["tags"])) {
$keywords = implode(" ", $json["tags"]);
if ($keywords != "") {
$data["keywords"] = $keywords;
$data["location"] = $location;
}
- if (isset($json["about"])) {
+ if (!empty($json["about"])) {
$data["about"] = $json["about"];
}
- if (isset($json["key"])) {
+ if (!empty($json["key"])) {
$data["pubkey"] = $json["key"];
}
- if (isset($json["photo"])) {
+ if (!empty($json["photo"])) {
$data["photo"] = $json["photo"];
}
- if (isset($json["dfrn-request"])) {
+ if (!empty($json["dfrn-request"])) {
$data["request"] = $json["dfrn-request"];
}
- if (isset($json["dfrn-confirm"])) {
+ if (!empty($json["dfrn-confirm"])) {
$data["confirm"] = $json["dfrn-confirm"];
}
- if (isset($json["dfrn-notify"])) {
+ if (!empty($json["dfrn-notify"])) {
$data["notify"] = $json["dfrn-notify"];
}
- if (isset($json["dfrn-poll"])) {
+ if (!empty($json["dfrn-poll"])) {
$data["poll"] = $json["dfrn-poll"];
}
$data = self::pollNoscrape($noscrape_url, $data);
if (!isset($data["notify"])
- OR !isset($data["confirm"])
- OR !isset($data["request"])
- OR !isset($data["poll"])
- OR !isset($data["poco"])
- OR !isset($data["name"])
- OR !isset($data["photo"])
+ || !isset($data["confirm"])
+ || !isset($data["request"])
+ || !isset($data["poll"])
+ || !isset($data["poco"])
+ || !isset($data["name"])
+ || !isset($data["photo"])
) {
$data = self::pollHcard($profile_link, $data, true);
}
*
* @return array DFRN data
*/
- private function dfrn($webfinger) {
+ private static function dfrn($webfinger) {
$hcard_url = "";
$data = array();
foreach ($webfinger["links"] as $link) {
- if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != "")) {
+ if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
$data["network"] = NETWORK_DFRN;
- } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
$hcard_url = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
$data["poco"] = $link["href"];
- } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && ($link["href"] != "")) {
$data["photo"] = $link["href"];
- } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
$data["baseurl"] = trim($link["href"], '/');
- } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
$data["guid"] = $link["href"];
- } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
$data["pubkey"] = base64_decode($link["href"]);
- //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+ //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) {
$data["pubkey"] = rsatopem($data["pubkey"]);
}
}
}
- if (!isset($data["network"]) OR ($hcard_url == "")) {
+ if (is_array($webfinger["aliases"])) {
+ foreach ($webfinger["aliases"] as $alias) {
+ if (substr($alias, 0, 5) == 'acct:') {
+ $data["addr"] = substr($alias, 5);
+ }
+ }
+ }
+
+ if (!isset($data["network"]) || ($hcard_url == "")) {
return false;
}
$data = self::pollNoscrape($noscrape_url, $data);
if (isset($data["notify"])
- AND isset($data["confirm"])
- AND isset($data["request"])
- AND isset($data["poll"])
- AND isset($data["name"])
- AND isset($data["photo"])
+ && isset($data["confirm"])
+ && isset($data["request"])
+ && isset($data["poll"])
+ && isset($data["name"])
+ && isset($data["photo"])
) {
return $data;
}
*
* @return array hcard data
*/
- private function pollHcard($hcard_url, $data, $dfrn = false) {
+ private static function pollHcard($hcard_url, $data, $dfrn = false) {
$ret = z_fetch_url($hcard_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
// 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"] == "")) {
+ if (($search->length > 0) && ($data["guid"] == "")) {
$data["guid"] = $search->item(0)->nodeValue;
}
$attr[$attribute->name] = trim($attribute->value);
}
- if (isset($attr["src"]) AND isset($attr["width"])) {
+ if (isset($attr["src"]) && isset($attr["width"])) {
$avatar[$attr["width"]] = $attr["src"];
}
// We don't have a width. So we just take everything that we got.
// This is a Hubzilla workaround which doesn't send a width.
- if ((sizeof($avatar) == 0) AND isset($attr["src"])) {
+ if ((sizeof($avatar) == 0) && !empty($attr["src"])) {
$avatar[] = $attr["src"];
}
}
*
* @return array Diaspora data
*/
- private function diaspora($webfinger) {
+ private static function diaspora($webfinger) {
$hcard_url = "";
$data = array();
foreach ($webfinger["links"] as $link) {
- if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
+ if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
$hcard_url = $link["href"];
- } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
$data["baseurl"] = trim($link["href"], '/');
- } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
$data["guid"] = $link["href"];
- } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
$data["poco"] = $link["href"];
- } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
$data["notify"] = $link["href"];
- } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
$data["pubkey"] = base64_decode($link["href"]);
- //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+ //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) {
$data["pubkey"] = rsatopem($data["pubkey"]);
}
}
}
- if (!isset($data["url"]) OR ($hcard_url == "")) {
+ if (!isset($data["url"]) || ($hcard_url == "")) {
return false;
}
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
- if (normalise_link($alias) != normalise_link($data["url"]) AND ! strstr($alias, "@")) {
+ if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
$data["alias"] = $alias;
}
}
}
if (isset($data["url"])
- AND isset($data["guid"])
- AND isset($data["baseurl"])
- AND isset($data["pubkey"])
- AND ($hcard_url != "")
+ && isset($data["guid"])
+ && isset($data["baseurl"])
+ && isset($data["pubkey"])
+ && ($hcard_url != "")
) {
$data["network"] = NETWORK_DIASPORA;
* @brief Check for OStatus contact
*
* @param array $webfinger Webfinger data
+ * @param bool $short Short detection mode
*
- * @return array OStatus data
+ * @return array|bool OStatus data or "false" on error or "true" on short mode
*/
- private function ostatus($webfinger) {
+ private static function ostatus($webfinger, $short = false) {
$data = array();
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
}
}
- if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@")) {
+ if (is_string($webfinger["subject"]) && 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 ($link["type"] == "text/html")
- AND ($link["href"] != "")
+ && ($link["type"] == "text/html")
+ && ($link["href"] != "")
) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
$data["notify"] = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == "magic-public-key") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "magic-public-key") && ($link["href"] != "")) {
$pubkey = $link["href"];
if (substr($pubkey, 0, 5) === 'data:') {
}
}
- if (isset($data["notify"]) AND isset($data["pubkey"])
- AND isset($data["poll"])
- AND isset($data["url"])
+ if (isset($data["notify"]) && isset($data["pubkey"])
+ && isset($data["poll"])
+ && isset($data["url"])
) {
$data["network"] = NETWORK_OSTATUS;
} else {
return false;
}
+
+ if ($short) {
+ return true;
+ }
+
// Fetch all additional data from the feed
$ret = z_fetch_url($data["poll"]);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
*
* @return array profile data
*/
- private function pumpioProfileData($profile_link) {
+ private static function pumpioProfileData($profile_link) {
$doc = new DOMDocument();
if (!@$doc->loadHTMLFile($profile_link)) {
*
* @return array pump.io data
*/
- private function pumpio($webfinger) {
+ private static function pumpio($webfinger) {
$data = array();
foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page")
- AND ($link["type"] == "text/html")
- AND ($link["href"] != "")
+ && ($link["type"] == "text/html")
+ && ($link["href"] != "")
) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "activity-inbox") && ($link["href"] != "")) {
$data["notify"] = $link["href"];
- } elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "activity-outbox") && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == "dialback") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "dialback") && ($link["href"] != "")) {
$data["dialback"] = $link["href"];
}
}
- if (isset($data["poll"]) AND isset($data["notify"])
- AND isset($data["dialback"])
- AND isset($data["url"])
+ if (isset($data["poll"]) && isset($data["notify"])
+ && isset($data["dialback"])
+ && isset($data["url"])
) {
// by now we use these fields only for the network type detection
// So we unset all data that isn't used at the moment
*
* @return string feed link
*/
- private function getFeedLink($url) {
+ private static function getFeedLink($url) {
$doc = new DOMDocument();
if (!@$doc->loadHTMLFile($url)) {
*
* @return array feed data
*/
- private function feed($url, $probe = true) {
+ private static function feed($url, $probe = true) {
$ret = z_fetch_url($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
*
* @return array mail data
*/
- private function mail($uri, $uid) {
+ private static function mail($uri, $uid) {
if (!validate_email($uri)) {
return false;
projects / friendica.git / blobdiff