diff options
| author |   Tom Knight <tomk@gentoo.org> | 2013-09-08 14:18:08 +0000 |
|---|---|---|
| committer | Tom Knight <tomk@gentoo.org> | 2013-09-08 14:18:08 +0000 |
| commit | 8714efe523b07b1e7df695f3cad8531da5b08c4e (patch) | |
| tree | 48d0cea61aa759950959758ce211ceaf9f452d8a | |
| parent | phpBB-2-0-23-gentoo-p10 (diff) | |
| download | forums-8714efe523b07b1e7df695f3cad8531da5b08c4e.tar.gz forums-8714efe523b07b1e7df695f3cad8531da5b08c4e.tar.bz2 forums-8714efe523b07b1e7df695f3cad8531da5b08c4e.zip | |
- Add more information to admin activation e-mails
- Send e-amil to f-mods when admin activates an account from e-mail
| -rw-r--r-- | docs/ChangeLog | 5 | ||||
| -rw-r--r-- | htdocs/includes/usercp_activate.php | 6 | ||||
| -rw-r--r-- | htdocs/includes/usercp_register.php | 6 | ||||
| -rw-r--r-- | htdocs/language/lang_english/email/admin_activate.tpl | 18 |
4 files changed, 29 insertions, 6 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog index 0318f2f6a..50c344cb3 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,8 @@ +- Add more information to admin activation e-mails (tomk) +- Send e-amil to f-mods when admin activates an account from e-mail (tomk) + +------------------------------------------------------------------------------- + phpBB-2-0-23-gentoo-p10 (2013-08-07) - Automatically add known spambots (England, Nowe Misato, Xrumer) to profile spammers table (tomk) - Require admin activation when SFS is down (tomk) diff --git a/htdocs/includes/usercp_activate.php b/htdocs/includes/usercp_activate.php index aee06498c..28a4ea9af 100644 --- a/htdocs/includes/usercp_activate.php +++ b/htdocs/includes/usercp_activate.php @@ -6,7 +6,7 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * - * $Id: usercp_activate.php,v 1.8 2006/03/04 18:18:09 tomk Exp $ + * $Id: usercp_activate.php,v 1.9 2006/05/04 18:28:09 tomk Exp $ * * ***************************************************************************/ @@ -97,7 +97,7 @@ if ( $row = $db->sql_fetchrow($result) ) $emailer->reset(); // 2006-01-21 tomk - send a mail to f-mods to say that the account's been activated - if ( intval($board_config['require_activation']) == USER_ACTIVATION_WATCHED_IP || intval($board_config['require_activation']) == USER_ACTIVATION_MULTI_IP ) + if ( intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN || intval($board_config['require_activation']) == USER_ACTIVATION_WATCHED_IP || intval($board_config['require_activation']) == USER_ACTIVATION_MULTI_IP ) { $emailer = new emailer($board_config['smtp_delivery']); @@ -122,7 +122,7 @@ if ( $row = $db->sql_fetchrow($result) ) } // 2006-05-04 tomk - redirect to the user's profile if activating from watched/dupe ip - if ( intval($board_config['require_activation']) == USER_ACTIVATION_WATCHED_IP || intval($board_config['require_activation']) == USER_ACTIVATION_MULTI_IP ) + if ( intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN || intval($board_config['require_activation']) == USER_ACTIVATION_WATCHED_IP || intval($board_config['require_activation']) == USER_ACTIVATION_MULTI_IP ) { $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '">') diff --git a/htdocs/includes/usercp_register.php b/htdocs/includes/usercp_register.php index 4de9bdf07..09a798b42 100644 --- a/htdocs/includes/usercp_register.php +++ b/htdocs/includes/usercp_register.php @@ -6,7 +6,7 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * - * $Id: usercp_register.php,v 1.43 2013/02/25 10:39:07 tomk Exp $ + * $Id: usercp_register.php,v 1.44 2013/08/06 21:11:35 tomk Exp $ * * ***************************************************************************/ @@ -1072,7 +1072,11 @@ if ( isset($HTTP_POST_VARS['submit']) ) $emailer->assign_vars(array( 'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)), 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), + 'USER_IP' => decode_ip($user_ip), + 'U_PROFILE' => $admin_url . $script_name . '?mode=viewprofile&' . POST_USERS_URL . '=' . $user_id, + 'U_SEARCH_IP' => $admin_url . 'admin/admin_user_search.php?dosearch=1&search_ip=1&ip_address=' . decode_ip($user_ip), + 'U_SEARCH_REG_IP' => $admin_url . 'admin/admin_user_search.php?dosearch=1&search_reg_ip=1&ip_address=' . decode_ip($user_ip), 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) ); diff --git a/htdocs/language/lang_english/email/admin_activate.tpl b/htdocs/language/lang_english/email/admin_activate.tpl index f49644bff..91f3803ef 100644 --- a/htdocs/language/lang_english/email/admin_activate.tpl +++ b/htdocs/language/lang_english/email/admin_activate.tpl @@ -1,9 +1,23 @@ -Subject: New user account +Subject: New user account - SFS down - {USER_IP} - {USERNAME} Charset: utf-8 Hello, -The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and activate it using the following link: +The account owned by "{USERNAME}" has been deactivated or newly created. + +This user's profile can be seen here: + +{U_PROFILE} + +You can search for users who have registered with this IP address using the following link: + +{U_SEARCH_REG_IP} + +You can search for users who have posted from this IP address using the following link: + +{U_SEARCH_IP} + +You should check the details of this user (if required) and activate it using the following link: {U_ACTIVATE} |