MCP take 2, see forum

git-svn-id: file:///svn/phpbb/trunk@4496 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/mcp/mcp_main.php

@@ -0,0 +1,547 @@
+<?php
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : mcp_main.php
+// STARTED   : Mon Sep 02, 2003
+// COPYRIGHT : © 2003 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
+
+class mcp_main extends mcp
+{
+	var $module_name = 'main';
+
+	function mcp_main($module_id)
+	{
+		$this->module_id = $module_id;
+		$this->url = $module_url;
+
+		$this->mcp_init();
+
+		$this->submodules = array(
+			'MCP_FRONT'	=>	'&amp;i=' . $module_id . '&amp;mode=front',
+			'MCP_FORUM'	=>	'&amp;i=' . $module_id . '&amp;mode=forum_view'
+		);
+
+		if ($this->topic_id)
+		{
+			$this->submodules['MCP_TOPIC'] = '&amp;i=' . $module_id . '&amp;mode=topic_view';
+		}
+		if ($this->post_id)
+		{
+			$this->submodules['MCP_POST'] = '&amp;i=' . $module_id . '&amp;mode=post_details';
+		}
+	}
+
+	function main($mode)
+	{
+		global $auth, $db, $user, $template;
+		global $config, $phpbb_root_path, $phpEx, $SID, $start;
+
+		switch ($mode)
+		{
+			case 'merge_posts':
+				if (!$this->to_topic_id)
+				{
+					redirect(str_replace('&amp;', '&', $this->url . $this->selected_ids) . '&i=' . $this->module_id . '&mode=merge_select');
+				}
+			break;
+
+			case 'merge_select':
+			case 'forum_view':
+				$this->menu('MCP_FORUM');
+				$this->mcp_jumpbox($this->url . '&amp;mode=forum_view', 'm_', $this->forum_id);
+			
+				if (!$this->forum_id)
+				{
+					$this->message_die('PLEASE_SELECT_FORUM');
+				}
+
+				if (!$auth->acl_get('m_', $this->forum_id))
+				{
+					trigger_error('NOT_MODERATOR');
+				}
+
+				$forum_info = $this->get_forum_data($this->forum_id, 'm_');
+				$topics_per_page = ($forum_info['forum_topics_per_page']) ? $forum_info['forum_topics_per_page'] : $config['topics_per_page'];
+
+				$this->mcp_sorting('viewforum', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $this->forum_id);
+				$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
+				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
+
+				$template->assign_vars(array(
+					'FORUM_NAME' => $forum_info['forum_name'],
+
+					'S_CAN_DELETE'	=>	$auth->acl_get('m_delete', $this->forum_id),
+					'S_CAN_MOVE'	=>	$auth->acl_get('m_move', $this->forum_id),
+					'S_CAN_FORK'	=>	$auth->acl_get('m_', $this->forum_id),
+					'S_CAN_LOCK'	=>	$auth->acl_get('m_lock', $this->forum_id),
+					'S_CAN_SYNC'	=>	$auth->acl_get('m_', $this->forum_id),
+
+					'U_VIEW_FORUM'		=>	"viewforum.$phpEx$SID&amp;f=" . $this->forum_id,
+					'S_MCP_ACTION'		=>	"mcp.$phpEx$SID&amp;mode=$mode&ampf=$this->forum_id&amp;start=$start" . (($mode == 'merge_select') ? $this->selected_ids : ''),
+
+					'PAGINATION' => generate_pagination($this->url . "&amp;mode={$mode}&amp;f=" . $this->forum_id . (($mode == 'merge_select') ? $this->selected_ids : ''), $forum_topics, $topics_per_page, $start),
+					'PAGE_NUMBER' => on_page($forum_topics, $config['topics_per_page'], $start)
+				));
+
+
+				// Define censored word matches
+				$censors = array();
+				obtain_word_list($censors);
+
+				$topic_rows = array();
+
+				$sql = 'SELECT t.*
+					FROM ' . TOPICS_TABLE . " t
+					WHERE t.forum_id = {$this->forum_id}
+						" . (($auth->acl_gets('m_approve', $this->forum_id)) ? '' : 'AND t.topic_approved = 1') . "
+					AND t.topic_type = " . POST_ANNOUNCE . " 
+					$limit_time_sql
+				ORDER BY $sort_order_sql";
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$topic_rows[] = $row;
+				}
+
+				$db->sql_freeresult($result);
+
+				$sql = "SELECT t.*
+					FROM " . TOPICS_TABLE . " t
+					WHERE t.forum_id = {$this->forum_id}
+						" . (($auth->acl_gets('m_approve', $this->forum_id)) ? '' : 'AND t.topic_approved = 1') . "
+					AND t.topic_type <> " . POST_ANNOUNCE . " 
+					$limit_time_sql
+				ORDER BY t.topic_type DESC, $sort_order_sql";
+				$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$topic_rows[] = $row;
+				}
+				$db->sql_freeresult($result);
+
+				foreach ($topic_rows as $row)
+				{
+					$topic_title = '';
+
+					if ($auth->acl_get('m_approve', $row['forum_id']))
+					{
+						$row['topic_replies'] = $row['topic_replies_real'];
+					}
+
+					if ($row['topic_status'] == ITEM_LOCKED)
+					{
+						$folder_img = $user->img('folder_locked', 'VIEW_TOPIC_LOCKED');
+					}
+					else
+					{
+						if ($row['topic_type'] == POST_ANNOUNCE)
+						{
+							$folder_img = $user->img('folder_announce', 'VIEW_TOPIC_ANNOUNCEMENT');
+						}
+						else if ($row['topic_type'] == POST_STICKY)
+						{
+							$folder_img = $user->img('folder_sticky', 'VIEW_TOPIC_STICKY');
+						}
+						else
+						{
+							$folder_img = $user->img('folder', 'NO_NEW_POSTS');
+						}
+					}
+
+					if ($row['topic_type'] == POST_ANNOUNCE)
+					{
+						$topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'] . ' ';
+					}
+					else if ($row['topic_type'] == POST_STICKY)
+					{
+						$topic_type = $user->lang['VIEW_TOPIC_STICKY'] . ' ';
+					}
+					else if ($row['topic_status'] == ITEM_MOVED)
+					{
+						$topic_type = $user->lang['VIEW_TOPIC_MOVED'] . ' ';
+					}
+					else
+					{
+						$topic_type = '';
+					}
+
+					if (intval($row['poll_start']))
+					{
+						$topic_type .= $user->lang['VIEW_TOPIC_POLL'] . ' ';
+					}
+
+					$topic_title = $row['topic_title'];
+					if (count($censors['match']))
+					{
+						$topic_title = preg_replace($censors['match'], $censors['replace'], $topic_title);
+					}
+
+					$template->assign_block_vars('topicrow', array(
+						'U_VIEW_TOPIC'		=>	"mcp.$phpEx$SID&amp;t=" . $row['topic_id'] . '&amp;mode=topic_view',
+
+						'S_SELECT_TOPIC'	=>	($mode == 'merge_select' && $row['topic_id'] != $this->topic_id) ? TRUE : FALSE,
+						'U_SELECT_TOPIC'	=>	$this->url . '&amp;mode=merge&amp;to_topic_id=' . $row['topic_id'] . $this->selected_ids,
+
+						'TOPIC_FOLDER_IMG'	=>	$folder_img,
+						'TOPIC_TYPE'		=>	$topic_type,
+						'TOPIC_TITLE'		=>	$topic_title,
+						'REPLIES'			=>	$row['topic_replies'],
+						'LAST_POST_TIME'	=>	$user->format_date($row['topic_last_post_time']),
+						'TOPIC_ID'			=>	$row['topic_id'],
+
+						'S_TOPIC_REPORTED'	=>	($row['topic_reported']) ? TRUE : FALSE,
+						'S_TOPIC_UNAPPROVED'=>	($row['topic_approved']) ? FALSE : TRUE
+					));
+				}
+				unset($topoic_rows);
+
+				$this->display($user->lang['MCP'], 'mcp_forum.html');
+			break;
+
+			case 'merge':
+			case 'split':
+			case 'delete':
+			case 'topic_view':
+				$this->menu('MCP_TOPIC');
+				$this->mcp_jumpbox($this->url . '&amp;mode=forum_view', 'm_', $this->forum_id);
+
+				$topic_info = $this->get_topic_data($this->topic_id, 'm_');
+
+				if (!$this->topic_id)
+				{
+					$this->message_die('TOPIC_NOT_EXIST');
+				}
+				if (!$auth->acl_get('m_', $topic_info['forum_id']))
+				{
+					trigger_error('NOT_MODERATOR');
+				}
+
+				$topics_per_page = ($forum_info['forum_topics_per_page']) ? $forum_info['forum_topics_per_page'] : $config['topics_per_page'];
+
+				$this->mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $this->topic_id);
+
+				$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
+				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
+
+				if ($total == -1)
+				{
+					$total = $topic_info['topic_replies'] + 1;
+				}
+				$posts_per_page = (isset($_REQUEST['posts_per_page'])) ? max(0, intval($_REQUEST['posts_per_page'])) : $config['posts_per_page'];
+
+				$sql = 'SELECT u.username, u.user_colour, p.*
+					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
+					WHERE p.topic_id = {$this->topic_id}
+						AND p.poster_id = u.user_id
+					ORDER BY $sort_order_sql";
+				$result = $db->sql_query_limit($sql, $posts_per_page, $start);
+
+				$rowset = array();
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$rowset[] = $row;
+					$bbcode_bitfield |= $row['bbcode_bitfield'];
+				}
+
+				if ($bbcode_bitfield)
+				{
+					include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
+					$bbcode = new bbcode($bbcode_bitfield);
+				}
+
+				foreach ($rowset as $i => $row)
+				{
+					$has_unapproved_posts = FALSE;
+					$poster = (!empty($row['username'])) ? $row['username'] : ((!$row['post_username']) ? $user->lang['GUEST'] : $row['post_username']);
+					$poster = ($row['user_colour']) ? '<span style="color:#' . $row['user_colour'] . '">' . $poster . '</span>' : $poster;
+
+					$message = $row['post_text'];
+					$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
+
+					// If the board has HTML off but the post has HTML
+					// on then we process it, else leave it alone
+					if (!$config['allow_html'] && $row['enable_html'])
+					{
+						$message = preg_replace('#(<)([\/]?.*?)(>)#is', '&lt;\\2&gt;', $message);
+					}
+
+					if ($row['bbcode_bitfield'])
+					{
+						$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
+					}
+
+					$message = (empty($config['allow_smilies']) || !$user->data['user_viewsmilies']) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message);
+
+					$message = nl2br($message);
+
+					$checked = (in_array(intval($row['post_id']), $this->post_id_list)) ? 'checked="checked" ' : '';
+					$s_checkbox = ($row['post_id'] == $topic_info['topic_first_post_id'] && $mode == 'split') ? '&nbsp;' : '<input type="checkbox" name="post_id_list[]" value="' . $row['post_id'] . '" ' . $checked . '/>';
+
+					if (!$row['post_approved'])
+					{
+						$has_unapproved_posts = TRUE;
+					}
+
+					$template->assign_block_vars('postrow', array(
+						'POSTER_NAME'	=>	$poster,
+						'POST_DATE'		=>	$user->format_date($row['post_time']),
+						'POST_SUBJECT'	=>	$post_subject,
+						'MESSAGE'		=>	$message,
+						'POST_ID'		=>	$row['post_id'],
+
+						'POST_ICON_IMG' =>	($row['post_time'] > $user->data['user_lastvisit'] && $user->data['user_id'] != ANONYMOUS) ? $user->img('icon_post_new', $user->lang['NEW_POST']) : $user->img('icon_post', $user->lang['POST']),
+
+						'S_CHECKBOX'		=>	$s_checkbox,
+						'S_DISPLAY_MODES'	=>	($i % 10 == 0) ? TRUE : FALSE,
+						'S_ROW_COUNT'		=>	$i,
+						'S_POST_REPORTED'	=>	($row['post_reported']) ? TRUE : FALSE,
+						'S_POST_UNAPPROVED'	=>	($row['post_approved']) ? FALSE : TRUE,
+						
+						'U_POST_DETAILS'	=>	"mcp.$phpEx$SID&amp;f=" . $row['forum_id'] . '&amp;t=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '&amp;mode=post_details',
+						'U_APPROVE'			=>	"mcp.$phpEx$SID&amp;mode=approve&amp;p=" . $row['post_id']
+					));
+
+					unset($rowset[$i]);
+				}
+
+				// Display topic icons for split topic
+				if ($auth->acl_get('m_split', $topic_info['forum_id']))
+				{
+					$icons = array();
+					obtain_icons($icons);
+
+					if (count($icons))
+					{
+						$s_topic_icons = true;
+
+						foreach ($icons as $id => $data)
+						{
+							if ($data['display'])
+							{
+								$template->assign_block_vars('topic_icon', array(
+									'ICON_ID'		=> $id,
+									'ICON_IMG'		=> $config['icons_path'] . '/' . $data['img'],
+									'ICON_WIDTH'	=> $data['width'],
+									'ICON_HEIGHT' 	=> $data['height']
+								));
+							}
+						}
+					}
+				}
+
+				// Has the user selected a topic for merge?
+				if ($this->to_topic_id)
+				{
+					if (!$to_topic_info = $this->get_topic_data($this->to_topic_id, 'm_merge', TRUE))
+					{
+						$this->to_topic_id = 0;
+					}
+				}
+
+				$template->assign_vars(array(
+					'TOPIC_TITLE'		=>	$topic_info['topic_title'],
+					'U_VIEW_TOPIC'		=>	"viewtopic.$phpEx$SID&amp;f=" . $topic_info['forum_id'] . '&amp;t=' . $topic_info['topic_id'],
+
+					'TO_TOPIC_ID'		=>	($this->to_topic_id) ? $this->to_topic_id : '',
+					'TO_TOPIC_INFO'	=>	($this->to_topic_id) ? sprintf($user->lang['YOU_SELECTED_TOPIC'], $this->to_topic_id, '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $to_topic_info['forum_id'] . '&amp;t=' . $this->to_topic_id . '" target="_new">' . $to_topic_info['topic_title'] . '</a>') : '',
+
+					'SPLIT_SUBJECT'		=>	$subject,
+					'POSTS_PER_PAGE'	=>	$posts_per_page,
+					'MODE'				=>	$mode,
+
+					'REPORTED_IMG'		=> $user->img('icon_reported', 'POST_REPORTED', FALSE, TRUE),
+					'UNAPPROVED_IMG'	=> $user->img('icon_unapproved', 'POST_UNAPPROVED', FALSE, TRUE),
+
+					'S_FORM_ACTION'		=>	"mcp.$phpEx$SID&amp;mode=$mode&amp;t=" . $topic_info['topic_id'] . '&amp;start=' . $start,
+					'S_FORUM_SELECT'	=>	'<select name="to_forum_id">' . make_forum_select($this->to_forum_id) . '</select>',
+					'S_CAN_SPLIT'		=>	($auth->acl_get('m_split', $topic_info['forum_id'])) ? TRUE : FALSE,
+					'S_CAN_MERGE'		=>	($auth->acl_get('m_merge', $topic_info['forum_id'])) ? TRUE : FALSE,
+					'S_CAN_DELETE'		=>	($auth->acl_get('m_delete', $topic_info['forum_id'])) ? TRUE : FALSE,
+					'S_CAN_APPROVE'		=>	($has_unapproved_posts && $auth->acl_get('m_approve', $topic_info['forum_id'])) ? TRUE : FALSE,
+					'S_SHOW_TOPIC_ICONS'=>	(!empty($s_topic_icons)) ? TRUE : FALSE,
+
+					'PAGE_NUMBER'		=>	on_page($total, $posts_per_page, $start),
+					'PAGINATION'		=>	(!$posts_per_page) ? '' : generate_pagination("mcp.$phpEx$SID&amp;t=" . $topic_info['topic_id'] . "&amp;mode=$mode&amp;posts_per_page=$posts_per_page&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $total, $posts_per_page, $start)
+				));
+
+				$this->display('MCP', 'mcp_topic.html');
+			break;
+
+			default:
+				$this->menu('MCP_FRONT');
+				// -------------
+				// Latest 5 unapproved
+				$forum_list = get_forum_list('m_approve');
+
+				$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? TRUE : FALSE);
+				if (!empty($forum_list))
+				{
+					$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, t.topic_id, t.topic_title, t.topic_first_post_id, f.forum_id, f.forum_name
+						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u
+						LEFT JOIN ' . FORUMS_TABLE . ' f ON f.forum_id = p.forum_id
+						WHERE p.topic_id = t.topic_id
+							AND p.poster_id = u.user_id
+							AND p.post_approved = 0
+							AND p.forum_id IN (0,' . implode(', ', $forum_list) . ')
+						ORDER BY p.post_time DESC';
+					$result = $db->sql_query_limit($sql, 5);
+
+					while ($row = $db->sql_fetchrow($result))
+					{
+						if ($row['poster_id'] == ANONYMOUS)
+						{
+							$author = ($row['post_username']) ? $row['post_username'] : $user->lang['GUEST'];
+						}
+						else
+						{
+							$author = '<a href="memberlist.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $row['poster_id'] . '">' . $row['username'] . '</a>';
+						}
+
+						$template->assign_block_vars('unapproved', array(
+							'U_POST_DETAILS'=>	$this->url . '&amp;mode=post_details',
+							'FORUM'				=>	(!empty($row['forum_id'])) ? '<a href="viewforum.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '">' . $row['forum_name'] . '</a>' : $user->lang['POST_GLOBAL'],
+							'TOPIC'					=>	'<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id'] . '">' . $row['topic_title'] . '</a>',
+							'AUTHOR'				=>	$author,
+							'SUBJECT'				=>	'<a href="mcp.' . $phpEx . $SID . '&amp;p=' . $row['post_id'] . '&amp;mode=post_details">' . (($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT']) . '</a>',
+							'POST_TIME'			=>	$user->format_date($row['post_time'])
+						));				
+					}
+
+					$sql = 'SELECT COUNT(post_id) AS total
+						FROM ' . POSTS_TABLE . '
+						WHERE post_approved = 0
+							AND forum_id IN (0, ' . implode(', ', $forum_list) . ')';
+					$result = $db->sql_query($sql);
+					$row = $db->sql_fetchrow($result);
+
+					if ($row['total'] == 0)
+					{
+						$template->assign_vars(array(
+							'L_UNAPPROVED_TOTAL'		=>	$user->lang['UNAPPROVED_POSTS_ZERO_TOTAL'],
+							'S_HAS_UNAPPROVED_POSTS'	=>	FALSE
+						));
+					}
+					elseif ($row['total'] == 1)
+					{
+						$template->assign_vars(array(
+							'L_UNAPPROVED_TOTAL'		=>	$user->lang['UNAPPROVED_POST_TOTAL'],
+							'S_HAS_UNAPPROVED_POSTS'	=>	TRUE
+						));
+					}
+					else
+					{
+						$template->assign_vars(array(
+							'L_UNAPPROVED_TOTAL'		=>	sprintf($user->lang['UNAPPROVED_POSTS_TOTAL'], $row['total']),
+							'S_HAS_UNAPPROVED_POSTS'	=>	TRUE
+						));
+					}
+				}
+				// -------------
+
+				// -------------
+				// Latest 5 reported
+				$forum_list = get_forum_list('m_');
+				
+				$template->assign_var('S_SHOW_REPORTS', (!empty($forum_list)) ? TRUE : FALSE);
+				if (!empty($forum_list))
+				{
+					$sql = 'SELECT r.*, p.post_id, p.post_subject, u.username, t.topic_id, t.topic_title, f.forum_id, f.forum_name
+						FROM ' . REPORTS_TABLE . ' r, ' . REASONS_TABLE . ' rr,' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u
+						LEFT JOIN ' . FORUMS_TABLE . ' f ON f.forum_id = p.forum_id
+						WHERE r.post_id = p.post_id
+							AND r.reason_id = rr.reason_id
+							AND p.topic_id = t.topic_id
+							AND r.user_id = u.user_id
+							AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')
+						ORDER BY p.post_time DESC';
+					$result = $db->sql_query_limit($sql, 5);
+
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$template->assign_block_vars('report', array(
+							'U_POST_DETAILS'	=>	$this->url . '&amp;mode=post_details',
+							'FORUM'				=>	(!empty($row['forum_id'])) ? '<a href="viewforum.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '">' . $row['forum_name'] . '</a>' : $user->lang['POST_GLOBAL'],
+							'TOPIC'				=>	'<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id'] . '">' . $row['topic_title'] . '</a>',
+							'REPORTER'			=>	($row['user_id'] == ANONYMOUS) ? $user->lang['GUEST'] : '<a href="memberlist.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $row['user_id'] . '">' . $row['username'] . '</a>',
+							'SUBJECT'			=>	'<a href="mcp.' . $phpEx . $SID . '&amp;p=' . $row['post_id'] . '&amp;mode=post_details">' . (($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT']) . '</a>',
+							'REPORT_TIME'		=>	$user->format_date($row['report_time'])
+						));				
+					}
+
+					$sql = 'SELECT COUNT(r.report_id) AS total
+						FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
+						WHERE r.post_id = p.post_id
+							AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')';
+					$result = $db->sql_query($sql);
+					$row = $db->sql_fetchrow($result);
+
+					if ($row['total'] == 0)
+					{
+						$template->assign_vars(array(
+							'L_REPORTS_TOTAL'	=>	$user->lang['REPORTS_ZERO_TOTAL'],
+							'S_HAS_REPORTS'		=>	FALSE
+						));
+					}
+					elseif ($row['total'] == 1)
+					{
+						$template->assign_vars(array(
+							'L_REPORTS_TOTAL'	=>	$user->lang['REPORT_TOTAL'],
+							'S_HAS_REPORTS'		=>	TRUE
+						));
+					}
+					else
+					{
+						$template->assign_vars(array(
+							'L_REPORTS_TOTAL'	=>	sprintf($user->lang['REPORTS_TOTAL'], $row['total']),
+							'S_HAS_REPORTS'		=>	TRUE
+						));
+					}
+				}
+				// -------------
+
+				// -------------
+				// Latest 5 logs
+				$forum_list = get_forum_list(array('m_', 'a_general'));
+
+				if (!empty($forum_list))
+				{
+					// Add forum_id 0 for global announcements
+					$forum_list[] = 0;
+
+					$log_count = 0;
+					$log = array();
+					view_log('mod', $log, $log_count, 5, 0, $forum_list);
+
+					foreach ($log as $row)
+					{
+						$template->assign_block_vars('log', array(
+							'USERNAME'		=>	$row['username'],
+							'IP'			=>	$row['ip'],
+							'TIME'			=>	$user->format_date($row['time']),
+							'ACTION'		=>	$row['action'],
+							'U_VIEWTOPIC'	=>	$row['viewtopic'],
+							'U_VIEWLOGS'	=>	$row['viewlogs']
+						));
+					}
+				}
+				$template->assign_vars(array(
+					'S_SHOW_LOGS'	=>	(!empty($forum_list)) ? TRUE : FALSE,
+					'S_HAS_LOGS'	=>	(!empty($log)) ? TRUE : FALSE
+				));
+				// -------------
+
+				$template->assign_var('S_MCP_ACTION', $this->url);
+				$this->mcp_jumpbox($this->url . '&amp;mode=forum_view', 'm_', $this->forum_id);
+				$this->display('MCP', 'mcp_front.html');
+		}
+	}
+}
+?>

phpBB/styles/subSilver/template/mcp_footer.html

@@ -0,0 +1,8 @@
+<!-- $Id$ -->
+
+		</td>
+	</tr>
+</table>
+
+
+<!-- INCLUDE overall_footer.html -->

phpBB/styles/subSilver/template/mcp_forum.html

@@ -1,17 +1,17 @@
 <!-- $ Id: $ -->
 <!-- INCLUDE mcp_header.html -->
 
-<form method="post" name="main" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
+<form method="post" name="main" action="{S_MCP_ACTION}">
 	<tr>
 		<th colspan="6" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
 	</tr>
 	<tr>
-		<td colspan="2" class="cat" height="28" align="left" nowrap="nowrap"><!-- INCLUDE mcp_jumpbox.html --></td>
-		<td colspan="4" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
+		<td colspan="6" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
 	<tr>
 		<th width="4%" height="28" nowrap="nowrap">&nbsp;</th>
-		<th colspan="2" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
 		<th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
 		<th width="17%" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
 		<th width="5%" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
@@ -19,7 +19,20 @@
 	<!-- BEGIN topicrow -->
 	<tr>
 		<td class="row1" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<td class="row1" colspan="2"><span class="topictitle"><!-- IF topicrow.S_SELECT_TOPIC -->[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ] <!-- ENDIF -->{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span></td>
+		<td class="row1" width="100%"><table width="100%" border="0" cellspacing="0" cellpadding="0">
+			<tr class="topictitle">
+				<!-- IF topicrow.S_SELECT_TOPIC -->
+				<td>[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]</td>
+				<!-- ENDIF -->
+				<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_TOPIC_REPORTED -->
+				<td align="left" valign="middle">
+					<!-- IF topicrow.S_TOPIC_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->
+					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;<!-- ENDIF -->
+				</td>
+				<!-- ENDIF -->
+				<td width="100%">{topicrow.ATTACH_ICON_IMG}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
+			</tr>
+		</table></td>
 		<td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
 		<td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST_TIME}</span></td>
 		<td class="row2" align="center" valign="middle"><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" /></td>
@@ -38,6 +51,7 @@
 			<!-- IF S_CAN_SYNC --><input type="submit" name="resync" class="btnlite" value="{L_RESYNC}" />&nbsp;<!-- ENDIF -->
 		</td>
 	</tr>
+</form>
 </table>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
@@ -46,6 +60,5 @@
 		<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist(true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist(false);">{L_UNMARK_ALL}</a></b><br /><span class="nav">{PAGINATION}</span></td>
 	</tr>
 </table>
-</form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/styles/subSilver/template/mcp_front.html

@@ -2,7 +2,7 @@
 <!-- INCLUDE mcp_header.html -->
 
 <!-- IF S_SHOW_UNAPPROVED -->
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="right">
 	<tr>
 		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_UNAPPROVED}</span></td>
 	</tr>
@@ -33,11 +33,11 @@
 	<!-- ENDIF -->
 </table>
 
-<br />
+<br clear="all" /><br clear="all" />
 <!-- ENDIF -->
 
 <!-- IF S_SHOW_REPORTS -->
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="right">
 	<tr>
 		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_REPORTED}</span></td>
 	</tr>
@@ -68,11 +68,11 @@
 	<!-- ENDIF -->
 </table>
 
-<br />
+<br clear="all" /><br clear="all" />
 <!-- ENDIF -->
 
 <!-- IF S_SHOW_LOGS -->
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="right">
 	<tr>
 		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_LOGS}</span></td>
 	</tr>
@@ -98,9 +98,7 @@
 	<!-- END log -->
 </table>
 
-<br />
+<br clear="all" />
 <!-- ENDIF -->
 
-<form name="main" action="{S_MCP_ACTION}" method="post"><!-- INCLUDE mcp_jumpbox.html --></form>
-
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE mcp_footer.html -->

phpBB/styles/subSilver/template/mcp_header.html

@@ -1,43 +1,75 @@
+<!-- $Id$ -->
 <!-- INCLUDE overall_header.html -->
 
-<script language="Javascript" type="text/javascript" defer="defer">
+<script language="javascript" type="text/javascript" defer="defer">
 <!--
-function marklist(status)
+function marklist(form_name, status)
 {
-	for (i = 0; i < document.forms['main'].length; i++)
+	for (i = 0; i < document.forms[form_name].length; i++)
 	{
-		document.forms['main'].elements[i].checked = status;
+		document.forms[form_name].elements[i].checked = status;
 	}
 }
 //-->
 </script>
 
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<!-- IF TOPIC_TITLE -->
-	<tr>
-		<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></td>
-	</tr>
-	<!-- ELSEIF FORUM_NAME -->
-	<tr>
-		<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- IF PAGINATION -->
-	<tr>
-		<td valign="bottom" class="gensmall">{MODERATORS}</td>
-		<td align="right" valign="bottom" nowrap="nowrap"><b class="gensmall">{PAGINATION}</b></td>
-	</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td class="nav" colspan="2" align="left" valign="middle"><!-- IF S_FORUM_NAV --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --><!-- ENDIF --></td>
-	</tr>
-</table>
 
-<table class="tablebg" cellspacing="1" cellpadding="4" border="0" align="left">
-	<tr>
-		<!-- BEGIN tab --><!-- IF tab.S_IS_SELECTED --><td class="row1" nowrap="nowrap">&nbsp;<span class="gen"><b>{tab.NAME}</b><!-- ELSE --><td class="row2" nowrap="nowrap">&nbsp;<a class="nav" href="{tab.U_LINK}">{tab.NAME}</a><!-- ENDIF -->&nbsp;</td>
-		<!-- END tab -->
-	</tr>
-</table>
+<form method="post" name="mcp" action="{S_MCP_ACTION}"{S_FORM_ENCTYPE}><table width="95%" cellspacing="0" cellpadding="2" border="0" align="center">
+	<tr valign="top">
+		<td colspan="2"><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+			<!-- IF TOPIC_TITLE -->
+			<tr>
+				<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></td>
+			</tr>
+			<!-- ELSEIF FORUM_NAME -->
+			<tr>
+				<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
+			</tr>
+			<!-- ENDIF -->
+			<!-- IF PAGINATION -->
+			<tr>
+				<td valign="bottom" class="gensmall">{MODERATORS}</td>
+				<td align="right" valign="bottom" nowrap="nowrap"><b class="gensmall">{PAGINATION}</b></td>
+			</tr>
+			<!-- ENDIF -->
+			<tr>
+				<td class="nav" colspan="2" align="left" valign="middle"><!-- IF S_FORUM_NAV --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --><!-- ENDIF --></td>
+			</tr>
+		</table></td>
+</tr>
+<tr valign="top">
+	<td width="20%"><table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="left">
+		<tr>
+			<th height="28">{L_JUMPBOX}</th>
+		</tr>
+		<tr>
+			<td class="row1"><!-- INCLUDE mcp_jumpbox.html --></td>
+		</tr>
+	</table>
 
-<br clear="all" />
+	<br clear="all" /><br clear="all" />
+
+	<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="left">
+		<tr>
+			<th height="28">{L_OPTIONS}</th>
+		</tr>
+		<!-- BEGIN mcp_section -->
+		<tr>
+			<!-- IF mcp_section.S_SELECTED -->
+			<td class="row1" height="28"><b class="nav">{mcp_section.L_TITLE}</b>
+				<table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<!-- BEGIN mcp_subsection -->
+					<tr>
+						<td class="nav">&#187;</td>
+						<td class="nav" height="20"><!-- IF mcp_section.mcp_subsection.S_SELECTED --><b>{mcp_section.mcp_subsection.L_TITLE}</b><!-- ELSE --><a href="{mcp_section.mcp_subsection.U_TITLE}">{mcp_section.mcp_subsection.L_TITLE}</a><!-- ENDIF --></td>
+					</tr>
+				<!-- END mcp_subsection -->
+				</table>
+			<!-- ELSE -->
+			<td class="row2" height="25" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'"><a class="nav" href="{mcp_section.U_TITLE}">{mcp_section.L_TITLE}</a>
+			<!-- ENDIF -->
+			</td>
+		</tr>
+		<!-- END mcp_section -->
+	</table></td>
+	<td width="80%">

phpBB/styles/subSilver/template/mcp_jumpbox.html

@@ -1,10 +1,10 @@
-<!-- $Id$ --><span class="gensmall">{L_JUMP_TO}:</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.main.current_f.value){ forms['main'].submit() }">
+<!-- $Id$ --><span class="gensmall">{L_JUMP_TO}:</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.mcp.current_f.value){ forms['mcp'].submit() }">
 <!-- IF S_ENABLE_SELECT_ALL -->
 <option value="0">{L_ALL_FORUMS}</option>
 <!-- ELSE -->
 <option value="-1">{L_SELECT_FORUM}</option>
-<!-- ENDIF !-->
+<!-- ENDIF -->
 <!-- BEGIN options --><option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="greyed"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option>
 <!-- BEGINELSE -->
 <!-- END options -->
-</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onClick="if(document.main.f.value == -1){return false;}" />
+</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onClick="if(document.mcp.f.value == -1){return false;}" />

phpBB/styles/subSilver/template/mcp_message.html

@@ -0,0 +1,14 @@
+<!-- INCLUDE mcp_header.html -->
+
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
+	<tr>
+		<th height="28"><b>{MESSAGE_TITLE}</b></th>
+	</tr>
+	<tr> 
+		<td class="row1" align="center"><br /><span class="gen">{MESSAGE_TEXT}</span><br /><br /></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<!-- INCLUDE mcp_footer.html -->

phpBB/styles/subSilver/template/mcp_post.html

@@ -24,7 +24,7 @@
 		<td class="row2"><span class="gen">{POST_SUBJECT}</span></td>
 	</tr>
 	<tr>
-		<td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+		<td class="spacer" colspan="2" height="1"></td>
 	</tr>
 	<tr>
 		<td class="row2" colspan="2"><span class="gen">{MESSAGE}</span></td>
@@ -121,4 +121,4 @@
 <!-- ENDIF -->
 
 </form>
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE mcp_footer.html -->

phpBB/styles/subSilver/template/mcp_topic.html

@@ -1,7 +1,8 @@
 <!-- INCLUDE mcp_header.html -->
 
-<form name="main" method="post" action="{S_FORM_ACTION}"><table class="tablebg" width="100%" cellspacing="1"  cellpadding="2" border="0">
-	<!-- IF S_CAN_SPLIT -->
+<table class="tablebg" width="100%" cellspacing="1"  cellpadding="2" border="0">
+<form name="main" method="post" action="{S_FORM_ACTION}">
+<!-- IF S_CAN_SPLIT -->
 	<tr>
 		<th colspan="3" height="28" nowrap="nowrap">{L_SPLIT_TOPIC}</th>
 	</tr>
@@ -36,8 +37,13 @@
 	</tr>
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_MERGE_TOPIC_ID}</span></td>
-		<td class="row2" colspan="2"><input class="post" type="text" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <input class="btnlite" type="submit" name="select_topic" value="{L_SELECT_TOPIC}" /><!-- IF TO_TOPIC_INFO --><br /><span class="gensmall">{TO_TOPIC_INFO}</span><!-- ENDIF --></td>
+		<td class="row2" colspan="2"><input class="post" type="text" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <input class="btnlite" type="submit" name="mode[merge_select]" value="{L_SELECT_TOPIC}" /></td>
 	</tr>
+	<!-- IF TO_TOPIC_INFO -->
+	<tr>
+		<td class="row2" colspan="3" align="center"><b class="gen">&nbsp;&nbsp;{TO_TOPIC_INFO}</b></td>
+	</tr>
+	<!-- ENDIF -->
 	<!-- ENDIF -->
 	<tr>
 		<th colspan="3" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
@@ -46,9 +52,6 @@
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_POSTS_PER_PAGE}</span><br /><span class="gensmall">{L_POSTS_PER_PAGE_EXPLAIN}</span</td>
 		<td class="row2" colspan="2"><input class="post" type="text" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}"></td>
 	</tr>
-	<tr>
-		<td class="cat" colspan="3" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
-	</tr>
 	<tr>
 		<th height="28" nowrap="nowrap">{L_AUTHOR}</th>
 		<th nowrap="nowrap">{L_MESSAGE}</th>
@@ -57,12 +60,12 @@
 	<!-- BEGIN postrow -->
 	<!-- IF postrow.S_DISPLAY_MODES -->
 	<tr>
-		<td class="cat" colspan="3" height="28" align="center">
-			<!-- IF S_CAN_MERGE -->&nbsp;<input class="btnlite" type="submit" name="merge_posts" value="{L_MERGE_POSTS}" />&nbsp;<!-- ENDIF -->
-			<!-- IF S_CAN_DELETE -->&nbsp;<input class="btnlite" type="submit" name="delete_posts" value="{L_DELETE_POSTS}" />&nbsp;<!-- ENDIF -->
-			<!-- IF S_CAN_APPROVE -->&nbsp;<input class="btnlite" type="submit" name="approve" value="{L_APPROVE_POSTS}" />&nbsp;<!-- ENDIF -->
-			<!-- IF S_CAN_SPLIT -->&nbsp;<input class="btnlite" type="submit" name="split_all" value="{L_SPLIT_POSTS}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="split_beyond" value="{L_SPLIT_AFTER}" />&nbsp;<!-- ENDIF -->
-		</td>
+		<td class="cat" colspan="3" height="28" align="center"><select name="mode">
+			<!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF -->
+			<!-- IF S_CAN_DELETE --><option value="delete_posts">{L_DELETE_POSTS}</option><!-- ENDIF -->
+			<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF MODE == 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
+			<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF MODE == 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
+		</select>&nbsp;<input class="btnmain" type="submit" value="{L_SUBMIT}"></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- IF postrow.S_ROW_COUNT is even -->
@@ -70,42 +73,51 @@
 	<!-- ELSE -->
 	<tr class="row2">
 	<!-- ENDIF -->
-		<td align="left" valign="top"><span class="name"><a name="{postrow.U_POST_ID}"></a>{postrow.POSTER_NAME}</span><br /><br /><br /><span class="gensmall"><a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a></span></td>
-		<td width="100%" valign="top"><table width="100%" cellspacing="0" cellpadding="2" border="0">
-			<tr>
-				<td valign="middle"><img src="imagesets/subSilver/icon_minipost.gif" alt="{L_POST}"><span class="postdetails">{L_POSTED}:
-				{postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
-			</tr>
-			<tr>
-				<td><hr /></td>
-			</tr>
-			<!-- IF postrow.S_POST_UNAPPROVED -->
-			<tr><td><table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<tr align="left" valign="middle">
-					<td>{UNAPPROVED_IMG}</td>
-					<td class="gensmall" width="100%">&nbsp;<b><a style="color:green"  href="{postrow.U_APPROVE}">{L_POST_NOT_APPROVED}</a></b></td>
-				</tr>
-			</table></td></tr>
-			<tr>
-				<td colspan="2"><hr /></td>
-			</tr>
-			<!-- ENDIF -->
-			<!-- IF postrow.S_POST_REPORTED -->
-			<tr><td><table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<tr align="left" valign="middle">
-					<td>{REPORTED_IMG}</td>
-					<td class="gensmall" width="100%">&nbsp;{L_POST_BEEN_REPORTED}&nbsp;[ <a href="{postrow.U_MCP_REPORT}">{L_READ_REPORTS}</a> ]</td>
-				</tr>
-			</table></td></tr>
-			<tr>
-				<td colspan="2"><hr /></td>
-			</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td class="postbody" valign="top">{postrow.MESSAGE}</td>
+		<td align="center"><b class="postauthor">{postrow.POSTER_NAME}</b></td>
+		<td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+			<tr valign="top">
+				<td class="gensmall" nowrap="nowrap">&nbsp;<b>{L_POST_SUBJECT}:</b>&nbsp;</td>
+				<td class="gensmall" width="100%">{postrow.POST_SUBJECT}</td>
+			</tr>
+		</table></td>
+		<td rowspan="2" width="5%" align="center">{postrow.S_CHECKBOX}</td>
+	</tr>
+	<!-- IF postrow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
+		<td valign="bottom">
+			<table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<tr valign="middle">
+					<td height="28" align="center"><span class="gensmall">[ <a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> ]</span></td>
+				</tr>
+			</table>
+		</td>
+		<td width="100%" valign="top"><table width="100%" cellspacing="0" cellpadding="2" border="0">
+			<tr>
+				<td class="postbody" valign="top">{postrow.MESSAGE}<br /><br /></td>
+			</tr>
+			<tr>
+				<td valign="bottom">
+					<table width="100%" cellspacing="0" cellpadding="0" border="0">
+						<tr valign="middle">
+							<!-- IF postrow.S_POST_UNAPPROVED -->
+							<td width="5">{UNAPPROVED_IMG}</td>
+							<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:green"  href="{postrow.U_MCP_APPROVE}">{L_POST_NOT_APPROVED}</a></b>&nbsp;&nbsp;</td>
+							<!-- ENDIF -->
+							<!-- IF postrow.S_POST_REPORTED -->
+							<td width="5">{REPORTED_IMG}</td>
+							<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:red" href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></b>&nbsp;</td>
+							<!-- ENDIF -->
+							<td width="100%">&nbsp;</td>
+							<td width="10" nowrap="nowrap">{postrow.POST_ICON_IMG}</td>
+							<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
+						</tr>
+					</table>
+				</td>
 			</tr>
 		</table></td>
-		<td width="5%" align="center">{postrow.S_CHECKBOX}</td>
 	</tr>
 	<tr>
 		<td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></td>
@@ -114,14 +126,14 @@
 	<tr>
 		<td class="cat" colspan="3" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
+</form>
 </table>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr>
 		<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td>
-		<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist(true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist(false);">{L_UNMARK_ALL}</a></b><br /><span class="nav">{PAGINATION}</span></td>
+		<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist(false);">{L_UNMARK_ALL}</a></b><br /><span class="nav">{PAGINATION}</span></td>
 	</tr>
 </table>
-</form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE mcp_footer.html -->