escape email template var names. fix bug n385.

This commit is contained in:
Fabio Comuni 2012-04-20 11:39:36 +02:00
parent c88dd1485f
commit 6af5a3a485
8 changed files with 50 additions and 50 deletions

View file

@ -1,14 +1,14 @@
Dear $myname, Dear $[myname],
You have a new follower at $sitename - '$requestor'. You have a new follower at $[sitename] - '$[requestor]'.
You may visit their profile at $url. You may visit their profile at $[url].
Please login to your site to approve or ignore/cancel the request. Please login to your site to approve or ignore/cancel the request.
$siteurl $[siteurl]
Regards, Regards,
$sitename administrator $[sitename] administrator

View file

@ -1,22 +1,22 @@
Dear $username, Dear $[username],
Great news... '$fn' at '$dfrn_url' has accepted Great news... '$[fn]' at '$[dfrn_url]' has accepted
your connection request at '$sitename'. your connection request at '$[sitename]'.
You are now mutual friends and may exchange status updates, photos, and email You are now mutual friends and may exchange status updates, photos, and email
without restriction. without restriction.
Please visit your 'Contacts' page at $sitename if you wish to make Please visit your 'Contacts' page at $[sitename] if you wish to make
any changes to this relationship. any changes to this relationship.
$siteurl $[siteurl]
[For instance, you may create a separate profile with information that is not [For instance, you may create a separate profile with information that is not
available to the general public - and assign viewing rights to '$fn']. available to the general public - and assign viewing rights to '$[fn]'].
Sincerely, Sincerely,
$sitename Administrator $[sitename] Administrator

View file

@ -1,22 +1,22 @@
Dear $username, Dear $[username],
'$fn' at '$dfrn_url' has accepted '$[fn]' at '$[dfrn_url]' has accepted
your connection request at '$sitename'. your connection request at '$[sitename]'.
'$fn' has chosen to accept you a "fan", which restricts '$[fn]' has chosen to accept you a "fan", which restricts
some forms of communication - such as private messaging and some profile some forms of communication - such as private messaging and some profile
interactions. If this is a celebrity or community page, these settings were interactions. If this is a celebrity or community page, these settings were
applied automatically. applied automatically.
'$fn' may choose to extend this into a two-way or more permissive '$[fn]' may choose to extend this into a two-way or more permissive
relationship in the future. relationship in the future.
You will start receiving public status updates from '$fn', You will start receiving public status updates from '$[fn]',
which will appear on your 'Network' page at which will appear on your 'Network' page at
$siteurl $[siteurl]
Sincerely, Sincerely,
$sitename Administrator $[sitename] Administrator

View file

@ -1,6 +1,6 @@
Dear $username, Dear $[username],
A request was recently received at $sitename to reset your account A request was recently received at $[sitename] to reset your account
password. In order to confirm this request, please select the verification link password. In order to confirm this request, please select the verification link
below or paste it into your web browser address bar. below or paste it into your web browser address bar.
@ -12,7 +12,7 @@ issued this request.
Follow this link to verify your identity: Follow this link to verify your identity:
$reset_link $[reset_link]
You will then receive a follow-up message containing the new password. You will then receive a follow-up message containing the new password.
@ -20,13 +20,13 @@ You may change that password from your account settings page after logging in.
The login details are as follows: The login details are as follows:
Site Location: $siteurl Site Location: $[siteurl]
Login Name: $email Login Name: $[email]
Sincerely, Sincerely,
$sitename Administrator $[sitename] Administrator

View file

@ -1,5 +1,5 @@
Dear $username, Dear $[username],
Your password has been changed as requested. Please retain this Your password has been changed as requested. Please retain this
information for your records (or change your password immediately to information for your records (or change your password immediately to
something that you will remember). something that you will remember).
@ -7,14 +7,14 @@ something that you will remember).
Your login details are as follows: Your login details are as follows:
Site Location: $siteurl Site Location: $[siteurl]
Login Name: $email Login Name: $[email]
Password: $new_password Password: $[new_password]
You may change that password from your account settings page after logging in. You may change that password from your account settings page after logging in.
Sincerely, Sincerely,
$sitename Administrator $[sitename] Administrator

View file

@ -1,12 +1,12 @@
Dear $username, Dear $[username],
Thank you for registering at $sitename. Your account has been created. Thank you for registering at $[sitename]. Your account has been created.
The login details are as follows: The login details are as follows:
Site Location: $siteurl Site Location: $[siteurl]
Login Name: $email Login Name: $[email]
Password: $password Password: $[password]
You may change your password from your account "Settings" page after logging You may change your password from your account "Settings" page after logging
in. in.
@ -26,9 +26,9 @@ If you are new and do not know anybody here, they may help
you to make some new and interesting friends. you to make some new and interesting friends.
Thank you and welcome to $sitename. Thank you and welcome to $[sitename].
Sincerely, Sincerely,
$sitename Administrator $[sitename] Administrator

View file

@ -1,25 +1,25 @@
A new user registration request was received at $sitename which requires A new user registration request was received at $[sitename] which requires
your approval. your approval.
The login details are as follows: The login details are as follows:
Full Name: $username Full Name: $[username]
Site Location: $siteurl Site Location: $[siteurl]
Login Name: $email Login Name: $[email]
To approve this request please visit the following link: To approve this request please visit the following link:
$siteurl/regmod/allow/$hash $[siteurl]/regmod/allow/$[hash]
To deny the request and remove the account, please visit: To deny the request and remove the account, please visit:
$siteurl/regmod/deny/$hash $[siteurl]/regmod/deny/$[hash]
Thank you. Thank you.

View file

@ -1,17 +1,17 @@
Dear $myname, Dear $[myname],
You have just received a connection request at $sitename You have just received a connection request at $[sitename]
from '$requestor'. from '$[requestor]'.
You may visit their profile at $url. You may visit their profile at $[url].
Please login to your site to view the complete introduction Please login to your site to view the complete introduction
and approve or ignore/cancel the request. and approve or ignore/cancel the request.
$siteurl $[siteurl]
Regards, Regards,
$sitename administrator $[sitename] administrator