From 8bcc3c68602cb7df05ccf8241dff5d53cfa71afb Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 2 Sep 2018 17:35:55 -0400 Subject: [PATCH] Fix formatting in Util/ParseUrl - Remove commented out code - Replace double quotes with simple quotes - Remove parentheses for language construct - Add spaces around operators - Rename variables --- src/Util/ParseUrl.php | 265 +++++++++++++++++++++--------------------- 1 file changed, 132 insertions(+), 133 deletions(-) diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index 3be372767b..b897c54ee7 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -118,13 +118,13 @@ class ParseUrl // Check if the URL does contain a scheme $scheme = parse_url($url, PHP_URL_SCHEME); - if ($scheme == "") { - $url = "http://".trim($url, "/"); + if ($scheme == '') { + $url = 'http://' . trim($url, '/'); } if ($count > 10) { - logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG); - return($siteinfo); + logger('Endless loop detected for ' . $url, LOGGER_DEBUG); + return $siteinfo; } $url = trim($url, "'"); @@ -132,220 +132,217 @@ class ParseUrl $url = Network::stripTrackingQueryParams($url); - $siteinfo["url"] = $url; - $siteinfo["type"] = "link"; + $siteinfo['url'] = $url; + $siteinfo['type'] = 'link'; $data = Network::curl($url); if (!$data['success']) { - return($siteinfo); + return $siteinfo; } // If the file is too large then exit - if ($data["info"]["download_content_length"] > 1000000) { - return($siteinfo); + if ($data['info']['download_content_length'] > 1000000) { + return $siteinfo; } // If it isn't a HTML file then exit - if (($data["info"]["content_type"] != "") && !strstr(strtolower($data["info"]["content_type"]), "html")) { - return($siteinfo); + if (($data['info']['content_type'] != '') && !strstr(strtolower($data['info']['content_type']), 'html')) { + return $siteinfo; } - $header = $data["header"]; - $body = $data["body"]; + $header = $data['header']; + $body = $data['body']; if ($do_oembed) { $oembed_data = OEmbed::fetchURL($url); if (!empty($oembed_data->type)) { - if (!in_array($oembed_data->type, ["error", "rich", ""])) { - $siteinfo["type"] = $oembed_data->type; + if (!in_array($oembed_data->type, ['error', 'rich', ''])) { + $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)) { - $siteinfo["title"] = trim($oembed_data->title); + $siteinfo['title'] = trim($oembed_data->title); } if (isset($oembed_data->description)) { - $siteinfo["text"] = trim($oembed_data->description); + $siteinfo['text'] = trim($oembed_data->description); } 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 - $charset = ""; - if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) { + $charset = ''; + if (preg_match('/charset=(.*?)[\'"\s\n]/', $header, $matches)) { $charset = trim(trim(trim(array_pop($matches)), ';,')); } - if ($charset == "") { - $charset = "utf-8"; + if ($charset == '') { + $charset = 'utf-8'; } - if (($charset != "") && (strtoupper($charset) != "UTF-8")) { - logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG); - //$body = mb_convert_encoding($body, "UTF-8", $charset); - $body = iconv($charset, "UTF-8//TRANSLIT", $body); + if (($charset != '') && (strtoupper($charset) != 'UTF-8')) { + logger('detected charset ' . $charset, LOGGER_DEBUG); + $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->loadHTML($body); - XML::deleteNode($doc, "style"); - XML::deleteNode($doc, "script"); - XML::deleteNode($doc, "option"); - XML::deleteNode($doc, "h1"); - XML::deleteNode($doc, "h2"); - XML::deleteNode($doc, "h3"); - XML::deleteNode($doc, "h4"); - XML::deleteNode($doc, "h5"); - XML::deleteNode($doc, "h6"); - XML::deleteNode($doc, "ol"); - XML::deleteNode($doc, "ul"); + XML::deleteNode($doc, 'style'); + XML::deleteNode($doc, 'script'); + XML::deleteNode($doc, 'option'); + XML::deleteNode($doc, 'h1'); + XML::deleteNode($doc, 'h2'); + XML::deleteNode($doc, 'h3'); + XML::deleteNode($doc, 'h4'); + XML::deleteNode($doc, 'h5'); + XML::deleteNode($doc, 'h6'); + XML::deleteNode($doc, 'ol'); + XML::deleteNode($doc, 'ul'); $xpath = new DOMXPath($doc); - $list = $xpath->query("//meta[@content]"); + $list = $xpath->query('//meta[@content]'); foreach ($list as $node) { - $attr = []; + $meta_tag = []; if ($node->attributes->length) { foreach ($node->attributes as $attribute) { - $attr[$attribute->name] = $attribute->value; + $meta_tag[$attribute->name] = $attribute->value; } } - if (@$attr["http-equiv"] == "refresh") { - $path = $attr["content"]; - $pathinfo = explode(";", $path); - $content = ""; + if (@$meta_tag['http-equiv'] == 'refresh') { + $path = $meta_tag['content']; + $pathinfo = explode(';', $path); + $content = ''; foreach ($pathinfo as $value) { - if (substr(strtolower($value), 0, 4) == "url=") { + if (substr(strtolower($value), 0, 4) == 'url=') { $content = substr($value, 4); } } - if ($content != "") { + if ($content != '') { $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) { - $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) { - $attr = []; + $meta_tag = []; if ($node->attributes->length) { foreach ($node->attributes as $attribute) { - $attr[$attribute->name] = $attribute->value; + $meta_tag[$attribute->name] = $attribute->value; } } - if (!empty($attr["content"])) { - $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); + if (!empty($meta_tag['content'])) { + $meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8')); - switch (strtolower($attr["name"])) { - case "fulltitle": - $siteinfo["title"] = trim($attr["content"]); + switch (strtolower($meta_tag['name'])) { + case 'fulltitle': + $siteinfo['title'] = trim($meta_tag['content']); break; - case "description": - $siteinfo["text"] = trim($attr["content"]); + case 'description': + $siteinfo['text'] = trim($meta_tag['content']); break; - case "thumbnail": - $siteinfo["image"] = $attr["content"]; + case 'thumbnail': + $siteinfo['image'] = $meta_tag['content']; break; - case "twitter:image": - $siteinfo["image"] = $attr["content"]; + case 'twitter:image': + $siteinfo['image'] = $meta_tag['content']; break; - case "twitter:image:src": - $siteinfo["image"] = $attr["content"]; + case 'twitter:image:src': + $siteinfo['image'] = $meta_tag['content']; break; - case "twitter:card": - if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) { - $siteinfo["type"] = $attr["content"]; + case 'twitter:card': + if (($siteinfo['type'] == '') || ($meta_tag['content'] == 'photo')) { + $siteinfo['type'] = $meta_tag['content']; } break; - case "twitter:description": - $siteinfo["text"] = trim($attr["content"]); + case 'twitter:description': + $siteinfo['text'] = trim($meta_tag['content']); break; - case "twitter:title": - $siteinfo["title"] = trim($attr["content"]); + case 'twitter:title': + $siteinfo['title'] = trim($meta_tag['content']); break; - case "dc.title": - $siteinfo["title"] = trim($attr["content"]); + case 'dc.title': + $siteinfo['title'] = trim($meta_tag['content']); break; - case "dc.description": - $siteinfo["text"] = trim($attr["content"]); + case 'dc.description': + $siteinfo['text'] = trim($meta_tag['content']); break; - case "keywords": - $keywords = explode(",", $attr["content"]); + case 'keywords': + $keywords = explode(',', $meta_tag['content']); break; - case "news_keywords": - $keywords = explode(",", $attr["content"]); + case 'news_keywords': + $keywords = explode(',', $meta_tag['content']); break; } } - if ($siteinfo["type"] == "summary") { - $siteinfo["type"] = "link"; + if ($siteinfo['type'] == 'summary') { + $siteinfo['type'] = 'link'; } } if (isset($keywords)) { - $siteinfo["keywords"] = []; + $siteinfo['keywords'] = []; foreach ($keywords as $keyword) { - if (!in_array(trim($keyword), $siteinfo["keywords"])) { - $siteinfo["keywords"][] = trim($keyword); + if (!in_array(trim($keyword), $siteinfo['keywords'])) { + $siteinfo['keywords'][] = trim($keyword); } } } - //$list = $xpath->query("head/meta[@property]"); - $list = $xpath->query("//meta[@property]"); + $list = $xpath->query('//meta[@property]'); foreach ($list as $node) { - $attr = []; + $meta_tag = []; if ($node->attributes->length) { foreach ($node->attributes as $attribute) { - $attr[$attribute->name] = $attribute->value; + $meta_tag[$attribute->name] = $attribute->value; } } - if (!empty($attr["content"])) { - $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); + if (!empty($meta_tag['content'])) { + $meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8')); - switch (strtolower($attr["property"])) { - case "og:image": - $siteinfo["image"] = $attr["content"]; + switch (strtolower($meta_tag['property'])) { + case 'og:image': + $siteinfo['image'] = $meta_tag['content']; break; - case "og:title": - $siteinfo["title"] = trim($attr["content"]); + case 'og:title': + $siteinfo['title'] = trim($meta_tag['content']); break; - case "og:description": - $siteinfo["text"] = trim($attr["content"]); + case 'og:description': + $siteinfo['text'] = trim($meta_tag['content']); break; } } } - if ((@$siteinfo["image"] == "") && !$no_guessing) { - $list = $xpath->query("//img[@src]"); + if ((@$siteinfo['image'] == '') && !$no_guessing) { + $list = $xpath->query('//img[@src]'); foreach ($list as $node) { - $attr = []; + $img_tag = []; if ($node->attributes->length) { 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); if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) { @@ -357,70 +354,72 @@ class ParseUrl $photodata[0] = round($photodata[0] * (300 / $photodata[1])); $photodata[1] = 300; } - $siteinfo["images"][] = ["src" => $src, - "width" => $photodata[0], - "height" => $photodata[1]]; + $siteinfo['images'][] = [ + 'src' => $src, + 'width' => $photodata[0], + 'height' => $photodata[1] + ]; } } - } elseif (!empty($siteinfo["image"])) { - $src = self::completeUrl($siteinfo["image"], $url); + } elseif (!empty($siteinfo['image'])) { + $src = self::completeUrl($siteinfo['image'], $url); - unset($siteinfo["image"]); + unset($siteinfo['image']); $photodata = Image::getInfoFromURL($src); if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) { - $siteinfo["images"][] = ["src" => $src, - "width" => $photodata[0], - "height" => $photodata[1]]; + $siteinfo['images'][] = ['src' => $src, + 'width' => $photodata[0], + 'height' => $photodata[1]]; } } - if ((@$siteinfo["text"] == "") && (@$siteinfo["title"] != "") && !$no_guessing) { - $text = ""; + if ((@$siteinfo['text'] == '') && (@$siteinfo['title'] != '') && !$no_guessing) { + $text = ''; - $list = $xpath->query("//div[@class='article']"); + $list = $xpath->query('//div[@class="article"]'); foreach ($list as $node) { if (strlen($node->nodeValue) > 40) { - $text .= " ".trim($node->nodeValue); + $text .= ' ' . trim($node->nodeValue); } } - if ($text == "") { - $list = $xpath->query("//div[@class='content']"); + if ($text == '') { + $list = $xpath->query('//div[@class="content"]'); foreach ($list as $node) { if (strlen($node->nodeValue) > 40) { - $text .= " ".trim($node->nodeValue); + $text .= ' ' . trim($node->nodeValue); } } } // If none text was found then take the paragraph content - if ($text == "") { - $list = $xpath->query("//p"); + if ($text == '') { + $list = $xpath->query('//p'); foreach ($list as $node) { if (strlen($node->nodeValue) > 40) { - $text .= " ".trim($node->nodeValue); + $text .= ' ' . trim($node->nodeValue); } } } - if ($text != "") { - $text = trim(str_replace(["\n", "\r"], [" ", " "], $text)); + if ($text != '') { + $text = trim(str_replace(["\n", "\r"], [' ', ' '], $text)); - while (strpos($text, " ")) { - $text = trim(str_replace(" ", " ", $text)); + while (strpos($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; } /** -- 2.39.5