clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

apply coding standard

This commit is contained in:
rabuzarus 2017-05-08 17:06:57 +02:00
parent cc8a3a4101
commit 450a4920fd
1 changed files with 276 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

446
src/Network/Probe.php
View File

@ -12,9 +12,9 @@ use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
require_once("include/feed.php"); require_once 'include/feed.php';
require_once('include/email.php'); require_once 'include/email.php';
require_once('include/network.php'); require_once 'include/network.php';
/** /**
* @brief This class contain functions for probing URL * @brief This class contain functions for probing URL
@ -38,11 +38,13 @@ class Probe {
"priority", "network", "pubkey", "baseurl"); "priority", "network", "pubkey", "baseurl");
$newdata = array(); $newdata = array();
foreach ($fields AS $field) foreach ($fields as $field) {
if (isset($data[$field])) if (isset($data[$field])) {
$newdata[$field] = $data[$field]; $newdata[$field] = $data[$field];
else } else {
$newdata[$field] = ""; $newdata[$field] = "";
}
}
// We don't use the "priority" field anymore and replace it with a dummy. // We don't use the "priority" field anymore and replace it with a dummy.
$newdata["priority"] = 0; $newdata["priority"] = 0;
@ -68,7 +70,7 @@ class Probe {
$ssl_url = "https://".$host."/.well-known/host-meta"; $ssl_url = "https://".$host."/.well-known/host-meta";
$url = "http://".$host."/.well-known/host-meta"; $url = "http://".$host."/.well-known/host-meta";
$xrd_timeout = Config::get('system','xrd_timeout', 20); $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0; $redirects = 0;
$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml')); $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
@ -87,32 +89,36 @@ class Probe {
$xml = $ret['body']; $xml = $ret['body'];
$xrd = parse_xml_string($xml, false); $xrd = parse_xml_string($xml, false);
} }
if (!is_object($xrd)) if (!is_object($xrd)) {
return false; return false;
}
$links = \xml::element_to_array($xrd); $links = \xml::element_to_array($xrd);
if (!isset($links["xrd"]["link"])) if (!isset($links["xrd"]["link"])) {
return false; return false;
}
$xrd_data = array(); $xrd_data = array();
foreach ($links["xrd"]["link"] AS $value => $link) { foreach ($links["xrd"]["link"] as $value => $link) {
if (isset($link["@attributes"])) if (isset($link["@attributes"])) {
$attributes = $link["@attributes"]; $attributes = $link["@attributes"];
elseif ($value == "@attributes") } elseif ($value == "@attributes") {
$attributes = $link; $attributes = $link;
else } else {
continue; continue;
}
if (($attributes["rel"] == "lrdd") AND if (($attributes["rel"] == "lrdd") AND
($attributes["type"] == "application/xrd+xml")) ($attributes["type"] == "application/xrd+xml")) {
$xrd_data["lrdd-xml"] = $attributes["template"]; $xrd_data["lrdd-xml"] = $attributes["template"];
elseif (($attributes["rel"] == "lrdd") AND } elseif (($attributes["rel"] == "lrdd") AND
($attributes["type"] == "application/json")) ($attributes["type"] == "application/json")) {
$xrd_data["lrdd-json"] = $attributes["template"]; $xrd_data["lrdd-json"] = $attributes["template"];
elseif ($attributes["rel"] == "lrdd") } elseif ($attributes["rel"] == "lrdd") {
$xrd_data["lrdd"] = $attributes["template"]; $xrd_data["lrdd"] = $attributes["template"];
} }
}
self::$baseurl = "http://".$host; self::$baseurl = "http://".$host;
@ -145,17 +151,20 @@ class Probe {
$profile_link = ''; $profile_link = '';
$links = self::lrdd($webbie); $links = self::lrdd($webbie);
logger('webfingerDfrn: '.$webbie.':'.print_r($links,true), LOGGER_DATA); logger('webfingerDfrn: '.$webbie.':'.print_r($links, true), LOGGER_DATA);
if (count($links)) { if (count($links)) {
foreach ($links as $link) { foreach ($links as $link) {
if ($link['@attributes']['rel'] === NAMESPACE_DFRN) if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
$profile_link = $link['@attributes']['href']; $profile_link = $link['@attributes']['href'];
if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) }
if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) {
$profile_link = 'stat:'.$link['@attributes']['template']; $profile_link = 'stat:'.$link['@attributes']['template'];
if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') }
if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
$hcard = $link['@attributes']['href']; $hcard = $link['@attributes']['href'];
} }
} }
}
return $profile_link; return $profile_link;
} }
@ -176,8 +185,9 @@ class Probe {
if (!$lrdd) { if (!$lrdd) {
$parts = @parse_url($uri); $parts = @parse_url($uri);
if (!$parts) if (!$parts) {
return array(); return array();
}
$host = $parts["host"]; $host = $parts["host"];
if (isset($parts["port"])) { if (isset($parts["port"])) {
@ -194,15 +204,18 @@ class Probe {
} while (!$lrdd AND (sizeof($path_parts) > 0)); } while (!$lrdd AND (sizeof($path_parts) > 0));
} }
if (!$lrdd) if (!$lrdd) {
return array(); return array();
}
foreach ($lrdd AS $key => $link) { foreach ($lrdd as $key => $link) {
if ($webfinger) if ($webfinger) {
continue; continue;
}
if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json"))) if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json"))) {
continue; continue;
}
$path = str_replace('{uri}', urlencode($uri), $link); $path = str_replace('{uri}', urlencode($uri), $link);
$webfinger = self::webfinger($path); $webfinger = self::webfinger($path);
@ -226,19 +239,23 @@ class Probe {
} }
} }
if (!is_array($webfinger["links"])) if (!is_array($webfinger["links"])) {
return false; return false;
}
$data = array(); $data = array();
foreach ($webfinger["links"] AS $link) foreach ($webfinger["links"] as $link) {
$data[] = array("@attributes" => $link); $data[] = array("@attributes" => $link);
}
if (is_array($webfinger["aliases"])) if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] AS $alias) foreach ($webfinger["aliases"] as $alias) {
$data[] = array("@attributes" => $data[] = array("@attributes" =>
array("rel" => "alias", array("rel" => "alias",
"href" => $alias)); "href" => $alias));
}
}
return $data; return $data;
} }
@ -262,33 +279,39 @@ class Probe {
} }
} }
if ($uid == 0) if ($uid == 0) {
$uid = local_user(); $uid = local_user();
}
$data = self::detect($uri, $network, $uid); $data = self::detect($uri, $network, $uid);
if (!isset($data["url"])) if (!isset($data["url"])) {
$data["url"] = $uri; $data["url"] = $uri;
}
if ($data["photo"] != "") if ($data["photo"] != "") {
$data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"])); $data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
else } else {
$data["photo"] = App::get_baseurl().'/images/person-175.jpg'; $data["photo"] = App::get_baseurl().'/images/person-175.jpg';
}
if (!isset($data["name"]) OR ($data["name"] == "")) { if (!isset($data["name"]) OR ($data["name"] == "")) {
if (isset($data["nick"])) if (isset($data["nick"])) {
$data["name"] = $data["nick"]; $data["name"] = $data["nick"];
}
if ($data["name"] == "") if ($data["name"] == "") {
$data["name"] = $data["url"]; $data["name"] = $data["url"];
} }
}
if (!isset($data["nick"]) OR ($data["nick"] == "")) { if (!isset($data["nick"]) OR ($data["nick"] == "")) {
$data["nick"] = strtolower($data["name"]); $data["nick"] = strtolower($data["name"]);
if (strpos($data['nick'], ' ')) if (strpos($data['nick'], ' ')) {
$data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' '))); $data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' ')));
} }
}
if (self::$baseurl != "") { if (self::$baseurl != "") {
$data["baseurl"] = self::$baseurl; $data["baseurl"] = self::$baseurl;
@ -308,7 +331,7 @@ class Probe {
/// The biggest problem is the avatar picture that could have a reduced image size. /// The biggest problem is the avatar picture that could have a reduced image size.
/// It should only be updated if the existing picture isn't existing anymore. /// It should only be updated if the existing picture isn't existing anymore.
if (($data['network'] != NETWORK_FEED) AND ($mode == PROBE_NORMAL) AND if (($data['network'] != NETWORK_FEED) AND ($mode == PROBE_NORMAL) AND
$data["name"] AND $data["nick"] AND $data["url"] AND $data["addr"] AND $data["poll"]) $data["name"] AND $data["nick"] AND $data["url"] AND $data["addr"] AND $data["poll"]) {
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s', q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s',
`notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s' `notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s'
WHERE `nurl` = '%s' AND NOT `self` AND `uid` = 0", WHERE `nurl` = '%s' AND NOT `self` AND `uid` = 0",
@ -323,6 +346,7 @@ class Probe {
dbesc(normalise_link($data['url'])) dbesc(normalise_link($data['url']))
); );
} }
}
return $data; return $data;
} }
@ -342,7 +366,6 @@ class Probe {
$parts = parse_url($uri); $parts = parse_url($uri);
if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) { if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) {
$host = $parts["host"]; $host = $parts["host"];
if (isset($parts["port"])) { if (isset($parts["port"])) {
$host .= ':'.$parts["port"]; $host .= ':'.$parts["port"];
@ -368,9 +391,10 @@ class Probe {
$nick = ltrim($nick, '@'); $nick = ltrim($nick, '@');
$addr = $nick."@".$host; $addr = $nick."@".$host;
} elseif (strstr($uri, '@')) { } elseif (strstr($uri, '@')) {
// If the URI starts with "mailto:" then jump directly to the mail detection // If the URI starts with "mailto:" then jump directly to the mail detection
if (strpos($url,'mailto:') !== false) { if (strpos($url, 'mailto:') !== false) {
$uri = str_replace('mailto:', '', $url); $uri = str_replace('mailto:', '', $url);
return self::mail($uri, $uid); return self::mail($uri, $uid);
} }
@ -381,8 +405,8 @@ class Probe {
// Remove "acct:" from the URI // Remove "acct:" from the URI
$uri = str_replace('acct:', '', $uri); $uri = str_replace('acct:', '', $uri);
$host = substr($uri,strpos($uri, '@') + 1); $host = substr($uri, strpos($uri, '@') + 1);
$nick = substr($uri,0, strpos($uri, '@')); $nick = substr($uri, 0, strpos($uri, '@'));
if (strpos($uri, '@twitter.com')) { if (strpos($uri, '@twitter.com')) {
return array("network" => NETWORK_TWITTER); return array("network" => NETWORK_TWITTER);
@ -393,6 +417,7 @@ class Probe {
return self::mail($uri, $uid); return self::mail($uri, $uid);
} }
$addr = $uri; $addr = $uri;
} else { } else {
return false; return false;
} }
@ -401,7 +426,7 @@ class Probe {
/// @todo Do we need the prefix "acct:" or "acct://"? /// @todo Do we need the prefix "acct:" or "acct://"?
foreach ($lrdd AS $key => $link) { foreach ($lrdd as $key => $link) {
if ($webfinger) { if ($webfinger) {
continue; continue;
} }
@ -438,33 +463,40 @@ class Probe {
logger("Probing ".$uri, LOGGER_DEBUG); logger("Probing ".$uri, LOGGER_DEBUG);
if (in_array($network, array("", NETWORK_DFRN))) if (in_array($network, array("", NETWORK_DFRN))) {
$result = self::dfrn($webfinger); $result = self::dfrn($webfinger);
if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) }
if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) {
$result = self::diaspora($webfinger); $result = self::diaspora($webfinger);
if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS)) }
if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS)) {
$result = self::ostatus($webfinger); $result = self::ostatus($webfinger);
if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO)) }
if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO)) {
$result = self::pumpio($webfinger); $result = self::pumpio($webfinger);
if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED)) }
if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED)) {
$result = self::feed($uri); $result = self::feed($uri);
else { } else {
// We overwrite the detected nick with our try if the previois routines hadn't detected it. // 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). // 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 ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != "")) {
$result["nick"] = $nick; $result["nick"] = $nick;
}
if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != "")) if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != "")) {
$result["addr"] = $addr; $result["addr"] = $addr;
} }
}
logger($uri." is ".$result["network"], LOGGER_DEBUG); logger($uri." is ".$result["network"], LOGGER_DEBUG);
if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) { if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) {
$pos = strpos($result["url"], $host); $pos = strpos($result["url"], $host);
if ($pos) if ($pos) {
$result["baseurl"] = substr($result["url"], 0, $pos).$host; $result["baseurl"] = substr($result["url"], 0, $pos).$host;
} }
}
return $result; return $result;
} }
@ -480,7 +512,7 @@ class Probe {
*/ */
private function webfinger($url) { private function webfinger($url) {
$xrd_timeout = Config::get('system','xrd_timeout', 20); $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0; $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' => 'application/xrd+xml'));
@ -495,33 +527,38 @@ class Probe {
// If it is not XML, maybe it is JSON // If it is not XML, maybe it is JSON
$webfinger = json_decode($data, true); $webfinger = json_decode($data, true);
if (!isset($webfinger["links"])) if (!isset($webfinger["links"])) {
return false; return false;
}
return $webfinger; return $webfinger;
} }
$xrd_arr = \xml::element_to_array($xrd); $xrd_arr = \xml::element_to_array($xrd);
if (!isset($xrd_arr["xrd"]["link"])) if (!isset($xrd_arr["xrd"]["link"])) {
return false; return false;
}
$webfinger = array(); $webfinger = array();
if (isset($xrd_arr["xrd"]["subject"])) if (isset($xrd_arr["xrd"]["subject"])) {
$webfinger["subject"] = $xrd_arr["xrd"]["subject"]; $webfinger["subject"] = $xrd_arr["xrd"]["subject"];
}
if (isset($xrd_arr["xrd"]["alias"])) if (isset($xrd_arr["xrd"]["alias"])) {
$webfinger["aliases"] = $xrd_arr["xrd"]["alias"]; $webfinger["aliases"] = $xrd_arr["xrd"]["alias"];
}
$webfinger["links"] = array(); $webfinger["links"] = array();
foreach ($xrd_arr["xrd"]["link"] AS $value => $data) { foreach ($xrd_arr["xrd"]["link"] as $value => $data) {
if (isset($data["@attributes"])) if (isset($data["@attributes"])) {
$attributes = $data["@attributes"]; $attributes = $data["@attributes"];
elseif ($value == "@attributes") } elseif ($value == "@attributes") {
$attributes = $data; $attributes = $data;
else } else {
continue; continue;
}
$webfinger["links"][] = $attributes; $webfinger["links"][] = $attributes;
} }
@ -550,51 +587,65 @@ class Probe {
} }
$json = json_decode($content, true); $json = json_decode($content, true);
if (!is_array($json)) if (!is_array($json)) {
return false; return false;
}
if (isset($json["fn"])) if (isset($json["fn"])) {
$data["name"] = $json["fn"]; $data["name"] = $json["fn"];
}
if (isset($json["addr"])) if (isset($json["addr"])) {
$data["addr"] = $json["addr"]; $data["addr"] = $json["addr"];
}
if (isset($json["nick"])) if (isset($json["nick"])) {
$data["nick"] = $json["nick"]; $data["nick"] = $json["nick"];
}
if (isset($json["comm"])) if (isset($json["comm"])) {
$data["community"] = $json["comm"]; $data["community"] = $json["comm"];
}
if (isset($json["tags"])) { if (isset($json["tags"])) {
$keywords = implode(" ", $json["tags"]); $keywords = implode(" ", $json["tags"]);
if ($keywords != "") if ($keywords != "") {
$data["keywords"] = $keywords; $data["keywords"] = $keywords;
} }
}
$location = formatted_location($json); $location = formatted_location($json);
if ($location) if ($location) {
$data["location"] = $location; $data["location"] = $location;
}
if (isset($json["about"])) if (isset($json["about"])) {
$data["about"] = $json["about"]; $data["about"] = $json["about"];
}
if (isset($json["key"])) if (isset($json["key"])) {
$data["pubkey"] = $json["key"]; $data["pubkey"] = $json["key"];
}
if (isset($json["photo"])) if (isset($json["photo"])) {
$data["photo"] = $json["photo"]; $data["photo"] = $json["photo"];
}
if (isset($json["dfrn-request"])) if (isset($json["dfrn-request"])) {
$data["request"] = $json["dfrn-request"]; $data["request"] = $json["dfrn-request"];
}
if (isset($json["dfrn-confirm"])) if (isset($json["dfrn-confirm"])) {
$data["confirm"] = $json["dfrn-confirm"]; $data["confirm"] = $json["dfrn-confirm"];
}
if (isset($json["dfrn-notify"])) if (isset($json["dfrn-notify"])) {
$data["notify"] = $json["dfrn-notify"]; $data["notify"] = $json["dfrn-notify"];
}
if (isset($json["dfrn-poll"])) if (isset($json["dfrn-poll"])) {
$data["poll"] = $json["dfrn-poll"]; $data["poll"] = $json["dfrn-poll"];
}
return $data; return $data;
} }
@ -608,16 +659,21 @@ class Probe {
*/ */
public static function validDfrn($data) { public static function validDfrn($data) {
$errors = 0; $errors = 0;
if(!isset($data['key'])) if (!isset($data['key'])) {
$errors ++; $errors ++;
if(!isset($data['dfrn-request'])) }
if (!isset($data['dfrn-request'])) {
$errors ++; $errors ++;
if(!isset($data['dfrn-confirm'])) }
if (!isset($data['dfrn-confirm'])) {
$errors ++; $errors ++;
if(!isset($data['dfrn-notify'])) }
if (!isset($data['dfrn-notify'])) {
$errors ++; $errors ++;
if(!isset($data['dfrn-poll'])) }
if (!isset($data['dfrn-poll'])) {
$errors ++; $errors ++;
}
return $errors; return $errors;
} }
@ -641,8 +697,9 @@ class Probe {
if (!isset($data["notify"]) OR !isset($data["confirm"]) OR if (!isset($data["notify"]) OR !isset($data["confirm"]) OR
!isset($data["request"]) OR !isset($data["poll"]) OR !isset($data["request"]) OR !isset($data["poll"]) OR
!isset($data["poco"]) OR !isset($data["name"]) OR !isset($data["poco"]) OR !isset($data["name"]) OR
!isset($data["photo"])) !isset($data["photo"])) {
$data = self::pollHcard($profile, $data, true); $data = self::pollHcard($profile, $data, true);
}
$prof_data = array(); $prof_data = array();
$prof_data["addr"] = $data["addr"]; $prof_data["addr"] = $data["addr"];
@ -672,44 +729,45 @@ class Probe {
$hcard = ""; $hcard = "";
$data = array(); $data = array();
foreach ($webfinger["links"] AS $link) { foreach ($webfinger["links"] as $link) {
if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != "")) if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != "")) {
$data["network"] = NETWORK_DFRN; $data["network"] = NETWORK_DFRN;
elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
$data["poll"] = $link["href"]; $data["poll"] = $link["href"];
elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
($link["type"] == "text/html") AND ($link["href"] != ""))
$data["url"] = $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") AND ($link["href"] != "")) {
$hcard = $link["href"]; $hcard = $link["href"];
elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
$data["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") AND ($link["href"] != "")) {
$data["photo"] = $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") AND ($link["href"] != ""))
$data["baseurl"] = trim($link["href"], '/'); $data["baseurl"] = trim($link["href"], '/');
elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
$data["guid"] = $link["href"]; $data["guid"] = $link["href"];
elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) { } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
$data["pubkey"] = base64_decode($link["href"]); $data["pubkey"] = base64_decode($link["href"]);
//if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) if (strstr($data["pubkey"], 'RSA ')) {
$data["pubkey"] = rsatopem($data["pubkey"]); $data["pubkey"] = rsatopem($data["pubkey"]);
} }
} }
}
if (!isset($data["network"]) OR ($hcard == "")) if (!isset($data["network"]) OR ($hcard == "")) {
return false; return false;
}
// Fetch data via noscrape - this is faster // Fetch data via noscrape - this is faster
$noscrape = str_replace("/hcard/", "/noscrape/", $hcard); $noscrape = str_replace("/hcard/", "/noscrape/", $hcard);
$data = self::pollNoscrape($noscrape, $data); $data = self::pollNoscrape($noscrape, $data);
if (isset($data["notify"]) AND isset($data["confirm"]) AND isset($data["request"]) AND 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["poll"]) AND isset($data["name"]) AND isset($data["photo"])) {
return $data; return $data;
}
$data = self::pollHcard($hcard, $data, true); $data = self::pollHcard($hcard, $data, true);
@ -736,14 +794,16 @@ class Probe {
} }
$doc = new \DOMDocument(); $doc = new \DOMDocument();
if (!@$doc->loadHTML($content)) if (!@$doc->loadHTML($content)) {
return false; return false;
}
$xpath = new \DomXPath($doc); $xpath = new \DomXPath($doc);
$vcards = $xpath->query("//div[contains(concat(' ', @class, ' '), ' vcard ')]"); $vcards = $xpath->query("//div[contains(concat(' ', @class, ' '), ' vcard ')]");
if (!is_object($vcards)) if (!is_object($vcards)) {
return false; return false;
}
if ($vcards->length > 0) { if ($vcards->length > 0) {
$vcard = $vcards->item(0); $vcard = $vcards->item(0);
@ -751,36 +811,42 @@ class Probe {
// We have to discard the guid from the hcard in favour of the guid from lrdd // 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. // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
if (($search->length > 0) AND ($data["guid"] == "")) if (($search->length > 0) AND ($data["guid"] == "")) {
$data["guid"] = $search->item(0)->nodeValue; $data["guid"] = $search->item(0)->nodeValue;
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
if ($search->length > 0) if ($search->length > 0) {
$data["nick"] = $search->item(0)->nodeValue; $data["nick"] = $search->item(0)->nodeValue;
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
if ($search->length > 0) if ($search->length > 0) {
$data["name"] = $search->item(0)->nodeValue; $data["name"] = $search->item(0)->nodeValue;
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
if ($search->length > 0) if ($search->length > 0) {
$data["searchable"] = $search->item(0)->nodeValue; $data["searchable"] = $search->item(0)->nodeValue;
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
if ($search->length > 0) { if ($search->length > 0) {
$data["pubkey"] = $search->item(0)->nodeValue; $data["pubkey"] = $search->item(0)->nodeValue;
if (strstr($data["pubkey"], 'RSA ')) if (strstr($data["pubkey"], 'RSA ')) {
$data["pubkey"] = rsatopem($data["pubkey"]); $data["pubkey"] = rsatopem($data["pubkey"]);
} }
}
$search = $xpath->query("//*[@id='pod_location']", $vcard); // */ $search = $xpath->query("//*[@id='pod_location']", $vcard); // */
if ($search->length > 0) if ($search->length > 0) {
$data["baseurl"] = trim($search->item(0)->nodeValue, "/"); $data["baseurl"] = trim($search->item(0)->nodeValue, "/");
} }
}
$avatar = array(); $avatar = array();
$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */ $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
foreach ($photos AS $photo) { foreach ($photos as $photo) {
$attr = array(); $attr = array();
foreach ($photo->attributes as $attribute) { foreach ($photo->attributes as $attribute) {
$attr[$attribute->name] = trim($attribute->value); $attr[$attribute->name] = trim($attribute->value);
@ -806,20 +872,22 @@ class Probe {
// Poll DFRN specific data // Poll DFRN specific data
$search = $xpath->query("//link[contains(concat(' ', @rel), ' dfrn-')]"); $search = $xpath->query("//link[contains(concat(' ', @rel), ' dfrn-')]");
if ($search->length > 0) { if ($search->length > 0) {
foreach ($search AS $link) { foreach ($search as $link) {
//$data["request"] = $search->item(0)->nodeValue; //$data["request"] = $search->item(0)->nodeValue;
$attr = array(); $attr = array();
foreach ($link->attributes as $attribute) foreach ($link->attributes as $attribute) {
$attr[$attribute->name] = trim($attribute->value); $attr[$attribute->name] = trim($attribute->value);
}
$data[substr($attr["rel"], 5)] = $attr["href"]; $data[substr($attr["rel"], 5)] = $attr["href"];
} }
} }
// Older Friendica versions had used the "uid" field differently than newer versions // Older Friendica versions had used the "uid" field differently than newer versions
if ($data["nick"] == $data["guid"]) if ($data["nick"] == $data["guid"]) {
unset($data["guid"]); unset($data["guid"]);
} }
}
return $data; return $data;
@ -836,44 +904,49 @@ class Probe {
$hcard = ""; $hcard = "";
$data = array(); $data = array();
foreach ($webfinger["links"] AS $link) { foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
$hcard = $link["href"]; $hcard = $link["href"];
elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
$data["baseurl"] = trim($link["href"], '/'); $data["baseurl"] = trim($link["href"], '/');
elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
$data["guid"] = $link["href"]; $data["guid"] = $link["href"];
elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
($link["type"] == "text/html") AND ($link["href"] != ""))
$data["url"] = $link["href"]; $data["url"] = $link["href"];
elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
$data["poll"] = $link["href"]; $data["poll"] = $link["href"];
elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
$data["poco"] = $link["href"]; $data["poco"] = $link["href"];
elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
$data["notify"] = $link["href"]; $data["notify"] = $link["href"];
elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) { } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
$data["pubkey"] = base64_decode($link["href"]); $data["pubkey"] = base64_decode($link["href"]);
//if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) if (strstr($data["pubkey"], 'RSA ')) {
$data["pubkey"] = rsatopem($data["pubkey"]); $data["pubkey"] = rsatopem($data["pubkey"]);
} }
} }
}
if (!isset($data["url"]) OR ($hcard == "")) if (!isset($data["url"]) OR ($hcard == "")) {
return false; return false;
}
if (is_array($webfinger["aliases"])) if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] AS $alias) foreach ($webfinger["aliases"] as $alias) {
if (normalise_link($alias) != normalise_link($data["url"]) AND !strstr($alias, "@")) if (normalise_link($alias) != normalise_link($data["url"]) AND ! strstr($alias, "@")) {
$data["alias"] = $alias; $data["alias"] = $alias;
}
}
}
// Fetch further information from the hcard // Fetch further information from the hcard
$data = self::pollHcard($hcard, $data); $data = self::pollHcard($hcard, $data);
if (!$data) if (!$data) {
return false; return false;
}
if (isset($data["url"]) AND isset($data["guid"]) AND isset($data["baseurl"]) AND if (isset($data["url"]) AND isset($data["guid"]) AND isset($data["baseurl"]) AND
isset($data["pubkey"]) AND ($hcard != "")) { isset($data["pubkey"]) AND ($hcard != "")) {
@ -883,10 +956,11 @@ class Probe {
$data["addr"] = strtolower($data["addr"]); $data["addr"] = strtolower($data["addr"]);
// We have to overwrite the detected value for "notify" since Hubzilla doesn't send it // We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
$data["notify"] = $data["baseurl"]."/receive/users/".$data["guid"]; $data["notify"] = $data["baseurl"] . "/receive/users/" . $data["guid"];
$data["batch"] = $data["baseurl"]."/receive/public"; $data["batch"] = $data["baseurl"] . "/receive/public";
} else } else {
return false; return false;
}
return $data; return $data;
} }
@ -901,7 +975,7 @@ class Probe {
private function ostatus($webfinger) { private function ostatus($webfinger) {
$data = array(); $data = array();
if (is_array($webfinger["aliases"])) { if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] AS $alias) { foreach ($webfinger["aliases"] as $alias) {
if (strstr($alias, "@")) { if (strstr($alias, "@")) {
$data["addr"] = str_replace('acct:', '', $alias); $data["addr"] = str_replace('acct:', '', $alias);
} }
@ -912,7 +986,7 @@ class Probe {
$data["addr"] = str_replace('acct:', '', $webfinger["subject"]); $data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
} }
$pubkey = ""; $pubkey = "";
foreach ($webfinger["links"] AS $link) { foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
($link["type"] == "text/html") AND ($link["href"] != "")) { ($link["type"] == "text/html") AND ($link["href"] != "")) {
$data["url"] = $link["href"]; $data["url"] = $link["href"];
@ -942,7 +1016,7 @@ class Probe {
if (sizeof($key) >= 3) { if (sizeof($key) >= 3) {
$m = base64url_decode($key[1]); $m = base64url_decode($key[1]);
$e = base64url_decode($key[2]); $e = base64url_decode($key[2]);
$data["pubkey"] = metopem($m,$e); $data["pubkey"] = metopem($m, $e);
} }
} }
} }
@ -959,7 +1033,7 @@ class Probe {
return false; return false;
} }
$feed = $ret['body']; $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 (!$feed_data) {
return false; return false;
} }
@ -1000,8 +1074,9 @@ class Probe {
private function pumpioProfileData($profile) { private function pumpioProfileData($profile) {
$doc = new \DOMDocument(); $doc = new \DOMDocument();
if (!@$doc->loadHTMLFile($profile)) if (!@$doc->loadHTMLFile($profile)) {
return false; return false;
}
$xpath = new \DomXPath($doc); $xpath = new \DomXPath($doc);
@ -1010,14 +1085,18 @@ class Probe {
// This is ugly - but pump.io doesn't seem to know a better way for it // 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); $data["name"] = trim($xpath->query("//h1[@class='media-header']")->item(0)->nodeValue);
$pos = strpos($data["name"], chr(10)); $pos = strpos($data["name"], chr(10));
if ($pos) if ($pos) {
$data["name"] = trim(substr($data["name"], 0, $pos)); $data["name"] = trim(substr($data["name"], 0, $pos));
}
$avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0); $avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
if ($avatar) if ($avatar) {
foreach ($avatar->attributes as $attribute) foreach ($avatar->attributes as $attribute) {
if ($attribute->name == "src") if ($attribute->name == "src") {
$data["photo"] = trim($attribute->value); $data["photo"] = trim($attribute->value);
}
}
}
$data["location"] = $xpath->query("//p[@class='location']")->item(0)->nodeValue; $data["location"] = $xpath->query("//p[@class='location']")->item(0)->nodeValue;
$data["about"] = $xpath->query("//p[@class='summary']")->item(0)->nodeValue; $data["about"] = $xpath->query("//p[@class='summary']")->item(0)->nodeValue;
@ -1035,32 +1114,34 @@ class Probe {
private function pumpio($webfinger) { private function pumpio($webfinger) {
$data = array(); $data = array();
foreach ($webfinger["links"] AS $link) { foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
($link["type"] == "text/html") AND ($link["href"] != "")) ($link["type"] == "text/html") AND ($link["href"] != "")) {
$data["url"] = $link["href"]; $data["url"] = $link["href"];
elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != "")) } elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != "")) {
$data["notify"] = $link["href"]; $data["notify"] = $link["href"];
elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != "")) } elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != "")) {
$data["poll"] = $link["href"]; $data["poll"] = $link["href"];
elseif (($link["rel"] == "dialback") AND ($link["href"] != "")) } elseif (($link["rel"] == "dialback") AND ($link["href"] != "")) {
$data["dialback"] = $link["href"]; $data["dialback"] = $link["href"];
} }
}
if (isset($data["poll"]) AND isset($data["notify"]) AND if (isset($data["poll"]) AND isset($data["notify"]) AND
isset($data["dialback"]) AND isset($data["url"])) { isset($data["dialback"]) AND isset($data["url"])) {
// by now we use these fields only for the network type detection // by now we use these fields only for the network type detection
// So we unset all data that isn't used at the moment // So we unset all data that isn't used at the moment
unset($data["dialback"]); unset($data["dialback"]);
$data["network"] = NETWORK_PUMPIO; $data["network"] = NETWORK_PUMPIO;
} else } else {
return false; return false;
}
$profile_data = self::pumpioProfileData($data["url"]); $profile_data = self::pumpioProfileData($data["url"]);
if (!$profile_data) if (!$profile_data) {
return false; return false;
}
$data = array_merge($data, $profile_data); $data = array_merge($data, $profile_data);
@ -1077,29 +1158,34 @@ class Probe {
private function getFeedLink($url) { private function getFeedLink($url) {
$doc = new \DOMDocument(); $doc = new \DOMDocument();
if (!@$doc->loadHTMLFile($url)) if (!@$doc->loadHTMLFile($url)) {
return false; return false;
}
$xpath = new \DomXPath($doc); $xpath = new \DomXPath($doc);
//$feeds = $xpath->query("/html/head/link[@type='application/rss+xml']"); //$feeds = $xpath->query("/html/head/link[@type='application/rss+xml']");
$feeds = $xpath->query("/html/head/link[@type='application/rss+xml' and @rel='alternate']"); $feeds = $xpath->query("/html/head/link[@type='application/rss+xml' and @rel='alternate']");
if (!is_object($feeds)) if (!is_object($feeds)) {
return false; return false;
}
if ($feeds->length == 0) if ($feeds->length == 0) {
return false; return false;
}
$feed_url = ""; $feed_url = "";
foreach ($feeds AS $feed) { foreach ($feeds as $feed) {
$attr = array(); $attr = array();
foreach ($feed->attributes as $attribute) foreach ($feed->attributes as $attribute) {
$attr[$attribute->name] = trim($attribute->value); $attr[$attribute->name] = trim($attribute->value);
}
if ($feed_url == "") if ($feed_url == "") {
$feed_url = $attr["href"]; $feed_url = $attr["href"];
} }
}
return $feed_url; return $feed_url;
} }
@ -1121,36 +1207,43 @@ class Probe {
$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true); $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) { if (!$feed_data) {
if (!$probe) if (!$probe) {
return false; return false;
}
$feed_url = self::getFeedLink($url); $feed_url = self::getFeedLink($url);
if (!$feed_url) if (!$feed_url) {
return false; return false;
}
return self::feed($feed_url, false); return self::feed($feed_url, false);
} }
if ($feed_data["header"]["author-name"] != "") if ($feed_data["header"]["author-name"] != "") {
$data["name"] = $feed_data["header"]["author-name"]; $data["name"] = $feed_data["header"]["author-name"];
}
if ($feed_data["header"]["author-nick"] != "") if ($feed_data["header"]["author-nick"] != "") {
$data["nick"] = $feed_data["header"]["author-nick"]; $data["nick"] = $feed_data["header"]["author-nick"];
}
if ($feed_data["header"]["author-avatar"] != "") if ($feed_data["header"]["author-avatar"] != "") {
$data["photo"] = $feed_data["header"]["author-avatar"]; $data["photo"] = $feed_data["header"]["author-avatar"];
}
if ($feed_data["header"]["author-id"] != "") if ($feed_data["header"]["author-id"] != "") {
$data["alias"] = $feed_data["header"]["author-id"]; $data["alias"] = $feed_data["header"]["author-id"];
}
$data["url"] = $url; $data["url"] = $url;
$data["poll"] = $url; $data["poll"] = $url;
if ($feed_data["header"]["author-link"] != "") if ($feed_data["header"]["author-link"] != "") {
$data["baseurl"] = $feed_data["header"]["author-link"]; $data["baseurl"] = $feed_data["header"]["author-link"];
else } else {
$data["baseurl"] = $data["url"]; $data["baseurl"] = $data["url"];
}
$data["network"] = NETWORK_FEED; $data["network"] = NETWORK_FEED;
@ -1167,8 +1260,9 @@ class Probe {
*/ */
private function mail($uri, $uid) { private function mail($uri, $uid) {
if (!validate_email($uri)) if (!validate_email($uri)) {
return false; return false;
}
$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));
@ -1177,49 +1271,54 @@ class Probe {
if (\dbm::is_result($x) && \dbm::is_result($r)) { if (\dbm::is_result($x) && \dbm::is_result($r)) {
$mailbox = construct_mailbox_name($r[0]); $mailbox = construct_mailbox_name($r[0]);
$password = ''; $password = '';
openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']); openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
$mbox = email_connect($mailbox,$r[0]['user'], $password); $mbox = email_connect($mailbox, $r[0]['user'], $password);
if(!mbox) if (!mbox) {
return false; return false;
} }
}
$msgs = email_poll($mbox, $uri); $msgs = email_poll($mbox, $uri);
logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG); logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
if (!count($msgs)) if (!count($msgs)) {
return false; return false;
}
$data = array(); $data = array();
$data["addr"] = $uri; $data["addr"] = $uri;
$data["network"] = NETWORK_MAIL; $data["network"] = NETWORK_MAIL;
$data["name"] = substr($uri, 0, strpos($uri,'@')); $data["name"] = substr($uri, 0, strpos($uri, '@'));
$data["nick"] = $data["name"]; $data["nick"] = $data["name"];
$data["photo"] = avatar_img($uri); $data["photo"] = avatar_img($uri);
$phost = substr($uri, strpos($uri,'@') + 1); $phost = substr($uri, strpos($uri, '@') + 1);
$data["url"] = 'http://'.$phost."/".$data["nick"]; $data["url"] = 'http://'.$phost."/".$data["nick"];
$data["notify"] = 'smtp '.random_string(); $data["notify"] = 'smtp '.random_string();
$data["poll"] = 'email '.random_string(); $data["poll"] = 'email '.random_string();
$x = email_msg_meta($mbox, $msgs[0]); $x = email_msg_meta($mbox, $msgs[0]);
if(stristr($x[0]->from, $uri)) if (stristr($x[0]->from, $uri)) {
$adr = imap_rfc822_parse_adrlist($x[0]->from, ''); $adr = imap_rfc822_parse_adrlist($x[0]->from, '');
elseif(stristr($x[0]->to, $uri)) } elseif (stristr($x[0]->to, $uri)) {
$adr = imap_rfc822_parse_adrlist($x[0]->to, ''); $adr = imap_rfc822_parse_adrlist($x[0]->to, '');
if(isset($adr)) { }
foreach($adr as $feadr) { if (isset($adr)) {
if((strcasecmp($feadr->mailbox, $data["name"]) == 0) foreach ($adr as $feadr) {
if ((strcasecmp($feadr->mailbox, $data["name"]) == 0)
&&(strcasecmp($feadr->host, $phost) == 0) &&(strcasecmp($feadr->host, $phost) == 0)
&& (strlen($feadr->personal))) { && (strlen($feadr->personal))) {
$personal = imap_mime_header_decode($feadr->personal); $personal = imap_mime_header_decode($feadr->personal);
$data["name"] = ""; $data["name"] = "";
foreach($personal as $perspart) foreach ($personal as $perspart) {
if ($perspart->charset != "default") if ($perspart->charset != "default") {
$data["name"] .= iconv($perspart->charset, 'UTF-8//IGNORE', $perspart->text); $data["name"] .= iconv($perspart->charset, 'UTF-8//IGNORE', $perspart->text);
else } else {
$data["name"] .= $perspart->text; $data["name"] .= $perspart->text;
}
}
$data["name"] = notags($data["name"]); $data["name"] = notags($data["name"]);
} }
@ -1265,5 +1364,4 @@ class Probe {
return $fixed; return $fixed;
} }
} }