cleaned up the mcp, basic operations such as deleting/moving/(un)locking are functional, as well as all basic views, the other modes (splitting, merging, forking, approval, reports and warnings) will be added within the next days.

git-svn-id: file:///svn/phpbb/trunk@4922 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2004-07-08 23:03:03 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2004-07-08 23:03:03 +0000
commit: e083255f661573641167afd52f5c41a0588e49d3 (patch)
tree: 850f4080ec7b824226ab21f3451fe75dd7ef3d04 /phpBB
parent: 754b1c91f4e844ddb76d8f256970eaa7007344cc (diff)
download: forums-e083255f661573641167afd52f5c41a0588e49d3.tar
forums-e083255f661573641167afd52f5c41a0588e49d3.tar.gz
forums-e083255f661573641167afd52f5c41a0588e49d3.tar.bz2
forums-e083255f661573641167afd52f5c41a0588e49d3.tar.xz
forums-e083255f661573641167afd52f5c41a0588e49d3.zip
13 files changed, 924 insertions, 104 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
new file mode 100644
index 0000000000..e75c009b25
--- /dev/null
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -0,0 +1,187 @@
+<?php
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : mcp_forum.php
+// STARTED   : Thu Jul 08, 2004
+// COPYRIGHT : © 2004 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
+
+//
+// TODO:
+//
+
+function mcp_forum_view($id, $mode, $action, $url, $forum_info)
+{
+	global $SID, $phpEx, $phpbb_root_path, $config;
+	global $template, $db, $user, $auth;
+	global $_POST, $_REQUEST;
+
+	if ($action == 'merge_select')
+	{
+		// Fixes a "bug" that makes forum_view use the same ordering as topic_view
+		unset($_POST['sk'], $_POST['sd'], $_REQUEST['sk'], $_REQUEST['sd']);
+	}
+
+	$forum_id = $forum_info['forum_id'];
+	$start = request_var('start', 0);
+	$topic_id_list = request_var('topic_id_list', 0);
+	$post_id_list = request_var('post_id_list', 0);
+	$topic_id = request_var('t', 0);
+
+	$selected_ids = '';
+	if ($post_id_list)
+	{
+		foreach ($post_id_list as $num => $post_id)
+		{
+			$selected_ids .= '&amp;post_id_list[' . $num . ']=' . $post_id;
+		}
+	}
+
+	make_jumpbox($url . "&amp;action=$action&amp;mode=$mode", $forum_id . (($action == 'merge_select') ? $selected_ids : ''), false, 'm_');
+
+	$topics_per_page = ($forum_info['forum_topics_per_page']) ? $forum_info['forum_topics_per_page'] : $config['topics_per_page'];
+
+	mcp_sorting('viewforum', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $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'],
+
+		'REPORTED_IMG'			=> $user->img('icon_reported', 'TOPIC_REPORTED'),
+		'UNAPPROVED_IMG'		=> $user->img('icon_unapproved', 'TOPIC_UNAPPROVED'),
+
+		'S_CAN_DELETE'			=> $auth->acl_get('m_delete', $forum_id),
+		'S_CAN_MOVE'			=> $auth->acl_get('m_move', $forum_id),
+		'S_CAN_FORK'			=> $auth->acl_get('m_', $forum_id),
+		'S_CAN_LOCK'			=> $auth->acl_get('m_lock', $forum_id),
+		'S_CAN_SYNC'			=> $auth->acl_get('m_', $forum_id),
+		'S_CAN_APPROVE'			=> $auth->acl_get('m_approve', $forum_id),
+
+		'U_VIEW_FORUM'			=> "viewforum.$phpEx$SID&amp;f=" . $forum_id,
+		'S_MCP_ACTION'			=> $url . "&amp;action=$action&amp;mode=$mode&amp;start=$start" . (($action == 'merge_select') ? $selected_ids : ''),
+
+		'PAGINATION'			=> generate_pagination($url . "&amp;action=$action&amp;mode=$mode" . (($action == 'merge_select') ? $selected_ids : ''), $forum_topics, $topics_per_page, $start),
+		'PAGE_NUMBER'			=> on_page($forum_topics, $topics_per_page, $start),
+		'TOTAL'					=> $forum_topics)
+	);
+
+	$topic_rows = array();
+
+	$sql = 'SELECT t.*
+		FROM ' . TOPICS_TABLE . " t
+		WHERE (t.forum_id = $forum_id OR t.forum_id = 0)
+			" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
+			AND t.topic_type IN (" . POST_ANNOUNCE . ", " . POST_GLOBAL . ")
+			$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 = $forum_id
+			" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . '
+			AND t.topic_type IN (' . POST_NORMAL . ', ' . POST_STICKY . ")
+			$limit_time_sql
+		ORDER BY t.topic_type DESC, $sort_order_sql";
+	$result = $db->sql_query_limit($sql, $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 || $row['topic_type'] == POST_GLOBAL)
+			{
+				$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 if ($row['topic_status'] == ITEM_MOVED)
+			{
+				$folder_img = $user->img('folder_moved', 'VIEW_TOPIC_MOVED');
+			}
+			else
+			{
+				$folder_img = $user->img('folder', 'NO_NEW_POSTS');
+			}
+		}
+
+		if ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL)
+		{
+			$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 = censor_text($row['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'	=> ($action == 'merge_select' && $row['topic_id'] != $topic_id) ? true : false,
+			'U_SELECT_TOPIC'	=> $url . '&amp;mode=topic_view&amp;action=merge&amp;to_topic_id=' . $row['topic_id'] . $selected_ids,
+			'U_MCP_QUEUE'		=> $url . '&amp;i=queue&amp;mode=approve&amp;t=' . $row['topic_id'],
+			'U_MCP_REPORT'		=> $url . '&amp;mode=reports&amp;t=' . $row['topic_id'],
+
+			'ATTACH_ICON_IMG'	=> ($auth->acl_gets('f_download', 'u_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_attach', sprintf($user->lang['TOTAL_ATTACHMENTS'], $row['topic_attachment'])) : '',
+			'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_CHECKED'	=>	($topic_id_list && in_array($row['topic_id'], $topic_id_list)) ? 'checked="checked" ' : '',
+
+			'S_TOPIC_REPORTED'	=>	($row['topic_reported']) ? true : false,
+			'S_TOPIC_UNAPPROVED'=>	($row['topic_approved']) ? false : true)
+		);
+	}
+	unset($topic_rows);
+}
+
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
new file mode 100644
index 0000000000..cf9eb5a05e
--- /dev/null
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -0,0 +1,189 @@
+<?php
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : mcp_front.php
+// STARTED   : Thu Jul 08, 2004
+// COPYRIGHT : © 2004 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
+
+//
+// TODO:
+//	- add list of forums user is moderator in (with links to common management facilities)
+//	- add statistics (how many reports handled, how many posts locked/moved... etc.? - 
+//			those would be only valid from the time the log is valid (and not purged)
+//
+
+function mcp_front_view($id, $mode, $action, $url)
+{
+	global $SID, $phpEx, $phpbb_root_path, $config;
+	global $template, $db, $user, $auth;
+
+	// Latest 5 unapproved
+	$forum_list = get_forum_list('m_approve');
+	$post_list = array();
+
+	$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false);
+	if (!empty($forum_list))
+	{
+		$sql = 'SELECT COUNT(post_id) AS total
+			FROM ' . POSTS_TABLE . '
+			WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ')
+				AND post_approved = 0';
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$total = $row['total'];
+
+		if ($total)
+		{
+			$sql = 'SELECT post_id
+				FROM ' . POSTS_TABLE . '
+				WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ')
+					AND post_approved = 0
+				ORDER BY post_id DESC';
+			$result = $db->sql_query_limit($sql, 5);
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$post_list[] = $row['post_id'];
+			}
+
+			$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, ' . FORUMS_TABLE . ' f, ' . USERS_TABLE . ' u
+				WHERE p.post_id IN (' . implode(', ', $post_list) . ')
+					AND t.topic_id = p.topic_id
+					AND f.forum_id = p.forum_id
+					AND p.poster_id = u.user_id
+				ORDER BY p.post_id DESC';
+			$result = $db->sql_query($sql);
+
+			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'	=> $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']))
+				);				
+			}
+		}
+
+		if ($total == 0)
+		{
+			$template->assign_vars(array(
+				'L_UNAPPROVED_TOTAL'		=> $user->lang['UNAPPROVED_POSTS_ZERO_TOTAL'],
+				'S_HAS_UNAPPROVED_POSTS'	=> false)
+			);
+		}
+		else
+		{
+			$template->assign_vars(array(
+				'L_UNAPPROVED_TOTAL'		=> ($total == 1) ? $user->lang['UNAPPROVED_POST_TOTAL'] : sprintf($user->lang['UNAPPROVED_POSTS_TOTAL'], $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 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);
+		$total = $row['total'];
+
+		if ($total)
+		{
+			$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_id DESC';
+			$result = $db->sql_query_limit($sql, 5);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$template->assign_block_vars('report', array(
+					'U_POST_DETAILS'	=> $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']))
+				);				
+			}
+		}
+
+		if ($total == 0)
+		{
+			$template->assign_vars(array(
+				'L_REPORTS_TOTAL'	=>	$user->lang['REPORTS_ZERO_TOTAL'],
+				'S_HAS_REPORTS'		=>	false)
+			);
+		}
+		else
+		{
+			$template->assign_vars(array(
+				'L_REPORTS_TOTAL'	=> ($total == 1) ? $user->lang['REPORT_TOTAL'] : sprintf($user->lang['REPORTS_TOTAL'], $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', $url);
+	make_jumpbox($url . '&amp;mode=forum_view', 0, false, 'm_');
+}
+\ No newline at end of file
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
new file mode 100644
index 0000000000..c1ecd3325b
--- /dev/null
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -0,0 +1,218 @@
+<?php
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : mcp_post.php
+// STARTED   : Thu Jul 08, 2004
+// COPYRIGHT : © 2004 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
+
+//
+// TODO:
+//	- change poster
+//	- delete post
+//
+
+function mcp_post_details($id, $mode, $action, $url)
+{
+	global $SID, $phpEx, $phpbb_root_path, $config;
+	global $template, $db, $user, $auth;
+
+	$user->add_lang('posting');
+
+	$post_id = request_var('p', 0);
+	$start	= request_var('start', 0);
+
+	// Get post data
+	$post_info = get_post_data(array($post_id));
+
+	if (!sizeof($post_info))
+	{
+		trigger_error($user->lang['POST_NOT_EXIST']);
+	}
+
+	$post_info = $post_info[$post_id];
+
+	switch ($action)
+	{
+		case 'chgposter_search':
+		
+			$username = request_var('username', '');
+
+			if ($username)
+			{
+				$users_ary = array();
+
+				if (strpos($username, '*') === false)
+				{
+					$username = "*$username*";
+				}
+				$username = str_replace('*', '%', str_replace('%', '\%', $username));
+
+				$sql = 'SELECT user_id, username
+					FROM ' . USERS_TABLE . "
+					WHERE username LIKE '" . $db->sql_escape($username) . "'
+						AND user_type NOT IN (" . USER_INACTIVE . ', ' . USER_IGNORE . ')
+						AND user_id <> ' . $post_info['user_id'];
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$users_ary[strtolower($row['username'])] = $row;
+				}
+
+				$user_select = '';
+				ksort($users_ary);
+				foreach ($users_ary as $row)
+				{
+					$user_select .= '<option value="' . $row['user_id'] . '">' . $row['username'] . "</option>\n";
+				}
+			}
+
+			if (!$user_select)
+			{
+				$template->assign_var('MESSAGE', $user->lang['NO_MATCHES_FOUND']);
+			}
+
+			$template->assign_vars(array(
+				'S_USER_SELECT'		=>	$user_select,
+				'SEARCH_USERNAME'	=>	request_var('username', ''))
+			);
+			break;
+
+		default:
+	}
+
+	// Set some vars
+	$users_ary = array();
+	$poster = ($post_info['user_colour']) ? '<span style="color:#' . $post_info['user_colour'] . '">' . $post_info['username'] . '</span>' : $post_info['username'];
+
+	// Process message, leave it uncensored
+	$message = $post_info['post_text'];
+	if ($post_info['bbcode_bitfield'])
+	{
+		include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx);
+		$bbcode = new bbcode($post_info['bbcode_bitfield']);
+		$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']);
+	}
+	$message = smilie_text($message);
+
+	$template->assign_vars(array(
+		'S_MCP_ACTION'			=> "$url&amp;i=main&amp;quickmod=1",
+		'S_CHGPOSTER_ACTION'	=> "$url&amp;i=$id&amp;mode=post_details",
+		'S_APPROVE_ACTION'		=> "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=queue&amp;mode=approve&amp;quickmod=1&amp;p=$post_id",
+
+		'S_CAN_VIEWIP'			=> $auth->acl_get('m_ip', $post_info['forum_id']),
+		'S_CAN_CHGPOSTER'		=> $auth->acl_get('m_', $post_info['forum_id']),
+		'S_CAN_LOCK_POST'		=> $auth->acl_get('m_lock', $post_info['forum_id']),
+		'S_CAN_DELETE_POST'		=> $auth->acl_get('m_delete', $post_info['forum_id']),
+
+		'S_POST_REPORTED'		=> $post_info['post_reported'],
+		'S_POST_UNAPPROVED'		=> !$post_info['post_approved'],
+		'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
+//		'S_USER_NOTES'			=> ($post_info['user_notes']) ? true : false,
+		'S_USER_WARNINGS'		=> ($post_info['user_warnings']) ? true : false,
+
+		'U_VIEW_PROFILE'		=> "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $post_info['user_id'],
+		'U_MCP_USERNOTES'		=> "mcp.$phpEx$SID&amp;i=notes&amp;mode=user_notes&amp;u=" . $post_info['user_id'],
+		'U_MCP_WARNINGS'		=> "mcp.$phpEx$SID&amp;i=warnings&amp;mode=view_user&amp;u=" . $post_info['user_id'],
+
+		'RETURN_TOPIC'			=> sprintf($user->lang['RETURN_TOPIC'], "<a href=\"viewtopic.$phpEx$SID&amp;p=$post_id#$post_id\">", '</a>'),
+		'RETURN_FORUM'			=> sprintf($user->lang['RETURN_FORUM'], "<a href=\"viewforum.$phpEx$SID&amp;f={$post_info['forum_id']}&amp;start={$start}\">", '</a>'),
+		'REPORTED_IMG'			=> $user->img('icon_reported', $user->lang['POST_REPORTED']),
+		'UNAPPROVED_IMG'		=> $user->img('icon_unapproved', $user->lang['POST_UNAPPROVED']),
+
+		'POSTER_NAME'			=> $poster,
+		'POST_PREVIEW'			=> $message,
+		'POST_SUBJECT'			=> $post_info['post_subject'],
+		'POST_DATE'				=> $user->format_date($post_info['post_time']),
+		'POST_IP'				=> $post_info['poster_ip'],
+		'POST_IPADDR'			=> @gethostbyaddr($post_info['poster_ip']))
+	);
+
+	// Get IP
+	if ($auth->acl_get('m_ip', $post_info['forum_id']))
+	{
+		$rdns_ip_num = request_var('rdns', '');
+
+		if ($rdns_ip_num != 'all')
+		{
+			$template->assign_vars(array(
+				'U_LOOKUP_ALL'	=> "$url&amp;i=main&amp;mode=post_details&amp;rdns=all")
+			);
+		}
+
+		// Get other users who've posted under this IP
+		$sql = 'SELECT u.user_id, u.username, COUNT(*) as postings
+			FROM ' . USERS_TABLE . ' u, ' . POSTS_TABLE . " p
+			WHERE p.poster_id = u.user_id
+				AND p.poster_ip = '{$post_info['poster_ip']}'
+				AND p.poster_id <> {$post_info['user_id']}
+			GROUP BY u.user_id
+			ORDER BY postings DESC";
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			// Fill the user select list with users who have posted
+			// under this IP
+			if ($row['user_id'] != $post_info['poster_id'])
+			{
+				$users_ary[strtolower($row['username'])] = $row;
+			}
+
+			$template->assign_block_vars('userrow', array(
+				'USERNAME'		=> ($row['user_id'] == ANONYMOUS) ? $user->lang['GUEST'] : $row['username'],
+				'NUM_POSTS'		=> $row['postings'],	
+				'L_POST_S'		=> ($row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'],
+
+				'U_PROFILE'		=> ($row['user_id'] == ANONYMOUS) ? '' : "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'],
+				'U_SEARCHPOSTS' => "search.$phpEx$SID&amp;search_author=" . urlencode($row['username']) . "&amp;showresults=topics")
+			);
+		}
+		$db->sql_freeresult($result);
+
+		// Get other IP's this user has posted under
+		$sql = 'SELECT poster_ip, COUNT(*) AS postings
+			FROM ' . POSTS_TABLE . '
+			WHERE poster_id = ' . $post_info['poster_id'] . '
+			GROUP BY poster_ip
+			ORDER BY postings DESC';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$hostname = (($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') && $row['poster_ip']) ? @gethostbyaddr($row['poster_ip']) : '';
+
+			$template->assign_block_vars('iprow', array(
+				'IP'			=> $row['poster_ip'],
+				'HOSTNAME'		=> $hostname,
+				'NUM_POSTS'		=> $row['postings'],	
+				'L_POST_S'		=> ($row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'],
+
+				'U_LOOKUP_IP'	=> ($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? '' : "$url&amp;i=$id&amp;mode=post_details&amp;rdns={$row['poster_ip']}#ip",
+				'U_WHOIS'		=> "mcp.$phpEx$SID&amp;i=$id&amp;mode=whois&amp;ip={$row['poster_ip']}")
+			);
+		}
+		$db->sql_freeresult($result);
+
+		// If we were not searching for a specific username fill
+		// the user_select box with users who have posted under
+		// the same IP
+		if ($action != 'chgposter_search')
+		{
+			$user_select = '';
+			ksort($users_ary);
+			foreach ($users_ary as $row)
+			{
+				$user_select .= '<option value="' . $row['user_id'] . '">' . $row['username'] . "</option>\n";
+			}
+			$template->assign_var('S_USER_SELECT', $user_select);
+		}
+	}
+
+}
+\ No newline at end of file
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
new file mode 100644
index 0000000000..20eb8d0d53
--- /dev/null
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -0,0 +1,195 @@
+<?php
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : mcp_topic.php
+// STARTED   : Thu Jul 08, 2004
+// COPYRIGHT : © 2004 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
+
+//
+// TODO:
+//
+
+function mcp_topic_view($id, $mode, $action, $url)
+{
+	global $SID, $phpEx, $phpbb_root_path, $config;
+	global $template, $db, $user, $auth;
+
+	$user->add_lang('viewtopic');
+
+	$topic_id = request_var('t', 0);
+	
+	$topic_info = get_topic_data(array($topic_id));
+
+	if (!sizeof($topic_info))
+	{
+		trigger_error($user->lang['TOPIC_NOT_EXIST']);
+	}
+
+	$topic_info = $topic_info[$topic_id];
+
+	// Set up some vars
+	$icon_id = request_var('icon', 0);
+	$subject = request_var('subject', '');
+	$start = request_var('start', 0);
+	$to_topic_id = request_var('to_topic_id', 0);
+	$to_forum_id = request_var('to_forum_id', 0);
+
+	$post_id_list = get_array('post_id_list', 0);
+
+	$topics_per_page = ($topic_info['forum_topics_per_page']) ? $topic_info['forum_topics_per_page'] : $config['topics_per_page'];
+
+	// Jumpbox, sort selects and that kind of things
+	make_jumpbox($url . '&amp;mode=forum_view', $topic_info['forum_id'], false, 'm_');
+	mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id);
+
+	$forum_topics = ($total == -1) ? $topic_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 = max(0, request_var('posts_per_page', intval($config['posts_per_page'])));
+
+	$sql = 'SELECT u.username, u.user_colour, p.*
+		FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
+		WHERE p.topic_id = {$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();
+	$bbcode_bitfield = 0;
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$rowset[] = $row;
+		$bbcode_bitfield |= $row['bbcode_bitfield'];
+	}
+
+	if ($bbcode_bitfield)
+	{
+		include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
+		$bbcode = new bbcode($bbcode_bitfield);
+	}
+
+	foreach ($rowset as $i => $row)
+	{
+		$has_unapproved_posts = false;
+		$poster = ($row['poster_id'] != ANONYMOUS) ? $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 = smilie_text($message);
+		$message = str_replace("\n", '<br />', $message);
+
+		$checked = ($post_id_list && in_array(intval($row['post_id']), $post_id_list)) ? 'checked="checked" ' : '';
+		$s_checkbox = ($row['post_id'] == $topic_info['topic_first_post_id'] && $action == '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_POST_REPORTED'	=> ($row['post_reported']) ? true : false,
+			'S_POST_UNAPPROVED'	=> ($row['post_approved']) ? false : true,
+						
+			'U_POST_DETAILS'	=> "$url&amp;p={$row['post_id']}&amp;mode=post_details",
+			'U_APPROVE'			=> "$url&amp;i=queue&amp;mode=approve&amp;p=" . $row['post_id'])
+		);
+
+		unset($rowset[$i]);
+	}
+
+	// Display topic icons for split topic
+	$s_topic_icons = false;
+
+	if ($auth->acl_get('m_split', $topic_info['forum_id']))
+	{
+		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
+		$s_topic_icons = posting_gen_topic_icons('', $icon_id);
+
+		// Has the user selected a topic for merge?
+		if ($to_topic_id)
+		{
+			$to_topic_info = get_topic_data(array($to_topic_id), 'm_merge');
+			
+			if (!sizeof($to_topic_info))
+			{
+				$to_topic_id = 0;
+			}
+			else
+			{
+				$to_topic_info = $to_topic_info[$to_topic_id];
+			}
+			
+
+			if (!$to_topic_info['enable_icons'])
+			{
+				$s_topic_icons = false;
+			}
+		}
+	}
+
+	$template->assign_vars(array(
+		'TOPIC_TITLE'		=> $topic_info['topic_title'],
+		'U_VIEWTOPIC'		=> "viewtopic.$phpEx$SID&amp;f=" . $topic_info['forum_id'] . '&amp;t=' . $topic_info['topic_id'],
+
+		'TO_TOPIC_ID'		=> $to_topic_id,
+		'TO_TOPIC_INFO'		=> ($to_topic_id) ? sprintf($user->lang['YOU_SELECTED_TOPIC'], $to_topic_id, '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $to_topic_info['forum_id'] . '&amp;t=' . $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_MCP_ACTION'		=> "$url&amp;mode=$mode&amp;start=$start",
+		'S_FORUM_SELECT'	=> '<select name="to_forum_id">' . (($to_forum_id) ? make_forum_select($to_forum_id) : make_forum_select($topic_info['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_CAN_LOCK'		=> ($auth->acl_get('m_lock', $topic_info['forum_id'])) ? true : false,
+
+		'S_SHOW_TOPIC_ICONS'=> $s_topic_icons,
+		'S_TOPIC_ICON'		=> $icon_id,
+
+		'RETURN_TOPIC'		=> sprintf($user->lang['RETURN_TOPIC'], "<a href=\"viewtopic.$phpEx$SID&amp;f={$topic_info['forum_id']}&amp;t={$topic_info['topic_id']}&amp;start=$start\">", '</a>'),
+		'RETURN_FORUM'		=> sprintf($user->lang['RETURN_FORUM'], "<a href=\"viewforum.$phpEx$SID&amp;f={$topic_info['forum_id']}&amp;start=$start\">", '</a>'),
+
+		'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),
+		'TOTAL'				=> $total)
+	);
+}
+\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_footer.html b/phpBB/styles/subSilver/template/mcp_footer.html
index f0f1b942d8..afc10d98d3 100644
--- a/phpBB/styles/subSilver/template/mcp_footer.html
+++ b/phpBB/styles/subSilver/template/mcp_footer.html
@@ -4,7 +4,17 @@
 			</td>
 		</tr>
 	</table>
-
+	<!-- IF PAGINATION -->
+	<table width="80%" align="right" cellspacing="1">
+		<tr>
+			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
+			<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL} ]&nbsp;</td>
+			<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
+		</tr>
+	</table>
+	<br />
+	<!-- ENDIF -->
+	
 	</div>
 
 	<br clear="all" />
@@ -20,6 +30,6 @@
 
 	<br clear="all" />
 
-	<div style="float: right"><!-- INCLUDE mcp_jumpbox.html --></div>
+	<div style="float: right"><!-- INCLUDE jumpbox.html --></div>
 
 <!-- INCLUDE overall_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html
index b43813b60a..cd5e368e79 100644
--- a/phpBB/styles/subSilver/template/mcp_forum.html
+++ b/phpBB/styles/subSilver/template/mcp_forum.html
@@ -21,7 +21,7 @@
 				<!-- ENDIF -->
 				<td class="row1">
 					<!-- IF topicrow.S_SELECT_TOPIC -->
-						[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;
+						<span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;</span>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED -->
 						<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
diff --git a/phpBB/styles/subSilver/template/mcp_foruminfo.html b/phpBB/styles/subSilver/template/mcp_foruminfo.html
index efe9a0d51d..57e6869308 100644
--- a/phpBB/styles/subSilver/template/mcp_foruminfo.html
+++ b/phpBB/styles/subSilver/template/mcp_foruminfo.html
@@ -1,4 +1,7 @@
-<!-- $ Id: $ -->
+<!-- $Id$ -->
+
+<!-- Note: was this used ever? -->
+
 <!-- INCLUDE mcp_header.html -->
 
 <form method="post" name="main" action="{S_MCP_ACTION}">
diff --git a/phpBB/styles/subSilver/template/mcp_front.html b/phpBB/styles/subSilver/template/mcp_front.html
index 83932f80ae..0717fdb470 100644
--- a/phpBB/styles/subSilver/template/mcp_front.html
+++ b/phpBB/styles/subSilver/template/mcp_front.html
@@ -5,7 +5,7 @@
 <!-- IF S_SHOW_UNAPPROVED -->
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" colspan="5"><span class="cattitle">{L_LATEST_UNAPPROVED}</span></td>
+		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_UNAPPROVED}</b></td>
 	</tr>
 	<tr>
 		<th>&nbsp;{L_FORUM}&nbsp;</th>
@@ -40,7 +40,7 @@
 <!-- IF S_SHOW_REPORTS -->
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" colspan="5"><span class="cattitle">{L_LATEST_REPORTED}</span></td>
+		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_REPORTED}</b></td>
 	</tr>
 	<tr>
 		<th height="28">&nbsp;{L_FORUM}&nbsp;</th>
@@ -75,7 +75,7 @@
 <!-- IF S_SHOW_LOGS -->
 <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>
+		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_LOGS}</b></td>
 	</tr>
 	<tr>
 		<th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th>
diff --git a/phpBB/styles/subSilver/template/mcp_header.html b/phpBB/styles/subSilver/template/mcp_header.html
index 85f1629c00..0e1e3ee8d7 100644
--- a/phpBB/styles/subSilver/template/mcp_header.html
+++ b/phpBB/styles/subSilver/template/mcp_header.html
@@ -32,8 +32,6 @@ function marklist(form_name, status)
 	<div id="pagecontent">
 
 
-<!-- {PAGINATION} -->
-
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
 		<td width="20%" valign="top">
@@ -49,7 +47,7 @@ function marklist(form_name, status)
 
 						<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
 						<!-- BEGIN mcp_subsection -->
-						<li>&#187; <!-- IF ucp_section.ucp_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 --></li>
+						<li>&#187; <!-- 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 --></li>
 						<!-- END mcp_subsection -->
 						</ul>
 
diff --git a/phpBB/styles/subSilver/template/mcp_jumpbox.html b/phpBB/styles/subSilver/template/mcp_jumpbox.html
index ed170f5ea3..03e559a625 100644
--- a/phpBB/styles/subSilver/template/mcp_jumpbox.html
+++ b/phpBB/styles/subSilver/template/mcp_jumpbox.html
@@ -1,5 +1,7 @@
 <!-- $Id$ -->
 
+<!-- Note: no longer in use... -->
+
 <form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}">
 <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.jumpbox.current_f.value){ forms['jumpbox'].submit() }">
 <!-- IF S_ENABLE_SELECT_ALL -->
diff --git a/phpBB/styles/subSilver/template/mcp_move.html b/phpBB/styles/subSilver/template/mcp_move.html
index a4cfc1d6c8..5f67a993a4 100644
--- a/phpBB/styles/subSilver/template/mcp_move.html
+++ b/phpBB/styles/subSilver/template/mcp_move.html
@@ -1,29 +1,42 @@
 <!-- $Id$ -->
-<!-- INCLUDE mcp_header.html -->
+<!-- INCLUDE overall_header.html -->
 
-<form action="{S_MCP_ACTION}" name="mcp" method="post">{S_HIDDEN_FIELDS}<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th height="28" valign="middle">{L_MODE_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1"><table width="100%" border="0" cellspacing="0" cellpadding="1">
-			<tr> 
-				<td>&nbsp;</td>
+	<div id="pagecontent">
+
+		<form name="confirm" action="{S_CONFIRM_ACTION}" method="post"><table class="tablebg" width="100%" cellspacing="1">
+			<tr>
+				<th>{MESSAGE_TITLE}</th>
 			</tr>
-			<tr> 
-				<td align="center"><span class="gen"><!-- IF L_MODE_EXPLAIN -->{L_MODE_EXPLAIN}<br /><br /><!-- ENDIF -->{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
-					<!-- IF S_CAN_LEAVE_SHADOW --><input type="checkbox" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br /><br /><!-- ENDIF -->
-					<input class="btnmain" type="submit" name="confirm" value="{L_CONFIRM}" />
-					&nbsp;&nbsp; 
-					<input class="btnlite" type="submit" name="cancel" value="{L_CANCEL}" />
+			<tr>
+				<td class="row1" align="center">
+					<!-- IF ADDITIONAL_MSG -->
+						<span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br />
+					<!-- ENDIF -->
+					<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
+						<select name="to_forum_id">{S_FORUM_SELECT}</select><br />
+					<!-- IF S_CAN_LEAVE_SHADOW -->
+						<input type="checkbox" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
+					<!-- ENDIF -->
+					<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br />
+					<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span>
 				</td>
 			</tr>
-			<tr> 
-				<td>&nbsp;</td>
-			</tr>
-		</table></td>
-	</tr>
-</table>
-</form>
+		</table></form>
+	
+	</div>
+
+	<br clear="all" />
+
+	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
+		<tr>
+			<td class="row1">
+				<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+				<p class="datetime">{S_TIMEZONE}</p>
+			</td>
+		</tr>
+	</table>
+
+	<br clear="all" />
 
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
+				
diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html
index aa6ffe5a35..962edf6892 100644
--- a/phpBB/styles/subSilver/template/mcp_post.html
+++ b/phpBB/styles/subSilver/template/mcp_post.html
@@ -5,24 +5,24 @@
 		<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
 	</tr>
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_QUICKMOD -->{RETURN_FORUM}<!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall">{RETURN_TOPIC}</span></td>
 	</tr>
 	<tr>
-		<td class="row1"><b class="gen">{L_POST_SUBJECT}</b></td>
+		<td class="row1"><b class="gen">{L_POST_SUBJECT}: </b></td>
 		<td class="row2"><span class="gen">{POST_SUBJECT}</span></td>
 	</tr>
 	<tr>
-		<td class="row1" width="20%"><b class="gen">{L_POSTER}</b></td>
-		<td class="row2" width="80%"><span class="gen">{POSTER_NAME} &nbsp; [ <a href="{U_PROFILE}">{L_READ_PROFILE}</a> ]<!-- IF S_USER_NOTES --> [ <a href="{U_MCP_USERNOTES}">{L_READ_USERNOTES}</a> ]<!-- ENDIF --><!-- IF S_USER_WARNINGS --> [ <a href="{U_MCP_WARNINGS}">{L_READ_WARNINGS}</a> ]<!-- ENDIF --></span></td>
+		<td class="row1" width="20%"><b class="gen">{L_POSTER}: </b></td>
+		<td class="row2" width="80%"><span class="gen">{POSTER_NAME} &nbsp; [ <a href="{U_VIEW_PROFILE}">{L_READ_PROFILE}</a> ]<!-- IF S_USER_NOTES --> [ <a href="{U_MCP_USERNOTES}">{L_READ_USERNOTES}</a> ]<!-- ENDIF --><!-- IF S_USER_WARNINGS --> [ <a href="{U_MCP_WARNINGS}">{L_READ_WARNINGS}</a> ]<!-- ENDIF --></span></td>
 	</tr>
 	<!-- IF S_CAN_VIEWIP -->
 	<tr>
-		<td class="row1"><b class="gen">{L_THIS_POST_IP}</b></td>
-		<td class="row2"><span class="gen">{POST_IP}</span></td>
+		<td class="row1"><b class="gen">{L_THIS_POST_IP}: </b></td>
+		<td class="row2"><span class="gen">{POST_IP} [ {POST_IPADDR} ]</span></td>
 	</tr>
 	<!-- ENDIF -->
 	<tr>
-		<td class="row1"><b class="gen">{L_POSTED}</b></td>
+		<td class="row1"><b class="gen">{L_POSTED}: </b></td>
 		<td class="row2"><span class="postdetails">{POST_DATE}</span></td>
 	</tr>
 	</tr>
@@ -39,6 +39,7 @@
 	<!-- ENDIF -->
 </form></table>
 
+<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->
 <br /><a name="mod"></a>
 
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
@@ -51,11 +52,14 @@
 		<td class="row2"><!-- IF S_USER_SELECT --><select name="u">{S_USER_SELECT}</select> <input type="submit" class="btnmain" name="action[chgposter]" value="{L_CONFIRM}" /><br /><!-- ENDIF --> <input class="post" type="text" name="username" value="{SEARCH_USERNAME}" /> <input class="btnlite" type="submit" value="{L_SEARCH}" name="action[chgposter_search]" /></td>
 	</form></tr>
 	<!-- ENDIF -->
+	<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->
 	<tr><form method="post" name="mcp" action="{S_MCP_ACTION}"{S_FORM_ENCTYPE}>
 		<td class="row1" valign="top"><b class="gen">{L_MOD_OPTIONS}</b></td>
-		<td class="row2"><select name="action"><!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF --><!-- IF S_CAN_LOCK_POST --><option value="unrate">{L_UNRATE_POST} [{L_UNRATE_POST_EXPLAIN}]</option><!-- ENDIF --></select> <input class="btnmain" type="submit" value="{L_SUBMIT}" /></td>
+		<td class="row2"><select name="mode"><!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF --><!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF --></select> <input class="btnmain" type="submit" value="{L_SUBMIT}" /></td>
 	</form></tr>
+	<!-- ENDIF -->
 </table>
+<!-- ENDIF -->
 
 <!-- IF S_CAN_VIEWIP -->
 <br /><a name="ip"></a>
@@ -73,7 +77,7 @@
 	<!-- ELSE -->
 	<tr class="row2">
 	<!-- ENDIF -->
-		<td><span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.POSTS} ]</span></td>
+		<td><span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.NUM_POSTS} {userrow.L_POST_S} ]</span></td>
 		<td align="center"><a href="{userrow.U_SEARCHPOSTS}">{SEARCH_IMG}</a></td>
 	</tr>
 	<!-- BEGINELSE -->
@@ -91,7 +95,7 @@
 	<!-- ELSE -->
 	<tr class="row2">
 	<!-- ENDIF -->
-		<td><span class="gen"><!-- IF iprow.HOSTNAME --><a href="{iprow.U_WHOIS}">{iprow.HOSTNAME}</a> ({iprow.IP})<!-- ELSE --><a href="{iprow.U_WHOIS}">{iprow.IP}</a><!-- ENDIF --> [ {iprow.POSTS} ]</span></td>
+		<td><span class="gen"><!-- IF iprow.HOSTNAME --><a href="{iprow.U_WHOIS}">{iprow.HOSTNAME}</a> ({iprow.IP})<!-- ELSE --><a href="{iprow.U_WHOIS}">{iprow.IP}</a><!-- ENDIF --> [ {iprow.NUM_POSTS} {iprow.L_POST_S} ]</span></td>
 		<td align="center"><!-- IF iprow.U_LOOKUP_IP --><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a> ]</span><!-- ENDIF --></td>
 	</tr>
 	<!-- BEGINELSE -->
diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html
index 1a8e04da66..ef772ae36b 100644
--- a/phpBB/styles/subSilver/template/mcp_topic.html
+++ b/phpBB/styles/subSilver/template/mcp_topic.html
@@ -21,7 +21,7 @@
 		<td class="row1"><span class="gen">{L_TOPIC_ICON}</span></td>
 		<td class="row2" colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td><input type="radio" name="icon" value="0" <!-- IF not S_TOPIC_ICON -->checked="checked" <!-- ENDIF -->/><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}" <!-- IF topic_icon.S_CHECKED -->checked="checked" <!-- ENDIF -->/><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
+				<td><input type="radio" name="icon" value="0"<!-- IF not S_TOPIC_ICON --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"<!-- IF topic_icon.S_CHECKED --> checked="checked"<!-- ENDIF --> /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
 			</tr>
 		</table></td>
 	</tr>
@@ -36,7 +36,7 @@
 	</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="mode[merge_select]" value="{L_SELECT_TOPIC}" /></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="action[merge_select]" value="{L_SELECT_TOPIC}" /></td>
 	</tr>
 	<!-- IF TO_TOPIC_INFO -->
 	<tr>
@@ -60,76 +60,77 @@
 		<th nowrap="nowrap">{L_SELECT}</th>
 	</tr>
 	<!-- BEGIN postrow -->
-	<!-- IF postrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-		<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>
+		<!-- IF postrow.S_ROW_COUNT is even -->
+			<tr class="row1">
+		<!-- ELSE -->
+			<tr class="row2">
+		<!-- ENDIF -->
+
+			<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 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_UNAPPROVED}</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>
-	</tr>
-	<tr>
-		<td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></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_UNAPPROVED}</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>
+		</tr>
+		<tr>
+			<td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></td>
+		</tr>
 	<!-- END postrow -->
 	<tr>
-		<td class="cat" colspan="3" height="28" align="center"><select name="mode">
+		<td class="cat" colspan="3" height="28" align="center"><select name="mode2"><option value="" selected="selected">{L_SELECT_ACTION}</option>			
 			<!-- 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_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF -->
+			<!-- IF S_CAN_DELETE --><option value="delete_post">{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>
+		</select>&nbsp;<input class="btnmain" type="submit" name="quick" value="{L_SUBMIT}"></form></td>
 	</tr>
-</form>
 </table>
+</form>
 
 <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('mcp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', 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('mcp', false);">{L_UNMARK_ALL}</a></b></td>
 	</tr>
 </table>
author	Meik Sievertsen <acydburn@phpbb.com>	2004-07-08 23:03:03 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2004-07-08 23:03:03 +0000
commit	e083255f661573641167afd52f5c41a0588e49d3 (patch)
tree	850f4080ec7b824226ab21f3451fe75dd7ef3d04 /phpBB
parent	754b1c91f4e844ddb76d8f256970eaa7007344cc (diff)
download	forums-e083255f661573641167afd52f5c41a0588e49d3.tar forums-e083255f661573641167afd52f5c41a0588e49d3.tar.gz forums-e083255f661573641167afd52f5c41a0588e49d3.tar.bz2 forums-e083255f661573641167afd52f5c41a0588e49d3.tar.xz forums-e083255f661573641167afd52f5c41a0588e49d3.zip