You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2016/06/01 04:31:55 UTC
[1/2] incubator-ponymail git commit: fix up preferences script
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 <hu...@apache.org>
Authored: Wed Jun 1 06:30:24 2016 +0200
Committer: humbedooh <hu...@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
[2/2] incubator-ponymail git commit: reword a bit
Posted by hu...@apache.org.
reword a bit
this should fix #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/42b2a9eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/42b2a9eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/42b2a9eb
Branch: refs/heads/master
Commit: 42b2a9eb4e902191dcc4206c2efba688dd997090
Parents: b228f12
Author: humbedooh <hu...@apache.org>
Authored: Wed Jun 1 06:31:33 2016 +0200
Committer: humbedooh <hu...@apache.org>
Committed: Wed Jun 1 06:31:33 2016 +0200
----------------------------------------------------------------------
site/js/alts.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/42b2a9eb/site/js/alts.js
----------------------------------------------------------------------
diff --git a/site/js/alts.js b/site/js/alts.js
index af4ba82..82412b2 100644
--- a/site/js/alts.js
+++ b/site/js/alts.js
@@ -52,7 +52,7 @@ function listAlts() {
}
function newAlt(addr) {
- GetAsync("/api/preferences.lua?associate=" + addr, null, function() { alert("Your association request has been handled. Please check your inbox! Depending on grey-listing etc, it may take up to 15 minutes before your confirmation email arrives.")})
+ GetAsync("/api/preferences.lua?associate=" + addr, null, function() { alert("An association request has been sent to the specified email address. Please check your inbox! Depending on grey-listing etc, it may take up to 15 minutes before your confirmation email arrives.")})
return false;
}