<?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\System;
+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\XML;
use dba;
-use dbm;
-use Cache;
-use xml;
-
-use DomXPath;
+use DOMXPath;
use DOMDocument;
-require_once 'include/feed.php';
-require_once 'include/email.php';
+require_once 'include/dba.php';
require_once 'include/network.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) {
+ 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 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 XRD data
+ * @brief Probes for webfinger path via "host-meta"
*
* @param string $host The host part of an url
*
- * @return array
- * 'lrdd' => Link to LRDD endpoint
- * 'lrdd-xml' => Link to LRDD endpoint in XML format
- * 'lrdd-json' => Link to LRDD endpoint in JSON format
+ * @return array with template and type of the webfinger template for JSON or XML
*/
- private static function xrd($host) {
-
+ private static function hostMeta($host)
+ {
// Reset the static variable
self::$baseurl = '';
if ($ret['success']) {
$xml = $ret['body'];
$xrd = parse_xml_string($xml, false);
+ $host_url = 'https://'.$host;
}
if (!is_object($xrd)) {
}
$xml = $ret['body'];
$xrd = parse_xml_string($xml, false);
+ $host_url = 'http://'.$host;
}
if (!is_object($xrd)) {
logger("No xrd object found for ".$host, LOGGER_DEBUG);
return array();
}
- $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();
}
- $xrd_data = array();
+ $lrdd = array();
+ // 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.
+ // $lrdd = array("application/jrd+json" => $host_url.'/.well-known/webfinger?resource={uri}');
foreach ($links["xrd"]["link"] as $value => $link) {
if (!empty($link["@attributes"])) {
continue;
}
- if (($attributes["rel"] == "lrdd")
- && ($attributes["type"] == "application/xrd+xml")
- ) {
- $xrd_data["lrdd-xml"] = $attributes["template"];
- } elseif (($attributes["rel"] == "lrdd")
- && ($attributes["type"] == "application/json")
- ) {
- $xrd_data["lrdd-json"] = $attributes["template"];
- } elseif ($attributes["rel"] == "lrdd") {
- $xrd_data["lrdd"] = $attributes["template"];
+ if (($attributes["rel"] == "lrdd") && !empty($attributes["template"])) {
+ $type = (empty($attributes["type"]) ? '' : $attributes["type"]);
+
+ $lrdd[$type] = $attributes["template"];
}
}
logger("Probing successful for ".$host, LOGGER_DEBUG);
- return $xrd_data;
+ return $lrdd;
}
/**
* 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);
*
* @return array uri data
*/
- public static function lrdd($uri) {
-
- $lrdd = self::xrd($uri);
+ public static function lrdd($uri)
+ {
+ $lrdd = self::hostMeta($uri);
$webfinger = null;
if (is_bool($lrdd)) {
$nick = array_pop($path_parts);
do {
- $lrdd = self::xrd($host);
+ $lrdd = self::hostMeta($host);
$host .= "/".array_shift($path_parts);
} while (!$lrdd && (sizeof($path_parts) > 0));
}
return array();
}
- foreach ($lrdd as $key => $link) {
+ foreach ($lrdd as $type => $template) {
if ($webfinger) {
continue;
}
- if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json"))) {
- continue;
- }
-
- $path = str_replace('{uri}', urlencode($uri), $link);
- $webfinger = self::webfinger($path);
+ $path = str_replace('{uri}', urlencode($uri), $template);
+ $webfinger = self::webfinger($path, $type);
if (!$webfinger && (strstr($uri, "@"))) {
- $path = str_replace('{uri}', urlencode("acct:".$uri), $link);
- $webfinger = self::webfinger($path);
+ $path = str_replace('{uri}', urlencode("acct:".$uri), $template);
+ $webfinger = self::webfinger($path, $type);
}
// Special treatment for Mastodon
$addr = $nick."@".$host;
- $path = str_replace('{uri}', urlencode("acct:".$addr), $link);
- $webfinger = self::webfinger($path);
+ $path = str_replace('{uri}', urlencode("acct:".$addr), $template);
+ $webfinger = self::webfinger($path, $type);
}
}
/**
* @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 = 0, $cache = true) {
-
+ public static function uri($uri, $network = "", $uid = -1, $cache = true)
+ {
if ($cache) {
- $result = Cache::get("probe_url:".$network.":".$uri);
+ $result = Cache::get("Probe::uri:".$network.":".$uri);
if (!is_null($result)) {
return $result;
}
}
- if ($uid == 0) {
+ if ($uid == -1) {
$uid = local_user();
}
// 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, $data, CACHE_DAY);
+ Cache::set("Probe::uri:".$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.
'about' => $data['about'],
'notify' => $data['notify'],
'network' => $data['network'],
- 'server_url' => $data['baseurl'],
- 'updated' => dbm::date());
+ 'server_url' => $data['baseurl']);
+
+ $fieldnames = array();
- foreach ($fields AS $key => $val) {
+ foreach ($fields as $key => $val) {
if (empty($val)) {
unset($fields[$key]);
+ } else {
+ $fieldnames[] = $key;
}
}
- dba::update('gcontact', $fields, array('nurl' => normalise_link($data["url"])));
+ $fields['updated'] = DBM::date();
+
+ $condition = array('nurl' => normalise_link($data["url"]));
+
+ $old_fields = dba::select('gcontact', $fieldnames, $condition, array('limit' => 1));
+
+ dba::update('gcontact', $fields, $condition, $old_fields);
$fields = array('name' => $data['name'],
'nick' => $data['nick'],
'confirm' => $data['confirm'],
'poco' => $data['poco'],
'network' => $data['network'],
- 'success_update' => dbm::date());
+ 'success_update' => DBM::date());
- foreach ($fields AS $key => $val) {
+ $fieldnames = array();
+
+ foreach ($fields as $key => $val) {
if (empty($val)) {
unset($fields[$key]);
+ } else {
+ $fieldnames[] = $key;
}
}
$condition = array('nurl' => normalise_link($data["url"]), 'self' => false, 'uid' => 0);
- dba::update('contact', $fields, $condition);
+
+ $old_fields = dba::select('contact', $fieldnames, $condition, array('limit' => 1));
+
+ 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) {
+ private static function fixOStatus($webfinger, $lrdd, $type)
+ {
if (empty($webfinger['links']) || empty($webfinger['subject'])) {
return $webfinger;
}
$url = self::switchScheme($webfinger['subject']);
$path = str_replace('{uri}', urlencode($url), $lrdd);
- $webfinger2 = self::webfinger($path);
+ $webfinger2 = self::webfinger($path, $type);
// Is the new webfinger detectable as OStatus?
if (self::ostatus($webfinger2, true)) {
*
* 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);
}
- $lrdd = self::xrd($host);
+ $lrdd = self::hostMeta($host);
if (is_bool($lrdd)) {
return array();
while (!$lrdd && (sizeof($path_parts) > 1)) {
$host .= "/".array_shift($path_parts);
- $lrdd = self::xrd($host);
+ $lrdd = self::hostMeta($host);
}
if (!$lrdd) {
logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
$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) {
if (strpos($uri, '@twitter.com')) {
return array("network" => NETWORK_TWITTER);
}
- $lrdd = self::xrd($host);
+ $lrdd = self::hostMeta($host);
if (is_bool($lrdd)) {
return array();
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 $key => $link) {
+ foreach ($lrdd as $type => $template) {
if ($webfinger) {
continue;
}
- if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json"))) {
- continue;
- }
+
// At first try it with the given uri
- $path = str_replace('{uri}', urlencode($uri), $link);
- $webfinger = self::webfinger($path);
+ $path = str_replace('{uri}', urlencode($uri), $template);
+ $webfinger = self::webfinger($path, $type);
// Fix possible problems with GNU Social probing to wrong scheme
- $webfinger = self::fixOstatus($webfinger, $link);
+ $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)) {
// Try webfinger with the address (user@domain.tld)
if (!$webfinger) {
- $path = str_replace('{uri}', urlencode($addr), $link);
- $webfinger = self::webfinger($path);
+ $path = str_replace('{uri}', urlencode($addr), $template);
+ $webfinger = self::webfinger($path, $type);
}
// Mastodon needs to have it with "acct:"
if (!$webfinger) {
- $path = str_replace('{uri}', urlencode("acct:".$addr), $link);
- $webfinger = self::webfinger($path);
+ $path = str_replace('{uri}', urlencode("acct:".$addr), $template);
+ $webfinger = self::webfinger($path, $type);
}
}
+
if (!$webfinger) {
return self::feed($uri);
}
*
* 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) {
-
+ 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' => 'application/xrd+xml'));
+ $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => $type));
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$data = $ret['body'];
- // This is a bugfix for this issue: https://github.com/redmatrix/hubzilla/issues/851
- // $data = str_replace('&url=', '&url=', $data);
- // we have to decide if we want to create a workaround - or we wait for an update
-
- $xrd = parse_xml_string($data, false);
-
- if (!is_object($xrd)) {
- // If it is not XML, maybe it is JSON
- $webfinger = json_decode($data, true);
-
+ $webfinger = json_decode($data, true);
+ if (is_array($webfinger)) {
if (!isset($webfinger["links"])) {
logger("No json webfinger links for ".$url, LOGGER_DEBUG);
return false;
}
-
return $webfinger;
}
- $xrd_arr = xml::element_to_array($xrd);
+ // If it is not JSON, maybe it is XML
+ $xrd = parse_xml_string($data, false);
+ if (!is_object($xrd)) {
+ logger("No webfinger data retrievable for ".$url, LOGGER_DEBUG);
+ return false;
+ }
+
+ $xrd_arr = XML::elementToArray($xrd);
if (!isset($xrd_arr["xrd"]["link"])) {
logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
return false;
* 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) {
+ private static function pollNoscrape($noscrape_url, $data)
+ {
$ret = z_fetch_url($noscrape_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
$data["nick"] = $json["nick"];
}
+ if (!empty($json["guid"])) {
+ $data["guid"] = $json["guid"];
+ }
+
if (!empty($json["comm"])) {
$data["community"] = $json["comm"];
}
}
}
- $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) {
-
+ public static function profile($profile_link)
+ {
$data = array();
logger("Check profile ".$profile_link, LOGGER_DEBUG);
*
* @return array DFRN data
*/
- private static function dfrn($webfinger) {
-
+ private static function dfrn($webfinger)
+ {
$hcard_url = "";
$data = array();
foreach ($webfinger["links"] as $link) {
//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 (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
- if (substr($alias, 0, 5) == 'acct:') {
+ if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
+ $data["alias"] = $alias;
+ } elseif (substr($alias, 0, 5) == 'acct:') {
$data["addr"] = substr($alias, 5);
}
}
/**
* @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) {
+ private static function pollHcard($hcard_url, $data, $dfrn = false)
+ {
$ret = z_fetch_url($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"]);
}
}
*
* @return array Diaspora data
*/
- private static function diaspora($webfinger) {
-
+ private static function diaspora($webfinger)
+ {
$hcard_url = "";
$data = array();
foreach ($webfinger["links"] as $link) {
//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) {
- $data["pubkey"] = rsatopem($data["pubkey"]);
+ $data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
}
}
}
foreach ($webfinger["aliases"] as $alias) {
if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
$data["alias"] = $alias;
+ } elseif (substr($alias, 0, 5) == 'acct:') {
+ $data["addr"] = substr($alias, 5);
}
}
}
+ if (!empty($webfinger["subject"]) && (substr($webfinger["subject"], 0, 5) == 'acct:')) {
+ $data["addr"] = substr($webfinger["subject"], 5);
+ }
+
// Fetch further information from the hcard
$data = self::pollHcard($hcard_url, $data);
* @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) {
+ private static function ostatus($webfinger, $short = false)
+ {
$data = array();
+
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
- if (strstr($alias, "@")) {
+ if (strstr($alias, "@") && !strstr(normalise_link($alias), "http://")) {
$data["addr"] = str_replace('acct:', '', $alias);
}
}
}
- if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")) {
+ if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")
+ && !strstr(normalise_link($webfinger["subject"]), "http://")
+ ) {
$data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
}
+
$pubkey = "";
if (is_array($webfinger["links"])) {
foreach ($webfinger["links"] as $link) {
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);
}
}
}
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;
*
* @return array pump.io data
*/
- private static function pumpio($webfinger) {
-
+ private static function pumpio($webfinger)
+ {
$data = array();
foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page")
*
* @return string feed link
*/
- private static function getFeedLink($url) {
+ private static function getFeedLink($url)
+ {
$doc = new DOMDocument();
if (!@$doc->loadHTMLFile($url)) {
/**
* @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) {
+ private static function feed($url, $probe = true)
+ {
$ret = z_fetch_url($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 (!validate_email($uri)) {
return false;
}
- $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+ if ($uid != 0) {
+ $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["name"] = substr($uri, 0, strpos($uri, '@'));
$data["nick"] = $data["name"];
$data["photo"] = avatar_img($uri);
- $data["url"] = 'http://'.$phost."/".$data["nick"];
+ $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)) {
}
}
}
- imap_close($mbox);
+ if (!empty($mbox)) {
+ imap_close($mbox);
+ }
return $data;
}
* @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