mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Create user loader class, update for DIC

Browse Source 
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
This commit is contained in:
Nathan Guse
2012-11-20 18:14:48 -06:00
parent d2187424da
commit 2afb8b9df8
30 changed files with 518 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/mcp/mcp_pm_reports.php
View File

@@ -90,7 +90,7 @@ class mcp_pm_reports
trigger_error('NO_REPORT');
}
$phpbb_notifications->mark_notifications_read_by_parent('phpbb_notification_type_report_pm', $report_id, $user->data['user_id']);
$phpbb_notifications->mark_notifications_read_by_parent('report_pm', $report_id, $user->data['user_id']);
$pm_id = $report['pm_id'];
$report_id = $report['report_id'];

28
phpBB/includes/mcp/mcp_queue.php
View File

@@ -86,7 +86,7 @@ class mcp_queue
{
$post_id = (int) $topic_info[$topic_id]['topic_first_post_id'];
$phpbb_notifications->mark_notifications_read('phpbb_notification_type_topic_in_queue', $topic_id, $user->data['user_id']);
$phpbb_notifications->mark_notifications_read('topic_in_queue', $topic_id, $user->data['user_id']);
}
else
{
@@ -94,7 +94,7 @@ class mcp_queue
}
}
$phpbb_notifications->mark_notifications_read('phpbb_notification_type_post_in_queue', $post_id, $user->data['user_id']);
$phpbb_notifications->mark_notifications_read('post_in_queue', $post_id, $user->data['user_id']);
$post_info = get_post_data(array($post_id), 'm_approve', true);
@@ -610,28 +610,28 @@ function approve_post($post_id_list, $id, $mode)
{
if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
{
$phpbb_notifications->delete_notifications('phpbb_notification_type_topic_in_queue', $post_data['topic_id']);
$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
$phpbb_notifications->add_notifications('phpbb_notification_type_topic', $post_data);
$phpbb_notifications->add_notifications('topic', $post_data);
if ($notify_poster)
{
$phpbb_notifications->add_notifications('phpbb_notification_type_approve_topic', $post_data);
$phpbb_notifications->add_notifications('approve_topic', $post_data);
}
}
else
{
$phpbb_notifications->delete_notifications('phpbb_notification_type_post_in_queue', $post_id);
$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
$phpbb_notifications->add_notifications(array(
'phpbb_notification_type_quote',
'phpbb_notification_type_bookmark',
'phpbb_notification_type_post',
'quote',
'bookmark',
'post',
), $post_data);
if ($notify_poster)
{
$phpbb_notifications->add_notifications('phpbb_notification_type_approve_post', $post_data);
$phpbb_notifications->add_notifications('approve_post', $post_data);
}
}
}
@@ -859,11 +859,11 @@ function disapprove_post($post_id_list, $id, $mode)
{
if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
{
$phpbb_notifications->delete_notifications('phpbb_notification_type_topic_in_queue', $post_data['topic_id']);
$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
}
else
{
$phpbb_notifications->delete_notifications('phpbb_notification_type_post_in_queue', $post_id);
$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
}
}
@@ -909,14 +909,14 @@ function disapprove_post($post_id_list, $id, $mode)
{
if ($notify_poster)
{
$phpbb_notifications->add_notifications('phpbb_notification_type_disapprove_topic', $post_data);
$phpbb_notifications->add_notifications('disapprove_topic', $post_data);
}
}
else
{
if ($notify_poster)
{
$phpbb_notifications->add_notifications('phpbb_notification_type_disapprove_post', $post_data);
$phpbb_notifications->add_notifications('disapprove_post', $post_data);
}
}
}

10
phpBB/includes/mcp/mcp_reports.php
View File

@@ -88,7 +88,7 @@ class mcp_reports
trigger_error('NO_REPORT');
}
$phpbb_notifications->mark_notifications_read('phpbb_notification_type_report_post', $post_id, $user->data['user_id']);
$phpbb_notifications->mark_notifications_read('report_post', $post_id, $user->data['user_id']);
if (!$report_id && $report['report_closed'])
{
@@ -647,20 +647,20 @@ function close_report($report_id_list, $mode, $action, $pm = false)
if ($pm)
{
$phpbb_notifications->add_notifications('phpbb_notification_type_report_pm_closed', array_merge($post_info[$post_id], array(
$phpbb_notifications->add_notifications('report_pm_closed', array_merge($post_info[$post_id], array(
'reporter' => $reporter['user_id'],
'closer_id' => $user->data['user_id'],
'from_user_id' => $post_info[$post_id]['author_id'],
)));
$phpbb_notifications->delete_notifications('phpbb_notification_type_report_pm', $post_id);
$phpbb_notifications->delete_notifications('report_pm', $post_id);
}
else
{
$phpbb_notifications->add_notifications('phpbb_notification_type_report_post_closed', array_merge($post_info[$post_id], array(
$phpbb_notifications->add_notifications('report_post_closed', array_merge($post_info[$post_id], array(
'reporter' => $reporter['user_id'],
'closer_id' => $user->data['user_id'],
)));
$phpbb_notifications->delete_notifications('phpbb_notification_type_report_post', $post_id);
$phpbb_notifications->delete_notifications('report_post', $post_id);
}
}
}