<?php
-
+/**
+ * @file src/Network/Probe.php
+ */
namespace Friendica\Network;
/**
* @file src/Network/Probe.php
* @brief Functions for probing URL
- *
*/
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
+use Friendica\Model\Profile;
+use Friendica\Protocol\Email;
+use Friendica\Protocol\Feed;
+use Friendica\Util\Crypto;
+use Friendica\Util\Network;
use Friendica\Util\XML;
use dba;
-use DomXPath;
+use DOMXPath;
use DOMDocument;
-require_once 'include/feed.php';
-require_once 'include/email.php';
-require_once 'include/network.php';
+require_once 'include/dba.php';
/**
* @brief This class contain functions for probing URL
*
*/
-class Probe {
-
+class Probe
+{
private static $baseurl;
/**
*
* @return array Ordered data
*/
- private static function rearrangeData($data) {
- $fields = array("name", "nick", "guid", "url", "addr", "alias",
+ private static function rearrangeData($data)
+ {
+ $fields = ["name", "nick", "guid", "url", "addr", "alias",
"photo", "community", "keywords", "location", "about",
"batch", "notify", "poll", "request", "confirm", "poco",
- "priority", "network", "pubkey", "baseurl");
+ "priority", "network", "pubkey", "baseurl"];
- $newdata = array();
+ $newdata = [];
foreach ($fields as $field) {
if (isset($data[$field])) {
$newdata[$field] = $data[$field];
*
* @return bool Does the testes hostname belongs to the own server?
*/
- private static function ownHost($host) {
+ private static function ownHost($host)
+ {
$own_host = get_app()->get_hostname();
$parts = parse_url($host);
/**
* @brief Probes for webfinger path via "host-meta"
*
+ * We have to check if the servers in the future still will offer this.
+ * It seems as if it was dropped from the standard.
+ *
* @param string $host The host part of an url
*
* @return array with template and type of the webfinger template for JSON or XML
*/
- private static function hostMeta($host) {
-
+ private static function hostMeta($host)
+ {
// Reset the static variable
self::$baseurl = '';
logger("Probing for ".$host, LOGGER_DEBUG);
- $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
+ $ret = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
if ($ret['success']) {
$xml = $ret['body'];
- $xrd = parse_xml_string($xml, false);
+ $xrd = XML::parseString($xml, false);
$host_url = 'https://'.$host;
}
if (!is_object($xrd)) {
- $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
+ $ret = Network::curl($url, false, $redirects, ['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);
+ $xrd = XML::parseString($xml, false);
$host_url = 'http://'.$host;
}
if (!is_object($xrd)) {
logger("No xrd object found for ".$host, LOGGER_DEBUG);
- return array();
+ return [];
}
- $links = XML::element_to_array($xrd);
+ $links = XML::elementToArray($xrd);
if (!isset($links["xrd"]["link"])) {
logger("No xrd data found for ".$host, LOGGER_DEBUG);
- return array();
+ return [];
}
- $lrdd = array();
+ $lrdd = [];
// The following webfinger path is defined in RFC 7033 https://tools.ietf.org/html/rfc7033
// Problem is that Hubzilla currently doesn't provide all data in the JSON webfinger
// compared to the XML webfinger. So this is commented out by now.
* amended 7/9/2011 to return an hcard which could save potentially loading
* a lengthy content page to scrape dfrn attributes
*
- * @param string $webbie Address that should be probed
+ * @param string $webbie Address that should be probed
* @param string $hcard_url Link to the hcard - is returned by reference
*
* @return string profile link
*/
- public static function webfingerDfrn($webbie, &$hcard_url) {
-
+ public static function webfingerDfrn($webbie, &$hcard_url)
+ {
$profile_link = '';
$links = self::lrdd($webbie);
/**
* @brief Check an URI for LRDD data
*
- * this is a replacement for the "lrdd" function in include/network.php.
+ * this is a replacement for the "lrdd" function.
* It isn't used in this class and has some redundancies in the code.
* When time comes we can check the existing calls for "lrdd" if we can rework them.
*
*
* @return array uri data
*/
- public static function lrdd($uri) {
-
+ public static function lrdd($uri)
+ {
$lrdd = self::hostMeta($uri);
$webfinger = null;
if (is_bool($lrdd)) {
- return array();
+ return [];
}
if (!$lrdd) {
$parts = @parse_url($uri);
if (!$parts) {
- return array();
+ return [];
}
$host = $parts["host"];
if (!$lrdd) {
logger("No lrdd data found for ".$uri, LOGGER_DEBUG);
- return array();
+ return [];
}
- foreach ($lrdd AS $type => $template) {
+ foreach ($lrdd as $type => $template) {
if ($webfinger) {
continue;
}
return false;
}
- $data = array();
+ $data = [];
foreach ($webfinger["links"] as $link) {
- $data[] = array("@attributes" => $link);
+ $data[] = ["@attributes" => $link];
}
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
- $data[] = array("@attributes" =>
- array("rel" => "alias",
- "href" => $alias));
+ $data[] = ["@attributes" =>
+ ["rel" => "alias",
+ "href" => $alias]];
}
}
/**
* @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
- * @param integer $uid User ID for the probe (only used for mails)
- * @param boolean $cache Use cached values?
+ * @param string $uri Address that should be probed
+ * @param string $network Test for this specific network
+ * @param integer $uid User ID for the probe (only used for mails)
+ * @param boolean $cache Use cached values?
*
* @return array uri data
*/
- public static function uri($uri, $network = "", $uid = -1, $cache = true) {
-
+ public static function uri($uri, $network = "", $uid = -1, $cache = true)
+ {
if ($cache) {
$result = Cache::get("Probe::uri:".$network.":".$uri);
if (!is_null($result)) {
$data["url"] = $uri;
}
- if ($data["photo"] != "") {
- $data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
+ if (x($data, "photo")) {
+ $data["baseurl"] = Network::getUrlMatch(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
} else {
$data["photo"] = System::baseUrl().'/images/person-175.jpg';
}
$data["name"] = $data["nick"];
}
- if ($data["name"] == "") {
+ if (!x($data, "name")) {
$data["name"] = $data["url"];
}
}
$data = self::rearrangeData($data);
// Only store into the cache if the value seems to be valid
- if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
+ if (!in_array($data['network'], [NETWORK_PHANTOM, NETWORK_MAIL])) {
Cache::set("Probe::uri:".$network.":".$uri, $data, CACHE_DAY);
/// @todo temporary fix - we need a real contact update function that updates only changing fields
&& $data["addr"]
&& $data["poll"]
) {
- $fields = array('name' => $data['name'],
+ $fields = ['name' => $data['name'],
'nick' => $data['nick'],
'url' => $data['url'],
'addr' => $data['addr'],
'about' => $data['about'],
'notify' => $data['notify'],
'network' => $data['network'],
- 'server_url' => $data['baseurl']);
+ 'server_url' => $data['baseurl']];
- $fieldnames = array();
+ $fieldnames = [];
- foreach ($fields AS $key => $val) {
+ foreach ($fields as $key => $val) {
if (empty($val)) {
unset($fields[$key]);
} else {
$fields['updated'] = DBM::date();
- $condition = array('nurl' => normalise_link($data["url"]));
+ $condition = ['nurl' => normalise_link($data["url"])];
- $old_fields = dba::select('gcontact', $fieldnames, $condition, array('limit' => 1));
+ $old_fields = dba::selectFirst('gcontact', $fieldnames, $condition);
dba::update('gcontact', $fields, $condition, $old_fields);
- $fields = array('name' => $data['name'],
+ $fields = ['name' => $data['name'],
'nick' => $data['nick'],
'url' => $data['url'],
'addr' => $data['addr'],
'confirm' => $data['confirm'],
'poco' => $data['poco'],
'network' => $data['network'],
- 'success_update' => DBM::date());
+ 'success_update' => DBM::date()];
- $fieldnames = array();
+ $fieldnames = [];
- foreach ($fields AS $key => $val) {
+ foreach ($fields as $key => $val) {
if (empty($val)) {
unset($fields[$key]);
} else {
}
}
- $condition = array('nurl' => normalise_link($data["url"]), 'self' => false, 'uid' => 0);
+ $condition = ['nurl' => normalise_link($data["url"]), 'self' => false, 'uid' => 0];
- $old_fields = dba::select('contact', $fieldnames, $condition, array('limit' => 1));
+ $old_fields = dba::selectFirst('contact', $fieldnames, $condition);
dba::update('contact', $fields, $condition, $old_fields);
}
*
* @return string switched URL
*/
- private static function switchScheme($url) {
+ private static function switchScheme($url)
+ {
$parts = parse_url($url);
if (!isset($parts['scheme'])) {
/**
* @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
+ * @param array $webfinger Webfinger data
+ * @param string $lrdd Path template for webfinger request
+ * @param string $type type
*
* @return array fixed webfinger data
*/
- private static function fixOstatus($webfinger, $lrdd, $type) {
+ private static function fixOStatus($webfinger, $lrdd, $type)
+ {
if (empty($webfinger['links']) || empty($webfinger['subject'])) {
return $webfinger;
}
*
* 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
- * @param integer $uid User ID for the probe (only used for mails)
+ * @param string $uri Address that should be probed
+ * @param string $network Test for this specific network
+ * @param integer $uid User ID for the probe (only used for mails)
*
* @return array uri data
*/
- private static function detect($uri, $network, $uid) {
+ private static function detect($uri, $network, $uid)
+ {
$parts = parse_url($uri);
if (!empty($parts["scheme"]) && !empty($parts["host"]) && !empty($parts["path"])) {
}
if ($host == 'twitter.com') {
- return array("network" => NETWORK_TWITTER);
+ return ["network" => NETWORK_TWITTER];
}
$lrdd = self::hostMeta($host);
if (is_bool($lrdd)) {
- return array();
+ return [];
}
$path_parts = explode("/", trim($parts["path"], "/"));
$nick = ltrim($nick, '@');
$addr = $nick."@".$host;
-
} elseif (strstr($uri, '@')) {
// If the URI starts with "mailto:" then jump directly to the mail detection
if (strpos($uri, 'mailto:') !== false) {
$nick = substr($uri, 0, strpos($uri, '@'));
if (strpos($uri, '@twitter.com')) {
- return array("network" => NETWORK_TWITTER);
+ return ["network" => NETWORK_TWITTER];
}
$lrdd = self::hostMeta($host);
if (is_bool($lrdd)) {
- return array();
+ return [];
}
if (!$lrdd) {
return self::mail($uri, $uid);
}
$addr = $uri;
-
} else {
logger("Uri ".$uri." was not detectable", LOGGER_DEBUG);
return false;
/// @todo Do we need the prefix "acct:" or "acct://"?
- foreach ($lrdd AS $type => $template) {
+ foreach ($lrdd as $type => $template) {
if ($webfinger) {
continue;
}
$webfinger = self::webfinger($path, $type);
// Fix possible problems with GNU Social probing to wrong scheme
- $webfinger = self::fixOstatus($webfinger, $template, $type);
+ $webfinger = self::fixOStatus($webfinger, $template, $type);
// We cannot be sure that the detected address was correct, so we don't use the values
if ($webfinger && ($uri != $addr)) {
logger("Probing ".$uri, LOGGER_DEBUG);
- if (in_array($network, array("", NETWORK_DFRN))) {
+ if (in_array($network, ["", NETWORK_DFRN])) {
$result = self::dfrn($webfinger);
}
if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) {
$result = self::ostatus($webfinger);
}
if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
- $result = self::pumpio($webfinger);
+ $result = self::pumpio($webfinger, $addr);
}
if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
$result = self::feed($uri);
$result["baseurl"] = substr($result["url"], 0, $pos).$host;
}
}
-
return $result;
}
*
* For details see RFC 7033: <https://tools.ietf.org/html/rfc7033>
*
- * @param string $url Address that should be probed
+ * @param string $url Address that should be probed
+ * @param string $type type
*
* @return array webfinger data
*/
- private static function webfinger($url, $type) {
-
+ private static function webfinger($url, $type)
+ {
$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0;
- $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => $type));
- if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+ $ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+ if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$data = $ret['body'];
}
// If it is not JSON, maybe it is XML
- $xrd = parse_xml_string($data, false);
+ $xrd = XML::parseString($data, false);
if (!is_object($xrd)) {
logger("No webfinger data retrievable for ".$url, LOGGER_DEBUG);
return false;
}
- $xrd_arr = XML::element_to_array($xrd);
+ $xrd_arr = XML::elementToArray($xrd);
if (!isset($xrd_arr["xrd"]["link"])) {
logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
return false;
}
- $webfinger = array();
+ $webfinger = [];
if (!empty($xrd_arr["xrd"]["subject"])) {
$webfinger["subject"] = $xrd_arr["xrd"]["subject"];
$webfinger["aliases"] = $xrd_arr["xrd"]["alias"];
}
- $webfinger["links"] = array();
+ $webfinger["links"] = [];
foreach ($xrd_arr["xrd"]["link"] as $value => $data) {
if (!empty($data["@attributes"])) {
* This functionality was originally created for the directory.
*
* @param string $noscrape_url Link to the noscrape page
- * @param array $data The already fetched data
+ * @param array $data The already fetched data
*
* @return array noscrape data
*/
- private static function pollNoscrape($noscrape_url, $data) {
- $ret = z_fetch_url($noscrape_url);
+ private static function pollNoscrape($noscrape_url, $data)
+ {
+ $ret = Network::curl($noscrape_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
}
}
- $location = formatted_location($json);
+ $location = Profile::formatLocation($json);
if ($location) {
$data["location"] = $location;
}
*
* @return int Number of errors
*/
- public static function validDfrn($data) {
+ public static function validDfrn($data)
+ {
$errors = 0;
if (!isset($data['key'])) {
$errors ++;
*
* @return array profile data
*/
- public static function profile($profile_link) {
-
- $data = array();
+ public static function profile($profile_link)
+ {
+ $data = [];
logger("Check profile ".$profile_link, LOGGER_DEBUG);
// Fetch data via noscrape - this is faster
- $noscrape_url = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile_link);
+ $noscrape_url = str_replace(["/hcard/", "/profile/"], "/noscrape/", $profile_link);
$data = self::pollNoscrape($noscrape_url, $data);
if (!isset($data["notify"])
$data = self::pollHcard($profile_link, $data, true);
}
- $prof_data = array();
+ $prof_data = [];
$prof_data["addr"] = $data["addr"];
$prof_data["nick"] = $data["nick"];
$prof_data["dfrn-request"] = $data["request"];
*
* @return array DFRN data
*/
- private static function dfrn($webfinger) {
+ private static function dfrn($webfinger)
+ {
$hcard_url = "";
- $data = array();
+ $data = [];
foreach ($webfinger["links"] as $link) {
if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
$data["network"] = NETWORK_DFRN;
//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) {
- $data["pubkey"] = rsatopem($data["pubkey"]);
+ $data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
}
}
}
}
}
+ if (substr($webfinger["subject"], 0, 5) == "acct:") {
+ $data["addr"] = substr($webfinger["subject"], 5);
+ }
+
if (!isset($data["network"]) || ($hcard_url == "")) {
return false;
}
/**
* @brief Poll the hcard page (Diaspora and Friendica specific)
*
- * @param string $hcard_url Link to the hcard page
- * @param array $data The already fetched data
- * @param boolean $dfrn Poll DFRN specific data
+ * @param string $hcard_url Link to the hcard page
+ * @param array $data The already fetched data
+ * @param boolean $dfrn Poll DFRN specific data
*
* @return array hcard data
*/
- private static function pollHcard($hcard_url, $data, $dfrn = false) {
- $ret = z_fetch_url($hcard_url);
+ private static function pollHcard($hcard_url, $data, $dfrn = false)
+ {
+ $ret = Network::curl($hcard_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
if ($search->length > 0) {
$data["pubkey"] = $search->item(0)->nodeValue;
if (strstr($data["pubkey"], 'RSA ')) {
- $data["pubkey"] = rsatopem($data["pubkey"]);
+ $data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
}
}
}
}
- $avatar = array();
+ $avatar = [];
$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
foreach ($photos as $photo) {
- $attr = array();
+ $attr = [];
foreach ($photo->attributes as $attribute) {
$attr[$attribute->name] = trim($attribute->value);
}
if ($search->length > 0) {
foreach ($search as $link) {
//$data["request"] = $search->item(0)->nodeValue;
- $attr = array();
+ $attr = [];
foreach ($link->attributes as $attribute) {
$attr[$attribute->name] = trim($attribute->value);
}
*
* @return array Diaspora data
*/
- private static function diaspora($webfinger) {
+ private static function diaspora($webfinger)
+ {
$hcard_url = "";
- $data = array();
+ $data = [];
foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
$hcard_url = $link["href"];
//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) {
- $data["pubkey"] = rsatopem($data["pubkey"]);
+ $data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
}
}
}
* @brief Check for OStatus contact
*
* @param array $webfinger Webfinger data
- * @param bool $short Short detection mode
+ * @param bool $short Short detection mode
*
* @return array|bool OStatus data or "false" on error or "true" on short mode
*/
- private static function ostatus($webfinger, $short = false) {
- $data = array();
+ private static function ostatus($webfinger, $short = false)
+ {
+ $data = [];
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
}
}
- if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@") &&
- !strstr(normalise_link($webfinger["subject"]), "http://")) {
+ if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")
+ && !strstr(normalise_link($webfinger["subject"]), "http://")
+ ) {
$data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
}
$pubkey = substr($pubkey, 5);
}
} elseif (normalise_link($pubkey) == 'http://') {
- $ret = z_fetch_url($pubkey);
+ $ret = Network::curl($pubkey);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
if (sizeof($key) >= 3) {
$m = base64url_decode($key[1]);
$e = base64url_decode($key[2]);
- $data["pubkey"] = metopem($m, $e);
+ $data["pubkey"] = Crypto::meToPem($m, $e);
}
}
}
}
// Fetch all additional data from the feed
- $ret = z_fetch_url($data["poll"]);
+ $ret = Network::curl($data["poll"]);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$feed = $ret['body'];
- $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
+ $feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) {
return false;
}
*
* @return array profile data
*/
- private static function pumpioProfileData($profile_link) {
-
+ private static function pumpioProfileData($profile_link)
+ {
$doc = new DOMDocument();
if (!@$doc->loadHTMLFile($profile_link)) {
return false;
$xpath = new DomXPath($doc);
- $data = array();
+ $data = [];
+
+ $data["name"] = $xpath->query("//span[contains(@class, 'p-name')]")->item(0)->nodeValue;
+
+ if ($data["name"] == '') {
+ // This is ugly - but pump.io doesn't seem to know a better way for it
+ $data["name"] = trim($xpath->query("//h1[@class='media-header']")->item(0)->nodeValue);
+ $pos = strpos($data["name"], chr(10));
+ if ($pos) {
+ $data["name"] = trim(substr($data["name"], 0, $pos));
+ }
+ }
+
+ $data["location"] = $xpath->query("//p[contains(@class, 'p-locality')]")->item(0)->nodeValue;
+
+ if ($data["location"] == '') {
+ $data["location"] = $xpath->query("//p[contains(@class, 'location')]")->item(0)->nodeValue;
+ }
+
+ $data["about"] = $xpath->query("//p[contains(@class, 'p-note')]")->item(0)->nodeValue;
- // This is ugly - but pump.io doesn't seem to know a better way for it
- $data["name"] = trim($xpath->query("//h1[@class='media-header']")->item(0)->nodeValue);
- $pos = strpos($data["name"], chr(10));
- if ($pos) {
- $data["name"] = trim(substr($data["name"], 0, $pos));
+ if ($data["about"] == '') {
+ $data["about"] = $xpath->query("//p[contains(@class, 'summary')]")->item(0)->nodeValue;
}
- $avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
+ $avatar = $xpath->query("//img[contains(@class, 'u-photo')]")->item(0);
+ if (!$avatar) {
+ $avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
+ }
if ($avatar) {
foreach ($avatar->attributes as $attribute) {
if ($attribute->name == "src") {
}
}
- $data["location"] = $xpath->query("//p[@class='location']")->item(0)->nodeValue;
- $data["about"] = $xpath->query("//p[@class='summary']")->item(0)->nodeValue;
-
return $data;
}
*
* @return array pump.io data
*/
- private static function pumpio($webfinger) {
-
- $data = array();
+ private static function pumpio($webfinger, $addr)
+ {
+ $data = [];
foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page")
&& ($link["type"] == "text/html")
$data = array_merge($data, $profile_data);
+ if (($addr != '') && ($data['name'] != '')) {
+ $name = trim(str_replace($addr, '', $data['name']));
+ if ($name != '') {
+ $data['name'] = $name;
+ }
+ }
+
return $data;
}
*
* @return string feed link
*/
- private static function getFeedLink($url) {
+ private static function getFeedLink($url)
+ {
$doc = new DOMDocument();
if (!@$doc->loadHTMLFile($url)) {
$feed_url = "";
foreach ($feeds as $feed) {
- $attr = array();
+ $attr = [];
foreach ($feed->attributes as $attribute) {
$attr[$attribute->name] = trim($attribute->value);
}
/**
* @brief Check for feed contact
*
- * @param string $url Profile link
+ * @param string $url Profile link
* @param boolean $probe Do a probe if the page contains a feed link
*
* @return array feed data
*/
- private static function feed($url, $probe = true) {
- $ret = z_fetch_url($url);
+ private static function feed($url, $probe = true)
+ {
+ $ret = Network::curl($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$feed = $ret['body'];
- $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
+ $feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) {
if (!$probe) {
/**
* @brief Check for mail contact
*
- * @param string $uri Profile link
+ * @param string $uri Profile link
* @param integer $uid User ID
*
* @return array mail data
*/
- private static function mail($uri, $uid) {
+ private static function mail($uri, $uid)
+ {
+ if (!Network::isEmailDomainValid($uri)) {
+ return false;
+ }
- if (!validate_email($uri)) {
+ if ($uid == 0) {
return false;
}
- if ($uid != 0) {
- $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+ $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
- 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']);
- $mbox = email_connect($mailbox, $r[0]['user'], $password);
- if (!mbox) {
- return false;
- }
+ if (DBM::is_result($x) && DBM::is_result($r)) {
+ $mailbox = Email::constructMailboxName($r[0]);
+ $password = '';
+ openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
+ $mbox = Email::connect($mailbox, $r[0]['user'], $password);
+ if (!$mbox) {
+ return false;
}
+ }
- $msgs = email_poll($mbox, $uri);
- logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
+ $msgs = Email::poll($mbox, $uri);
+ logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
- if (!count($msgs)) {
- return false;
- }
+ if (!count($msgs)) {
+ return false;
}
$phost = substr($uri, strpos($uri, '@') + 1);
- $data = array();
+ $data = [];
$data["addr"] = $uri;
$data["network"] = NETWORK_MAIL;
$data["name"] = substr($uri, 0, strpos($uri, '@'));
$data["nick"] = $data["name"];
- $data["photo"] = avatar_img($uri);
+ $data["photo"] = Network::lookupAvatarByEmail($uri);
$data["url"] = 'mailto:'.$uri;
$data["notify"] = 'smtp '.random_string();
$data["poll"] = 'email '.random_string();
- $x = email_msg_meta($mbox, $msgs[0]);
+ $x = Email::messageMeta($mbox, $msgs[0]);
if (stristr($x[0]->from, $uri)) {
$adr = imap_rfc822_parse_adrlist($x[0]->from, '');
} elseif (stristr($x[0]->to, $uri)) {
* @brief Mix two paths together to possibly fix missing parts
*
* @param string $avatar Path to the avatar
- * @param string $base Another path that is hopefully complete
+ * @param string $base Another path that is hopefully complete
*
* @return string fixed avatar path
*/
- public static function fixAvatar($avatar, $base) {
+ public static function fixAvatar($avatar, $base)
+ {
$base_parts = parse_url($base);
// Remove all parts that could create a problem
projects / friendica.git / blobdiff