harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort out registrations requiring approval

Browse Source
This commit is contained in:
friendica 2013-02-11 16:43:27 -08:00
parent 6db8e97535
commit 698a372ba1
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/account.php
View File

@ -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')),

9
view/en/register_open_eml.tpl
View File

@ -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

3
view/en/register_verify_eml.tpl
View File

@ -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:

9
view/en/smarty3/register_open_eml.tpl
View File

@ -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

3
view/en/smarty3/register_verify_eml.tpl
View File

@ -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: