aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorErik Frèrejean <erikfrerejean@phpbb.com>2010-12-30 16:03:11 +0100
committerErik Frèrejean <erikfrerejean@phpbb.com>2011-04-19 13:11:20 +0200
commit1d2201902f0f3789daf02ca054f33f4b4bfa3eb2 (patch)
tree891a022b9e7b10fb5726a2a293ec6ecac74bc945 /phpBB
parent32bc980ca06b67789d8fd86e4c3a5c897a6de23f (diff)
downloadforums-1d2201902f0f3789daf02ca054f33f4b4bfa3eb2.tar
forums-1d2201902f0f3789daf02ca054f33f4b4bfa3eb2.tar.gz
forums-1d2201902f0f3789daf02ca054f33f4b4bfa3eb2.tar.bz2
forums-1d2201902f0f3789daf02ca054f33f4b4bfa3eb2.tar.xz
forums-1d2201902f0f3789daf02ca054f33f4b4bfa3eb2.zip
[ticket/9961] Create log entries when users are activated.
* Create log entries when a user activates own account without also changing their password. * Additionally create admin log entries when an administrator activates user accounts. PHPBB3-9961
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/ucp/ucp_activate.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 8debaabf31..b00c1b9f52 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -98,6 +98,13 @@ class ucp_activate
SET user_actkey = ''
WHERE user_id = {$user_row['user_id']}";
$db->sql_query($sql);
+
+ // Create the correct logs
+ add_log('user', $user_row['user_id'], 'LOG_USER_ACTIVE_USER');
+ if ($auth->acl_get('a_user'))
+ {
+ add_log('admin', 'LOG_USER_ACTIVE', $user_row['username']);
+ }
}
if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)