makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11103] Approve/disapprove notification options

Browse source 
PHPBB3-11103
This commit is contained in:
Nathaniel Guse 2012-09-27 10:42:50 -05:00
parent ae91a0a846
commit f062087f30
2 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/notifications/type/approve_post.php
View file

@ -69,11 +69,9 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
*/ */
public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post) public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
{ {
$users = array(); $db = $phpbb_container->get('dbal.conn');
/* todo $users = array();
* find what type of notification they'd like to receive
*/
$users[$post['poster_id']] = array(''); $users[$post['poster_id']] = array('');
$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']); $auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
@ -85,11 +83,22 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
$notify_users = array(); $notify_users = array();
foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id) $sql = 'SELECT *
FROM ' . USER_NOTIFICATIONS_TABLE . "
WHERE item_type = 'moderation_queue'
AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{ {
$notify_users[$user_id] = $users[$user_id]; if (!isset($rowset[$row['user_id']]))
{
$notify_users[$row['user_id']] = array();
} }
$notify_users[$row['user_id']][] = $row['method'];
}
$db->sql_freeresult($result);
return $notify_users; return $notify_users;
} }

21
phpBB/includes/notifications/type/approve_topic.php
View file

@ -69,11 +69,9 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
*/ */
public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post) public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
{ {
$users = array(); $db = $phpbb_container->get('dbal.conn');
/* todo $users = array();
* find what type of notification they'd like to receive
*/
$users[$post['poster_id']] = array(''); $users[$post['poster_id']] = array('');
$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']); $auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
@ -85,11 +83,22 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
$notify_users = array(); $notify_users = array();
foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id) $sql = 'SELECT *
FROM ' . USER_NOTIFICATIONS_TABLE . "
WHERE item_type = 'moderation_queue'
AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{ {
$notify_users[$user_id] = $users[$user_id]; if (!isset($rowset[$row['user_id']]))
{
$notify_users[$row['user_id']] = array();
} }
$notify_users[$row['user_id']][] = $row['method'];
}
$db->sql_freeresult($result);
return $notify_users; return $notify_users;
} }