X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fparse_url.php;h=07f319fdca69e8ab2372b29b1302a81d1c97398c;hb=3fc5c1ad840f98926319478a855dab3686a0ace3;hp=a68f405de83b0335d993dcead15b36c5212ba4ff;hpb=3065d1c40afec3bef9c5b82a10672a5746fc2915;p=friendica.git diff --git a/mod/parse_url.php b/mod/parse_url.php index a68f405de8..07f319fdca 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -11,6 +11,7 @@ */ use Friendica\App; use Friendica\Core\Addon; +use Friendica\Core\Logger; use Friendica\Util\Network; use Friendica\Util\ParseUrl; @@ -46,15 +47,15 @@ function parse_url_content(App $a) // Add url scheme if it is missing $arrurl = parse_url($url); - if (!x($arrurl, 'scheme')) { - if (x($arrurl, 'host')) { + if (empty($arrurl['scheme'])) { + if (!empty($arrurl['host'])) { $url = 'http:' . $url; } else { $url = 'http://' . $url; } } - logger($url); + Logger::log($url); // Check if the URL is an image, video or audio file. If so format // the URL with the corresponding BBCode media tag @@ -73,6 +74,7 @@ function parse_url_content(App $a) $hdrs[$k] = $v; } } + $type = null; if (array_key_exists('Content-Type', $hdrs)) { $type = $hdrs['Content-Type']; } @@ -92,10 +94,6 @@ function parse_url_content(App $a) } } - if(!empty($_GET['isComment'])) { - echo $br . '[url]' . $url . '[/url]'; - exit(); - } $template = '[bookmark=%s]%s[/bookmark]%s'; @@ -117,7 +115,7 @@ function parse_url_content(App $a) $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags; - logger('(unparsed): returns: ' . $result); + Logger::log('(unparsed): returns: ' . $result); echo $result; exit(); @@ -128,6 +126,12 @@ function parse_url_content(App $a) unset($siteinfo['keywords']); + // Bypass attachment if parse url for a comment + if (!empty($_GET['noAttachment'])) { + echo $br . '[url=' . $url . ']' . $siteinfo['title'] . '[/url]'; + exit(); + } + // Format it as BBCode attachment $info = add_page_info_data($siteinfo);