From 16269e07ae21c2a9216ab33d6889830d3bec1e0f Mon Sep 17 00:00:00 2001
From: Sascha Greuel <sascha@softcreatr.de>
Date: Tue, 8 Oct 2013 23:43:51 +0200
Subject: [PATCH] Added option to obtain thumbnail dimensions

See
http://beta.woltlab.com/index.php/Thread/4094-Dateianh%C3%A4nge-Vorschau-besser-skalieren/
---
 com.woltlab.wcf/option.xml                                 | 7 ++++++-
 .../files/lib/data/attachment/AttachmentAction.class.php   | 2 +-
 wcfsetup/install/files/style/attachment.less               | 6 +++++-
 wcfsetup/install/lang/de.xml                               | 1 +
 wcfsetup/install/lang/en.xml                               | 1 +
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 46fedbf2a4..83897eb9db 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -615,7 +615,12 @@ no:!cache_source_memcached_host]]></enableoptions>
 				<categoryname>message.attachment</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue><![CDATA[1]]></defaultvalue>
-				<enableoptions>attachment_thumbnail_height,attachment_thumbnail_width</enableoptions>
+				<enableoptions>attachment_obtain_dimensions,attachment_thumbnail_height,attachment_thumbnail_width</enableoptions>
+			</option>
+			<option name="attachment_obtain_dimensions">
+				<categoryname>message.attachment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue><![CDATA[0]]></defaultvalue>
 			</option>
 			<option name="attachment_thumbnail_height">
 				<categoryname>message.attachment</categoryname>
diff --git a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
index 2312d37e3f..72e0921f30 100644
--- a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
+++ b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
@@ -282,7 +282,7 @@ class AttachmentAction extends AbstractDatabaseObjectAction {
 			// create standard thumbnail
 			if ($attachment->width > ATTACHMENT_THUMBNAIL_WIDTH || $attachment->height > ATTACHMENT_THUMBNAIL_HEIGHT) {
 				$thumbnailLocation = $attachment->getThumbnailLocation();
-				$thumbnail = $adapter->createThumbnail(ATTACHMENT_THUMBNAIL_WIDTH, ATTACHMENT_THUMBNAIL_HEIGHT, false);
+				$thumbnail = $adapter->createThumbnail(ATTACHMENT_THUMBNAIL_WIDTH, ATTACHMENT_THUMBNAIL_HEIGHT, ATTACHMENT_OBTAIN_DIMENSIONS);
 				$adapter->writeImage($thumbnail, $thumbnailLocation);
 				if (file_exists($thumbnailLocation) && ($imageData = @getImageSize($thumbnailLocation)) !== false) {
 					$updateData['thumbnailType'] = $imageData['mime'];
diff --git a/wcfsetup/install/files/style/attachment.less b/wcfsetup/install/files/style/attachment.less
index 1fc0ec4d43..6651342be8 100644
--- a/wcfsetup/install/files/style/attachment.less
+++ b/wcfsetup/install/files/style/attachment.less
@@ -41,7 +41,11 @@
 	min-height: ~"@{wcf_option_attachment_thumbnail_height}px";
 	min-width: ~"@{wcf_option_attachment_thumbnail_width}px";
 	position: relative;
-	vertical-align: top;
+	text-align: center;
+		
+	> img {
+		margin-left: 0px !important;
+	}
 	
 	> a {
 		display: inline-block;
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 15c05c3e06..f8dfb27a69 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -706,6 +706,7 @@
 		<item name="wcf.acp.option.recaptcha_privatekey"><![CDATA[Private-API-Key]]></item>
 		<item name="wcf.acp.option.category.message.attachment"><![CDATA[Dateianhänge]]></item>
 		<item name="wcf.acp.option.attachment_enable_thumbnails"><![CDATA[Vorschaugrafiken von hochgeladenen Bilder erzeugen]]></item>
+		<item name="wcf.acp.option.attachment_obtain_dimensions"><![CDATA[Bildformat beim Erzeugen von Vorschaugrafiken beibehalten]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_height"><![CDATA[Höhe der Vorschaugrafiken]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_width"><![CDATA[Breite der Vorschaugrafiken]]></item>
 		<item name="wcf.acp.option.attachment_storage"><![CDATA[Speicherort der Dateianhänge]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a71574177d..191d0a46f8 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -705,6 +705,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.recaptcha_privatekey"><![CDATA[Private API Key]]></item>
 		<item name="wcf.acp.option.category.message.attachment"><![CDATA[Attachments]]></item>
 		<item name="wcf.acp.option.attachment_enable_thumbnails"><![CDATA[Create thumbnails for uploaded images]]></item>
+		<item name="wcf.acp.option.attachment_obtain_dimensions"><![CDATA[Obtain thumbnail dimensions]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_height"><![CDATA[Thumbnail Height in Pixel]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_width"><![CDATA[Thumbnail Width in Pixel]]></item>
 		<item name="wcf.acp.option.attachment_storage"><![CDATA[Storage Location]]></item>
-- 
2.20.1