From 26b4e6c40fcc5c386bdfcd29971dde14926007fc Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:33:52 +0100 Subject: [PATCH 01/20] Update 'public/js/domain_check.js' --- public/js/domain_check.js | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/public/js/domain_check.js b/public/js/domain_check.js index 129302e..794718f 100644 --- a/public/js/domain_check.js +++ b/public/js/domain_check.js @@ -1,23 +1,20 @@ -function updateAvailability() { - if (this.responseText === "y") { - document.getElementById("avail").innerHTML = "Available!"; - } else { - document.getElementById("avail").innerHTML = "Not available"; - } -} - function checkAvailability() { - var name = document.getElementById("name").value; - - if (name === "") { - document.getElementById("avail").innerHTML = ""; - return + let name = document.getElementById('name').value; + if (name === '') { + document.getElementById('avail').innerHTML = ''; + return false; } - - document.getElementById("avail").innerHTML = "Checking availability..."; - - var req = new XMLHttpRequest(); - req.addEventListener("load", updateAvailability); - req.open("GET", "/api/check_availability?name="+encodeURIComponent(name)); - req.send(); -} + document.getElementById('avail').innerHTML = 'Checking availability...'; + fetch('/api/check_availability?name=' + encodeURIComponent(name), { + method: 'GET', + mode: 'cors' + }).then(g => g.text()).then(g => { + if (g === 'y') { + document.getElementById('avail').innerHTML = 'Available!'; + } else { + document.getElementById('avail').innerHTML = 'Not available'; + } + }).catch((e) => { + document.getElementById('avail').innerHTML = 'Not available'; + }); +} \ No newline at end of file -- 2.43.0 From 563c48d0daf62a12e10328562490000ccb56ae8a Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:37:28 +0100 Subject: [PATCH 02/20] Update 'public/js/domain_check.js' --- public/js/domain_check.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/domain_check.js b/public/js/domain_check.js index 794718f..a291d07 100644 --- a/public/js/domain_check.js +++ b/public/js/domain_check.js @@ -2,7 +2,7 @@ function checkAvailability() { let name = document.getElementById('name').value; if (name === '') { document.getElementById('avail').innerHTML = ''; - return false; + return; } document.getElementById('avail').innerHTML = 'Checking availability...'; fetch('/api/check_availability?name=' + encodeURIComponent(name), { @@ -15,6 +15,6 @@ function checkAvailability() { document.getElementById('avail').innerHTML = 'Not available'; } }).catch((e) => { - document.getElementById('avail').innerHTML = 'Not available'; + document.getElementById('avail').innerHTML = 'Server error'; }); } \ No newline at end of file -- 2.43.0 From bf25528424f190cc1d746503a6ab7d211969720c Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:43:10 +0100 Subject: [PATCH 03/20] Update 'public/js/admin_domains.js' --- public/js/admin_domains.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/public/js/admin_domains.js b/public/js/admin_domains.js index abc95aa..9814fa3 100644 --- a/public/js/admin_domains.js +++ b/public/js/admin_domains.js @@ -1,14 +1,15 @@ -function updateOwnerEmail() { - var name = this.domainName; - document.getElementById("owneremail-"+name).innerHTML = this.responseText; -} - -function showOwnerEmail(name) { - document.getElementById("owneremail-"+name).innerHTML = "Loading..."; - - var req = new XMLHttpRequest(); - req.domainName = name; - req.addEventListener("load", updateOwnerEmail); - req.open("GET", "/api/get_owner_email?name="+encodeURIComponent(name)); - req.send(); -} +function showOwnerEmail(in_name) { + let name = in_name; + if (!document.getElementById('owneremail-' + name)) { + return; + } + document.getElementById('owneremail-' + name).innerHTML = 'Loading...'; + fetch('/api/get_owner_email?name=' + encodeURIComponent(name), { + method: 'GET', + mode: 'cors' + }).then(g => g.text()).then(g => { + document.getElementById('owneremail-' + name).innerHTML = g; + }).catch((e) => { + console.log('server error', e); + }); +} \ No newline at end of file -- 2.43.0 From 7c2002ccad760ccc11a7f33ae9c1f595f9d2d6f6 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:49:25 +0100 Subject: [PATCH 04/20] Update 'views/register.tt' --- views/register.tt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/register.tt b/views/register.tt index 238bb64..b8a6919 100644 --- a/views/register.tt +++ b/views/register.tt @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -58,13 +58,13 @@ - +
- [  ] - [ go back ] + [  ] + [ Go back ]

By registering, you agree to be bound by the policies set forward in our charter. -- 2.43.0 From 25647f7ae1dc5bbba8479e5b399ab3903a6f7ab0 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:49:52 +0100 Subject: [PATCH 05/20] Update 'views/redir.tt' --- views/redir.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/redir.tt b/views/redir.tt index d6f5694..0b463a7 100644 --- a/views/redir.tt +++ b/views/redir.tt @@ -1,3 +1,3 @@
- Redirecting, please wait. + Redirecting...
-- 2.43.0 From 7281ba0ee1458e13016ff956b875904206114060 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:53:45 +0100 Subject: [PATCH 06/20] Update 'views/login.tt' --- views/login.tt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/views/login.tt b/views/login.tt index ad207c6..49dc586 100644 --- a/views/login.tt +++ b/views/login.tt @@ -5,14 +5,14 @@ <% IF account_created %>
- Your account has been created and a confirmation email sent to <% params.email | html_entity %>. Please confirm your email address, then log in here. + Your account has been created and a confirmation email sent to <% params.email | html_entity %>. Please confirm your email address to confirm your registration.


<% END %> <% IF params.pwchange %>
- Your password has been changed and all browsers logged out. Please log in again here. + Your password has been changed and all sessions logged out. Please log in again.


<% END %> @@ -20,13 +20,13 @@ <% IF error %>
<% IF e_no_user %> - The email address <% params.email | html_entity %> is not registered. + Your email address is not registered or the password is incorrect. <% END %> <% IF e_pass %> - Your password was incorrect, sorry. + Your email address is not registered or the password is incorrect. <% END %> <% IF e_not_confirmed %> - Please confirm your email address using the link sent to <% params.email | html_entity %>. + Please confirm your email address. <% END %>


@@ -42,7 +42,7 @@ - + @@ -50,14 +50,14 @@ - +
- [  ] - [ go back ] + [  ] + [ Go back ]

- [ recover forgotten password ] + [ Recover password ] -- 2.43.0 From 676f8e948e2b284c815220e399ba4986c535ca3c Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:54:19 +0100 Subject: [PATCH 07/20] Update 'views/index.tt' --- views/index.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.tt b/views/index.tt index 33cf8f3..1ac61df 100644 --- a/views/index.tt +++ b/views/index.tt @@ -10,6 +10,6 @@

You can read our charter for more information and details on how to report abuse of cybNIC services.

Create or log in to an account in order to register or update .cyb domains.

-

[ log in ]  [ register ]

+

[ Log in ]  [ Register ]

-- 2.43.0 From db5d3c7018d71a9388b4c2b7d093bfe053130fde Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:56:12 +0100 Subject: [PATCH 08/20] Update 'views/forgot.tt' --- views/forgot.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/forgot.tt b/views/forgot.tt index cad7bbc..e9ec465 100644 --- a/views/forgot.tt +++ b/views/forgot.tt @@ -5,10 +5,10 @@ <% IF err || success %>
<% IF e_no_user %> - Error: There is no user account associated with that email address. + An email has been sent if there is an account. Please click the link to reset your password. <% END %> <% IF success %> - An email has been sent to <% params.email | html_entity %>. Please click the link to reset your password. + An email has been sent if there is an account. Please click the link to reset your password. <% END %>


@@ -20,8 +20,8 @@
- +
- [  ] + [  ]
-- 2.43.0 From dc6f5694091fa22eb1d515d05d9cb8d8f19625d5 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:57:31 +0100 Subject: [PATCH 09/20] Update 'views/confirmed.tt' --- views/confirmed.tt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/confirmed.tt b/views/confirmed.tt index c5abb54..d7f8956 100644 --- a/views/confirmed.tt +++ b/views/confirmed.tt @@ -6,4 +6,6 @@
Your email address was confirmed successfully. +
+

[ Log in ]

-- 2.43.0 From b6129ebf4151a029354445eb0f6475652116d367 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:58:25 +0100 Subject: [PATCH 10/20] Update 'views/confirm_forgot.tt' --- views/confirm_forgot.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/confirm_forgot.tt b/views/confirm_forgot.tt index 9e986b4..a40f39b 100644 --- a/views/confirm_forgot.tt +++ b/views/confirm_forgot.tt @@ -31,7 +31,7 @@ - + @@ -39,11 +39,11 @@ - +
- [  ] + [  ] -- 2.43.0 From f186226340f011e999ac211ab46f4f7a7a587da5 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 05:58:53 +0100 Subject: [PATCH 11/20] Update 'views/charter.tt' --- views/charter.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/charter.tt b/views/charter.tt index c194809..6c96df3 100644 --- a/views/charter.tt +++ b/views/charter.tt @@ -15,7 +15,7 @@ Description We are also going to implement an opt-in mailing list which would permit notifications of domain registrations to be sent out to all those interested. This will, of course, be optional on both sides (opt-in to notify, opt-in to receive). -Furthermore, we will provide a certificate authority and issue each domain owner with a corresponding certificate. Alternative names and wildcards can also be requested. + Registration - - - - - - -- 2.43.0 From 371ffbdc2c6cb8455b009cfc73327fc215610d1f Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:00:31 +0100 Subject: [PATCH 12/20] Update 'views/account.tt' --- views/account.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/account.tt b/views/account.tt index a744ba2..fe40685 100644 --- a/views/account.tt +++ b/views/account.tt @@ -54,7 +54,7 @@ - + @@ -130,6 +130,6 @@
- [  ] + [  ] -- 2.43.0 From 8666dd06df6392ce22d90a2e3786a35cab15e327 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:04:30 +0100 Subject: [PATCH 13/20] Update 'views/records/add.tt' --- views/records/add.tt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/views/records/add.tt b/views/records/add.tt index d98c6f1..5bb4834 100644 --- a/views/records/add.tt +++ b/views/records/add.tt @@ -12,7 +12,7 @@
    <% IF e_bad_value %>
  • The value you entered was invalid. - <% IF params.type == 'NS' || params.type == 'CNAME' %>(Did you forget the trailing '.'?)<% END %>
    • + <% IF params.type == 'NS' || params.type == 'CNAME' || params.type == 'MX' %>(Did you forget the trailing '.'? e.g. "fqdnname.tld.")<% END %> <% END %> <% IF e_bad_type %>
  • You must choose a type for the record.
    • @@ -55,6 +55,8 @@ + + @@ -71,7 +73,7 @@
    - [  ] - [ go back ] + [  ] + [ Go back ] -- 2.43.0 From e2ceceed021cac914512d5fd55c538c577dc86c0 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:05:36 +0100 Subject: [PATCH 14/20] Update 'views/records/add.tt' --- views/records/add.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/records/add.tt b/views/records/add.tt index 5bb4834..80e7df8 100644 --- a/views/records/add.tt +++ b/views/records/add.tt @@ -51,7 +51,7 @@ + -- 2.43.0 From 092efa3298533381a24aa30786f3d24a235697fc Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:07:06 +0100 Subject: [PATCH 15/20] Update 'views/email/forgot.tt' --- views/email/forgot.tt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/email/forgot.tt b/views/email/forgot.tt index dfaca4e..b7f546e 100644 --- a/views/email/forgot.tt +++ b/views/email/forgot.tt @@ -1,6 +1,8 @@ Hello! -You're receiving this email because someone tried to reset your cybNIC password. If this was you, please click the link below: +You're receiving this email because someone tried to reset your cybNIC password. + +If this was you, please click the link below: <% link %> If it wasn't, you can safely ignore this email. -- 2.43.0 From b2f92afdd4343e95f661266be1f2824e97ef3485 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:07:40 +0100 Subject: [PATCH 16/20] Update 'views/email/forgot.tt' --- views/email/forgot.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/email/forgot.tt b/views/email/forgot.tt index b7f546e..884bc6a 100644 --- a/views/email/forgot.tt +++ b/views/email/forgot.tt @@ -2,7 +2,7 @@ Hello! You're receiving this email because someone tried to reset your cybNIC password. -If this was you, please click the link below: +If this was you, please click the link below to reset your password: <% link %> If it wasn't, you can safely ignore this email. -- 2.43.0 From 7b5a8edc38d49524a31672bcf52b50a10176d4d5 Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:08:09 +0100 Subject: [PATCH 17/20] Update 'views/email/registration.tt' --- views/email/registration.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/email/registration.tt b/views/email/registration.tt index a1955c0..a730ba9 100644 --- a/views/email/registration.tt +++ b/views/email/registration.tt @@ -5,4 +5,4 @@ You're receiving this email because someone used your email address to sign up f If this was you and you'd like to confirm your account, please click this link: <% link %> -Otherwise, feel free to ignore this email - we won't send any more. +Otherwise, feel free to ignore this email - we won't send anymore. -- 2.43.0 From 4f96325695ab6831d193f8f956301bef4a6ee8ad Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:08:53 +0100 Subject: [PATCH 18/20] Update 'views/email/update.tt' --- views/email/update.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/email/update.tt b/views/email/update.tt index a3bd3f5..3144304 100644 --- a/views/email/update.tt +++ b/views/email/update.tt @@ -2,7 +2,7 @@ Hello! You're receiving this email because someone entered your email address into cybNIC. -If this was you and you'd like to use this address, please click this link: +If this was you and you'd like to change your email address to this one, please click this link: <% link %> Otherwise, feel free to ignore this email. -- 2.43.0 From d27b943d72c1b62d39669b15c1e6ed9aedba6c1f Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:13:08 +0100 Subject: [PATCH 19/20] Update 'views/domains/new.tt' --- views/domains/new.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/domains/new.tt b/views/domains/new.tt index c2139e0..d5ad625 100644 --- a/views/domains/new.tt +++ b/views/domains/new.tt @@ -31,8 +31,8 @@ -- 2.43.0 From 71414b6e63ede5943f3b1042ccc5fbbb2efb930b Mon Sep 17 00:00:00 2001 From: mia Date: Sat, 23 Feb 2019 06:15:29 +0100 Subject: [PATCH 20/20] Update 'views/domains/remove.tt' --- views/domains/remove.tt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/domains/remove.tt b/views/domains/remove.tt index f0f7fae..de9fac2 100644 --- a/views/domains/remove.tt +++ b/views/domains/remove.tt @@ -20,6 +20,8 @@
    [  ]
    +
    + [ No, I changed my mind  ]

    -- 2.43.0