diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-19 20:38:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-19 20:38:38 +0000 |
| commit | 75a51629454e971fd85118647d05a2a7f39931ad (patch) | |
| tree | 2a22645ce7b2ccfdbe62b85515f252af3cd9e131 /phpBB/includes/acp/acp_inactive.php | |
| parent | 870991c0608caf7467018245a0a4e1f1d55efd12 (diff) | |
| download | forums-75a51629454e971fd85118647d05a2a7f39931ad.tar forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.gz forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.bz2 forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.xz forums-75a51629454e971fd85118647d05a2a7f39931ad.zip | |
again, a lot of bug fixes
git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_inactive.php')
| -rwxr-xr-x | phpBB/includes/acp/acp_inactive.php | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 450b9fd0de..a3eefdfaba 100755 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -60,7 +60,50 @@ class acp_inactive if ($action == 'activate') { + if ($config['require_activation'] == USER_ACTIVATION_ADMIN) + { + // Get those 'being activated'... + $sql = 'SELECT user_id, username, user_email, user_lang + FROM ' . USERS_TABLE . ' + WHERE ' . $db->sql_in_set('user_id', $mark) . ' + AND user_type = ' . USER_INACTIVE; + $result = $db->sql_query($sql); + + $inactive_users = array(); + while ($row = $db->sql_fetchrow($result)) + { + $inactive_users[] = $row; + } + $db->sql_freeresult($result); + } + user_active_flip('activate', $mark); + + if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users)) + { + include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); + + $messenger = new messenger(); + + foreach ($inactive_users as $row) + { + $messenger->template('admin_welcome_activated', $row['user_lang']); + + $messenger->to($row['user_email'], $row['username']); + + $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); + $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); + $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); + + $messenger->assign_vars(array( + 'USERNAME' => htmlspecialchars_decode($row['username'])) + ); + + $messenger->send(NOTIFY_EMAIL); + } + + $messenger->save_queue(); + } } else if ($action == 'delete') { |