From b8ada6d36e6e6359b8af7c951d10df89fa3c4514 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Tue, 16 Jan 2007 17:21:31 +0000 Subject: [PATCH] - rewrite some of the message templates to be clearer --- db-config | 175 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 97 insertions(+), 78 deletions(-) diff --git a/db-config b/db-config index 618fc61..e572d5a 100755 --- a/db-config +++ b/db-config @@ -7,7 +7,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: db-config,v 1.12 2006/12/12 16:33:45 thierry Exp $ +# $Id$ # from plc_config import PLCConfiguration @@ -662,85 +662,104 @@ def main(): if (name, value) not in slice_attributes: AddSliceAttribute(slice['name'], name, value) - # Load default email templates - email_templates = [ - {'message_id': 'JOIN_REQUEST_APPROVED', - 'subject': "Your request to join PlanetLab has been approved", - 'template': """ - Your request to join PlanetLab has been approved! - - At this point PI and tech contact accounts have been created - and enabled. You will not be able to create slices until at - least one node is up and running correctly. To use these - accounts, you must first reset your password to obtain a - new one. Once logged in, please change your password. - - Instructions for setting up your nodes can be found at: - http://%s/consortium/setup_procedure.php - - Please direct any questions to PlanetLab Support, thank you! - - %s - http://%s - """ - }, - {'message_id': 'JOIN_REQUEST_APPROVED_PL', - 'subject': "The join request for %s has been approved", - 'template':""" - The join request for %s has been approved. - - To view the details of this site, visit: - https://%s/db/sites/detail.php?site_id=%d - """ - }, - {'message_id': 'ACCOUNT_REGISTERED', - 'subject': "New account registration from %s at %s", - 'template': """ - %s has signed up for a new PlanetLab account at %s, but - has not yet been enabled. The following roles have been - requested:%s - - If this account includes a PI role, we require an email from - the current PI at that site indicating this is acceptable. - If this account includes Admin role, another PlanetLab administrator - will have to enable the account. For User and Tech roles, any site PI - can enable the account. - - If this account is registered at a site that does not have a PI, - this email is also being sent to PlanetLab support for further - followup. - - To view details and enable this account, visit: - https://%s/db/accounts/detail.php?person_id=%s - - %s - http://%s - """ - }, - {'message_id': 'PASSWORD_RESET_INITIATE', - 'subject': "PlanetLab password reset", - 'template': """ - Someone initiated a password reset on your PlanetLab account. If this - was you, you may continue with the reset, by visiting: - - https://%s/db/login/reset_passwd.php?key=%s&id=%s - - If this was not you, please contact PlanetLab support about this - request. Please do not share the above link with anyone, as it can be - used to gain access to your account. If responding to support, delete - the link before sending. Thank you. - - %s - http://%s - """ - } - ] - - for template in email_templates: + # Load default message templates + message_templates = [ + {'message_id': 'Verify account', + 'subject': "Verify account registration", + 'template': """ +Please verify that you registered for a %(PLC_NAME)s account with the +username %(email)s by visiting: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/register.php?id=%(person_id)d&key=%(verification_key)s + +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 +""" + }, + + {'message_id': 'New PI account', + '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 +are responsible for enabling user accounts, creating slices, and +ensuring that all users abide by the %(PLC_NAME)s Acceptable Use +Policy. + +Only %(PLC_NAME)s administrators may enable new PI accounts. If you +are a PI at %(site_name)s, please respond and indicate whether this +registration is acceptable. + +To view the request, visit: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_id)d +""" + }, + + {'message_id': 'New account', + '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 +roles: %(roles)s. + +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 +""" + }, + + {'message_id': 'Password reset requested', + 'subject': "Password reset requested", + 'template': """ +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?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 +otherwise include any of this text in any correspondence. +""" + }, + + {'message_id': 'Password reset', + 'subject': "Password reset", + 'template': """ +The password of your %(PLC_NAME)s account %(email)s has been +temporarily reset to: + +%(password)s + +Please change it at as soon as possible by visiting: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_id)d + +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 +otherwise include any of this text in any correspondence. +""" + }, + ] + + for template in message_templates: messages = GetMessages([template['message_id']]) if not messages: - AddMessage(template) - + AddMessage(template) if __name__ == '__main__': main() -- 2.43.0