X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fparse_url.php;h=07f319fdca69e8ab2372b29b1302a81d1c97398c;hb=66bf39216b890a0b89f9bef537204a5e637ac8b1;hp=dbe45aba15736245f606d9ea110c2b8b7d5af5db;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git

diff --git a/mod/parse_url.php b/mod/parse_url.php
index dbe45aba15..07f319fdca 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -8,123 +8,136 @@
  * information and does format this information to BBCode
  *
  * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
-*/
-
+ */
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\Logger;
+use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
-require_once("include/items.php");
-
-function parse_url_content(App $a) {
+require_once 'include/items.php';
 
+function parse_url_content(App $a)
+{
 	$text = null;
-	$str_tags = "";
+	$str_tags = '';
 
 	$br = "\n";
 
-	if (x($_GET,"binurl")) {
-		$url = trim(hex2bin($_GET["binurl"]));
+	if (!empty($_GET['binurl'])) {
+		$url = trim(hex2bin($_GET['binurl']));
 	} else {
-		$url = trim($_GET["url"]);
+		$url = trim($_GET['url']);
 	}
 
-	if ($_GET["title"]) {
-		$title = strip_tags(trim($_GET["title"]));
+	if (!empty($_GET['title'])) {
+		$title = strip_tags(trim($_GET['title']));
 	}
 
-	if ($_GET["description"]) {
-		$text = strip_tags(trim($_GET["description"]));
+	if (!empty($_GET['description'])) {
+		$text = strip_tags(trim($_GET['description']));
 	}
 
-	if ($_GET["tags"]) {
-		$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
+	if (!empty($_GET['tags'])) {
+		$arr_tags = ParseUrl::convertTagsToArray($_GET['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
 	$arrurl = parse_url($url);
-	if (!x($arrurl, "scheme")) {
-		if (x($arrurl, "host")) {
-			$url = "http:".$url;
+	if (empty($arrurl['scheme'])) {
+		if (!empty($arrurl['host'])) {
+			$url = 'http:' . $url;
 		} else {
-			$url = "http://".$url;
+			$url = 'http://' . $url;
 		}
 	}
 
-	logger("prse_url: " . $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 = z_fetch_url($url, false, $redirects, ["novalidate" => true, "nobody" => true]);
-	if($result["success"]) {
+	$curlResponse = Network::curl($url, false, $redirects, ['novalidate' => true, 'nobody' => true]);
+
+	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) {
-			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-			$hdrs[$k] = $v;
+			$header = array_map('trim', explode(':', trim($l), 2));
+			if (count($header) == 2) {
+				list($k, $v) = $header;
+				$hdrs[$k] = $v;
+			}
 		}
-		if (array_key_exists("Content-Type", $hdrs)) {
-			$type = $hdrs["Content-Type"];
+		$type = null;
+		if (array_key_exists('Content-Type', $hdrs)) {
+			$type = $hdrs['Content-Type'];
 		}
 		if ($type) {
-			if(stripos($type, "image/") !== false) {
-				echo $br . "[img]" . $url . "[/img]" . $br;
-				killme();
+			if (stripos($type, 'image/') !== false) {
+				echo $br . '[img]' . $url . '[/img]' . $br;
+				exit();
 			}
-			if (stripos($type, "video/") !== false) {
-				echo $br . "[video]" . $url . "[/video]" . $br;
-				killme();
+			if (stripos($type, 'video/') !== false) {
+				echo $br . '[video]' . $url . '[/video]' . $br;
+				exit();
 			}
-			if (stripos($type, "audio/") !== false) {
-				echo $br . "[audio]" . $url . "[/audio]" . $br;
-				killme();
+			if (stripos($type, 'audio/') !== false) {
+				echo $br . '[audio]' . $url . '[/audio]' . $br;
+				exit();
 			}
 		}
 	}
 
-	$template = "[bookmark=%s]%s[/bookmark]%s";
 
-	$arr = ["url" => $url, "text" => ""];
+	$template = '[bookmark=%s]%s[/bookmark]%s';
 
-	call_hooks("parse_link", $arr);
+	$arr = ['url' => $url, 'text' => ''];
 
-	if (strlen($arr["text"])) {
-		echo $arr["text"];
-		killme();
+	Addon::callHooks('parse_link', $arr);
+
+	if (strlen($arr['text'])) {
+		echo $arr['text'];
+		exit();
 	}
 
-	// If there is allready 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.
-	if ($url && $title && $text) {
-
-		$title = str_replace(["\r","\n"],["",""],$title);
+	if (!empty($url) && !empty($title) && !empty($text)) {
+		$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;
 
-		logger("parse_url (unparsed): returns: " . $result);
+		Logger::log('(unparsed): returns: ' . $result);
 
 		echo $result;
-		killme();
+		exit();
 	}
 
 	// Fetch the information directly from the webpage
 	$siteinfo = ParseUrl::getSiteinfo($url);
 
-	unset($siteinfo["keywords"]);
+	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);
 
 	echo $info;
 
-	killme();
+	exit();
 }
 
 /**
@@ -146,7 +159,8 @@ function parse_url_content(App $a) {
  * @todo Remove this function after all Addons has been changed to use
  *    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);
 	return $siteinfo;
 }