From cf33349ce98ad0abf086d1afa9b98cc7476fb623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@netscape.net>
Date: Wed, 22 Feb 2017 20:59:16 +0100
Subject: Rename login_domain_blacklist to email_domain_blacklist and
 login_username_blacklist to login_blacklist

---
 catdap.yml                        | 4 ++--
 lib/CatDap/Controller/register.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/catdap.yml b/catdap.yml
index d0df579..0fb6166 100644
--- a/catdap.yml
+++ b/catdap.yml
@@ -33,9 +33,9 @@ Model::User:
 
 register:
         login_regex: ^[a-z][a-z0-9]*$
-        login_username_blacklist:
+        login_blacklist:
                 - apache
-        login_domain_blacklist:
+        email_domain_blacklist:
                 - armyspy.com
                 - codehot.co.uk
                 - dayrep.com
diff --git a/lib/CatDap/Controller/register.pm b/lib/CatDap/Controller/register.pm
index f33130a..889aabe 100644
--- a/lib/CatDap/Controller/register.pm
+++ b/lib/CatDap/Controller/register.pm
@@ -67,10 +67,10 @@ sub check : Local {
         close($etcpasswd);
     }
 
-    if (grep { /^$username$/ } @{${$c->config}{'register'}{'login_username_blacklist'}}) {
+    if (grep { /^$username$/ } @{${$c->config}{'register'}{'login_blacklist'}}) {
         push @errors, $c->loc('Username is not authorized to be used');
     }
-    if ($email_obj and grep { $email_obj->host =~ /^\Q$_\E$/i } @{${$c->config}{'register'}{'login_domain_blacklist'}}) {
+    if ($email_obj and grep { $email_obj->host =~ /^\Q$_\E$/i } @{${$c->config}{'register'}{'email_domain_blacklist'}}) {
         push @errors, $c->loc('Email domain is not authorized to be used');
     }
 
-- 
cgit v1.2.1