X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fparse_url.php;h=3b2522ab12fb05184bcd4f54f1af6a85ebbc2c00;hb=a876c208504af3ee801689886ec8cab8f3eeff00;hp=ebe34875b76937221baa98bdf6b33044b9ae9ae3;hpb=306688057d64a156969eff79fff546c82d8e616a;p=friendica.git

diff --git a/mod/parse_url.php b/mod/parse_url.php
index ebe34875b7..3b2522ab12 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -10,16 +10,18 @@
  * @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\Core\System;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
-require_once 'include/items.php';
-
 function parse_url_content(App $a)
 {
 	$text = null;
 	$str_tags = '';
+	$format = '';
+	$ret= ['success' => false, 'contentType' => ''];
 
 	$br = "\n";
 
@@ -44,28 +46,32 @@ function parse_url_content(App $a)
 		}
 	}
 
+	if (isset($_GET['format']) && $_GET['format'] == 'json') {
+		$format = 'json';
+	}
+
 	// 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
 	$redirects = 0;
 	// Fetch the header of the URL
-	$result = Network::curl($url, false, $redirects, ['novalidate' => true, 'nobody' => true]);
+	$curlResponse = Network::curl($url, false, $redirects, ['novalidate' => true, 'nobody' => true]);
 
-	if ($result['success']) {
+	if ($curlResponse->isSuccess()) {
 		// Convert the header fields into an array
 		$hdrs = [];
-		$h = explode("\n", $result['header']);
+		$h = explode("\n", $curlResponse->getHeader());
 		foreach ($h as $l) {
 			$header = array_map('trim', explode(':', trim($l), 2));
 			if (count($header) == 2) {
@@ -73,30 +79,45 @@ function parse_url_content(App $a)
 				$hdrs[$k] = $v;
 			}
 		}
+		$type = null;
+		$content_type = '';
+		$bbcode = '';
 		if (array_key_exists('Content-Type', $hdrs)) {
 			$type = $hdrs['Content-Type'];
 		}
 		if ($type) {
 			if (stripos($type, 'image/') !== false) {
-				echo $br . '[img]' . $url . '[/img]' . $br;
-				exit();
+				$content_type = 'image';
+				$bbcode = $br . '[img]' . $url . '[/img]' . $br;
 			}
 			if (stripos($type, 'video/') !== false) {
-				echo $br . '[video]' . $url . '[/video]' . $br;
-				exit();
+				$content_type = 'video';
+				$bbcode = $br . '[video]' . $url . '[/video]' . $br;
 			}
 			if (stripos($type, 'audio/') !== false) {
-				echo $br . '[audio]' . $url . '[/audio]' . $br;
-				exit();
+				$content_type = 'audio';
+				$bbcode = $br . '[audio]' . $url . '[/audio]' . $br;
 			}
 		}
+		if (!empty($content_type)) {
+			if ($format == 'json') {
+				$ret['contentType'] = $content_type;
+				$ret['data'] = ['url' => $url];
+				$ret['success'] = true;
+				System::jsonExit($ret);
+			}
+
+			echo $bbcode;
+			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'];
@@ -112,7 +133,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();
@@ -123,6 +144,20 @@ 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();
+	}
+
+	if ($format == 'json') {
+		$ret['data'] = $siteinfo;
+		$ret['contentType'] = 'attachment';
+		$ret['success'] = true;
+
+		System::jsonExit($ret);
+	}
+
 	// Format it as BBCode attachment
 	$info = add_page_info_data($siteinfo);
 
@@ -137,18 +172,18 @@ function parse_url_content(App $a)
  * Note: We have moved the function to ParseUrl.php. This function is only for
  * legacy support and will be remove in the future
  *
- * @param type $url The url of the page which should be scraped
- * @param type $no_guessing If true the parse doens't search for
- *    preview pictures
- * @param type $do_oembed The false option is used by the function fetch_oembed()
- *    to avoid endless loops
+ * @param string $url         The url of the page which should be scraped
+ * @param bool   $no_guessing If true the parse doens't search for
+ *                            preview pictures
+ * @param bool   $do_oembed   The false option is used by the function fetch_oembed()
+ *                            to avoid endless loops
  *
  * @return array which contains needed data for embedding
  *
- * @see ParseUrl::getSiteinfoCached()
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @see   ParseUrl::getSiteinfoCached()
  *
- * @todo Remove this function after all Addons has been changed to use
- *    ParseUrl::getSiteinfoCached
+ * @deprecated since version 3.6 use ParseUrl::getSiteinfoCached instead
  */
 function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true)
 {