From 08308e588d53a6d11764495dafcfdc099f9d7b63 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 18 Apr 2016 12:13:54 +0200
Subject: [PATCH] Attachments: Better handling of preview pictures
---
include/plaintext.php | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/include/plaintext.php b/include/plaintext.php
index a6738ca93b..a4f6b6bf68 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -1,4 +1,7 @@
<?php
+
+require_once("include/Photo.php");
+
/**
* @brief Fetches attachment data that were generated the old way
*
@@ -31,8 +34,15 @@ function get_old_attachment_data($body) {
$URLSearchString = "^\[\]";
- if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches))
- $post["image"] = $matches[1];
+ if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) {
+
+ $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)) {
$post["url"] = $matches[1];
@@ -144,9 +154,7 @@ function get_attachment_data($body) {
$preview = $matches[1];
}
- if (($image == "") AND ($preview != ""))
- $data["image"] = $preview;
- else
+ if ($preview != "")
$data["preview"] = $preview;
$data["description"] = trim($match[3]);