From 6aa79cacfd8958c68f48f4f230fea9fb972ed3ae Mon Sep 17 00:00:00 2001 From: Felix Epp Date: Mon, 19 Sep 2016 16:00:41 +0200 Subject: [PATCH 1/4] Fix mail header logo [fixes #1326] Signed-off-by: Felix A. Epp --- 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 3783959b36..3754b4b3e5 100644 --- a/apps/encryption/templates/mail.php +++ b/apps/encryption/templates/mail.php @@ -6,9 +6,8 @@ - - 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{Wm%TyoP7~gK~%TBp*+57@`L-7~}Hc@$1et(74HIH70T91sH zo@9NWqGgCUBPFS*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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 diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php index 9bb10fb545..555c063c14 100644 --- a/core/templates/internalmail.php +++ b/core/templates/internalmail.php @@ -2,9 +2,8 @@
  - <?php p($theme->getName()); ?> + + <?php p($theme->getName()); ?>
 
- - diff --git a/core/templates/mail.php b/core/templates/mail.php index c2d84184d3..3721d50e27 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -2,9 +2,8 @@
  -<?php p($theme->getName()); ?> + +<?php p($theme->getName()); ?>
 
- - diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php index 8b13ac753e..054992532d 100644 --- a/settings/templates/email.new_user.php +++ b/settings/templates/email.new_user.php @@ -2,9 +2,8 @@
  -<?php p($theme->getName()); ?> + +<?php p($theme->getName()); ?>
 
- - From 01867b42d4dbc521e1e738f9f93a35389a7a5903 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 29 Nov 2016 16:31:40 +0100 Subject: [PATCH 2/4] Update sharedbymail template Signed-off-by: Morris Jobke --- apps/sharebymail/templates/mail.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/sharebymail/templates/mail.php b/apps/sharebymail/templates/mail.php index 48f7dcb063..ea3531809a 100644 --- a/apps/sharebymail/templates/mail.php +++ b/apps/sharebymail/templates/mail.php @@ -27,9 +27,8 @@
  - <?php p($theme->getName()); ?> + + <?php p($theme->getName()); ?>
 
- - From 224c89c1b837e1fd6a36cff2f17324e5b7535994 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 29 Nov 2016 16:50:02 +0100 Subject: [PATCH 3/4] Remove leftovers from #1929 Signed-off-by: Morris Jobke --- core/templates/internalaltmail.php | 13 ---------- core/templates/internalmail.php | 38 ------------------------------ 2 files changed, 51 deletions(-) delete mode 100644 core/templates/internalaltmail.php delete mode 100644 core/templates/internalmail.php diff --git a/core/templates/internalaltmail.php b/core/templates/internalaltmail.php deleted file mode 100644 index 38531d109b..0000000000 --- a/core/templates/internalaltmail.php +++ /dev/null @@ -1,13 +0,0 @@ -t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); -if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); - print_unescaped("\n\n"); -} -// TRANSLATORS term at the end of a mail -p($l->t("Cheers!")); -?> - --- -getName() . ' - ' . $theme->getSlogan()); ?> -getBaseUrl()); diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php deleted file mode 100644 index 555c063c14..0000000000 --- a/core/templates/internalmail.php +++ /dev/null @@ -1,38 +0,0 @@ -
  - <?php p($theme->getName()); ?> + + <?php p($theme->getName()); ?>
 
- -
- - - - - - - - - - - - - - - - - -
-<?php p($theme->getName()); ?> -
 
  -t('Hey there,

just letting you know that %s shared %s with you.
View it!

', array($_['user_displayname'], $_['filename'], $_['link']))); -if ( isset($_['expiration']) ) { - p($l->t("The share will expire on %s.", array($_['expiration']))); - print_unescaped('

'); -} -// TRANSLATORS term at the end of a mail -p($l->t('Cheers!')); -?> -
 
 --
-getName()); ?> - -getSlogan()); ?> -
getBaseUrl());?> -
 
-
From 8e361b723c76cf5c71ee5cbbad886afa48c10833 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 30 Nov 2016 08:51:50 +0100 Subject: [PATCH 4/4] Fix minor mail issues * a nextcloud * Strong username & url Signed-off-by: Roeland Jago Douma --- settings/templates/email.new_user.php | 2 +- settings/templates/email.new_user_plain_text.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php index 054992532d..bd2d4249d9 100644 --- a/settings/templates/email.new_user.php +++ b/settings/templates/email.new_user.php @@ -11,7 +11,7 @@ 		  t('Hey there,

just letting you know that you now have an %s account.

Your username: %s
Access it: %s

', array($theme->getName(), $_['username'], $_['url'], $_['url']))); + print_unescaped($l->t('Hey there,

just letting you know that you now have a %s account.

Your username: %s
Access it: %s

', array($theme->getName(), $_['username'], $_['url'], $_['url']))); // TRANSLATORS term at the end of a mail p($l->t('Cheers!')); diff --git a/settings/templates/email.new_user_plain_text.php b/settings/templates/email.new_user_plain_text.php index 79559a8702..2cc70ddfa2 100644 --- a/settings/templates/email.new_user_plain_text.php +++ b/settings/templates/email.new_user_plain_text.php @@ -1,5 +1,5 @@ t("Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n", array($theme->getName(), $_['username'], $_['url']))); +print_unescaped($l->t("Hey there,\n\njust letting you know that you now have a %s account.\n\nYour username: %s\nAccess it: %s\n\n", array($theme->getName(), $_['username'], $_['url']))); // TRANSLATORS term at the end of a mail p($l->t("Cheers!"));