makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9956] Display error message if no disapprove reason given

Browse source 
PHPBB3-9956
This commit is contained in:
Joas Schilling 2011-10-14 04:18:44 +02:00
parent 86f8851c40
commit ab8ecf5b92
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/mcp/mcp_queue.php
View file

@ -216,6 +216,7 @@ class mcp_queue
'POST_IP' => $post_info['poster_ip'], 'POST_IP' => $post_info['poster_ip'],
'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
'POST_ID' => $post_info['post_id'], 'POST_ID' => $post_info['post_id'],
'S_FIRST_POST' => ($post_info['topic_first_post_id'] == $post_id),
'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id . '&lookup=' . $post_info['poster_ip']) . '#ip' : '', 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id . '&lookup=' . $post_info['poster_ip']) . '#ip' : '',
)); ));
@ -778,6 +779,8 @@ function disapprove_post($post_id_list, $id, $mode)
if (!$row || (!$reason && strtolower($row['reason_title']) == 'other')) if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))
{ {
$additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; $additional_msg = $user->lang['NO_REASON_DISAPPROVAL'];
unset($_REQUEST['confirm_key']);
unset($_POST['confirm_key']);
unset($_POST['confirm']); unset($_POST['confirm']);
} }
else else

2
phpBB/styles/prosilver/template/mcp_approve.html
View file

@ -8,7 +8,7 @@
<div class="content"> <div class="content">
<h2>{MESSAGE_TITLE}</h2> <h2>{MESSAGE_TITLE}</h2>
<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF --> <!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF -->
<fieldset> <fieldset>
<!-- IF S_NOTIFY_POSTER --> <!-- IF S_NOTIFY_POSTER -->

1
phpBB/styles/prosilver/template/mcp_post.html
View file

@ -74,6 +74,7 @@
<p class="rules"> <p class="rules">
<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp; <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
<input type="hidden" name="post_id_list[]" value="{POST_ID}" /> <input type="hidden" name="post_id_list[]" value="{POST_ID}" />
{S_FORM_TOKEN} {S_FORM_TOKEN}
</p> </p>