ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject [1/2] incubator-ponymail git commit: fix up preferences script
Date Wed, 01 Jun 2016 04:31:55 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 59fd2dd40 -> 42b2a9eb4


fix up preferences script

- tweak the null check
- reword the email association email
This fixes #47 and also addresses #40


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/b228f12b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/b228f12b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/b228f12b

Branch: refs/heads/master
Commit: b228f12bd25d580b6c639122665e6c17321563a2
Parents: 59fd2dd
Author: humbedooh <humbedooh@apache.org>
Authored: Wed Jun 1 06:30:24 2016 +0200
Committer: humbedooh <humbedooh@apache.org>
Committed: Wed Jun 1 06:30:24 2016 +0200

----------------------------------------------------------------------
 site/api/preferences.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b228f12b/site/api/preferences.lua
----------------------------------------------------------------------
diff --git a/site/api/preferences.lua b/site/api/preferences.lua
index 3b4c164..80f3c0f 100644
--- a/site/api/preferences.lua
+++ b/site/api/preferences.lua
@@ -80,13 +80,13 @@ function handle(r)
         -- send email
         local source = smtp.message{
                 headers = {
-                    subject = "Confirm email address merge in Pony Mail",
+                    subject = "Confirm email address association in Pony Mail",
                     to = get.associate,
                     from = ("\"Pony Mail\"<no-reply@%s>"):format(mldom)
                     },
                 body = ([[
-You (or someone else) has requested to merge this email address with the account '%s' in
Pony Mail.
-If you wish to complete this merge, please visit %s
+You (or someone else) has requested to associate this email address with the account '%s'
in Pony Mail.
+If you wish to complete this association, please visit %s
  ...Or don't if you didn't request this, just ignore this email.
 
 With regards,
@@ -109,7 +109,7 @@ Pony Mail - Email for Ponies and People.
     if get.verify and get.hash and account and account.credentials.altemail then
         local verified = false
         for k, v in pairs(account.credentials.altemail) do
-            if v and (not v == JSON.null) and v.hash == get.hash then
+            if v and not (v == JSON.null) and v.hash == get.hash then
                 account.credentials.altemail[k].verified = true
                 verified = true
                 break


Mime
View raw message