Author: acydburn
Date: Tue Nov 3 15:03:14 2009
New Revision: 10253
Log:
This is not perfect... i know, but at least it gives out more information than a simple "this topic/post does not exist". ;)
Related to r9971
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Tue Nov 3 15:03:14 2009
***************
*** 95,102 ****
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND (f.forum_id = t.forum_id
! OR f.forum_id = $forum_id)
! AND t.topic_approved = 1";
break;
case 'quote':
--- 95,102 ----
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND (f.forum_id = t.forum_id
! OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1');
break;
case 'quote':
***************
*** 125,131 ****
AND u.user_id = p.poster_id
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id) && $mode != 'quote') ? '' : 'AND p.post_approved = 1');
break;
case 'smilies':
--- 125,131 ----
AND u.user_id = p.poster_id
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1');
break;
case 'smilies':
***************
*** 171,176 ****
--- 171,183 ----
trigger_error(($mode == 'post' || $mode == 'bump' || $mode == 'reply') ? 'NO_TOPIC' : 'NO_POST');
}
+ // Not able to reply to unapproved posts/topics
+ // TODO: add more descriptive language key
+ if ($auth->acl_get('m_approve', $forum_id) && ((($mode == 'reply' || $mode == 'bump') && !$post_data['topic_approved']) || ($mode == 'quote' && !$post_data['post_approved'])))
+ {
+ trigger_error(($mode == 'reply' || $mode == 'bump') ? 'TOPIC_UNAPPROVED' : 'POST_UNAPPROVED');
+ }
+
if ($mode == 'popup')
{
upload_popup($post_data['forum_style']);
|
