Fix undefined var in module Proxy

[friendica.git] / mod / parse_url.php

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 61c681d7230293f7b94d253f08ec36028996fc67..14ec4d42ce45748ea89c8150655347616b92a7b5 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -10,12 +10,11 @@
  * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
  */
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
-require_once 'include/items.php';
-
 function parse_url_content(App $a)
 {
        $text = null;
@@ -46,15 +45,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 +72,7 @@ function parse_url_content(App $a)
                                $hdrs[$k] = $v;
                        }
                }
+               $type = null;
                if (array_key_exists('Content-Type', $hdrs)) {
                        $type = $hdrs['Content-Type'];
                }
@@ -92,16 +92,12 @@ function parse_url_content(App $a)
                }
        }
 
-       if (!empty($_GET['isComment'])) {
-               echo $br . '[url]' . $url . '[/url]';
-               exit();
-       }
 
        $template = '[bookmark=%s]%s[/bookmark]%s';
 
        $arr = ['url' => $url, 'text' => ''];
 
-       Addon::callHooks('parse_link', $arr);
+       Hook::callAll('parse_link', $arr);
 
        if (strlen($arr['text'])) {
                echo $arr['text'];
@@ -117,7 +113,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 +124,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);