From ef514bc4bd13fc5a05303f4cb065abddd078250e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 9 Oct 2019 09:04:51 +0300
Subject: add notifications for mail and password changes update and shorten
 some other message templates

---
 templates/digest_template.txt          |  1 +
 templates/digest_template_html.txt     |  4 +++-
 templates/email_article_template.txt   |  2 +-
 templates/mail_change_template.txt     | 10 ++++++++++
 templates/password_change_template.txt | 10 ++++++++++
 templates/resetpass_link_template.txt  |  3 ++-
 templates/resetpass_template.txt       |  9 ---------
 7 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 templates/mail_change_template.txt
 create mode 100644 templates/password_change_template.txt
 delete mode 100644 templates/resetpass_template.txt

(limited to 'templates')

diff --git a/templates/digest_template.txt b/templates/digest_template.txt
index aa56fb3ae..841f8ee98 100644
--- a/templates/digest_template.txt
+++ b/templates/digest_template.txt
@@ -11,4 +11,5 @@ ${FEED_TITLE}
 <!-- $EndBlock feed -->
 -- 
 To unsubscribe, visit your configuration options or contact instance owner.
+Sent by tt-rss mailer daemon at ${TTRSS_HOST}.
 <!-- $EndBlock digest -->
diff --git a/templates/digest_template_html.txt b/templates/digest_template_html.txt
index ede93d917..f38d98a21 100644
--- a/templates/digest_template_html.txt
+++ b/templates/digest_template_html.txt
@@ -14,5 +14,7 @@
 <!-- $EndBlock feed -->
  
 <hr>
-<em>To unsubscribe, visit your configuration options or contact instance owner.</em>
+
+<em>To unsubscribe, visit your configuration options or contact instance owner.</em><br/>
+<em>Sent by tt-rss mailer daemon at ${TTRSS_HOST}.</em>
 <!-- $EndBlock digest -->
diff --git a/templates/email_article_template.txt b/templates/email_article_template.txt
index b6bc63921..c955100a0 100644
--- a/templates/email_article_template.txt
+++ b/templates/email_article_template.txt
@@ -12,5 +12,5 @@ Thought I'd share the following with you:
 <!-- $EndBlock article -->
 
 -- 
-This message has been sent by Tiny Tiny RSS installation at ${TTRSS_HOST}.
+Sent by Tiny Tiny RSS mailer daemon at ${TTRSS_HOST}.
 <!-- $EndBlock email -->
diff --git a/templates/mail_change_template.txt b/templates/mail_change_template.txt
new file mode 100644
index 000000000..1f7b2a60e
--- /dev/null
+++ b/templates/mail_change_template.txt
@@ -0,0 +1,10 @@
+<!-- $BeginBlock message -->
+Hello, ${LOGIN}.
+
+Your mail address for this Tiny Tiny RSS instance has been changed to ${NEWMAIL}.
+
+If you haven't requested this change, consider contacting your instance owner or resetting your password.
+
+-- 
+Sent by tt-rss mailer daemon at ${TTRSS_HOST}.
+<!-- $EndBlock message -->
diff --git a/templates/password_change_template.txt b/templates/password_change_template.txt
new file mode 100644
index 000000000..a5fa9c761
--- /dev/null
+++ b/templates/password_change_template.txt
@@ -0,0 +1,10 @@
+<!-- $BeginBlock message -->
+Hello, ${LOGIN}.
+
+Your password for this Tiny Tiny RSS instance has been changed.
+
+If you haven't requested this change, consider contacting your instance owner.
+
+-- 
+Sent by tt-rss mailer daemon at ${TTRSS_HOST}.
+<!-- $EndBlock message -->
diff --git a/templates/resetpass_link_template.txt b/templates/resetpass_link_template.txt
index d238c8616..c5c5d5f3a 100644
--- a/templates/resetpass_link_template.txt
+++ b/templates/resetpass_link_template.txt
@@ -10,5 +10,6 @@ Please note that the above link will only be valid for the next 15 minutes.
 
 If you don't want to reset your password, ignore this message.
 
-Sincerely, Tiny Tiny RSS Mail Daemon.
+-- 
+Sent by tt-rss mailer daemon at ${TTRSS_HOST}.
 <!-- $EndBlock message -->
diff --git a/templates/resetpass_template.txt b/templates/resetpass_template.txt
deleted file mode 100644
index c262f9a77..000000000
--- a/templates/resetpass_template.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- $BeginBlock message -->
-Hello, ${LOGIN}.
-
-Your password for this Tiny Tiny RSS installation has been reset.
-
-Your new password is ${NEWPASS}, please remember it for later reference.
-
-Sincerely, Tiny Tiny RSS Mail Daemon.
-<!-- $EndBlock message -->
-- 
cgit v1.2.3