diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-27 17:02:45 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-27 17:02:45 -0500 |
| commit | 46b4a405b1563c2fe15dad34c9ff2843271cd8f8 (patch) | |
| tree | cbf56e8aa6ff234bf8b21d94d6cb7ce1b99738e7 /phpBB/includes/functions_user.php | |
| parent | b213be84a7ff0f947de0025dcc4620142edf226b (diff) | |
| download | forums-46b4a405b1563c2fe15dad34c9ff2843271cd8f8.tar forums-46b4a405b1563c2fe15dad34c9ff2843271cd8f8.tar.gz forums-46b4a405b1563c2fe15dad34c9ff2843271cd8f8.tar.bz2 forums-46b4a405b1563c2fe15dad34c9ff2843271cd8f8.tar.xz forums-46b4a405b1563c2fe15dad34c9ff2843271cd8f8.zip | |
[ticket/11745] Group request approved notification
PHPBB3-11745
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 102fbaae78..4fcce67801 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2929,11 +2929,10 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna AND ' . $db->sql_in_set('ug.user_id', $user_id_ary); $result = $db->sql_query($sql); - $user_id_ary = $email_users = array(); + $user_id_ary = array(); while ($row = $db->sql_fetchrow($result)) { $user_id_ary[] = $row['user_id']; - $email_users[] = $row; } $db->sql_freeresult($result); @@ -2948,29 +2947,13 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna AND " . $db->sql_in_set('user_id', $user_id_ary); $db->sql_query($sql); - // Send approved email to users... - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(); - - foreach ($email_users as $row) - { - $messenger->template('group_approved', $row['user_lang']); - - $messenger->set_addresses($row); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($row['username']), - 'GROUP_NAME' => htmlspecialchars_decode($group_name), - 'U_GROUP' => generate_board_url() . "/ucp.$phpEx?i=groups&mode=membership") - ); - - $messenger->send($row['user_notify_type']); - } - - $messenger->save_queue(); - $phpbb_notifications = $phpbb_container->get('notification_manager'); + $phpbb_notifications->add_notifications('group_request_approved', array( + 'user_ids' => $user_id_ary, + 'group_id' => $group_id, + 'group_name' => $group_name, + )); $phpbb_notifications->delete_notifications('group_request', $user_id_ary, $group_id); $log = 'LOG_USERS_APPROVED'; |