diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
index 3783959b363..3754b4b3e58 100644
--- a/apps/encryption/templates/mail.php
+++ b/apps/encryption/templates/mail.php
@@ -6,9 +6,8 @@
- |
-
-
+ |
+
|
|
diff --git a/apps/sharebymail/templates/mail.php b/apps/sharebymail/templates/mail.php
index 48f7dcb063a..ea3531809a9 100644
--- a/apps/sharebymail/templates/mail.php
+++ b/apps/sharebymail/templates/mail.php
@@ -27,9 +27,8 @@
- |
-
-
+ |
+
|
|
diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif
deleted file mode 100644
index 7c14cb8d1af..00000000000
Binary files a/core/img/logo-mail.gif and /dev/null differ
diff --git a/core/img/logo-mail.png b/core/img/logo-mail.png
index 517b821e4be..80304ae7ec7 100644
Binary files a/core/img/logo-mail.png and b/core/img/logo-mail.png differ
diff --git a/core/templates/internalaltmail.php b/core/templates/internalaltmail.php
deleted file mode 100644
index 38531d109b7..00000000000
--- 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 9bb10fb5455..00000000000
--- a/core/templates/internalmail.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- |
-
-
- |
-
- |
-
- |
-
-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());?>
- |
-
-
- |
-
-
- |
-
diff --git a/core/templates/mail.php b/core/templates/mail.php
index c2d84184d38..3721d50e27b 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -2,9 +2,8 @@
- |
-
-
+ |
+
|
|
diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php
index 8b13ac753eb..bd2d4249d9a 100644
--- a/settings/templates/email.new_user.php
+++ b/settings/templates/email.new_user.php
@@ -2,9 +2,8 @@
- |
-
-
+ |
+
|
|
@@ -12,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 79559a87020..2cc70ddfa2f 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!"));
| | | | |