diff options
| -rwxr-xr-x | phpBB/includes/mcp/mcp_warn.php | 12 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 1 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index a8ee952c93..281b5d6410 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -210,6 +210,12 @@ function mcp_warn_post_view($id, $mode, $action) trigger_error($user->lang['CANNOT_WARN_ANONYMOUS']); } + // Prevent someone from warning themselves + if ($userrow['user_id'] == $user->data['user_id']) + { + trigger_error($user->lang['CANNOT_WARN_SELF']); + } + // Check if there is already a warning for this post to prevent multiple // warnings for the same offence $sql = 'SELECT post_id @@ -321,6 +327,12 @@ function mcp_warn_user_view($id, $mode, $action) trigger_error('NO_USER'); } + // Prevent someone from warning themselves + if ($userrow['user_id'] == $user->data['user_id']) + { + trigger_error($user->lang['CANNOT_WARN_SELF']); + } + $user_id = $userrow['user_id']; if ($warning && $action == 'add_warning') diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 1b6a496a7e..f18b934ddc 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -47,6 +47,7 @@ $lang = array_merge($lang, array( 'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it\'s already in', 'CANNOT_WARN_ANONYMOUS' => 'You cannot warn an guest user', + 'CANNOT_WARN_SELF' => 'You cannot warn yourself', 'CAN_LEAVE_BLANK' => 'This can be left blank.', 'CHANGE_POSTER' => 'Change poster', 'CLOSE_REPORT' => 'Close report', diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index f0dc63f023..b9e6ca3cbf 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1360,7 +1360,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($auth->acl_getf_global('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', + 'U_WARN' => ($auth->acl_getf_global('m_warn') && $poster_id != $user->data['user_id']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', 'POST_ID' => $row['post_id'], |