diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 68cceebc66..8f657d92f2 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -107,6 +107,53 @@ function mcp_post_details($id, $mode, $action, $url) } break; + case 'del_marked': + case 'del_all': + case 'add_feedback': + + $deletemark = ($action == 'del_marked') ? true : false; + $deleteall = ($action == 'del_all') ? true : false; + $marked = request_var('marknote', 0); + $usernote = request_var('usernote', ''); + + if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) + { + $where_sql = ''; + if ($deletemark && $marked) + { + $sql_in = array(); + foreach ($marked as $mark) + { + $sql_in[] = $mark; + } + $where_sql = ' AND log_id IN (' . implode(', ', $sql_in) . ')'; + unset($sql_in); + } + + $sql = 'DELETE FROM ' . LOG_TABLE . ' + WHERE log_type = ' . LOG_USERS . " + $where_sql"; + $db->sql_query($sql); + + add_log('admin', 'LOG_USERS_CLEAR'); + + $msg = ($deletemark) ? 'MARKED_DELETED' : 'ALL_DELETED'; + $redirect = "$url&i=$id&mode=post_details"; + meta_refresh(2, $redirect); + trigger_error($user->lang[$msg] . '

' . sprintf($user->lang['RETURN_PAGE'], '', '')); + } + + if ($usernote && $action == 'add_feedback') + { + add_log('admin', 'LOG_USER_FEEDBACK', $post_info['username']); + add_log('user', $post_info['user_id'], 'LOG_USER_GENERAL', $usernote); + + $redirect = "$url&i=$id&mode=post_details"; + meta_refresh(2, $redirect); + trigger_error($user->lang['USER_FEEDBACK_ADDED'] . '

' . sprintf($user->lang['RETURN_PAGE'], '', '')); + } + break; + default: } @@ -125,9 +172,9 @@ function mcp_post_details($id, $mode, $action, $url) $message = smilie_text($message); $template->assign_vars(array( - 'S_MCP_ACTION' => "$url&i=main&quickmod=1", - 'S_CHGPOSTER_ACTION' => "$url&i=$id&mode=post_details", - 'S_APPROVE_ACTION' => "{$phpbb_root_path}mcp.$phpEx$SID&i=queue&p=$post_id", + 'U_MCP_ACTION' => "$url&i=main&quickmod=1", // Use this for mode paramaters + 'U_POST_ACTION' => "$url&i=$id&mode=post_details", // Use this for action parameters + 'U_APPROVE_ACTION' => "{$phpbb_root_path}mcp.$phpEx$SID&i=queue&p=$post_id", 'S_CAN_VIEWIP' => $auth->acl_get('m_ip', $post_info['forum_id']), 'S_CAN_CHGPOSTER' => $auth->acl_get('m_', $post_info['forum_id']), @@ -137,12 +184,13 @@ function mcp_post_details($id, $mode, $action, $url) 'S_POST_REPORTED' => $post_info['post_reported'], 'S_POST_UNAPPROVED' => !$post_info['post_approved'], 'S_POST_LOCKED' => $post_info['post_edit_locked'], -// 'S_USER_NOTES' => ($post_info['user_notes']) ? true : false, 'S_USER_WARNINGS' => ($post_info['user_warnings']) ? true : false, + 'S_SHOW_USER_NOTES' => true, + 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, 'U_VIEW_PROFILE' => "memberlist.$phpEx$SID&mode=viewprofile&u=" . $post_info['user_id'], - 'U_MCP_USERNOTES' => "mcp.$phpEx$SID&i=notes&mode=user_notes&u=" . $post_info['user_id'], - 'U_MCP_WARNINGS' => "mcp.$phpEx$SID&i=warnings&mode=view_user&u=" . $post_info['user_id'], +// 'U_MCP_USERNOTES' => "mcp.$phpEx$SID&i=notes&mode=user_notes&u=" . $post_info['user_id'], +// 'U_MCP_WARNINGS' => "mcp.$phpEx$SID&i=warnings&mode=view_user&u=" . $post_info['user_id'], 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? "{$phpbb_root_path}posting.$phpEx$SID&mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}" : '', 'RETURN_TOPIC' => sprintf($user->lang['RETURN_TOPIC'], "", ''), @@ -160,6 +208,26 @@ function mcp_post_details($id, $mode, $action, $url) 'POST_ID' => $post_info['post_id']) ); + // Get User Notes + $log_data = array(); + $log_count = 0; + view_log('user', $log_data, $log_count, $config['posts_per_page'], 0, 0, 0, $post_info['user_id']); + + if ($log_count) + { + $template->assign_var('S_USER_NOTES', true); + + foreach ($log_data as $row) + { + $template->assign_block_vars('usernotes', array( + 'REPORT_BY' => $row['username'], + 'REPORT_AT' => $user->format_date($row['time']), + 'ACTION' => $row['action'], + 'ID' => $row['id']) + ); + } + } + // Get Reports if ($auth->acl_get('m_', $post_info['forum_id'])) { diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php index bc86dd197c..5a8b0e912f 100644 --- a/phpBB/language/en/admin.php +++ b/phpBB/language/en/admin.php @@ -1143,9 +1143,6 @@ $lang += array( 'USER_POSTING_PREFS' => 'Posting preferences', - 'ADD_FEEDBACK' => 'Add feedback', - 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text, HTML, BBCode, etc. are not permitted.', - 'ADMIN_SIGNATURE_PREVIEW' => 'Users signature will appear like this', 'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index c40a16487b..3345bd7af0 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -86,6 +86,7 @@ $lang += array( 'DAY' => 'Day', 'DAYS' => 'Days', 'DELETE' => 'Delete', + 'DELETE_ALL' => 'Delete All', 'DELETE_COOKIES' => 'Delete all board cookies', 'DELETE_MARKED' => 'Delete Marked', 'DESCENDING' => 'Descending', @@ -524,7 +525,6 @@ $unused = array( 'DESCRIPTION' => 'Description', 'DOWNLOAD' => 'Download', 'Date' => 'Date', - 'Delete_all' => 'Delete All', 'Deny_selected' => 'Deny Selected', 'Disable_BBCode_pm' => 'Disable BBCode in this message', 'Disable_HTML_pm' => 'Disable HTML in this message', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 49deed20c3..88a8305ca3 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -29,6 +29,8 @@ if (empty($lang) || !is_array($lang)) $lang += array( 'ACTION' => 'Action', + 'ADD_FEEDBACK' => 'Add feedback', + 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text, HTML, BBCode, etc. are not permitted.', 'ALL_ENTRIES' => 'All entries', 'ALREADY_REPORTED' => 'This post has already been reported', 'APPROVE' => 'Approve', @@ -54,6 +56,7 @@ $lang += array( 'EMPTY_REPORT' => 'You must enter a description when selecting this reason', 'EMPTY_TOPICS_REMOVED_WARNING' => 'Please note that one or several topics have been removed from the database because they were or become empty', + 'FEEDBACK' => 'Feedback', 'FORK' => 'Fork', 'FORK_TOPIC' => 'Fork Topic', 'FORK_TOPIC_CONFIRM' => 'Are you sure you want to copy this topic?', @@ -242,6 +245,7 @@ $lang += array( 'UNRATE_POST_EXPLAIN' => 'Reset post rating', 'USER_CANNOT_POST' => 'You cannot post in this forum', 'USER_CANNOT_REPORT' => 'You cannot report posts in this forum', + 'USER_FEEDBACK_ADDED' => 'User feedback added successfully', 'VIEW_DETAILS' => 'View Details', diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html index aba3f5edd0..702e01ad76 100644 --- a/phpBB/styles/subSilver/template/mcp_post.html +++ b/phpBB/styles/subSilver/template/mcp_post.html @@ -1,6 +1,6 @@ - +
@@ -13,7 +13,7 @@ - + @@ -46,6 +46,47 @@ + +
+ + + +
{L_POST_DETAILS}
{L_POSTER}: {POSTER_NAME}   [ {L_READ_PROFILE} ] [ {L_READ_USERNOTES} ] [ {L_READ_WARNINGS} ]{POSTER_NAME}   [ {L_READ_PROFILE} ]
+ + + + + + colspan="2">Report by: {usernotes.REPORT_BY} on {usernotes.REPORT_AT}
{usernotes.ACTION} + + + + + + + + +
{L_FEEDBACK}
 
+
+ + + + + + + + + + + + + + +
{L_ADD_FEEDBACK}
{L_ADD_FEEDBACK_EXPLAIN}
  
+ + + +
@@ -84,7 +125,7 @@ -
+ {L_CHANGE_POSTER}
@@ -92,7 +133,7 @@ -
+ {L_MOD_OPTIONS}