diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-05-28 12:55:31 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-05-28 12:55:31 +0200 |
| commit | cf93c6503aa1512a70250fbf70cd03d6a3daa3ae (patch) | |
| tree | 327d9c50962c2978f6347f175457bf080e571468 /phpBB/includes/mcp | |
| parent | b1d829c2322faa09ab24e8d100eda49775a51824 (diff) | |
| parent | d4fb3996d3a7fc14021136211d9f70610c7aeba0 (diff) | |
| download | forums-cf93c6503aa1512a70250fbf70cd03d6a3daa3ae.tar forums-cf93c6503aa1512a70250fbf70cd03d6a3daa3ae.tar.gz forums-cf93c6503aa1512a70250fbf70cd03d6a3daa3ae.tar.bz2 forums-cf93c6503aa1512a70250fbf70cd03d6a3daa3ae.tar.xz forums-cf93c6503aa1512a70250fbf70cd03d6a3daa3ae.zip | |
Merge pull request #3468 from brunoais/ticket/13668
[ticket/13668] Allow changing the query to obtain the user-submitted report
* brunoais/ticket/13668:
[ticket/13668] Removed bogus sting concatenation
[ticket/13668] BUMP version to 3.1.5-dev
[ticket/13668] Allow changing the query to obtain the user-submitted report.
[ticket/13668] Convert the mcp report_details query to a built query
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index ccb54092b4..3cd142ba43 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -73,14 +73,42 @@ class mcp_reports // closed reports are accessed by report id $report_id = request_var('r', 0); + $sql_ary = array( + 'SELECT' => 'r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, r.reported_post_uid, r.reported_post_bitfield, r.reported_post_enable_magic_url, r.reported_post_enable_smilies, r.reported_post_enable_bbcode, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour', - $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, r.reported_post_uid, r.reported_post_bitfield, r.reported_post_enable_magic_url, r.reported_post_enable_smilies, r.reported_post_enable_bbcode, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour - FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u - WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . ' + 'FROM' => array( + REPORTS_TABLE => 'r', + REPORTS_REASONS_TABLE => 'rr', + USERS_TABLE => 'u', + ), + + 'WHERE' => (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . ' AND rr.reason_id = r.reason_id AND r.user_id = u.user_id - AND r.pm_id = 0 - ORDER BY report_closed ASC'; + AND r.pm_id = 0', + + 'ORDER_BY' => 'report_closed ASC', + ); + + /** + * Allow changing the query to obtain the user-submitted report. + * + * @event core.mcp_reports_report_details_query_before + * @var array sql_ary The array in the format of the query builder with the query + * @var mixed forum_id The forum_id, the number in the f GET parameter + * @var int post_id The post_id of the report being viewed (if 0, it is meaningless) + * @var int report_id The report_id of the report being viewed + * @since 3.1.5-RC1 + */ + $vars = array( + 'sql_ary', + 'forum_id', + 'post_id', + 'report_id', + ); + extract($phpbb_dispatcher->trigger_event('core.mcp_reports_report_details_query_before', compact($vars))); + + $sql = $db->sql_build_query('SELECT', $sql_ary); $result = $db->sql_query_limit($sql, 1); $report = $db->sql_fetchrow($result); $db->sql_freeresult($result); |