use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
-use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Protocol\ActivityNamespace;
*/
private static function ownHost($host)
{
- $own_host = \get_app()->getHostName();
+ $own_host = DI::baseUrl()->getHostname();
$parts = parse_url($host);
$xrd = null;
$curlResult = Network::curl($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false);
$host_url = 'https://'.$host;
+ } elseif ($curlResult->isTimeout()) {
+ Logger::info('Probing timeout', ['url' => $ssl_url], Logger::DEBUG);
+ self::$istimeout = true;
+ return false;
}
if (!is_object($xrd)) {
$curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isTimeout()) {
- Logger::log("Probing timeout for " . $url, Logger::DEBUG);
+ Logger::info('Probing timeout', ['url' => $url], Logger::DEBUG);
+ self::$istimeout = true;
+ return false;
+ } elseif ($connection_error && $ssl_connection_error) {
self::$istimeout = true;
return false;
}
+
$xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false);
$host_url = 'http://'.$host;
if (!empty($data['photo']) && !empty($data['baseurl'])) {
$data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink($data['baseurl']), Strings::normaliseLink($data['photo']));
} elseif (empty($data['photo'])) {
- $data['photo'] = System::baseUrl() . '/images/person-300.jpg';
+ $data['photo'] = DI::baseUrl() . '/images/person-300.jpg';
}
if (empty($data['name'])) {
*/
private static function pumpioProfileData($profile_link)
{
+ $curlResult = Network::curl($profile_link);
+ if (!$curlResult->isSuccess()) {
+ return false;
+ }
+
$doc = new DOMDocument();
- if (!@$doc->loadHTMLFile($profile_link)) {
+ if (!@$doc->loadHTML($curlResult->getBody())) {
return false;
}
*/
private static function getFeedLink($url)
{
- $doc = new DOMDocument();
+ $curlResult = Network::curl($url);
+ if (!$curlResult->isSuccess()) {
+ return false;
+ }
- if (!@$doc->loadHTMLFile($url)) {
+ $doc = new DOMDocument();
+ if (!@$doc->loadHTML($curlResult->getBody())) {
return false;
}