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

Merge remote-tracking branch 'upstream/2019.09-rc' into delivery-counter

This commit is contained in:
Michael 2019-09-05 03:10:34 +00:00
parent 16a0afbbae 878d8a506d
commit f0b40853d0
2 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/display.php
View File

@ -188,7 +188,9 @@ function display_fetchauthor($a, $item)
$profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata); $profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]); if (!empty($profiledata["photo"])) {
$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
}
return $profiledata; return $profiledata;
} }

107
src/Content/Text/BBCode.php
View File

@ -1056,7 +1056,8 @@ class BBCode extends BaseObject
private static function removePictureLinksCallback($match) private static function removePictureLinksCallback($match)
{ {
$text = Cache::get($match[1]); $cache_key = 'remove:' . $match[1];
$text = Cache::get($cache_key);
if (is_null($text)) { if (is_null($text)) {
$a = self::getApp(); $a = self::getApp();
@ -1098,7 +1099,7 @@ class BBCode extends BaseObject
} }
} }
} }
Cache::set($match[1], $text); Cache::set($cache_key, $text);
} }
return $text; return $text;
@ -1115,58 +1116,72 @@ class BBCode extends BaseObject
private static function cleanPictureLinksCallback($match) private static function cleanPictureLinksCallback($match)
{ {
$text = Cache::get($match[1]); $a = self::getApp();
if (is_null($text)) { // When the picture link is the own photo path then we can avoid fetching the link
$a = self::getApp(); $own_photo_url = preg_quote(Strings::normaliseLink($a->getBaseURL()) . '/photos/');
if (preg_match('|' . $own_photo_url . '.*?/image/|', Strings::normaliseLink($match[1]))) {
$stamp1 = microtime(true); if (!empty($match[3])) {
$text = "[img=" . str_replace('-1.', '-0.', $match[2]) . "]" . $match[3] . "[/img]";
$ch = @curl_init($match[1]);
@curl_setopt($ch, CURLOPT_NOBODY, true);
@curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@curl_setopt($ch, CURLOPT_USERAGENT, $a->getUserAgent());
@curl_exec($ch);
$curl_info = @curl_getinfo($ch);
$a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
// if its a link to a picture then embed this picture
if (substr($curl_info["content_type"], 0, 6) == "image/") {
$text = "[img]" . $match[1] . "[/img]";
} else { } else {
if (!empty($match[3])) { $text = "[img]" . str_replace('-1.', '-0.', $match[2]) . "[/img]";
$text = "[img=" . $match[2] . "]" . $match[3] . "[/img]"; }
} else { return $text;
$text = "[img]" . $match[2] . "[/img]"; }
$cache_key = 'clean:' . $match[1];
$text = Cache::get($cache_key);
if (!is_null($text)) {
return $text;
}
// Only fetch the header, not the content
$stamp1 = microtime(true);
$ch = @curl_init($match[1]);
@curl_setopt($ch, CURLOPT_NOBODY, true);
@curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@curl_setopt($ch, CURLOPT_USERAGENT, $a->getUserAgent());
@curl_exec($ch);
$curl_info = @curl_getinfo($ch);
$a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack());
// if its a link to a picture then embed this picture
if (substr($curl_info["content_type"], 0, 6) == "image/") {
$text = "[img]" . $match[1] . "[/img]";
} else {
if (!empty($match[3])) {
$text = "[img=" . $match[2] . "]" . $match[3] . "[/img]";
} else {
$text = "[img]" . $match[2] . "[/img]";
}
// if its not a picture then look if its a page that contains a picture link
$body = Network::fetchUrl($match[1]);
$doc = new DOMDocument();
@$doc->loadHTML($body);
$xpath = new DOMXPath($doc);
$list = $xpath->query("//meta[@name]");
foreach ($list as $node) {
$attr = [];
if ($node->attributes->length) {
foreach ($node->attributes as $attribute) {
$attr[$attribute->name] = $attribute->value;
}
} }
// if its not a picture then look if its a page that contains a picture link if (strtolower($attr["name"]) == "twitter:image") {
$body = Network::fetchUrl($match[1]); if (!empty($match[3])) {
$text = "[img=" . $attr["content"] . "]" . $match[3] . "[/img]";
$doc = new DOMDocument(); } else {
@$doc->loadHTML($body); $text = "[img]" . $attr["content"] . "[/img]";
$xpath = new DOMXPath($doc);
$list = $xpath->query("//meta[@name]");
foreach ($list as $node) {
$attr = [];
if ($node->attributes->length) {
foreach ($node->attributes as $attribute) {
$attr[$attribute->name] = $attribute->value;
}
}
if (strtolower($attr["name"]) == "twitter:image") {
if (!empty($match[3])) {
$text = "[img=" . $attr["content"] . "]" . $match[3] . "[/img]";
} else {
$text = "[img]" . $attr["content"] . "[/img]";
}
} }
} }
} }
Cache::set($match[1], $text);
} }
Cache::set($cache_key, $text);
return $text; return $text;
} }