diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-12 21:25:00 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-12 21:25:00 -0700 |
| commit | f22b959257deba0f00a4330df9103c47673032b8 (patch) | |
| tree | 36ca640a1a9744c0a17260e85a25e159b9421de3 /phpBB/includes | |
| parent | d62973867511d4f2b337a4c1cf3654ee20a2a107 (diff) | |
| parent | 32b92547400c14a402f64463661ce7c1b44e81b3 (diff) | |
| download | forums-f22b959257deba0f00a4330df9103c47673032b8.tar forums-f22b959257deba0f00a4330df9103c47673032b8.tar.gz forums-f22b959257deba0f00a4330df9103c47673032b8.tar.bz2 forums-f22b959257deba0f00a4330df9103c47673032b8.tar.xz forums-f22b959257deba0f00a4330df9103c47673032b8.zip | |
Merge pull request #1620 from EXreaction/ticket/11745
Group join approved notification
Diffstat (limited to 'phpBB/includes')
| -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'; |