From 6af5a3a4851568bf03078a031ed179a66ef506f5 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 20 Apr 2012 11:39:36 +0200 Subject: [PATCH] escape email template var names. fix bug n385. --- view/en/follow_notify_eml.tpl | 10 +++++----- view/en/friend_complete_eml.tpl | 14 +++++++------- view/en/intro_complete_eml.tpl | 16 ++++++++-------- view/en/lostpass_eml.tpl | 12 ++++++------ view/en/passchanged_eml.tpl | 10 +++++----- view/en/register_open_eml.tpl | 14 +++++++------- view/en/register_verify_eml.tpl | 12 ++++++------ view/en/request_notify_eml.tpl | 12 ++++++------ 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl index ae758c9a8f..917024b842 100644 --- a/view/en/follow_notify_eml.tpl +++ b/view/en/follow_notify_eml.tpl @@ -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. -$siteurl +$[siteurl] Regards, - $sitename administrator \ No newline at end of file + $[sitename] administrator diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index ab12fcb6b7..89f5783881 100644 --- a/view/en/friend_complete_eml.tpl +++ b/view/en/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $username, +Dear $[username], - Great news... '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. + Great news... '$[fn]' at '$[dfrn_url]' has accepted +your connection request at '$[sitename]'. You are now mutual friends and may exchange status updates, photos, and email 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. -$siteurl +$[siteurl] [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, - $sitename Administrator + $[sitename] Administrator diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl index a60745ec55..cd78b2a150 100644 --- a/view/en/intro_complete_eml.tpl +++ b/view/en/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $username, +Dear $[username], - '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. + '$[fn]' at '$[dfrn_url]' has accepted +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 interactions. If this is a celebrity or community page, these settings were 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. - 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 -$siteurl +$[siteurl] Sincerely, - $sitename Administrator + $[sitename] Administrator diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl index c350236a43..1330caa122 100644 --- a/view/en/lostpass_eml.tpl +++ b/view/en/lostpass_eml.tpl @@ -1,6 +1,6 @@ -Dear $username, - A request was recently received at $sitename to reset your account +Dear $[username], + A request was recently received at $[sitename] to reset your account password. In order to confirm this request, please select the verification link below or paste it into your web browser address bar. @@ -12,7 +12,7 @@ issued this request. Follow this link to verify your identity: -$reset_link +$[reset_link] 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: -Site Location: $siteurl -Login Name: $email +Site Location: $[siteurl] +Login Name: $[email] Sincerely, - $sitename Administrator + $[sitename] Administrator diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl index 9692159e18..e7cc0e2dc1 100644 --- a/view/en/passchanged_eml.tpl +++ b/view/en/passchanged_eml.tpl @@ -1,5 +1,5 @@ -Dear $username, +Dear $[username], Your password has been changed as requested. Please retain this information for your records (or change your password immediately to something that you will remember). @@ -7,14 +7,14 @@ something that you will remember). Your login details are as follows: -Site Location: $siteurl -Login Name: $email -Password: $new_password +Site Location: $[siteurl] +Login Name: $[email] +Password: $[new_password] You may change that password from your account settings page after logging in. Sincerely, - $sitename Administrator + $[sitename] Administrator diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl index 221e6ec743..c55ac1e7e8 100644 --- a/view/en/register_open_eml.tpl +++ b/view/en/register_open_eml.tpl @@ -1,12 +1,12 @@ -Dear $username, - Thank you for registering at $sitename. Your account has been created. +Dear $[username], + Thank you for registering at $[sitename]. Your account has been created. The login details are as follows: -Site Location: $siteurl -Login Name: $email -Password: $password +Site Location: $[siteurl] +Login Name: $[email] +Password: $[password] You may change your password from your account "Settings" page after logging 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. -Thank you and welcome to $sitename. +Thank you and welcome to $[sitename]. Sincerely, - $sitename Administrator + $[sitename] Administrator diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl index 60c38d8000..73980bb5ce 100644 --- a/view/en/register_verify_eml.tpl +++ b/view/en/register_verify_eml.tpl @@ -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. The login details are as follows: -Full Name: $username -Site Location: $siteurl -Login Name: $email +Full Name: $[username] +Site Location: $[siteurl] +Login Name: $[email] 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: -$siteurl/regmod/deny/$hash +$[siteurl]/regmod/deny/$[hash] Thank you. diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl index 9eef7a61eb..ad118a6739 100644 --- a/view/en/request_notify_eml.tpl +++ b/view/en/request_notify_eml.tpl @@ -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 and approve or ignore/cancel the request. -$siteurl +$[siteurl] Regards, - $sitename administrator \ No newline at end of file + $[sitename] administrator