From bc69e5763605421d0a5a6a2acdc098da75158762 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 22 Feb 2014 15:42:34 +0100 Subject: [PATCH 1/6] API: Better support of picture links --- include/api.php | 4 +++ include/bbcode.php | 77 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/include/api.php b/include/api.php index b9187ca3aa..d98ad970d5 100644 --- a/include/api.php +++ b/include/api.php @@ -1625,6 +1625,8 @@ if ($include_entities != "true") return array(); + $bbcode = bb_CleanPictureLinks($bbcode); + // Change pure links in text to bbcode uris $bbcode = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2]$2[/url]', $bbcode); @@ -2392,6 +2394,8 @@ function api_get_nick($profile) { function api_clean_plain_items($Text) { $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false"); + $Text = bb_CleanPictureLinks($Text); + if ($include_entities == "true") { $URLSearchString = "^\[\]"; diff --git a/include/bbcode.php b/include/bbcode.php index 186caad7bc..96ca39462d 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -533,8 +533,8 @@ function GetProfileUsername($profile, $username) { return($username); } -function RemovePictureLinks($match) { - $ch = @curl_init($match[2]); +function bb_RemovePictureLinks($match) { + $ch = @curl_init($match[1]); @curl_setopt($ch, CURLOPT_NOBODY, true); @curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)"); @@ -542,13 +542,76 @@ function RemovePictureLinks($match) { $curl_info = @curl_getinfo($ch); if (substr($curl_info["content_type"], 0, 6) == "image/") - $text = "[url=".$match[2]."]".$match[2]."[/url]"; - else $text = "[url=".$match[1]."]".$match[1]."[/url]"; + else { + $text = "[url=".$match[2]."]".$match[2]."[/url]"; + + // if its not a picture then look if its a page that contains a picture link + require_once("include/network.php"); + + $body = fetch_url($match[1]); + + $doc = new DOMDocument(); + @$doc->loadHTML($body); + $xpath = new DomXPath($doc); + $list = $xpath->query("//meta[@name]"); + foreach ($list as $node) { + $attr = array(); + + if ($node->attributes->length) + foreach ($node->attributes as $attribute) + $attr[$attribute->name] = $attribute->value; + + if (strtolower($attr["name"]) == "twitter:image") + $text = "[url=".$attr["content"]."]".$attr["content"]."[/url]"; + } + } return($text); } +function bb_CleanPictureLinksSub($match) { + $ch = @curl_init($match[1]); + @curl_setopt($ch, CURLOPT_NOBODY, true); + @curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)"); + @curl_exec($ch); + $curl_info = @curl_getinfo($ch); + + // if its a link to a picture then embed this picture + if (substr($curl_info["content_type"], 0, 6) == "image/") + $text = "[img]".$match[1]."[/img]"; + else { + $text = "[img]".$match[2]."[/img]"; + + // if its not a picture then look if its a page that contains a picture link + require_once("include/network.php"); + + $body = fetch_url($match[1]); + + $doc = new DOMDocument(); + @$doc->loadHTML($body); + $xpath = new DomXPath($doc); + $list = $xpath->query("//meta[@name]"); + foreach ($list as $node) { + $attr = array(); + + if ($node->attributes->length) + foreach ($node->attributes as $attribute) + $attr[$attribute->name] = $attribute->value; + + if (strtolower($attr["name"]) == "twitter:image") + $text = "[img]".$attr["content"]."[/img]"; + } + } + + return($text); +} + +function bb_CleanPictureLinks($text) { + $text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_CleanPictureLinksSub', $text); + return ($text); +} // BBcode 2 HTML was written by WAY2WEB.net // extended to work with Mistpark/Friendica - Mike Macgirvin @@ -635,6 +698,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Set up the parameters for a MAIL search string $MAILSearchString = $URLSearchString; + // Bookmarks in red - will be converted to bookmarks in friendica + $Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text); + $Text = preg_replace("/#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $Text); + if ($simplehtml == 5) $Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text); @@ -652,7 +719,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1$2', $Text); else { $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text); - $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'RemovePictureLinks', $Text); + $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text); } if ($tryoembed) From 608d5255ec66ff4ac1c4e047ed32e3057201b5c7 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 22 Feb 2014 15:46:19 +0100 Subject: [PATCH 2/6] Support for twitter cards (in both directions) --- mod/display.php | 15 ++++++-- mod/parse_url.php | 29 +++++++++++++--- mod/photos.php | 88 ++++++++++++++++++++++++++--------------------- 3 files changed, 86 insertions(+), 46 deletions(-) diff --git a/mod/display.php b/mod/display.php index 75e51d5a90..116b4a17e3 100644 --- a/mod/display.php +++ b/mod/display.php @@ -203,6 +203,10 @@ function display_content(&$a, $update = 0) { $title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true)); $author_name = $r[0]["author-name"]; + $image = ""; + if ($image == "") + $image = $r[0]["thumb"]; + if ($title == "") $title = $author_name; @@ -219,9 +223,16 @@ function display_content(&$a, $update = 0) { // Schema.org microdata $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; + // Twitter cards + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + // Dublin Core $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; @@ -229,7 +240,7 @@ function display_content(&$a, $update = 0) { // Open Graph $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; diff --git a/mod/parse_url.php b/mod/parse_url.php index 66ad1e57ce..52083dfbcd 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -52,6 +52,9 @@ function completeurl($url, $scheme) { function parseurl_getsiteinfo($url, $no_guessing = false) { $siteinfo = array(); + + $siteinfo["type"] = "link"; + $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_HEADER, 1); @@ -165,6 +168,18 @@ function parseurl_getsiteinfo($url, $no_guessing = false) { case "description": $siteinfo["text"] = $attr["content"]; break; + case "twitter:image": + $siteinfo["image"] = $attr["content"]; + break; + case "twitter:card": + $siteinfo["type"] = $attr["content"]; + break; + case "twitter:description": + $siteinfo["text"] = $attr["content"]; + break; + case "twitter:title": + $siteinfo["title"] = $attr["content"]; + break; case "dc.title": $siteinfo["title"] = $attr["content"]; break; @@ -311,9 +326,9 @@ function parse_url_content(&$a) { logger('parse_url: ' . $url); if($textmode) - $template = '[bookmark=%s]%s[/bookmark]%s' . $br; + $template = '[bookmark=%s]%s[/bookmark]%s'; else - $template = "%s%s
"; + $template = "%s%s"; $arr = array('url' => $url, 'text' => ''); @@ -386,9 +401,10 @@ function parse_url_content(&$a) { $text = '
'.htmlspecialchars(trim($text)).'
'; } - if($image) { + if($image) $text = $br.$br.$image.$text; - } + else + $text = $br.$text; $title = str_replace(array("\r","\n"),array('',''),$title); @@ -398,7 +414,10 @@ function parse_url_content(&$a) { $sitedata .= trim($result); - echo "[class=type-link]".$sitedata."[/class]"; + if (($siteinfo["type"] != "photo")) + echo "[class=type-link]".$sitedata."[/class]"; + else + echo "[class=type-photo]".$title.$br.$image."[/class]"; killme(); } diff --git a/mod/photos.php b/mod/photos.php index 79a51fd4c9..dac6dae9be 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -49,7 +49,7 @@ function photos_init(&$a) { if($albums_visible) { $o .= '