Attachments: Better handling of preview pictures

This commit is contained in:
Michael Vogel 2016-04-18 12:13:54 +02:00 committed by Roland Haeder
parent d2741d7f2e
commit 08308e588d
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78

View file

@ -1,4 +1,7 @@
<?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
* *
@ -31,8 +34,15 @@ function get_old_attachment_data($body) {
$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 +154,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]);