X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fparse_url.php;h=6a1fc110106ef8f566d599b758b38919a939699f;hb=74883adfd186967cdd41037d76dd2684de273cb8;hp=28869b4c128d7ecd3d1f5b8436297b8b11aad5c5;hpb=cf86162a08a71435865803b40dd283fc0b83427d;p=friendica.git
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 28869b4c12..6a1fc11010 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -56,7 +56,15 @@ function completeurl($url, $scheme) {
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
- $data = Cache::get("parse_url:".$no_guessing.":".$do_oembed.":".$url);
+ if ($url == "")
+ return false;
+
+ $r = q("SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
+ dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed));
+
+ if ($r)
+ $data = $r[0]["content"];
+
if (!is_null($data)) {
$data = unserialize($data);
return $data;
@@ -64,13 +72,15 @@ function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = tr
$data = parseurl_getsiteinfo($url, $no_guessing, $do_oembed);
- Cache::set("parse_url:".$no_guessing.":".$do_oembed.":".$url,serialize($data), CACHE_DAY);
+ 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()));
return $data;
}
function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
require_once("include/network.php");
+ require_once("include/Photo.php");
$a = get_app();
@@ -321,7 +331,7 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
$attr[$attribute->name] = $attribute->value;
$src = completeurl($attr["src"], $url);
- $photodata = @getimagesize($src);
+ $photodata = get_photo_info($src);
if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) {
if ($photodata[0] > 300) {
@@ -338,12 +348,12 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
}
}
- } else {
+ } elseif ($siteinfo["image"] != "") {
$src = completeurl($siteinfo["image"], $url);
unset($siteinfo["image"]);
- $photodata = @getimagesize($src);
+ $photodata = get_photo_info($src);
if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10))
$siteinfo["images"][] = array("src"=>$src,
@@ -397,6 +407,8 @@ function arr_add_hashes(&$item,$k) {
function parse_url_content(&$a) {
+ require_once("include/items.php");
+
$text = null;
$str_tags = '';
@@ -474,77 +486,15 @@ function parse_url_content(&$a) {
$siteinfo = parseurl_getsiteinfo($url);
-// if ($textmode) {
-// require_once("include/items.php");
-//
-// echo add_page_info_data($siteinfo);
-// killme();
-// }
+ unset($siteinfo["keywords"]);
- $url= $siteinfo["url"];
+ $info = add_page_info_data($siteinfo);
- // 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 (!$textmode)
+ // Replace ' with â - not perfect - but the richtext editor has problems otherwise
+ $info = str_replace(array("'"), array("’"), $info);
- 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 .= '
';
- $total_images ++;
- if($max_images && $max_images >= $total_images)
- break;
- }
- }
-
- if(strlen($text)) {
- if($textmode)
- $text = '[quote]'.trim($text).'[/quote]';
- else
- $text = '
'.htmlspecialchars(trim($text)).''; - } - - 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; - - logger('parse_url: returns: ' . $result); - - $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(); }