From 6e3f6fd2a31f43658f8539e2571329b5a8ebade0 Mon Sep 17 00:00:00 2001
From: Felix Epp <work@felixepp.de>
Date: Mon, 19 Sep 2016 16:00:41 +0200
Subject: [PATCH] Fix mail header logo [fixes #1326]

---
 apps/encryption/templates/mail.php    |   5 ++---
 core/img/logo-mail.gif                | Bin 518 -> 0 bytes
 core/img/logo-mail.png                | Bin 1944 -> 1706 bytes
 core/templates/internalmail.php       |   5 ++---
 core/templates/mail.php               |   5 ++---
 settings/templates/email.new_user.php |   5 ++---
 6 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 core/img/logo-mail.gif

diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
index 3783959b36339..3754b4b3e5820 100644
--- a/apps/encryption/templates/mail.php
+++ b/apps/encryption/templates/mail.php
@@ -6,9 +6,8 @@
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
-						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+					<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
+						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
 				<tr><td colspan="2">&nbsp;</td></tr>
diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif
deleted file mode 100644
index 7c14cb8d1afe578634f7d410811d4c8d409e945c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmV+h0{Q(%Nk%w1VQm010OJV&0D;H=fyn@Y$^e4M0D{Q?g317c$N+=M0E5c^|NsC0
z|NsC0|NsC0|NsC0|NsC0A^8LW3IGoPEC2ui0Bry=06+x(@X1N5y*T5*wf|r!h5%un
zXsWL3F}@Zn&k_w=B^x})?5C4}4D>_YKE)Gp$V(O<wqu3ne1=pmQFV(dh<XL1bo}~-
z$>{Wm%TyoP7~gK~%TBp*+57@`L-7~}Hc@$1et(7<JuDUjY$h=?1~)>4HIH70T91sH
zo@9NWqGg<xqZw8jPN+#pbtI((6qPz-J`}NhKN0|8oNm6Dm$$<zOGyKoi5^UCs;kP-
z%$)+n6|~E0Y<sxY#lPRiwo$Q=9*eDo-mJSA!KtSgIpr<!_PXHr`mR0z`~U170sKc#
z%)n0togI`AtU!Teo2nq-!tI<xgD|kQ!#5+72S>CUBPFS*4p2849!FF&#R($Ed^1Rr
zYD3S$yIiKEP$}qgr9ufB)4ADp;bw|CGVGLumu8}qlo!y6`}uO6HfhgRJTR(+AJeNs
zvudR(vWS3aVFLm|v;ryxklE6NvLIC)TP6d7#vQ}e2}Gs|!<}$@V@9&N`6%?o3U`If
zh$~#)HK{i31Rn@y%9vCZD+t7PE0b;VweyP13nwQup)|GJ)g~UhMiY3pJ-vo)+ZND4
Iw}c1)JB~W@P5=M^

diff --git a/core/img/logo-mail.png b/core/img/logo-mail.png
index 517b821e4be59aa02c906f870b0a6808717c9f7e..80304ae7ec7a2394890dc166fc21cfd69a69ea4b 100644
GIT binary patch
literal 1706
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
AS^xk5

literal 1944
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
W;`xi~U;81SSi}7$de^Z>DgOdxJ&9=m

diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php
index 9bb10fb5455e6..555c063c1494c 100644
--- a/core/templates/internalmail.php
+++ b/core/templates/internalmail.php
@@ -2,9 +2,8 @@
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
-<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
+<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index c2d84184d383c..3721d50e27b8f 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -2,9 +2,8 @@
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
-<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
+<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php
index 8b13ac753eb79..054992532d2a2 100644
--- a/settings/templates/email.new_user.php
+++ b/settings/templates/email.new_user.php
@@ -2,9 +2,8 @@
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
-						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+					<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>" bordercolor="<?php p($theme->getMailHeaderColor());?>" border>
+						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
 				<tr><td colspan="2">&nbsp;</td></tr>