- just compare cnames (CN field), not emails (emailAddress field)

[myplc.git] / db-config

diff --git a/db-config b/db-config
index 60d28ab..4935860 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -674,19 +674,6 @@ https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/register.php?id=%(perso
 
 If you did not register for a %(PLC_NAME)s account, please ignore this
 message, or contact %(PLC_NAME)s Support <%(PLC_MAIL_SUPPORT_ADDRESS)s>.
-"""
-         },
-
-        {'message_id': 'New administrator account',
-         'subject': "New administrator account registration from %(first_name)s %(last_name)s <%(email)s>",
-         'template': """
-%(first_name)s %(last_name)s <%(email)s> has signed up for a new
-administrator account.
-
-Only current %(PLC_NAME)s administrators may enable new administrator
-accounts. To deny the request or enable the account, visit:
-
-https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_id)d
 """
          },
 
@@ -694,7 +681,7 @@ https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_i
          'subject': "New PI account registration from %(first_name)s %(last_name)s <%(email)s> at %(site_name)s",
          'template': """
 %(first_name)s %(last_name)s <%(email)s> has signed up for a new
-%(PLC_NAME) account at %(site_name)s and has requested a PI role. PIs
+%(PLC_NAME)s account at %(site_name)s and has requested a PI role. PIs
 are responsible for enabling user accounts, creating slices, and
 ensuring that all users abide by the %(PLC_NAME)s Acceptable Use
 Policy.
@@ -713,7 +700,7 @@ https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_i
          'subject': "New account registration from %(first_name)s %(last_name)s <%(email)s> at %(site_name)s",
          'template': """
 %(first_name)s %(last_name)s <%(email)s> has signed up for a new
-%(PLC_NAME) account at %(site_name)s and has requested the following
+%(PLC_NAME)s account at %(site_name)s and has requested the following
 roles: %(roles)s.
 
 To deny the request or enable the account, visit:
@@ -729,7 +716,7 @@ Someone has requested that the password of your %(PLC_NAME)s account
 %(email)s be reset. If this person was you, you may continue with the
 reset by visiting:
 
-https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/reset_password.php?email=%(email)s&key=%(verification_key)s
+https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/reset_password.php?id=%(person_id)d&key=%(verification_key)s
 
 If you did not request that your password be reset, please contact
 %(PLC_NAME)s Support <%(PLC_MAIL_SUPPORT_ADDRESS)s>. Do not quote or