[mxbb-commits] core/includes/shared/phpbb3/includes functions_posting.php, 1.3, 1.4

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9506

Modified Files:
	functions_posting.php 
Log Message:
$auth -> $phpbb_auth

Index: functions_posting.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functions_posting.php	15 Jun 2008 21:01:42 -0000	1.3
--- functions_posting.php	4 Sep 2008 00:02:06 -0000	1.4
***************
*** 23,27 ****
  function generate_smilies($mode, $forum_id)
  {
! 	global $auth, $db, $user, $config, $template;
  	global $phpEx, $phpbb_root_path;

--- 23,27 ----
  function generate_smilies($mode, $forum_id)
  {
! 	global $phpbb_auth, $db, $user, $config, $template;
  	global $phpEx, $phpbb_root_path;

***************
*** 287,291 ****
  function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL)
  {
! 	global $auth, $user, $template, $topic_type;

  	$toggle = false;
--- 287,291 ----
  function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL)
  {
! 	global $phpbb_auth, $user, $template, $topic_type;

  	$toggle = false;
***************
*** 299,308 ****
  	$topic_type_array = array();

! 	foreach ($topic_types as $auth_key => $topic_value)
  	{
  		// We do not have a special post global announcement permission
! 		$auth_key = ($auth_key == 'global') ? 'announce' : $auth_key;

! 		if ($auth->acl_get('f_' . $auth_key, $forum_id))
  		{
  			$toggle = true;
--- 299,308 ----
  	$topic_type_array = array();

! 	foreach ($topic_types as $phpbb_auth_key => $topic_value)
  	{
  		// We do not have a special post global announcement permission
! 		$phpbb_auth_key = ($phpbb_auth_key == 'global') ? 'announce' : $phpbb_auth_key;

! 		if ($phpbb_auth->acl_get('f_' . $phpbb_auth_key, $forum_id))
  		{
  			$toggle = true;
***************
*** 332,337 ****

  		$template->assign_vars(array(
! 			'S_TOPIC_TYPE_STICKY'	=> ($auth->acl_get('f_sticky', $forum_id)),
! 			'S_TOPIC_TYPE_ANNOUNCE'	=> ($auth->acl_get('f_announce', $forum_id)))
  		);
  	}
--- 332,337 ----

  		$template->assign_vars(array(
! 			'S_TOPIC_TYPE_STICKY'	=> ($phpbb_auth->acl_get('f_sticky', $forum_id)),
! 			'S_TOPIC_TYPE_ANNOUNCE'	=> ($phpbb_auth->acl_get('f_announce', $forum_id)))
  		);
  	}
***************
*** 350,354 ****
  function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false)
  {
! 	global $auth, $user, $config, $db, $cache;
  	global $phpbb_root_path, $phpEx;

--- 350,354 ----
  function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false)
  {
! 	global $phpbb_auth, $user, $config, $db, $cache;
  	global $phpbb_root_path, $phpEx;

***************
*** 402,406 ****

  	// Check Image Size, if it is an image
! 	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE)
  	{
  		$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
--- 402,406 ----

  	// Check Image Size, if it is an image
! 	if (!$phpbb_auth->acl_get('a_') && !$phpbb_auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE)
  	{
  		$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
***************
*** 408,412 ****

  	// Admins and mods are allowed to exceed the allowed filesize
! 	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id))
  	{
  		if (!empty($extensions[$file->get('extension')]['max_filesize']))
--- 408,412 ----

  	// Admins and mods are allowed to exceed the allowed filesize
! 	if (!$phpbb_auth->acl_get('a_') && !$phpbb_auth->acl_get('m_', $forum_id))
  	{
  		if (!empty($extensions[$file->get('extension')]['max_filesize']))
***************
*** 817,821 ****
  function load_drafts($topic_id = 0, $forum_id = 0, $id = 0)
  {
! 	global $user, $db, $template, $auth;
  	global $phpbb_root_path, $phpEx;

--- 817,821 ----
  function load_drafts($topic_id = 0, $forum_id = 0, $id = 0)
  {
! 	global $user, $db, $template, $phpbb_auth;
  	global $phpbb_root_path, $phpEx;

***************
*** 883,889 ****
  		if (isset($topic_rows[$draft['topic_id']])
  			&& (
! 				($topic_rows[$draft['topic_id']]['forum_id'] && $auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id']))
  				||
! 				(!$topic_rows[$draft['topic_id']]['forum_id'] && $auth->acl_getf_global('f_read'))
  			))
  		{
--- 883,889 ----
  		if (isset($topic_rows[$draft['topic_id']])
  			&& (
! 				($topic_rows[$draft['topic_id']]['forum_id'] && $phpbb_auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id']))
  				||
! 				(!$topic_rows[$draft['topic_id']]['forum_id'] && $phpbb_auth->acl_getf_global('f_read'))
  			))
  		{
***************
*** 896,900 ****
  			$insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id']);
  		}
! 		else if ($draft['forum_id'] && $auth->acl_get('f_read', $draft['forum_id']))
  		{
  			$link_forum = true;
--- 896,900 ----
  			$insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id']);
  		}
! 		else if ($draft['forum_id'] && $phpbb_auth->acl_get('f_read', $draft['forum_id']))
  		{
  			$link_forum = true;
***************
*** 932,936 ****
  function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true)
  {
! 	global $user, $auth, $db, $template, $bbcode, $cache;
  	global $config, $phpbb_root_path, $phpEx;

--- 932,936 ----
  function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true)
  {
! 	global $user, $phpbb_auth, $db, $template, $bbcode, $cache;
  	global $config, $phpbb_root_path, $phpEx;

***************
*** 939,943 ****
  		FROM ' . POSTS_TABLE . ' p' . "
  		WHERE p.topic_id = $topic_id
! 			" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . '
  			' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
  		ORDER BY p.post_time ';
--- 939,943 ----
  		FROM ' . POSTS_TABLE . ' p' . "
  		WHERE p.topic_id = $topic_id
! 			" . ((!$phpbb_auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . '
  			' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
  		ORDER BY p.post_time ';
***************
*** 997,1001 ****
  	// Grab extensions
  	$extensions = $attachments = array();
! 	if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id))
  	{
  		$extensions = $cache->obtain_attach_extensions($forum_id);
--- 997,1001 ----
  	// Grab extensions
  	$extensions = $attachments = array();
! 	if ($has_attachments && $phpbb_auth->acl_get('u_download') && $phpbb_auth->acl_get('f_download', $forum_id))
  	{
  		$extensions = $cache->obtain_attach_extensions($forum_id);
***************
*** 1033,1037 ****
  		$decoded_message = false;

! 		if ($show_quote_button && $auth->acl_get('f_reply', $forum_id))
  		{
  			$decoded_message = $message;
--- 1033,1037 ----
  		$decoded_message = false;

! 		if ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id))
  		{
  			$decoded_message = $message;
***************
*** 1074,1079 ****
  			'POST_ID'			=> $row['post_id'],
  			'U_MINI_POST'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
! 			'U_MCP_DETAILS'		=> ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
! 			'POSTER_QUOTE'		=> ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '')
  		);

--- 1074,1079 ----
  			'POST_ID'			=> $row['post_id'],
  			'U_MINI_POST'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
! 			'U_MCP_DETAILS'		=> ($phpbb_auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
! 			'POSTER_QUOTE'		=> ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '')
  		);

***************
*** 1105,1109 ****
  function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id)
  {
! 	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;

  	$topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false;
--- 1105,1109 ----
  function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id)
  {
! 	global $db, $user, $config, $phpbb_root_path, $phpEx, $phpbb_auth;

  	$topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false;
***************
*** 1206,1212 ****

  	// Make sure users are allowed to read the forum
! 	foreach ($auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary)
  	{
! 		foreach ($forum_ary as $auth_option => $user_ary)
  		{
  			foreach ($user_ary as $user_id)
--- 1206,1212 ----

  	// Make sure users are allowed to read the forum
! 	foreach ($phpbb_auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary)
  	{
! 		foreach ($forum_ary as $phpbb_auth_option => $user_ary)
  		{
  			foreach ($user_ary as $user_id)
***************
*** 1332,1336 ****
  function delete_post($forum_id, $topic_id, $post_id, &$data)
  {
! 	global $db, $user, $auth;
  	global $config, $phpEx, $phpbb_root_path;

--- 1332,1336 ----
  function delete_post($forum_id, $topic_id, $post_id, &$data)
  {
! 	global $db, $user, $phpbb_auth;
  	global $config, $phpEx, $phpbb_root_path;

***************
*** 1458,1462 ****
  					FROM ' . POSTS_TABLE . "
  					WHERE topic_id = $topic_id " .
! 						((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '');
  				$result = $db->sql_query($sql);
  				$row = $db->sql_fetchrow($result);
--- 1458,1462 ----
  					FROM ' . POSTS_TABLE . "
  					WHERE topic_id = $topic_id " .
! 						((!$phpbb_auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '');
  				$result = $db->sql_query($sql);
  				$row = $db->sql_fetchrow($result);
***************
*** 1471,1475 ****
  				FROM ' . POSTS_TABLE . "
  				WHERE topic_id = $topic_id " .
! 					((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '') . '
  					AND post_time > ' . $data['post_time'] . '
  				ORDER BY post_time ASC';
--- 1471,1475 ----
  				FROM ' . POSTS_TABLE . "
  				WHERE topic_id = $topic_id " .
! 					((!$phpbb_auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '') . '
  					AND post_time > ' . $data['post_time'] . '
  				ORDER BY post_time ASC';
***************
*** 1542,1546 ****
  function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true)
  {
! 	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;

  	// We do not handle erasing posts here
--- 1542,1546 ----
  function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true)
  {
! 	global $db, $phpbb_auth, $user, $config, $phpEx, $template, $phpbb_root_path;

  	// We do not handle erasing posts here
***************
*** 1606,1610 ****
  				'poster_ip'			=> $user->ip,
  				'post_time'			=> $current_time,
! 				'post_approved'		=> (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1,
  				'enable_bbcode'		=> $data['enable_bbcode'],
  				'enable_smilies'	=> $data['enable_smilies'],
--- 1606,1610 ----
  				'poster_ip'			=> $user->ip,
  				'post_time'			=> $current_time,
! 				'post_approved'		=> (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1,
  				'enable_bbcode'		=> $data['enable_bbcode'],
  				'enable_smilies'	=> $data['enable_smilies'],
***************
*** 1618,1622 ****
  				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
  				'bbcode_uid'		=> $data['bbcode_uid'],
! 				'post_postcount'	=> ($auth->acl_get('f_postcount', $data['forum_id'])) ? 1 : 0,
  				'post_edit_locked'	=> $data['post_edit_locked']
  			);
--- 1618,1622 ----
  				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
  				'bbcode_uid'		=> $data['bbcode_uid'],
! 				'post_postcount'	=> ($phpbb_auth->acl_get('f_postcount', $data['forum_id'])) ? 1 : 0,
  				'post_edit_locked'	=> $data['post_edit_locked']
  			);
***************
*** 1636,1640 ****

  			// Display edit info if edit reason given or user is editing his post, which is not the last within the topic.
! 			if ($data['post_edit_reason'] || (!$auth->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post')))
  			{
  				$sql_data[POSTS_TABLE]['sql'] = array(
--- 1636,1640 ----

  			// Display edit info if edit reason given or user is editing his post, which is not the last within the topic.
! 			if ($data['post_edit_reason'] || (!$phpbb_auth->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post')))
  			{
  				$sql_data[POSTS_TABLE]['sql'] = array(
***************
*** 1664,1668 ****
  				'poster_id'			=> $data['poster_id'],
  				'icon_id'			=> $data['icon_id'],
! 				'post_approved'		=> (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['post_approved'],
  				'enable_bbcode'		=> $data['enable_bbcode'],
  				'enable_smilies'	=> $data['enable_smilies'],
--- 1664,1668 ----
  				'poster_id'			=> $data['poster_id'],
  				'icon_id'			=> $data['icon_id'],
! 				'post_approved'		=> (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['post_approved'],
  				'enable_bbcode'		=> $data['enable_bbcode'],
  				'enable_smilies'	=> $data['enable_smilies'],
***************
*** 1698,1702 ****
  				'forum_id'					=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
  				'icon_id'					=> $data['icon_id'],
! 				'topic_approved'			=> (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1,
  				'topic_title'				=> $subject,
  				'topic_first_poster_name'	=> (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''),
--- 1698,1702 ----
  				'forum_id'					=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
  				'icon_id'					=> $data['icon_id'],
! 				'topic_approved'			=> (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1,
  				'topic_title'				=> $subject,
  				'topic_first_poster_name'	=> (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''),
***************
*** 1718,1739 ****
  			}

! 			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : '');

  			if ($topic_type != POST_GLOBAL)
  			{
! 				if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id']))
  				{
  					$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
  				}
! 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) ? ', forum_topics = forum_topics + 1' : '');
  			}
  		break;

  		case 'reply':
! 			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies_real = topic_replies_real + 1, topic_bumped = 0, topic_bumper = 0' . (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) ? ', topic_replies = topic_replies + 1' : '') . ((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : '');

! 			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : '');

! 			if (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) && $topic_type != POST_GLOBAL)
  			{
  				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
--- 1718,1739 ----
  			}

! 			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($phpbb_auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : '');

  			if ($topic_type != POST_GLOBAL)
  			{
! 				if ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id']))
  				{
  					$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
  				}
! 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? ', forum_topics = forum_topics + 1' : '');
  			}
  		break;

  		case 'reply':
! 			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies_real = topic_replies_real + 1, topic_bumped = 0, topic_bumper = 0' . (($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? ', topic_replies = topic_replies + 1' : '') . ((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : '');

! 			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($phpbb_auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : '');

! 			if (($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) && $topic_type != POST_GLOBAL)
  			{
  				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
***************
*** 1747,1751 ****
  				'forum_id'					=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
  				'icon_id'					=> $data['icon_id'],
! 				'topic_approved'			=> (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['topic_approved'],
  				'topic_title'				=> $subject,
  				'topic_first_poster_name'	=> $username,
--- 1747,1751 ----
  				'forum_id'					=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
  				'icon_id'					=> $data['icon_id'],
! 				'topic_approved'			=> (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['topic_approved'],
  				'topic_title'				=> $subject,
  				'topic_first_poster_name'	=> $username,
***************
*** 1762,1766 ****

  			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
! 			if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']) && $data['topic_approved'])
  			{
  				// Do we need to grab some topic informations?
--- 1762,1766 ----

  			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
! 			if (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id']) && $data['topic_approved'])
  			{
  				// Do we need to grab some topic informations?
***************
*** 1792,1796 ****

  			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
! 			if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']) && $data['post_approved'])
  			{
  				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1';
--- 1792,1796 ----

  			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
! 			if (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id']) && $data['post_approved'])
  			{
  				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1';
***************
*** 2271,2275 ****

  	// Update total post count, do not consider moderated posts/topics
! 	if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id']))
  	{
  		if ($post_mode == 'post')
--- 2271,2275 ----

  	// Update total post count, do not consider moderated posts/topics
! 	if ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id']))
  	{
  		if ($post_mode == 'post')
***************
*** 2403,2407 ****

  	// Send Notifications
! 	if ($mode != 'edit' && $mode != 'delete' && ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])))
  	{
  		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']);
--- 2403,2407 ----

  	// Send Notifications
! 	if ($mode != 'edit' && $mode != 'delete' && ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])))
  	{
  		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']);
***************
*** 2410,2414 ****
  	$params = $add_anchor = '';

! 	if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id']))
  	{
  		$params .= '&amp;t=' . $data['topic_id'];
--- 2410,2414 ----
  	$params = $add_anchor = '';

! 	if ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id']))
  	{
  		$params .= '&amp;t=' . $data['topic_id'];