X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fparse_url.php;h=ea860f6d318016636f40af1387b842b1d1fe5da0;hb=3e797547a37f8c8f22e88965b4a4d278bcc192e0;hp=2c610f275138cc4b489cd3f431e022192cee667c;hpb=5eaa5951a1b19b985017b5db20f3b1abf464a1ef;p=friendica.git

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 2c610f2751..ea860f6d31 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -4,18 +4,16 @@
  * @file mod/parse_url.php
  * @brief The parse_url module
  *
- * This module does parse an url for embedable content (audio, video, image files or link)
- * information and does format this information to BBCode or html (this depends
- * on the user settings - default is BBCode output).
- * If the user has enabled the richtext editor setting the output will be in html
- * (Note: This is not always possible and in some case not useful because
- * the richtext editor doesn't support all kind of html).
- * Otherwise the output will be constructed BBCode.
+ * This module does parse an url for embeddable content (audio, video, image files or link)
+ * information and does format this information to BBCode
  *
  * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
 */
 
-use \Friendica\ParseUrl;
+use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Util\Network;
+use Friendica\Util\ParseUrl;
 
 require_once("include/items.php");
 
@@ -24,13 +22,7 @@ function parse_url_content(App $a) {
 	$text = null;
 	$str_tags = "";
 
-	$textmode = false;
-
-	if (local_user() && (!feature_enabled(local_user(), "richtext"))) {
-		$textmode = true;
-	}
-
-	$br = (($textmode) ? "\n" : "<br />");
+	$br = "\n";
 
 	if (x($_GET,"binurl")) {
 		$url = trim(hex2bin($_GET["binurl"]));
@@ -69,10 +61,10 @@ function parse_url_content(App $a) {
 	// the URL with the corresponding BBCode media tag
 	$redirects = 0;
 	// Fetch the header of the URL
-	$result = z_fetch_url($url, false, $redirects, array("novalidate" => true, "nobody" => true));
+	$result = Network::curl($url, false, $redirects, ["novalidate" => true, "nobody" => true]);
 	if($result["success"]) {
 		// Convert the header fields into an array
-		$hdrs = array();
+		$hdrs = [];
 		$h = explode("\n", $result["header"]);
 		foreach ($h as $l) {
 			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
@@ -97,15 +89,11 @@ function parse_url_content(App $a) {
 		}
 	}
 
-	if ($textmode) {
-		$template = "[bookmark=%s]%s[/bookmark]%s";
-	} else {
-		$template = "<a class=\"bookmark\" href=\"%s\" >%s</a>%s";
-	}
+	$template = "[bookmark=%s]%s[/bookmark]%s";
 
-	$arr = array("url" => $url, "text" => "");
+	$arr = ["url" => $url, "text" => ""];
 
-	call_hooks("parse_link", $arr);
+	Addon::callHooks("parse_link", $arr);
 
 	if (strlen($arr["text"])) {
 		echo $arr["text"];
@@ -116,14 +104,9 @@ function parse_url_content(App $a) {
 	// need to parse the url for content.
 	if ($url && $title && $text) {
 
-		$title = str_replace(array("\r","\n"),array("",""),$title);
+		$title = str_replace(["\r","\n"],["",""],$title);
 
-		if ($textmode) {
-			$text = "[quote]" . trim($text) . "[/quote]" . $br;
-		} else {
-			$text = "<blockquote>" . htmlspecialchars(trim($text)) . "</blockquote><br />";
-			$title = htmlspecialchars($title);
-		}
+		$text = "[quote]" . trim($text) . "[/quote]" . $br;
 
 		$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
 
@@ -141,11 +124,6 @@ function parse_url_content(App $a) {
 	// Format it as BBCode attachment
 	$info = add_page_info_data($siteinfo);
 
-	if (!$textmode) {
-		// Replace ' with ’ - not perfect - but the richtext editor has problems otherwise
-		$info = str_replace(array("&#039;"), array("&#8217;"), $info);
-	}
-
 	echo $info;
 
 	killme();