X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fparse_url.php;h=baf86775010a8360a7e09c451efc3f3ee3303905;hb=3d6e3cbb78aa7791068ebad173a53c9cf600625a;hp=a1ca5a3db5e2e1c831d35bada4b52a3502b54183;hpb=9150ec59b5fcb3e4a7fab1a735f207ff80361cbf;p=friendica.git

diff --git a/mod/parse_url.php b/mod/parse_url.php
index a1ca5a3db5..baf8677501 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -72,8 +72,11 @@ function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = tr
 
 	$data = parseurl_getsiteinfo($url, $no_guessing, $do_oembed);
 
-	q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s')",
-		dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed), dbesc(serialize($data)), dbesc(datetime_convert()));
+	q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s')
+		 ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
+		dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed),
+		dbesc(serialize($data)), dbesc(datetime_convert()),
+		dbesc(serialize($data)), dbesc(datetime_convert()));
 
 	return $data;
 }
@@ -232,10 +235,9 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
 		}
 	}
 
-	//$list = $xpath->query("head/title");
 	$list = $xpath->query("//title");
-	foreach ($list as $node)
-		$siteinfo["title"] =  html_entity_decode($node->nodeValue, ENT_QUOTES, "UTF-8");
+	if ($list->length > 0)
+		$siteinfo["title"] = $list->item(0)->nodeValue;
 
 	//$list = $xpath->query("head/meta[@name]");
 	$list = $xpath->query("//meta[@name]");
@@ -407,6 +409,8 @@ function arr_add_hashes(&$item,$k) {
 
 function parse_url_content(&$a) {
 
+	require_once("include/items.php");
+
 	$text = null;
 	$str_tags = '';
 
@@ -484,77 +488,15 @@ function parse_url_content(&$a) {
 
 	$siteinfo = parseurl_getsiteinfo($url);
 
-//	if ($textmode) {
-//		require_once("include/items.php");
-//
-//		echo add_page_info_data($siteinfo);
-//		killme();
-//	}
-
-	$url= $siteinfo["url"];
-
-	// If the link contains BBCode stuff, make a short link out of this to avoid parsing problems
-	if (strpos($url, '[') OR strpos($url, ']')) {
-		require_once("include/network.php");
-		$url = short_link($url);
-	}
-
-	$sitedata = "";
-
-	if($siteinfo["title"] != "") {
-		$text = $siteinfo["text"];
-		$title = $siteinfo["title"];
-	}
-
-	$image = "";
-
-	if (($siteinfo["type"] != "video") AND (sizeof($siteinfo["images"]) > 0)){
-		/* Execute below code only if image is present in siteinfo */
-
-		$total_images = 0;
-		$max_images = get_config('system','max_bookmark_images');
-		if($max_images === false)
-			$max_images = 2;
-		else
-			$max_images = intval($max_images);
-
-		foreach ($siteinfo["images"] as $imagedata) {
-			if($textmode)
-				$image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n";
-			else
-				$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" /><br />';
-			$total_images ++;
-			if($max_images && $max_images >= $total_images)
-				break;
-		}
-	}
-
-	if(strlen($text)) {
-		if($textmode)
-			$text = '[quote]'.trim($text).'[/quote]';
-		else
-			$text = '<blockquote>'.htmlspecialchars(trim($text)).'</blockquote>';
-	}
+	unset($siteinfo["keywords"]);
 
-	if($image)
-		$text = $br.$br.$image.$text;
-	else
-		$text = $br.$text;
-
-	$title = str_replace(array("\r","\n"),array('',''),$title);
-
-	$result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags;
+	$info = add_page_info_data($siteinfo);
 
-	logger('parse_url: returns: ' . $result);
+	if (!$textmode)
+		// Replace ' with ’ - not perfect - but the richtext editor has problems otherwise
+		$info = str_replace(array("&#039;"), array("&#8217;"), $info);
 
-	$sitedata .=  trim($result);
-
-	if (($siteinfo["type"] == "video") AND ($url != ""))
-		echo "[class=type-video]".$sitedata."[/class]";
-	elseif (($siteinfo["type"] != "photo"))
-		echo "[class=type-link]".$sitedata."[/class]";
-	else
-		echo "[class=type-photo]".$title.$br.$image."[/class]";
+	echo $info;
 
 	killme();
 }