use Friendica\Util\Crypto;
use Friendica\Util\Network;
use Friendica\Util\XML;
-
+use Friendica\Util\DateTimeFormat;
use dba;
use DOMXPath;
use DOMDocument;
require_once 'include/dba.php';
-require_once 'include/network.php';
/**
* @brief This class contain functions for probing URL
/**
* @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
logger("Probing for ".$host, LOGGER_DEBUG);
- $ret = Network::zFetchURL($ssl_url, false, $redirects, ['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 = Network::zFetchURL($url, false, $redirects, ['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)) {
/**
* @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.
*
}
if (x($data, "photo")) {
- $data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
+ $data["baseurl"] = Network::getUrlMatch(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
} else {
$data["photo"] = System::baseUrl().'/images/person-175.jpg';
}
}
}
- if (self::$baseurl != "") {
+ if (!empty(self::$baseurl)) {
$data["baseurl"] = self::$baseurl;
}
- if (!isset($data["network"])) {
+ if (empty($data["network"])) {
$data["network"] = NETWORK_PHANTOM;
}
'network' => $data['network'],
'server_url' => $data['baseurl']];
+ // This doesn't cover the case when a community isn't a community anymore
+ if (!empty($data['community']) && $data['community']) {
+ $fields['community'] = $data['community'];
+ $fields['contact-type'] = ACCOUNT_TYPE_COMMUNITY;
+ }
+
$fieldnames = [];
foreach ($fields as $key => $val) {
$old_fields = dba::selectFirst('gcontact', $fieldnames, $condition);
+ // When the gcontact doesn't exist, the value "true" will trigger an insert.
+ // In difference to the public contacts we want to have every contact
+ // in the world in our global contacts.
+ if (!$old_fields) {
+ $old_fields = true;
+
+ // These values have to be set only on insert
+ $fields['photo'] = $data['photo'];
+ $fields['created'] = DateTimeFormat::utcNow();
+ }
+
dba::update('gcontact', $fields, $condition, $old_fields);
$fields = ['name' => $data['name'],
'confirm' => $data['confirm'],
'poco' => $data['poco'],
'network' => $data['network'],
- 'success_update' => DBM::date()];
+ 'pubkey' => $data['pubkey'],
+ 'priority' => $data['priority'],
+ 'writable' => true,
+ 'rel' => CONTACT_IS_SHARING];
$fieldnames = [];
$condition = ['nurl' => normalise_link($data["url"]), 'self' => false, 'uid' => 0];
+ // "$old_fields" will return a "false" when the contact doesn't exist.
+ // This won't trigger an insert. This is intended, since we only need
+ // public contacts for everyone we store items from.
+ // We don't need to store every contact on the planet.
$old_fields = dba::selectFirst('contact', $fieldnames, $condition);
+ $fields['name-date'] = DateTimeFormat::utcNow();
+ $fields['uri-date'] = DateTimeFormat::utcNow();
+ $fields['success_update'] = DateTimeFormat::utcNow();
+
dba::update('contact', $fields, $condition, $old_fields);
}
}
$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;
}
$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0;
- $ret = Network::zFetchURL($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+ $ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
}
// 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;
*/
private static function pollNoscrape($noscrape_url, $data)
{
- $ret = Network::zFetchURL($noscrape_url);
+ $ret = Network::curl($noscrape_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
}
}
+ if (substr($webfinger["subject"], 0, 5) == "acct:") {
+ $data["addr"] = substr($webfinger["subject"], 5);
+ }
+
if (!isset($data["network"]) || ($hcard_url == "")) {
return false;
}
*/
private static function pollHcard($hcard_url, $data, $dfrn = false)
{
- $ret = Network::zFetchURL($hcard_url);
+ $ret = Network::curl($hcard_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$pubkey = substr($pubkey, 5);
}
} elseif (normalise_link($pubkey) == 'http://') {
- $ret = Network::zFetchURL($pubkey);
+ $ret = Network::curl($pubkey);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
}
// Fetch all additional data from the feed
- $ret = Network::zFetchURL($data["poll"]);
+ $ret = Network::curl($data["poll"]);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$data = [];
- // 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["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;
}
- $avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
+ $data["about"] = $xpath->query("//p[contains(@class, 'p-note')]")->item(0)->nodeValue;
+
+ if ($data["about"] == '') {
+ $data["about"] = $xpath->query("//p[contains(@class, 'summary')]")->item(0)->nodeValue;
+ }
+
+ $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)
+ private static function pumpio($webfinger, $addr)
{
$data = [];
foreach ($webfinger["links"] as $link) {
$data = array_merge($data, $profile_data);
+ if (($addr != '') && ($data['name'] != '')) {
+ $name = trim(str_replace($addr, '', $data['name']));
+ if ($name != '') {
+ $data['name'] = $name;
+ }
+ }
+
return $data;
}
*/
private static function feed($url, $probe = true)
{
- $ret = Network::zFetchURL($url);
+ $ret = Network::curl($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
*/
private static function mail($uri, $uid)
{
- if (!Network::validateEmail($uri)) {
+ if (!Network::isEmailDomainValid($uri)) {
return false;
}
- 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));
+ if ($uid == 0) {
+ 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;
- }
- }
+ $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
- $msgs = Email::poll($mbox, $uri);
- logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
- if (!count($msgs)) {
+ 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);
+
+ if (!count($msgs)) {
+ return false;
+ }
+
$phost = substr($uri, strpos($uri, '@') + 1);
$data = [];
$data["network"] = NETWORK_MAIL;
$data["name"] = substr($uri, 0, strpos($uri, '@'));
$data["nick"] = $data["name"];
- $data["photo"] = Network::avatarImg($uri);
+ $data["photo"] = Network::lookupAvatarByEmail($uri);
$data["url"] = 'mailto:'.$uri;
$data["notify"] = 'smtp '.random_string();
$data["poll"] = 'email '.random_string();
projects / friendica.git / blobdiff