clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2461 from annando/1604-attach-preview 

Attachments: Better handling of preview pictures
This commit is contained in:
Tobias Diekershoff 2016-04-19 06:16:56 +02:00
parent 1c47ec35b8 432c1ec5e4
commit 8126683552
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/plaintext.php
View File

@ -1,11 +1,15 @@
<?php <?php
require_once("include/Photo.php");
/** /**
* @brief Fetches attachment data that were generated the old way * @brief Fetches attachment data that were generated the old way
* *
* @param string $body Message body * @param string $body Message body
* @return array * @return array
* 'type' -> Message type ("link", "video", "photo") * 'type' -> Message type ("link", "video", "photo")
* 'text' -> Text outside of the shared message * 'text' -> Text before the shared message
* 'after' -> Text after the shared message
* 'image' -> Preview image of the message * 'image' -> Preview image of the message
* 'url' -> Url to the attached message * 'url' -> Url to the attached message
* 'title' -> Title of the attachment * 'title' -> Title of the attachment
@ -25,14 +29,26 @@ function get_old_attachment_data($body) {
$post["type"] = substr($data[1], 5); $post["type"] = substr($data[1], 5);
$post["text"] = trim(str_replace($data[0], "", $body)); $pos = strpos($body, $data[0]);
if ($pos > 0) {
$post["text"] = trim(substr($body, 0, $pos));
$post["after"] = trim(substr($body, $pos + strlen($data[0])));
} else
$post["text"] = trim(str_replace($data[0], "", $body));
$attacheddata = $data[2]; $attacheddata = $data[2];
$URLSearchString = "^\[\]"; $URLSearchString = "^\[\]";
if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) {
$post["image"] = $matches[1];
$picturedata = get_photo_info($matches[1]);
if (($picturedata[0] >= 500) AND ($picturedata[0] >= $picturedata[1]))
$post["image"] = $matches[1];
else
$post["preview"] = $matches[1];
}
if (preg_match("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", $attacheddata, $matches)) { if (preg_match("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", $attacheddata, $matches)) {
$post["url"] = $matches[1]; $post["url"] = $matches[1];
@ -144,9 +160,7 @@ function get_attachment_data($body) {
$preview = $matches[1]; $preview = $matches[1];
} }
if (($image == "") AND ($preview != "")) if ($preview != "")
$data["image"] = $preview;
else
$data["preview"] = $preview; $data["preview"] = $preview;
$data["description"] = trim($match[3]); $data["description"] = trim($match[3]);

9
mod/parse_url.php
View File

@ -488,7 +488,14 @@ function parse_url_content(&$a) {
unset($siteinfo["keywords"]); unset($siteinfo["keywords"]);
echo add_page_info_data($siteinfo); $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(); killme();
} }
?> ?>