strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5715 from MrPetovan/bug/fix-photo-attachment

Browse source 
Fix 'photo' attachment
This commit is contained in:
Michael Vogel 2018-09-03 22:00:53 +00:00 committed by GitHub
commit 62c5e5d861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 207 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
mod/parse_url.php
View file

@ -9,127 +9,126 @@
* *
* @see ParseUrl::getSiteinfo() for more information about scraping embeddable content * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\ParseUrl; use Friendica\Util\ParseUrl;
require_once("include/items.php"); require_once 'include/items.php';
function parse_url_content(App $a) {
function parse_url_content(App $a)
{
$text = null; $text = null;
$str_tags = ""; $str_tags = '';
$br = "\n"; $br = "\n";
if (!empty($_GET["binurl"])) { if (!empty($_GET['binurl'])) {
$url = trim(hex2bin($_GET["binurl"])); $url = trim(hex2bin($_GET['binurl']));
} else { } else {
$url = trim($_GET["url"]); $url = trim($_GET['url']);
} }
if (!empty($_GET["title"])) { if (!empty($_GET['title'])) {
$title = strip_tags(trim($_GET["title"])); $title = strip_tags(trim($_GET['title']));
} }
if (!empty($_GET["description"])) { if (!empty($_GET['description'])) {
$text = strip_tags(trim($_GET["description"])); $text = strip_tags(trim($_GET['description']));
} }
if (!empty($_GET["tags"])) { if (!empty($_GET['tags'])) {
$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]); $arr_tags = ParseUrl::convertTagsToArray($_GET['tags']);
if (count($arr_tags)) { if (count($arr_tags)) {
$str_tags = $br . implode(" ", $arr_tags) . $br; $str_tags = $br . implode(' ', $arr_tags) . $br;
} }
} }
// Add url scheme if it is missing // Add url scheme if it is missing
$arrurl = parse_url($url); $arrurl = parse_url($url);
if (!x($arrurl, "scheme")) { if (!x($arrurl, 'scheme')) {
if (x($arrurl, "host")) { if (x($arrurl, 'host')) {
$url = "http:".$url; $url = 'http:' . $url;
} else { } else {
$url = "http://".$url; $url = 'http://' . $url;
} }
} }
logger("prse_url: " . $url); logger($url);
// Check if the URL is an image, video or audio file. If so format // Check if the URL is an image, video or audio file. If so format
// the URL with the corresponding BBCode media tag // the URL with the corresponding BBCode media tag
$redirects = 0; $redirects = 0;
// Fetch the header of the URL // Fetch the header of the URL
$result = Network::curl($url, false, $redirects, ["novalidate" => true, "nobody" => true]); $result = Network::curl($url, false, $redirects, ['novalidate' => true, 'nobody' => true]);
if($result["success"]) {
if ($result['success']) {
// Convert the header fields into an array // Convert the header fields into an array
$hdrs = []; $hdrs = [];
$h = explode("\n", $result["header"]); $h = explode("\n", $result['header']);
foreach ($h as $l) { foreach ($h as $l) {
$header = array_map("trim", explode(":", trim($l), 2)); $header = array_map('trim', explode(':', trim($l), 2));
if (count($header) == 2) { if (count($header) == 2) {
list($k, $v) = $header; list($k, $v) = $header;
$hdrs[$k] = $v; $hdrs[$k] = $v;
} }
} }
if (array_key_exists("Content-Type", $hdrs)) { if (array_key_exists('Content-Type', $hdrs)) {
$type = $hdrs["Content-Type"]; $type = $hdrs['Content-Type'];
} }
if ($type) { if ($type) {
if(stripos($type, "image/") !== false) { if (stripos($type, 'image/') !== false) {
echo $br . "[img]" . $url . "[/img]" . $br; echo $br . '[img]' . $url . '[/img]' . $br;
killme(); exit();
} }
if (stripos($type, "video/") !== false) { if (stripos($type, 'video/') !== false) {
echo $br . "[video]" . $url . "[/video]" . $br; echo $br . '[video]' . $url . '[/video]' . $br;
killme(); exit();
} }
if (stripos($type, "audio/") !== false) { if (stripos($type, 'audio/') !== false) {
echo $br . "[audio]" . $url . "[/audio]" . $br; echo $br . '[audio]' . $url . '[/audio]' . $br;
killme(); exit();
} }
} }
} }
$template = "[bookmark=%s]%s[/bookmark]%s"; $template = '[bookmark=%s]%s[/bookmark]%s';
$arr = ["url" => $url, "text" => ""]; $arr = ['url' => $url, 'text' => ''];
Addon::callHooks("parse_link", $arr); Addon::callHooks('parse_link', $arr);
if (strlen($arr["text"])) { if (strlen($arr['text'])) {
echo $arr["text"]; echo $arr['text'];
killme(); exit();
} }
// If there is already some content information submitted we don't // If there is already some content information submitted we don't
// need to parse the url for content. // need to parse the url for content.
if (!empty($url) && !empty($title) && !empty($text)) { if (!empty($url) && !empty($title) && !empty($text)) {
$title = str_replace(["\r", "\n"], ['', ''], $title);
$title = str_replace(["\r","\n"],["",""],$title); $text = '[quote]' . trim($text) . '[/quote]' . $br;
$text = "[quote]" . trim($text) . "[/quote]" . $br;
$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags; $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
logger("parse_url (unparsed): returns: " . $result); logger('(unparsed): returns: ' . $result);
echo $result; echo $result;
killme(); exit();
} }
// Fetch the information directly from the webpage // Fetch the information directly from the webpage
$siteinfo = ParseUrl::getSiteinfo($url); $siteinfo = ParseUrl::getSiteinfo($url);
unset($siteinfo["keywords"]); unset($siteinfo['keywords']);
// Format it as BBCode attachment // Format it as BBCode attachment
$info = add_page_info_data($siteinfo); $info = add_page_info_data($siteinfo);
echo $info; echo $info;
killme(); exit();
} }
/** /**
@ -151,7 +150,8 @@ function parse_url_content(App $a) {
* @todo Remove this function after all Addons has been changed to use * @todo Remove this function after all Addons has been changed to use
* ParseUrl::getSiteinfoCached * ParseUrl::getSiteinfoCached
*/ */
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) { function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true)
{
$siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed); $siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed);
return $siteinfo; return $siteinfo;
} }

7
src/Content/Text/BBCode.php
View file

@ -578,9 +578,7 @@ class BBCode extends BaseObject
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]); $return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
} }
if (($data["type"] == "photo") && !empty($data["url"]) && !empty($data["image"])) { if (!empty($data['title']) && !empty($data['url'])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
} else {
$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']); $return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
} }
@ -589,7 +587,8 @@ class BBCode extends BaseObject
$bbcode = HTML::toBBCode($data["description"]); $bbcode = HTML::toBBCode($data["description"]);
$return .= sprintf('<blockquote>%s</blockquote>', trim(self::convert($bbcode))); $return .= sprintf('<blockquote>%s</blockquote>', trim(self::convert($bbcode)));
} }
if ($data["type"] == "link") {
if (!empty($data['url'])) {
$return .= sprintf('<sup><a href="%s">%s</a></sup>', $data['url'], parse_url($data['url'], PHP_URL_HOST)); $return .= sprintf('<sup><a href="%s">%s</a></sup>', $data['url'], parse_url($data['url'], PHP_URL_HOST));
} }

273
src/Util/ParseUrl.php
View file

@ -118,13 +118,13 @@ class ParseUrl
// Check if the URL does contain a scheme // Check if the URL does contain a scheme
$scheme = parse_url($url, PHP_URL_SCHEME); $scheme = parse_url($url, PHP_URL_SCHEME);
if ($scheme == "") { if ($scheme == '') {
$url = "http://".trim($url, "/"); $url = 'http://' . trim($url, '/');
} }
if ($count > 10) { if ($count > 10) {
logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG); logger('Endless loop detected for ' . $url, LOGGER_DEBUG);
return($siteinfo); return $siteinfo;
} }
$url = trim($url, "'"); $url = trim($url, "'");
@ -132,220 +132,223 @@ class ParseUrl
$url = Network::stripTrackingQueryParams($url); $url = Network::stripTrackingQueryParams($url);
$siteinfo["url"] = $url; $siteinfo['url'] = $url;
$siteinfo["type"] = "link"; $siteinfo['type'] = 'link';
$data = Network::curl($url); $data = Network::curl($url);
if (!$data['success']) { if (!$data['success']) {
return($siteinfo); return $siteinfo;
} }
// If the file is too large then exit // If the file is too large then exit
if ($data["info"]["download_content_length"] > 1000000) { if ($data['info']['download_content_length'] > 1000000) {
return($siteinfo); return $siteinfo;
} }
// If it isn't a HTML file then exit // If it isn't a HTML file then exit
if (($data["info"]["content_type"] != "") && !strstr(strtolower($data["info"]["content_type"]), "html")) { if (($data['info']['content_type'] != '') && !strstr(strtolower($data['info']['content_type']), 'html')) {
return($siteinfo); return $siteinfo;
} }
$header = $data["header"]; $header = $data['header'];
$body = $data["body"]; $body = $data['body'];
if ($do_oembed) { if ($do_oembed) {
$oembed_data = OEmbed::fetchURL($url); $oembed_data = OEmbed::fetchURL($url);
if (!empty($oembed_data->type)) { if (!empty($oembed_data->type)) {
if (!in_array($oembed_data->type, ["error", "rich", ""])) { if (!in_array($oembed_data->type, ['error', 'rich', ''])) {
$siteinfo["type"] = $oembed_data->type; $siteinfo['type'] = $oembed_data->type;
} }
if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) { if (($oembed_data->type == 'link') && ($siteinfo['type'] != 'photo')) {
if (isset($oembed_data->title)) { if (isset($oembed_data->title)) {
$siteinfo["title"] = trim($oembed_data->title); $siteinfo['title'] = trim($oembed_data->title);
} }
if (isset($oembed_data->description)) { if (isset($oembed_data->description)) {
$siteinfo["text"] = trim($oembed_data->description); $siteinfo['text'] = trim($oembed_data->description);
} }
if (isset($oembed_data->thumbnail_url)) { if (isset($oembed_data->thumbnail_url)) {
$siteinfo["image"] = $oembed_data->thumbnail_url; $siteinfo['image'] = $oembed_data->thumbnail_url;
} }
} }
} }
} }
// Fetch the first mentioned charset. Can be in body or header // Fetch the first mentioned charset. Can be in body or header
$charset = ""; $charset = '';
if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) { if (preg_match('/charset=(.*?)[\'"\s\n]/', $header, $matches)) {
$charset = trim(trim(trim(array_pop($matches)), ';,')); $charset = trim(trim(trim(array_pop($matches)), ';,'));
} }
if ($charset == "") { if ($charset == '') {
$charset = "utf-8"; $charset = 'utf-8';
} }
if (($charset != "") && (strtoupper($charset) != "UTF-8")) { if (($charset != '') && (strtoupper($charset) != 'UTF-8')) {
logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG); logger('detected charset ' . $charset, LOGGER_DEBUG);
//$body = mb_convert_encoding($body, "UTF-8", $charset); $body = iconv($charset, 'UTF-8//TRANSLIT', $body);
$body = iconv($charset, "UTF-8//TRANSLIT", $body);
} }
$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); $body = mb_convert_encoding($body, 'HTML-ENTITIES', 'UTF-8');
$doc = new DOMDocument(); $doc = new DOMDocument();
@$doc->loadHTML($body); @$doc->loadHTML($body);
XML::deleteNode($doc, "style"); XML::deleteNode($doc, 'style');
XML::deleteNode($doc, "script"); XML::deleteNode($doc, 'script');
XML::deleteNode($doc, "option"); XML::deleteNode($doc, 'option');
XML::deleteNode($doc, "h1"); XML::deleteNode($doc, 'h1');
XML::deleteNode($doc, "h2"); XML::deleteNode($doc, 'h2');
XML::deleteNode($doc, "h3"); XML::deleteNode($doc, 'h3');
XML::deleteNode($doc, "h4"); XML::deleteNode($doc, 'h4');
XML::deleteNode($doc, "h5"); XML::deleteNode($doc, 'h5');
XML::deleteNode($doc, "h6"); XML::deleteNode($doc, 'h6');
XML::deleteNode($doc, "ol"); XML::deleteNode($doc, 'ol');
XML::deleteNode($doc, "ul"); XML::deleteNode($doc, 'ul');
$xpath = new DOMXPath($doc); $xpath = new DOMXPath($doc);
$list = $xpath->query("//meta[@content]"); $list = $xpath->query('//meta[@content]');
foreach ($list as $node) { foreach ($list as $node) {
$attr = []; $meta_tag = [];
if ($node->attributes->length) { if ($node->attributes->length) {
foreach ($node->attributes as $attribute) { foreach ($node->attributes as $attribute) {
$attr[$attribute->name] = $attribute->value; $meta_tag[$attribute->name] = $attribute->value;
} }
} }
if (@$attr["http-equiv"] == "refresh") { if (@$meta_tag['http-equiv'] == 'refresh') {
$path = $attr["content"]; $path = $meta_tag['content'];
$pathinfo = explode(";", $path); $pathinfo = explode(';', $path);
$content = ""; $content = '';
foreach ($pathinfo as $value) { foreach ($pathinfo as $value) {
if (substr(strtolower($value), 0, 4) == "url=") { if (substr(strtolower($value), 0, 4) == 'url=') {
$content = substr($value, 4); $content = substr($value, 4);
} }
} }
if ($content != "") { if ($content != '') {
$siteinfo = self::getSiteinfo($content, $no_guessing, $do_oembed, ++$count); $siteinfo = self::getSiteinfo($content, $no_guessing, $do_oembed, ++$count);
return($siteinfo); return $siteinfo;
} }
} }
} }
$list = $xpath->query("//title"); $list = $xpath->query('//title');
if ($list->length > 0) { if ($list->length > 0) {
$siteinfo["title"] = trim($list->item(0)->nodeValue); $siteinfo['title'] = trim($list->item(0)->nodeValue);
} }
//$list = $xpath->query("head/meta[@name]"); $list = $xpath->query('//meta[@name]');
$list = $xpath->query("//meta[@name]");
foreach ($list as $node) { foreach ($list as $node) {
$attr = []; $meta_tag = [];
if ($node->attributes->length) { if ($node->attributes->length) {
foreach ($node->attributes as $attribute) { foreach ($node->attributes as $attribute) {
$attr[$attribute->name] = $attribute->value; $meta_tag[$attribute->name] = $attribute->value;
} }
} }
if (!empty($attr["content"])) { if (empty($meta_tag['content'])) {
$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); continue;
}
switch (strtolower($attr["name"])) { $meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8'));
case "fulltitle":
$siteinfo["title"] = trim($attr["content"]); switch (strtolower($meta_tag['name'])) {
case 'fulltitle':
$siteinfo['title'] = trim($meta_tag['content']);
break; break;
case "description": case 'description':
$siteinfo["text"] = trim($attr["content"]); $siteinfo['text'] = trim($meta_tag['content']);
break; break;
case "thumbnail": case 'thumbnail':
$siteinfo["image"] = $attr["content"]; $siteinfo['image'] = $meta_tag['content'];
break; break;
case "twitter:image": case 'twitter:image':
$siteinfo["image"] = $attr["content"]; $siteinfo['image'] = $meta_tag['content'];
break; break;
case "twitter:image:src": case 'twitter:image:src':
$siteinfo["image"] = $attr["content"]; $siteinfo['image'] = $meta_tag['content'];
break; break;
case "twitter:card": case 'twitter:card':
if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) { // Obsolete card type
$siteinfo["type"] = $attr["content"]; if ($meta_tag['content'] == 'photo') {
$siteinfo['type'] = 'summary_large_image';
} else {
$siteinfo['type'] = $meta_tag['content'];
} }
break; break;
case "twitter:description": case 'twitter:description':
$siteinfo["text"] = trim($attr["content"]); $siteinfo['text'] = trim($meta_tag['content']);
break; break;
case "twitter:title": case 'twitter:title':
$siteinfo["title"] = trim($attr["content"]); $siteinfo['title'] = trim($meta_tag['content']);
break; break;
case "dc.title": case 'dc.title':
$siteinfo["title"] = trim($attr["content"]); $siteinfo['title'] = trim($meta_tag['content']);
break; break;
case "dc.description": case 'dc.description':
$siteinfo["text"] = trim($attr["content"]); $siteinfo['text'] = trim($meta_tag['content']);
break; break;
case "keywords": case 'keywords':
$keywords = explode(",", $attr["content"]); $keywords = explode(',', $meta_tag['content']);
break; break;
case "news_keywords": case 'news_keywords':
$keywords = explode(",", $attr["content"]); $keywords = explode(',', $meta_tag['content']);
break; break;
} }
} }
if ($siteinfo["type"] == "summary") {
$siteinfo["type"] = "link"; if ($siteinfo['type'] == 'summary' || $siteinfo['type'] == 'summary_large_image') {
} $siteinfo['type'] = 'link';
} }
if (isset($keywords)) { if (isset($keywords)) {
$siteinfo["keywords"] = []; $siteinfo['keywords'] = [];
foreach ($keywords as $keyword) { foreach ($keywords as $keyword) {
if (!in_array(trim($keyword), $siteinfo["keywords"])) { if (!in_array(trim($keyword), $siteinfo['keywords'])) {
$siteinfo["keywords"][] = trim($keyword); $siteinfo['keywords'][] = trim($keyword);
} }
} }
} }
//$list = $xpath->query("head/meta[@property]"); $list = $xpath->query('//meta[@property]');
$list = $xpath->query("//meta[@property]");
foreach ($list as $node) { foreach ($list as $node) {
$attr = []; $meta_tag = [];
if ($node->attributes->length) { if ($node->attributes->length) {
foreach ($node->attributes as $attribute) { foreach ($node->attributes as $attribute) {
$attr[$attribute->name] = $attribute->value; $meta_tag[$attribute->name] = $attribute->value;
} }
} }
if (!empty($attr["content"])) { if (!empty($meta_tag['content'])) {
$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); $meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8'));
switch (strtolower($attr["property"])) { switch (strtolower($meta_tag['property'])) {
case "og:image": case 'og:image':
$siteinfo["image"] = $attr["content"]; $siteinfo['image'] = $meta_tag['content'];
break; break;
case "og:title": case 'og:title':
$siteinfo["title"] = trim($attr["content"]); $siteinfo['title'] = trim($meta_tag['content']);
break; break;
case "og:description": case 'og:description':
$siteinfo["text"] = trim($attr["content"]); $siteinfo['text'] = trim($meta_tag['content']);
break; break;
} }
} }
} }
if ((@$siteinfo["image"] == "") && !$no_guessing) { if ((@$siteinfo['image'] == '') && !$no_guessing) {
$list = $xpath->query("//img[@src]"); $list = $xpath->query('//img[@src]');
foreach ($list as $node) { foreach ($list as $node) {
$attr = []; $img_tag = [];
if ($node->attributes->length) { if ($node->attributes->length) {
foreach ($node->attributes as $attribute) { foreach ($node->attributes as $attribute) {
$attr[$attribute->name] = $attribute->value; $img_tag[$attribute->name] = $attribute->value;
} }
} }
$src = self::completeUrl($attr["src"], $url); $src = self::completeUrl($img_tag['src'], $url);
$photodata = Image::getInfoFromURL($src); $photodata = Image::getInfoFromURL($src);
if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) { if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
@ -357,70 +360,72 @@ class ParseUrl
$photodata[0] = round($photodata[0] * (300 / $photodata[1])); $photodata[0] = round($photodata[0] * (300 / $photodata[1]));
$photodata[1] = 300; $photodata[1] = 300;
} }
$siteinfo["images"][] = ["src" => $src, $siteinfo['images'][] = [
"width" => $photodata[0], 'src' => $src,
"height" => $photodata[1]]; 'width' => $photodata[0],
'height' => $photodata[1]
];
} }
} }
} elseif (!empty($siteinfo["image"])) { } elseif (!empty($siteinfo['image'])) {
$src = self::completeUrl($siteinfo["image"], $url); $src = self::completeUrl($siteinfo['image'], $url);
unset($siteinfo["image"]); unset($siteinfo['image']);
$photodata = Image::getInfoFromURL($src); $photodata = Image::getInfoFromURL($src);
if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) { if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
$siteinfo["images"][] = ["src" => $src, $siteinfo['images'][] = ['src' => $src,
"width" => $photodata[0], 'width' => $photodata[0],
"height" => $photodata[1]]; 'height' => $photodata[1]];
} }
} }
if ((@$siteinfo["text"] == "") && (@$siteinfo["title"] != "") && !$no_guessing) { if ((@$siteinfo['text'] == '') && (@$siteinfo['title'] != '') && !$no_guessing) {
$text = ""; $text = '';
$list = $xpath->query("//div[@class='article']"); $list = $xpath->query('//div[@class="article"]');
foreach ($list as $node) { foreach ($list as $node) {
if (strlen($node->nodeValue) > 40) { if (strlen($node->nodeValue) > 40) {
$text .= " ".trim($node->nodeValue); $text .= ' ' . trim($node->nodeValue);
} }
} }
if ($text == "") { if ($text == '') {
$list = $xpath->query("//div[@class='content']"); $list = $xpath->query('//div[@class="content"]');
foreach ($list as $node) { foreach ($list as $node) {
if (strlen($node->nodeValue) > 40) { if (strlen($node->nodeValue) > 40) {
$text .= " ".trim($node->nodeValue); $text .= ' ' . trim($node->nodeValue);
} }
} }
} }
// If none text was found then take the paragraph content // If none text was found then take the paragraph content
if ($text == "") { if ($text == '') {
$list = $xpath->query("//p"); $list = $xpath->query('//p');
foreach ($list as $node) { foreach ($list as $node) {
if (strlen($node->nodeValue) > 40) { if (strlen($node->nodeValue) > 40) {
$text .= " ".trim($node->nodeValue); $text .= ' ' . trim($node->nodeValue);
} }
} }
} }
if ($text != "") { if ($text != '') {
$text = trim(str_replace(["\n", "\r"], [" ", " "], $text)); $text = trim(str_replace(["\n", "\r"], [' ', ' '], $text));
while (strpos($text, " ")) { while (strpos($text, ' ')) {
$text = trim(str_replace(" ", " ", $text)); $text = trim(str_replace(' ', ' ', $text));
} }
$siteinfo["text"] = trim(html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8").'...'); $siteinfo['text'] = trim(html_entity_decode(substr($text, 0, 350), ENT_QUOTES, 'UTF-8') . '...');
} }
} }
logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG); logger('Siteinfo for ' . $url . ' ' . print_r($siteinfo, true), LOGGER_DEBUG);
Addon::callHooks("getsiteinfo", $siteinfo); Addon::callHooks('getsiteinfo', $siteinfo);
return($siteinfo); return $siteinfo;
} }
/** /**