|
@@ -32,9 +32,10 @@ function ModerationMain($dont_call = false)
|
|
|
$context['can_moderate_boards'] = $user_info['mod_cache']['bq'] != '0=1';
|
|
|
$context['can_moderate_groups'] = $user_info['mod_cache']['gq'] != '0=1';
|
|
|
$context['can_moderate_approvals'] = $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']);
|
|
|
+ $context['can_moderate_users'] = allowedTo('moderate_forum');
|
|
|
|
|
|
// Everyone using this area must be allowed here!
|
|
|
- if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'])
|
|
|
+ if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users'])
|
|
|
isAllowedTo('access_mod_center');
|
|
|
|
|
|
// We're gonna want a menu of some kind.
|
|
@@ -124,11 +125,11 @@ function ModerationMain($dont_call = false)
|
|
|
'reports' => array(
|
|
|
'label' => $txt['mc_reported_posts'],
|
|
|
'enabled' => $context['can_moderate_boards'],
|
|
|
- 'file' => 'ModerationCenter.php',
|
|
|
+ 'file' => 'ReportedPosts.php',
|
|
|
'function' => 'ReportedPosts',
|
|
|
'icon' => 'reports.png',
|
|
|
'subsections' => array(
|
|
|
- 'open' => array($txt['mc_reportedp_active']),
|
|
|
+ 'show' => array($txt['mc_reportedp_active']),
|
|
|
'closed' => array($txt['mc_reportedp_closed']),
|
|
|
),
|
|
|
),
|
|
@@ -138,16 +139,6 @@ function ModerationMain($dont_call = false)
|
|
|
'title' => $txt['mc_groups'],
|
|
|
'enabled' => $context['can_moderate_groups'],
|
|
|
'areas' => array(
|
|
|
- 'userwatch' => array(
|
|
|
- 'label' => $txt['mc_watched_users_title'],
|
|
|
- 'enabled' => $modSettings['warning_settings'][0] == 1 && $context['can_moderate_boards'],
|
|
|
- 'function' => 'ViewWatchedUsers',
|
|
|
- 'icon' => 'members_watched.png',
|
|
|
- 'subsections' => array(
|
|
|
- 'member' => array($txt['mc_watched_users_member']),
|
|
|
- 'post' => array($txt['mc_watched_users_post']),
|
|
|
- ),
|
|
|
- ),
|
|
|
'groups' => array(
|
|
|
'label' => $txt['mc_group_requests'],
|
|
|
'file' => 'Groups.php',
|
|
@@ -163,6 +154,32 @@ function ModerationMain($dont_call = false)
|
|
|
),
|
|
|
),
|
|
|
),
|
|
|
+ 'members' => array(
|
|
|
+ 'title' => $txt['mc_members'],
|
|
|
+ 'enabled' => $context['can_moderate_users'] || ($modSettings['warning_settings'][0] == 1 && $context['can_moderate_boards']),
|
|
|
+ 'areas' => array(
|
|
|
+ 'userwatch' => array(
|
|
|
+ 'label' => $txt['mc_watched_users_title'],
|
|
|
+ 'enabled' => $modSettings['warning_settings'][0] == 1 && $context['can_moderate_boards'],
|
|
|
+ 'function' => 'ViewWatchedUsers',
|
|
|
+ 'icon' => 'members_watched.png',
|
|
|
+ 'subsections' => array(
|
|
|
+ 'member' => array($txt['mc_watched_users_member']),
|
|
|
+ 'post' => array($txt['mc_watched_users_post']),
|
|
|
+ ),
|
|
|
+ ),
|
|
|
+ 'memberreports' => array(
|
|
|
+ 'label' => $txt['mc_reported_members_title'],
|
|
|
+ 'enabled' => $context['can_moderate_users'],
|
|
|
+ 'function' => 'ReportedMembers',
|
|
|
+ 'icon' => 'members_watched.png',
|
|
|
+ 'subsections' => array(
|
|
|
+ 'open' => array($txt['mc_reportedp_active']),
|
|
|
+ 'closed' => array($txt['mc_reportedp_closed']),
|
|
|
+ ),
|
|
|
+ ),
|
|
|
+ ),
|
|
|
+ )
|
|
|
);
|
|
|
|
|
|
// Make sure the administrator has a valid session...
|
|
@@ -248,6 +265,14 @@ function ModerationHome()
|
|
|
$valid_blocks['r'] = 'ReportedPosts';
|
|
|
$valid_blocks['w'] = 'WatchedUsers';
|
|
|
}
|
|
|
+ if ($context['can_moderate_users'])
|
|
|
+ {
|
|
|
+ // This falls under the category of moderating users as well...
|
|
|
+ if (!$context['can_moderate_boards'])
|
|
|
+ $valid_blocks['w'] = 'WatchedUsers';
|
|
|
+
|
|
|
+ $valid_blocks['rm'] = 'ReportedMembers';
|
|
|
+ }
|
|
|
|
|
|
call_integration_hook('integrate_mod_centre_blocks', array(&$valid_blocks));
|
|
|
|
|
@@ -312,10 +337,15 @@ function ModBlockNotes()
|
|
|
{
|
|
|
global $context, $smcFunc, $scripturl, $txt, $user_info;
|
|
|
|
|
|
+ // Set a nice and informative message.
|
|
|
+ $context['report_post_action'] = !empty($_SESSION['rc_confirmation']) ? $_SESSION['rc_confirmation'] : array();
|
|
|
+ unset($_SESSION['rc_confirmation']);
|
|
|
+
|
|
|
// Are we saving a note?
|
|
|
if (isset($_GET['modnote']) && isset($_POST['makenote']) && isset($_POST['new_note']))
|
|
|
{
|
|
|
checkSession();
|
|
|
+ validateToken('mod-modnote-add');
|
|
|
|
|
|
$_POST['new_note'] = $smcFunc['htmlspecialchars'](trim($_POST['new_note']));
|
|
|
// Make sure they actually entered something.
|
|
@@ -339,6 +369,9 @@ function ModBlockNotes()
|
|
|
cache_put_data('moderator_notes_total', null, 240);
|
|
|
}
|
|
|
|
|
|
+ // Everything went better than expected!
|
|
|
+ $_SESSION['rc_confirmation'] = 'message_saved';
|
|
|
+
|
|
|
// Redirect otherwise people can resubmit.
|
|
|
redirectexit('action=moderate');
|
|
|
}
|
|
@@ -347,15 +380,15 @@ function ModBlockNotes()
|
|
|
if (isset($_GET['notes']) && isset($_GET['delete']) && is_numeric($_GET['delete']))
|
|
|
{
|
|
|
checkSession('get');
|
|
|
+ validateToken('mod-modnote-del', 'get');
|
|
|
|
|
|
// Lets delete it.
|
|
|
$smcFunc['db_query']('', '
|
|
|
DELETE FROM {db_prefix}log_comments
|
|
|
WHERE id_comment = {int:note}
|
|
|
- AND comment_type = {string:type}',
|
|
|
+ AND comment_type = {literal:modnote}',
|
|
|
array(
|
|
|
'note' => $_GET['delete'],
|
|
|
- 'type' => 'modnote',
|
|
|
)
|
|
|
);
|
|
|
|
|
@@ -363,6 +396,9 @@ function ModBlockNotes()
|
|
|
cache_put_data('moderator_notes', null, 240);
|
|
|
cache_put_data('moderator_notes_total', null, 240);
|
|
|
|
|
|
+ // Tell them the message was deleted.
|
|
|
+ $_SESSION['rc_confirmation'] = 'message_deleted';
|
|
|
+
|
|
|
redirectexit('action=moderate');
|
|
|
}
|
|
|
|
|
@@ -373,9 +409,8 @@ function ModBlockNotes()
|
|
|
SELECT COUNT(*)
|
|
|
FROM {db_prefix}log_comments AS lc
|
|
|
LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lc.id_member)
|
|
|
- WHERE lc.comment_type = {string:modnote}',
|
|
|
+ WHERE lc.comment_type = {literal:modnote}',
|
|
|
array(
|
|
|
- 'modnote' => 'modnote',
|
|
|
)
|
|
|
);
|
|
|
list ($moderator_notes_total) = $smcFunc['db_fetch_row']($request);
|
|
@@ -393,11 +428,10 @@ function ModBlockNotes()
|
|
|
lc.log_time, lc.body, lc.id_comment AS id_note
|
|
|
FROM {db_prefix}log_comments AS lc
|
|
|
LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lc.id_member)
|
|
|
- WHERE lc.comment_type = {string:modnote}
|
|
|
+ WHERE lc.comment_type = {literal:modnote}
|
|
|
ORDER BY id_comment DESC
|
|
|
LIMIT {int:offset}, 10',
|
|
|
array(
|
|
|
- 'modnote' => 'modnote',
|
|
|
'offset' => $offset,
|
|
|
)
|
|
|
);
|
|
@@ -428,6 +462,16 @@ function ModBlockNotes()
|
|
|
);
|
|
|
}
|
|
|
|
|
|
+ // Add a confirm on deleting a modnote
|
|
|
+ addInlineJavascript('
|
|
|
+ $(\'.delete_modnote\').on(\'click\', function(){
|
|
|
+ return confirm('. JavaScriptEscape($txt['mc_reportedp_delete_confirm']) .');
|
|
|
+ });', true);
|
|
|
+
|
|
|
+ // Couple tokens for add/delete modnotes
|
|
|
+ createToken('mod-modnote-add');
|
|
|
+ createToken('mod-modnote-del', 'get');
|
|
|
+
|
|
|
return 'notes';
|
|
|
}
|
|
|
|
|
@@ -454,11 +498,13 @@ function ModBlockReportedPosts()
|
|
|
FROM {db_prefix}log_reported AS lr
|
|
|
LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lr.id_member)
|
|
|
WHERE ' . ($user_info['mod_cache']['bq'] == '1=1' || $user_info['mod_cache']['bq'] == '0=1' ? $user_info['mod_cache']['bq'] : 'lr.' . $user_info['mod_cache']['bq']) . '
|
|
|
+ AND lr.id_board != {int:not_a_reported_post}
|
|
|
AND lr.closed = {int:not_closed}
|
|
|
AND lr.ignore_all = {int:not_ignored}
|
|
|
ORDER BY lr.time_updated DESC
|
|
|
LIMIT 10',
|
|
|
array(
|
|
|
+ 'not_a_reported_post' => 0,
|
|
|
'not_closed' => 0,
|
|
|
'not_ignored' => 0,
|
|
|
)
|
|
@@ -546,36 +592,96 @@ function ModBlockGroupRequests()
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Browse all the reported posts...
|
|
|
- * @todo this needs to be given its own file?
|
|
|
+ * Show a list of the most recent reported posts.
|
|
|
+ */
|
|
|
+function ModBlockReportedMembers()
|
|
|
+{
|
|
|
+ global $context, $user_info, $scripturl, $smcFunc;
|
|
|
+
|
|
|
+ // Got the info already?
|
|
|
+ $cachekey = md5(serialize((int) allowedTo('moderate_forum')));
|
|
|
+ $context['reported_users'] = array();
|
|
|
+ if (!allowedTo('moderate_forum'))
|
|
|
+ return 'reported_users_block';
|
|
|
+
|
|
|
+ if (($reported_posts = cache_get_data('reported_users_' . $cachekey, 90)) === null)
|
|
|
+ {
|
|
|
+ // By George, that means we in a position to get the reports, jolly good.
|
|
|
+ $request = $smcFunc['db_query']('', '
|
|
|
+ SELECT lr.id_report, lr.id_member,
|
|
|
+ lr.num_reports, IFNULL(mem.real_name, lr.membername) AS user_name,
|
|
|
+ IFNULL(mem.id_member, 0) AS id_user
|
|
|
+ FROM {db_prefix}log_reported AS lr
|
|
|
+ LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lr.id_member)
|
|
|
+ WHERE lr.id_board = {int:not_a_reported_post}
|
|
|
+ AND lr.closed = {int:not_closed}
|
|
|
+ AND lr.ignore_all = {int:not_ignored}
|
|
|
+ ORDER BY lr.time_updated DESC
|
|
|
+ LIMIT 10',
|
|
|
+ array(
|
|
|
+ 'not_a_reported_post' => 0,
|
|
|
+ 'not_closed' => 0,
|
|
|
+ 'not_ignored' => 0,
|
|
|
+ )
|
|
|
+ );
|
|
|
+ $reported_users = array();
|
|
|
+ while ($row = $smcFunc['db_fetch_assoc']($request))
|
|
|
+ $reported_users[] = $row;
|
|
|
+ $smcFunc['db_free_result']($request);
|
|
|
+
|
|
|
+ // Cache it.
|
|
|
+ cache_put_data('reported_users_' . $cachekey, $reported_posts, 90);
|
|
|
+ }
|
|
|
+
|
|
|
+ $context['reported_users'] = array();
|
|
|
+ foreach ($reported_users as $i => $row)
|
|
|
+ {
|
|
|
+ $context['reported_users'][] = array(
|
|
|
+ 'id' => $row['id_report'],
|
|
|
+ 'alternate' => $i % 2,
|
|
|
+ 'report_href' => $scripturl . '?action=moderate;area=memberreports;report=' . $row['id_report'],
|
|
|
+ 'user' => array(
|
|
|
+ 'id' => $row['id_user'],
|
|
|
+ 'name' => $row['user_name'],
|
|
|
+ 'link' => $row['id_user'] ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_user'] . '">' . $row['user_name'] . '</a>' : $row['user_name'],
|
|
|
+ 'href' => $scripturl . '?action=profile;u=' . $row['id_author'],
|
|
|
+ ),
|
|
|
+ 'comments' => array(),
|
|
|
+ 'num_reports' => $row['num_reports'],
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ return 'reported_users_block';
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * Browse all the reported users...
|
|
|
*/
|
|
|
-function ReportedPosts()
|
|
|
+function ReportedMembers()
|
|
|
{
|
|
|
global $txt, $context, $scripturl, $user_info, $smcFunc;
|
|
|
|
|
|
loadTemplate('ModerationCenter');
|
|
|
|
|
|
// Set an empty var for the server response.
|
|
|
- $context['report_post_action'] = '';
|
|
|
+ $context['report_member_action'] = '';
|
|
|
|
|
|
// Put the open and closed options into tabs, because we can...
|
|
|
$context[$context['moderation_menu_name']]['tab_data'] = array(
|
|
|
- 'title' => $txt['mc_reported_posts'],
|
|
|
+ 'title' => $txt['mc_reported_members'],
|
|
|
'help' => '',
|
|
|
- 'description' => $txt['mc_reported_posts_desc'],
|
|
|
+ 'description' => $txt['mc_reported_members_desc'],
|
|
|
);
|
|
|
|
|
|
- // This comes under the umbrella of moderating posts.
|
|
|
- if ($user_info['mod_cache']['bq'] == '0=1')
|
|
|
- isAllowedTo('moderate_forum');
|
|
|
+ isAllowedTo('moderate_forum');
|
|
|
|
|
|
// Are they wanting to view a particular report?
|
|
|
if (!empty($_REQUEST['report']))
|
|
|
- return ModReport();
|
|
|
+ return MemberReport();
|
|
|
|
|
|
// Set up the comforting bits...
|
|
|
- $context['page_title'] = $txt['mc_reported_posts'];
|
|
|
- $context['sub_template'] = 'reported_posts';
|
|
|
+ $context['page_title'] = $txt['mc_reported_members'];
|
|
|
+ $context['sub_template'] = 'reported_members';
|
|
|
|
|
|
// Are we viewing open or closed reports?
|
|
|
$context['view_closed'] = isset($_GET['sa']) && $_GET['sa'] == 'closed' ? 1 : 0;
|
|
@@ -590,8 +696,7 @@ function ReportedPosts()
|
|
|
$smcFunc['db_query']('', '
|
|
|
UPDATE {db_prefix}log_reported
|
|
|
SET ' . (isset($_GET['ignore']) ? 'ignore_all = {int:ignore_all}' : 'closed = {int:closed}') . '
|
|
|
- WHERE id_report = {int:id_report}
|
|
|
- AND ' . $user_info['mod_cache']['bq'],
|
|
|
+ WHERE id_report = {int:id_report}',
|
|
|
array(
|
|
|
'ignore_all' => isset($_GET['ignore']) ? (int) $_GET['ignore'] : 0,
|
|
|
'closed' => isset($_GET['close']) ? (int) $_GET['close'] : 0,
|
|
@@ -601,7 +706,7 @@ function ReportedPosts()
|
|
|
|
|
|
// Get the board, topic and message for this report
|
|
|
$request = $smcFunc['db_query']('', '
|
|
|
- SELECT id_board, id_topic, id_msg
|
|
|
+ SELECT id_member, membername
|
|
|
FROM {db_prefix}log_reported
|
|
|
WHERE id_report = {int:id_report}',
|
|
|
array(
|
|
@@ -611,18 +716,21 @@ function ReportedPosts()
|
|
|
|
|
|
// Set up the data for the log...
|
|
|
$extra = array('report' => $_GET['rid']);
|
|
|
- list ($extra['board'], $extra['topic'], $extra['message']) = $smcFunc['db_fetch_row']($request);
|
|
|
+ list($extra['member'], $extra['membername']) = $smcFunc['db_fetch_row']($request);
|
|
|
$smcFunc['db_free_result']($request);
|
|
|
|
|
|
+ // Stick this in string format for consistency
|
|
|
+ $extra['member'] = (string)$extra['member'];
|
|
|
+
|
|
|
// Tell the user about it.
|
|
|
- $context['report_post_action'] = isset($_GET['ignore']) ? (!empty($_GET['ignore']) ? 'ignore' : 'unignore') : (!empty($_GET['close']) ? 'close' : 'open');
|
|
|
+ $context['report_member_action'] = isset($_GET['ignore']) ? (!empty($_GET['ignore']) ? 'ignore' : 'unignore') : (!empty($_GET['close']) ? 'close' : 'open');
|
|
|
|
|
|
// Log this action
|
|
|
- logAction($context['report_post_action'] . '_report', $extra);
|
|
|
+ logAction($context['report_member_action'] . '_user_report', $extra);
|
|
|
|
|
|
// Time to update.
|
|
|
updateSettings(array('last_mod_report_action' => time()));
|
|
|
- recountOpenReports();
|
|
|
+ recountOpenMemberReports();
|
|
|
}
|
|
|
elseif (isset($_POST['close']) && isset($_POST['close_selected']))
|
|
|
{
|
|
@@ -637,26 +745,24 @@ function ReportedPosts()
|
|
|
{
|
|
|
// Get the data for each of these reports
|
|
|
$request = $smcFunc['db_query']('', '
|
|
|
- SELECT id_report, id_board, id_topic, id_msg
|
|
|
+ SELECT id_report, id_member, membername
|
|
|
FROM {db_prefix}log_reported
|
|
|
- WHERE id_report IN ({array_int:report_list})
|
|
|
- AND ' . $user_inf['mod_cache']['bq'],
|
|
|
+ WHERE id_report IN ({array_int:report_list})',
|
|
|
array(
|
|
|
- 'id_report' => $_GET['rid'],
|
|
|
+ 'report_list' => $toClose,
|
|
|
)
|
|
|
);
|
|
|
|
|
|
while ($reports = $smcFunc['db_fetch_assoc']($request))
|
|
|
{
|
|
|
$report_data = array(
|
|
|
- 'report' => $row['id_report'],
|
|
|
- 'board' => $row['id_board'],
|
|
|
- 'topic' => $row['id_topic'],
|
|
|
- 'message' => $row['id_msg'],
|
|
|
+ 'report' => $reports['id_report'],
|
|
|
+ 'membername' => $reports['membername'],
|
|
|
+ 'member' => (string)$reports['id_member'],
|
|
|
);
|
|
|
|
|
|
// Log that this report was closed
|
|
|
- logAction('close_report', $report_data);
|
|
|
+ logAction('close_user_report', $report_data);
|
|
|
}
|
|
|
|
|
|
$smcFunc['db_free_result']($request);
|
|
@@ -664,8 +770,7 @@ function ReportedPosts()
|
|
|
$smcFunc['db_query']('', '
|
|
|
UPDATE {db_prefix}log_reported
|
|
|
SET closed = {int:is_closed}
|
|
|
- WHERE id_report IN ({array_int:report_list})
|
|
|
- AND ' . $user_info['mod_cache']['bq'],
|
|
|
+ WHERE id_report IN ({array_int:report_list})',
|
|
|
array(
|
|
|
'report_list' => $toClose,
|
|
|
'is_closed' => 1,
|
|
@@ -674,11 +779,11 @@ function ReportedPosts()
|
|
|
|
|
|
// Time to update.
|
|
|
updateSettings(array('last_mod_report_action' => time()));
|
|
|
- recountOpenReports();
|
|
|
+ recountOpenMemberReports();
|
|
|
}
|
|
|
|
|
|
// Go on and tell the result.
|
|
|
- $context['report_post_action'] = 'close_all';
|
|
|
+ $context['report_member_action'] = 'close_all';
|
|
|
}
|
|
|
|
|
|
// How many entries are we viewing?
|
|
@@ -686,61 +791,52 @@ function ReportedPosts()
|
|
|
SELECT COUNT(*)
|
|
|
FROM {db_prefix}log_reported AS lr
|
|
|
WHERE lr.closed = {int:view_closed}
|
|
|
- AND ' . ($user_info['mod_cache']['bq'] == '1=1' || $user_info['mod_cache']['bq'] == '0=1' ? $user_info['mod_cache']['bq'] : 'lr.' . $user_info['mod_cache']['bq']),
|
|
|
+ AND lr.id_board = {int:not_a_reported_post}',
|
|
|
array(
|
|
|
'view_closed' => $context['view_closed'],
|
|
|
+ 'not_a_reported_post' => 0,
|
|
|
)
|
|
|
);
|
|
|
list ($context['total_reports']) = $smcFunc['db_fetch_row']($request);
|
|
|
$smcFunc['db_free_result']($request);
|
|
|
|
|
|
// So, that means we can page index, yes?
|
|
|
- $context['page_index'] = constructPageIndex($scripturl . '?action=moderate;area=reports' . ($context['view_closed'] ? ';sa=closed' : ''), $_GET['start'], $context['total_reports'], 10);
|
|
|
+ $context['page_index'] = constructPageIndex($scripturl . '?action=moderate;area=memberreports' . ($context['view_closed'] ? ';sa=closed' : ''), $_GET['start'], $context['total_reports'], 10);
|
|
|
$context['start'] = $_GET['start'];
|
|
|
|
|
|
// By George, that means we in a position to get the reports, golly good.
|
|
|
$request = $smcFunc['db_query']('', '
|
|
|
- SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
|
|
|
- lr.time_started, lr.time_updated, lr.num_reports, lr.closed, lr.ignore_all,
|
|
|
- IFNULL(mem.real_name, lr.membername) AS author_name, IFNULL(mem.id_member, 0) AS id_author
|
|
|
+ SELECT lr.id_report, lr.id_member, lr.time_started, lr.time_updated, lr.num_reports, lr.closed, lr.ignore_all,
|
|
|
+ IFNULL(mem.real_name, lr.membername) AS user_name, IFNULL(mem.id_member, 0) AS id_user
|
|
|
FROM {db_prefix}log_reported AS lr
|
|
|
LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lr.id_member)
|
|
|
WHERE lr.closed = {int:view_closed}
|
|
|
- AND ' . ($user_info['mod_cache']['bq'] == '1=1' || $user_info['mod_cache']['bq'] == '0=1' ? $user_info['mod_cache']['bq'] : 'lr.' . $user_info['mod_cache']['bq']) . '
|
|
|
+ AND lr.id_board = {int:not_a_reported_post}
|
|
|
ORDER BY lr.time_updated DESC
|
|
|
LIMIT ' . $context['start'] . ', 10',
|
|
|
array(
|
|
|
'view_closed' => $context['view_closed'],
|
|
|
+ 'not_a_reported_post' => 0,
|
|
|
)
|
|
|
);
|
|
|
$context['reports'] = array();
|
|
|
$report_ids = array();
|
|
|
- $report_boards_ids = array();
|
|
|
for ($i = 0; $row = $smcFunc['db_fetch_assoc']($request); $i++)
|
|
|
{
|
|
|
$report_ids[] = $row['id_report'];
|
|
|
- $report_boards_ids[] = $row['id_board'];
|
|
|
$context['reports'][$row['id_report']] = array(
|
|
|
'id' => $row['id_report'],
|
|
|
'alternate' => $i % 2,
|
|
|
- 'topic' => array(
|
|
|
- 'id' => $row['id_topic'],
|
|
|
- 'id_msg' => $row['id_msg'],
|
|
|
- 'id_board' => $row['id_board'],
|
|
|
- 'href' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
|
|
|
- ),
|
|
|
- 'report_href' => $scripturl . '?action=moderate;area=reports;report=' . $row['id_report'],
|
|
|
- 'author' => array(
|
|
|
- 'id' => $row['id_author'],
|
|
|
- 'name' => $row['author_name'],
|
|
|
- 'link' => $row['id_author'] ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_author'] . '">' . $row['author_name'] . '</a>' : $row['author_name'],
|
|
|
- 'href' => $scripturl . '?action=profile;u=' . $row['id_author'],
|
|
|
+ 'report_href' => $scripturl . '?action=moderate;area=memberreports;report=' . $row['id_report'],
|
|
|
+ 'user' => array(
|
|
|
+ 'id' => $row['id_user'],
|
|
|
+ 'name' => $row['user_name'],
|
|
|
+ 'link' => $row['id_user'] ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_user'] . '">' . $row['user_name'] . '</a>' : $row['user_name'],
|
|
|
+ 'href' => $scripturl . '?action=profile;u=' . $row['id_user'],
|
|
|
),
|
|
|
'comments' => array(),
|
|
|
'time_started' => timeformat($row['time_started']),
|
|
|
'last_updated' => timeformat($row['time_updated']),
|
|
|
- 'subject' => $row['subject'],
|
|
|
- 'body' => parse_bbc($row['body']),
|
|
|
'num_reports' => $row['num_reports'],
|
|
|
'closed' => $row['closed'],
|
|
|
'ignore' => $row['ignore_all']
|
|
@@ -748,29 +844,6 @@ function ReportedPosts()
|
|
|
}
|
|
|
$smcFunc['db_free_result']($request);
|
|
|
|
|
|
- // Get the names of boards those topics are in. Slightly faster this way.
|
|
|
- if (!empty($report_boards_ids))
|
|
|
- {
|
|
|
- $report_boards_ids = array_unique($report_boards_ids);
|
|
|
- $board_names = array();
|
|
|
- $request = $smcFunc['db_query']('', '
|
|
|
- SELECT id_board, name
|
|
|
- FROM {db_prefix}boards
|
|
|
- WHERE id_board IN ({array_int:boards})',
|
|
|
- array(
|
|
|
- 'boards' => $report_boards_ids,
|
|
|
- )
|
|
|
- );
|
|
|
-
|
|
|
- while ($row = $smcFunc['db_fetch_assoc']($request))
|
|
|
- $board_names[$row['id_board']] = $row['name'];
|
|
|
- $smcFunc['db_free_result']($request);
|
|
|
-
|
|
|
- foreach ($context['reports'] as $id_report => $report)
|
|
|
- if (!empty($board_names[$report['topic']['id_board']]))
|
|
|
- $context['reports'][$id_report]['topic']['board_name'] = $board_names[$report['topic']['id_board']];
|
|
|
- }
|
|
|
-
|
|
|
// Now get all the people who reported it.
|
|
|
if (!empty($report_ids))
|
|
|
{
|
|
@@ -801,13 +874,7 @@ function ReportedPosts()
|
|
|
$smcFunc['db_free_result']($request);
|
|
|
}
|
|
|
|
|
|
- // Get the boards where the current user can remove any message.
|
|
|
- $context['report_remove_any_boards'] = $user_info['is_admin'] ? $report_boards_ids : array_intersect($report_boards_ids, boardsAllowedTo('remove_any'));
|
|
|
$context['report_manage_bans'] = allowedTo('manage_bans');
|
|
|
-
|
|
|
- // Do we deleted a message?
|
|
|
- if (isset($_REQUEST['done']))
|
|
|
- $context['report_post_action'] = 'message_deleted';
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -842,38 +909,35 @@ function ModerateGroups()
|
|
|
/**
|
|
|
* How many open reports do we have?
|
|
|
*/
|
|
|
-function recountOpenReports()
|
|
|
+function recountOpenMemberReports()
|
|
|
{
|
|
|
global $user_info, $context, $smcFunc;
|
|
|
|
|
|
$request = $smcFunc['db_query']('', '
|
|
|
SELECT COUNT(*)
|
|
|
FROM {db_prefix}log_reported
|
|
|
- WHERE ' . $user_info['mod_cache']['bq'] . '
|
|
|
- AND closed = {int:not_closed}
|
|
|
- AND ignore_all = {int:not_ignored}',
|
|
|
+ WHERE closed = {int:not_closed}
|
|
|
+ AND ignore_all = {int:not_ignored}
|
|
|
+ AND id_board = {int:not_a_reported_post}',
|
|
|
array(
|
|
|
'not_closed' => 0,
|
|
|
'not_ignored' => 0,
|
|
|
+ 'not_a_reported_post' => 0,
|
|
|
)
|
|
|
);
|
|
|
list ($open_reports) = $smcFunc['db_fetch_row']($request);
|
|
|
$smcFunc['db_free_result']($request);
|
|
|
|
|
|
- $_SESSION['rc'] = array(
|
|
|
+ $_SESSION['rmc'] = array(
|
|
|
'id' => $user_info['id'],
|
|
|
'time' => time(),
|
|
|
'reports' => $open_reports,
|
|
|
);
|
|
|
|
|
|
- $context['open_mod_reports'] = $open_reports;
|
|
|
+ $context['open_member_reports'] = $open_reports;
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * Get details about the moderation report... specified in
|
|
|
- * $_REQUEST['report'].
|
|
|
- */
|
|
|
-function ModReport()
|
|
|
+function MemberReport()
|
|
|
{
|
|
|
global $user_info, $context, $sourcedir, $scripturl, $txt, $smcFunc;
|
|
|
|
|
@@ -886,16 +950,17 @@ function ModReport()
|
|
|
|
|
|
// Get the report details, need this so we can limit access to a particular board
|
|
|
$request = $smcFunc['db_query']('', '
|
|
|
- SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
|
|
|
+ SELECT lr.id_report, lr.id_member,
|
|
|
lr.time_started, lr.time_updated, lr.num_reports, lr.closed, lr.ignore_all,
|
|
|
- IFNULL(mem.real_name, lr.membername) AS author_name, IFNULL(mem.id_member, 0) AS id_author
|
|
|
+ IFNULL(mem.real_name, lr.membername) AS user_name, IFNULL(mem.id_member, 0) AS id_user
|
|
|
FROM {db_prefix}log_reported AS lr
|
|
|
LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lr.id_member)
|
|
|
WHERE lr.id_report = {int:id_report}
|
|
|
- AND ' . ($user_info['mod_cache']['bq'] == '1=1' || $user_info['mod_cache']['bq'] == '0=1' ? $user_info['mod_cache']['bq'] : 'lr.' . $user_info['mod_cache']['bq']) . '
|
|
|
+ AND lr.id_board = {int:not_a_reported_post}
|
|
|
LIMIT 1',
|
|
|
array(
|
|
|
'id_report' => $_REQUEST['report'],
|
|
|
+ 'not_a_reported_post' => 0,
|
|
|
)
|
|
|
);
|
|
|
|
|
@@ -935,13 +1000,9 @@ function ModReport()
|
|
|
$smcFunc['db_insert']('insert',
|
|
|
'{db_prefix}background_tasks',
|
|
|
array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
|
|
|
- array('$sourcedir/tasks/MsgReportReply-Notify.php', 'MsgReportReply_Notify_Background', serialize(array(
|
|
|
+ array('$sourcedir/tasks/MemberReportReply-Notify.php', 'MemberReportReply_Notify_Background', serialize(array(
|
|
|
'report_id' => $_REQUEST['report'],
|
|
|
'comment_id' => $last_comment,
|
|
|
- 'msg_id' => $row['id_msg'],
|
|
|
- 'topic_id' => $row['id_topic'],
|
|
|
- 'board_id' => $row['id_board'],
|
|
|
- 'sender_id' => $user_info['id'],
|
|
|
'sender_name' => $user_info['name'],
|
|
|
'time' => time(),
|
|
|
)), 0),
|
|
@@ -949,30 +1010,23 @@ function ModReport()
|
|
|
);
|
|
|
|
|
|
// Redirect to prevent double submittion.
|
|
|
- redirectexit($scripturl . '?action=moderate;area=reports;report=' . $_REQUEST['report']);
|
|
|
+ redirectexit($scripturl . '?action=moderate;area=memberreports;report=' . $_REQUEST['report']);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
$context['report'] = array(
|
|
|
'id' => $row['id_report'],
|
|
|
- 'topic_id' => $row['id_topic'],
|
|
|
- 'board_id' => $row['id_board'],
|
|
|
- 'message_id' => $row['id_msg'],
|
|
|
- 'message_href' => $scripturl . '?msg=' . $row['id_msg'],
|
|
|
- 'message_link' => '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>',
|
|
|
- 'report_href' => $scripturl . '?action=moderate;area=reports;report=' . $row['id_report'],
|
|
|
- 'author' => array(
|
|
|
- 'id' => $row['id_author'],
|
|
|
- 'name' => $row['author_name'],
|
|
|
- 'link' => $row['id_author'] ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_author'] . '">' . $row['author_name'] . '</a>' : $row['author_name'],
|
|
|
- 'href' => $scripturl . '?action=profile;u=' . $row['id_author'],
|
|
|
+ 'report_href' => $scripturl . '?action=moderate;area=memberreports;report=' . $row['id_report'],
|
|
|
+ 'user' => array(
|
|
|
+ 'id' => $row['id_user'],
|
|
|
+ 'name' => $row['user_name'],
|
|
|
+ 'link' => $row['id_user'] ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_user'] . '">' . $row['user_name'] . '</a>' : $row['user_name'],
|
|
|
+ 'href' => $scripturl . '?action=profile;u=' . $row['id_user'],
|
|
|
),
|
|
|
'comments' => array(),
|
|
|
'mod_comments' => array(),
|
|
|
'time_started' => timeformat($row['time_started']),
|
|
|
'last_updated' => timeformat($row['time_updated']),
|
|
|
- 'subject' => $row['subject'],
|
|
|
- 'body' => parse_bbc($row['body']),
|
|
|
'num_reports' => $row['num_reports'],
|
|
|
'closed' => $row['closed'],
|
|
|
'ignore' => $row['ignore_all']
|
|
@@ -1039,28 +1093,37 @@ function ModReport()
|
|
|
require_once($sourcedir . '/Subs-List.php');
|
|
|
loadLanguage('Modlog');
|
|
|
|
|
|
+ // Find their ID in the serialized action string...
|
|
|
+ $user_id_length = strlen((string)$context['report']['user']['id']);
|
|
|
+ $member = 's:6:"member";s:' . $user_id_length . ':"' . $context['report']['user']['id'] . '";}';
|
|
|
+
|
|
|
// This is all the information from the moderation log.
|
|
|
+ // Note that we use "raw" here to prevent SMF from escaping things we don't want escaped
|
|
|
$listOptions = array(
|
|
|
- 'id' => 'moderation_actions_list',
|
|
|
+ 'id' => 'memreport_actions_list',
|
|
|
'title' => $txt['mc_modreport_modactions'],
|
|
|
'items_per_page' => 15,
|
|
|
'no_items_label' => $txt['modlog_no_entries_found'],
|
|
|
- 'base_href' => $scripturl . '?action=moderate;area=reports;report=' . $context['report']['id'],
|
|
|
+ 'base_href' => $scripturl . '?action=moderate;area=memberreports;report=' . $context['report']['id'],
|
|
|
'default_sort_col' => 'time',
|
|
|
'get_items' => array(
|
|
|
'function' => 'list_getModLogEntries',
|
|
|
'params' => array(
|
|
|
- 'lm.id_topic = {int:id_topic}',
|
|
|
- array('id_topic' => $context['report']['topic_id']),
|
|
|
+ 'lm.extra LIKE {raw:member}
|
|
|
+ AND lm.action LIKE {raw:report}',
|
|
|
+ array('member' => '\'%' . $member . '\'', 'report' => '\'%_user_report\''),
|
|
|
1,
|
|
|
+ true,
|
|
|
),
|
|
|
),
|
|
|
'get_count' => array(
|
|
|
'function' => 'list_getModLogEntryCount',
|
|
|
'params' => array(
|
|
|
- 'lm.id_topic = {int:id_topic}',
|
|
|
- array('id_topic' => $context['report']['topic_id']),
|
|
|
+ 'lm.extra LIKE {string:member}
|
|
|
+ AND lm.action LIKE {string:report}',
|
|
|
+ array('member' => '%' . $member . '%', 'report' => '%_user_report'),
|
|
|
1,
|
|
|
+ true,
|
|
|
),
|
|
|
),
|
|
|
// This assumes we are viewing by user.
|
|
@@ -1142,8 +1205,8 @@ function ModReport()
|
|
|
|
|
|
// Finally we are done :P
|
|
|
loadTemplate('ModerationCenter');
|
|
|
- $context['page_title'] = sprintf($txt['mc_viewmodreport'], $context['report']['subject'], $context['report']['author']['name']);
|
|
|
- $context['sub_template'] = 'viewmodreport';
|
|
|
+ $context['page_title'] = sprintf($txt['mc_viewmemberreport'], $context['report']['user']['name']);
|
|
|
+ $context['sub_template'] = 'viewmemberreport';
|
|
|
}
|
|
|
|
|
|
/**
|