1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2dcd992a28f3/ Changeset: 2dcd992a28f3 User: martenson Date: 2013-10-04 20:24:35 Summary: modified activation email body, now it should not end up in spam folders, hopefully Affected #: 1 file diff -r 6e063ca1960f9fd0539ad974f4e98520e31fc0a9 -r 2dcd992a28f36431bf5a76c5662896256b172175 lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -749,13 +749,16 @@ """ activation_link = self.prepare_activation_link( trans, email ) - body = ("Hi %s,\n\n" - "Please click the activation link below in order to activate your account.\n\n" - "Activation link: %s \n\n" - "Your Galaxy Team" % ( email, activation_link )) + body = ("Hello %s,\n\n" + "In order to complete the activation process for %s begun on %s at %s, please click on the following link to verify your account:\n\n" + "%s \n\n" + "By clicking on the above link and opening a Galaxy account you are also confirming that you have read and agreed to Galaxy's Terms and Conditions for use of this service (https://main.g2.bx.psu.edu/static/terms.html). This includes a quota limit of one account per user. Attempts to subvert this limit by creating multiple accounts or through any other method may result in termination of all associated accounts and data.\n\n" + "Please contact us if you need help with your account at: galaxy-bugs@bx.psu.edu\n" + "More about Galaxy can be found on our wiki: galaxyproject.org\n\n" + "Your Galaxy Team" % ( trans.user.username, email, datetime.utcnow().strftime( "%D" ), trans.request.host, activation_link )) to = email - frm = trans.app.config.activation_email - subject = 'How to activate your Galaxy account' + frm = trans.app.config.admin_email + subject = 'Galaxy Account Activation' try: util.send_mail( frm, to, subject, body, trans.app.config ) return True @@ -767,9 +770,6 @@ Prepares the account activation link for the user. """ activation_token = self.get_activation_token( trans, email ) - host = trans.request.host.split( ':' )[ 0 ] - if host == 'localhost': - host = socket.getfqdn() activation_link = str( trans.request.host ) + url_for( controller='user', action='activate' ) + "?activation_token=" + str( activation_token ) + "&email=" + urllib.quote( email ) return activation_link Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.