aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-02-11 16:43:27 -0800
committerfriendica <info@friendica.com>2013-02-11 16:43:27 -0800
commit698a372ba1dc5ebad679ceddda0700a540c71ce7 (patch)
tree54d46dd047afb7087bbb69cd9df89f6e5f3f7e56
parent6db8e975357c1ac4a35a1048ff3f897ea55334bf (diff)
downloadvolse-hubzilla-698a372ba1dc5ebad679ceddda0700a540c71ce7.tar.gz
volse-hubzilla-698a372ba1dc5ebad679ceddda0700a540c71ce7.tar.bz2
volse-hubzilla-698a372ba1dc5ebad679ceddda0700a540c71ce7.zip
Sort out registrations requiring approval
-rw-r--r--include/account.php12
-rw-r--r--view/en/register_open_eml.tpl9
-rw-r--r--view/en/register_verify_eml.tpl3
-rw-r--r--view/en/smarty3/register_open_eml.tpl9
-rw-r--r--view/en/smarty3/register_verify_eml.tpl3
5 files changed, 21 insertions, 15 deletions
diff --git a/include/account.php b/include/account.php
index 444036473..8809d908a 100644
--- a/include/account.php
+++ b/include/account.php
@@ -238,6 +238,11 @@ function send_reg_approval_email($arr) {
dbesc($arr['account']['account_language'])
);
+ $ip = $_SERVER['REMOTE_ADDR'];
+
+ $details = (($ip) ? $ip . ' [' . gethostbyaddr($ip) . ']' : '[unknown or stealth IP]');
+
+
$delivered = 0;
foreach($admins as $admin) {
@@ -246,12 +251,13 @@ function send_reg_approval_email($arr) {
else
push_lang('en');
- $email_msg = replace_macros(get_intltext_template('register_verify_email.tpl'), array(
+ $email_msg = replace_macros(get_intltext_template('register_verify_eml.tpl'), array(
'$sitename' => get_config('system','sitename'),
'$siteurl' => z_root(),
'$email' => $arr['email'],
'$uid' => $arr['account']['account_id'],
- '$hash' => $hash
+ '$hash' => $hash,
+ '$details' => $details
));
$res = mail($admin['email'], sprintf( t('Registration request at %s'), get_config('system','sitename')),
@@ -278,7 +284,7 @@ function send_verification_email($email,$password) {
'$sitename' => get_config('config','sitename'),
'$siteurl' => z_root(),
'$email' => $email,
- '$password' => $password,
+ '$password' => t('your registration password'),
));
$res = mail($email, sprintf( t('Registration details for %s'), get_config('system','sitename')),
diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl
index 648720621..4191f803b 100644
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
@@ -4,13 +4,14 @@ The login details are as follows:
Site Location: $[siteurl]
Login: $[email]
-Password: (the password supplied during registration)
+Password: (the password which was provided during registration)
-If this account was created without your knowledge and is not desired, please
-login and remove the account from the links on the Settings page, and we
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
apologise for any inconvenience.
-Thank you and welcome.
+Thank you and welcome to $[sitename].
Sincerely,
$[sitename] Administrator
diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl
index 73980bb5c..c23de6a2a 100644
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
@@ -5,10 +5,9 @@ your approval.
The login details are as follows:
-Full Name: $[username]
Site Location: $[siteurl]
Login Name: $[email]
-
+IP Address: $[details]
To approve this request please visit the following link:
diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl
index e6702f478..160427ddb 100644
--- a/view/en/smarty3/register_open_eml.tpl
+++ b/view/en/smarty3/register_open_eml.tpl
@@ -9,13 +9,14 @@ The login details are as follows:
Site Location: {{$siteurl}}
Login: {{$email}}
-Password: (the password supplied during registration)
+Password: (the password which was provided during registration)
-If this account was created without your knowledge and is not desired, please
-login and remove the account from the links on the Settings page, and we
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
apologise for any inconvenience.
-Thank you and welcome.
+Thank you and welcome to {{$sitename}}.
Sincerely,
{{$sitename}} Administrator
diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl
index 43257e78a..8261d6960 100644
--- a/view/en/smarty3/register_verify_eml.tpl
+++ b/view/en/smarty3/register_verify_eml.tpl
@@ -10,10 +10,9 @@ your approval.
The login details are as follows:
-Full Name: {{$username}}
Site Location: {{$siteurl}}
Login Name: {{$email}}
-
+IP Address: {{$details}}
To approve this request please visit the following link: