From c17e275080d8b1834016d80687ccd5a4ecc674a7 Mon Sep 17 00:00:00 2001
From: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>
Date: Wed, 9 Apr 2003 22:17:55 +0000
Subject: [PATCH] Weekly update: MCP templates. Forms renamed to 'main', added
 mcp_jumpbox.html for easy jumping and mcp_foruminfo.html. Not too happy with
 HTML though =" templates\subSilver\mcp_forum.html
 templates\subSilver\mcp_foruminfo.html templates\subSilver\mcp_front.html
 templates\subSilver\mcp_header.html templates\subSilver\mcp_jumpbox.html
 templates\subSilver\mcp_move.html templates\subSilver\mcp_post.html
 templates\subSilver\mcp_viewip.html templates\subSilver\mcp_viewlogs.html

git-svn-id: file:///svn/phpbb/trunk@3800 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/admin_forums.php                   |  13 +-
 phpBB/adm/index.php                          |  23 +-
 phpBB/includes/functions_admin.php           |   4 +-
 phpBB/includes/functions_posting.php         |   4 +-
 phpBB/includes/message_parser.php            | 216 ++++++++++++++++++-
 phpBB/includes/session.php                   |  33 ++-
 phpBB/posting.php                            |   1 +
 phpBB/templates/subSilver/mcp_forum.html     |  42 ++--
 phpBB/templates/subSilver/mcp_foruminfo.html |  49 +++++
 phpBB/templates/subSilver/mcp_front.html     |  30 +--
 phpBB/templates/subSilver/mcp_header.html    |   1 -
 phpBB/templates/subSilver/mcp_jumpbox.html   |  10 +
 phpBB/templates/subSilver/mcp_move.html      |  25 +--
 phpBB/templates/subSilver/mcp_post.html      |  87 +++++---
 phpBB/templates/subSilver/mcp_viewip.html    |   2 +-
 phpBB/templates/subSilver/mcp_viewlogs.html  |   2 +-
 16 files changed, 408 insertions(+), 134 deletions(-)
 create mode 100644 phpBB/templates/subSilver/mcp_foruminfo.html
 create mode 100644 phpBB/templates/subSilver/mcp_jumpbox.html

diff --git a/phpBB/adm/admin_forums.php b/phpBB/adm/admin_forums.php
index 3b61263482..528c124649 100644
--- a/phpBB/adm/admin_forums.php
+++ b/phpBB/adm/admin_forums.php
@@ -210,9 +210,7 @@ switch ($mode)
 			'forum_name'		=> $_POST['forum_name'],
 			'forum_desc'		=> $_POST['forum_desc'], 
 			'forum_style'		=> (!empty($_POST['forum_style'])) ? intval($_POST['forum_style']) : 'NULL', 
-			'enable_post_count'	=> (!empty($_POST['disable_post_count'])) ? 0 : 1,
 			'enable_icons'		=> (!empty($_POST['enable_icons'])) ? 1 : 0, 
-			'enable_moderate'	=> (!empty($_POST['moderated'])) ? 1 : 0,
 			'enable_prune'		=> (!empty($_POST['prune_enable'])) ? 1 : 0,
 			'prune_days'		=> intval($_POST['prune_days']), 
 			'prune_freq'		=> intval($_POST['prune_freq'])
@@ -259,7 +257,6 @@ switch ($mode)
 			'forum_image'		=>  (!empty($_POST['forum_image'])) ? $_POST['forum_image'] : '', 
 			'display_on_index'	=>	(!empty($_POST['display_on_index'])) ? 1 : 0,
 			'enable_icons'		=>	(!empty($_POST['enable_icons'])) ? 1 : 0,
-			'enable_moderate'	=>	(!empty($_POST['moderated'])) ? 1 : 0,
 			'enable_prune'		=>	(!empty($_POST['prune_enable'])) ? 1 : 0,
 			'prune_days'		=>	intval($_POST['prune_days']),
 			'prune_freq'		=>	intval($_POST['prune_freq']),
@@ -284,7 +281,7 @@ switch ($mode)
 			SET ' . $db->sql_build_array('UPDATE', $sql) . " 
 			WHERE forum_id = $forum_id");
 
-		trigger_error($user->lang['Forums_updated']);
+		trigger_error($user->lang['FORUM_UPDATED']);
 
 	break;
 
@@ -421,8 +418,6 @@ switch ($mode)
 			$forum_status = ITEM_UNLOCKED;
 			$forum_name = (!empty($_POST['forum_name'])) ? htmlspecialchars($_POST['forum_name']) : '';
 
-			$post_count_inc = TRUE;
-			$moderated = FALSE;
 			$enable_icons = TRUE;
 
 			$prune_enabled = '';
@@ -520,15 +515,9 @@ switch ($mode)
 	<tr>
 		<td class="row1"><?php echo $user->lang['OPTIONS'] ?></td>
 		<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-		  	<tr>
-  				<td><input type="checkbox" name="disable_post_count"<?php echo ((!empty($post_count_inc)) ? ' ' : 'checked="checked" ') ?>/> <?php echo $user->lang['DISABLE_POST_COUNT'] ?></td>
-		  	</tr>
 		  	<tr>
   				<td><input type="checkbox" name="enable_icons"<?php echo ((!empty($enable_icons)) ? 'checked="checked" ' : ' ') ?>/> <?php echo $user->lang['ENABLE_TOPIC_ICONS']; ?></td>
 		  	</tr>
-		  	<tr>
-  				<td><input type="checkbox" name="moderated"<?php echo ((!empty($enable_moderate)) ? 'checked="checked" ' : ' ') ?>/> <?php echo $user->lang['FORUM_MODERATED']; ?></td>
-		  	</tr>
 <?php
 
 		if ($mode == 'edit' && $parent_id > 0)
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 55e024c61f..77433c127a 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -606,23 +606,40 @@ else
 	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 	header("Content-type: text/html; charset=" . $user->lang['ENCODING']);
 
+	$adm_url = "index.$phpEx$SID&amp;pane=right";
+
+	/*
+	// Allows non-admin pages to link to admin pages
+	// eg: http://forums.foo.com/adm/index.php?sid=&mod=admin_forums&f=1
+	if (!empty($_GET['mod']) && preg_match('/admin_([a-z]+)/', $_GET['mod'], $m))
+	{
+		if (file_exists($phpbb_root_path . 'adm/admin_' . $m[1] . '.' . $phpEx))
+		{
+			$adm_url = 'admin_' . $m[1] . '.' . $phpEx . $SID;
+			$adm_url .= (!empty($_GET['mode'])) ? '&amp;mode=' . htmlspecialchars($_GET['mode']) : '';
+			$adm_url .= (!empty($_GET['f'])) ? '&amp;f=' . intval($_GET['f']) : '';
+			$adm_url .= (!empty($_GET['u'])) ? '&amp;u=' . intval($_GET['u']) : '';
+			$adm_url .= (!empty($_GET['g'])) ? '&amp;g=' . intval($_GET['g']) : '';
+		}
+	}
+	*/
 ?>
 <html>
 <head>
-<title><?php echo $user->lang['Admin_title']; ?></title>
+<title><?php echo $user->lang['ADMIN_TITLE']; ?></title>
 </head>
 
 <frameset rows="60, *" border="0" framespacing="0" frameborder="NO">
 	<frame src="<?php echo "index.$phpEx$SID&amp;pane=top"; ?>" name="title" noresize marginwidth="0" marginheight="0" scrolling="NO">
 	<frameset cols="155,*" rows="*" border="2" framespacing="0" frameborder="yes">
 		<frame src="<?php echo "index.$phpEx$SID&amp;pane=left"; ?>" name="nav" marginwidth="3" marginheight="3" scrolling="yes">
-		<frame src="<?php echo "index.$phpEx$SID&amp;pane=right"; ?>" name="main" marginwidth="0" marginheight="0" scrolling="auto">
+		<frame src="<?php echo $adm_url ?>" name="main" marginwidth="0" marginheight="0" scrolling="auto">
 	</frameset>
 </frameset>
 
 <noframes>
 	<body bgcolor="white" text="#000000">
-		<p><?php echo $user->lang['No_frames']; ?></p>
+		<p><?php echo $user->lang['NO_FRAMES']; ?></p>
 	</body>
 </noframes>
 </html>
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 017f965907..1b85242572 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -96,6 +96,7 @@ function get_forum_list($acl_list = 'f_list', $id_only = TRUE, $postable_only =
 		{
 			$forum_rows[] = $row;
 		}
+		$db->sql_freeresult();
 	}
 
 	$rowset = array();
@@ -110,7 +111,6 @@ function get_forum_list($acl_list = 'f_list', $id_only = TRUE, $postable_only =
 			$rowset[] = ($id_only) ? $row['forum_id'] : $row;
 		}
 	}
-	$db->sql_freeresult();
 
 	return $rowset;
 }
@@ -1506,6 +1506,8 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		
 	if (count($topic_id_list))
 	{
+		$topic_id_list = array_unique($topic_id_list);
+
 		// This query is not really needed if move_topics() updates the forum_id field, altough it's also used to determine if the topic still exists in the database
 		$sql = 'SELECT topic_id, forum_id
 			FROM ' . TOPICS_TABLE . '
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index cddd1a0dda..0955bf677d 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -193,7 +193,7 @@ function topic_review($topic_id, $is_inline_review = false)
 		$forum_id = intval($row['forum_id']);
 		$topic_title = $row['topic_title'];
 
-		if (!$auth->acl_get('f_read', $forum_id))
+		if (!$auth->acl_gets('f_read', 'm_', 'a_', $forum_id))
 		{
 			trigger_error($user->lang['SORRY_AUTH_READ']);
 		}
@@ -251,7 +251,7 @@ function topic_review($topic_id, $is_inline_review = false)
 			}
 
 			$template->assign_block_vars('postrow', array(
-				'MINI_POST_IMG' 	=> $user->img('icon_post', $user->lang['POST']),
+				'MINI_POST_IMG' 	=> $user->img('goto_post', $user->lang['POST']),
 				'POSTER_NAME' 		=> $poster,
 				'POST_DATE' 		=> $user->format_date($row['post_time']),
 				'POST_SUBJECT' 		=> $post_subject,
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e18abd6ce1..a8a077f6b3 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -23,14 +23,17 @@
 // and parses it for attachments, html, bbcode and smilies
 class parse_message
 {
-	var $bbcode_tpl = null;
 	var $message_mode = 0; // MSG_POST/MSG_PM
+	var $bbcode_tpl = null;
+	var $bbcode_uid = '';
+	var $bbcode_bitfield = 0;
+	var $bbcode_array = array();
 
 	function parse_message($message_type)
 	{
 		$this->message_mode = $message_type;
 	}
-	
+
 	function parse(&$message, $html, $bbcode, $uid, $url, $smilies)
 	{
 		global $config, $db, $user;
@@ -81,7 +84,10 @@ class parse_message
 		}
 
 		$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->html($message, $html);
-		$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->bbcode($message, $bbcode, $uid);
+		if ($bbcode)
+		{
+			//$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->bbcode(&$message);
+		}
 		$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->emoticons($message, $smilies);
 		$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->magic_url($message, $url);
 
@@ -109,10 +115,210 @@ class parse_message
 		return;
 	}
 
-	function bbcode(&$message, $bbcode, $uid)
+	//
+	// bbcode()
+	//
+	function bbcode(&$message)
 	{
-		global $config;
+		$bbcode_bitfield = str_repeat('0', 32);
+		$this->bbcode_uid = substr(md5(time()), 0, BBCODE_UID_LEN);
+		$this->bbcode_init();
 
+		foreach ($this->bbcode_array as $offset => $row)
+		{
+			$parse = FALSE;
+			foreach ($row as $regex => $replacement)
+			{
+				$size = strlen($message);
+				$message = preg_replace($regex, $replacement, $message);
+				if ($size != strlen($message))
+				{
+					$parse = TRUE;
+				}
+
+				$bbcode_bitfield{$offset} = ($parse) ? '1' : '0';
+			}
+		}
+		$this->bbcode_bitfield = bindec(strrev($bbcode_bitfield));
+	}
+
+	function bbcode_init()
+	{
+		if (!empty($this->bbcode_array))
+		{
+			return;
+		}
+
+		// always encode the [code] tag first
+		$this->bbcode_array = array(
+			8	=> array('#\[code\](.+\[/code\])#ise'							=>	'$this->bbcode_code("\1")'),
+			10	=> array('#\[email(=.*?)?\](.*?)\[/email\]#ise'					=>	'$this->validate_email("\1", "\2")'),
+			9	=> array('#\[list(=[a-z|0-1]+)?\].*\[/list\]#ise'				=>	'$this->bbcode_list("\0")'),
+			7	=> array('#\[u\](.*?)\[/u\]#is'									=>	'<!-- u --><span style="text-decoration: underline">\1</span><!-- u -->'),
+			6	=> array('!\[color=(#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]!is'	=>	'<!-- c --><span style="color: \1">\2</span><!-- c -->'),
+			5	=> array('#\[size=([\-\+]?[1-2]?[0-9])\](.*?)\[/size\]#is'		=>	'<!-- z --><span style="font-size: \1px">\2</span><!-- z -->'),
+			4	=> array('#\[img\](https?://)([a-z0-9\-\.,\?!%\*_:;~\\&$@/=\+]+)\[/img\]#i'
+																				=>	'[img:' . $this->bbcode_uid . ']\1\2[/img:' . $this->bbcode_uid . ']'),
+			3	=> array('#\[url=?(.*?)?\](.*?)\[/url\]#ise'					=>	'$this->validate_url("\1", "\2")'),
+			2	=> array('#\[i\](.*?)\[/i\]#is'									=>	'<!-- i --><span style="font-style: italic">\1</span><!-- i -->'),
+			1	=> array('#\[b\](.*?)\[/b\]#is'									=>	'<!-- b --><span style="font-weight: bold">\1</span><!-- b -->'),
+			0	=> array('#\[quote(=".*?")?\](.*?)\[/quote\]#is'				=>	'[quote:' . $this->bbcode_uid . '\1]\2[/quote:' . $this->bbcode_uid . ']')
+		);
+
+	/*
+		global $db;
+		$result = $db->sql_query('SELECT bbcode_id, first_pass_regexp, first_pass_replacement FROM ' . BBCODES_TABLE);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$this->bbcode_array[$row['bbcode_id']] = array($row['first_pass_regexp'] => $row['first_pass_replacement']);
+		}
+	*/
+	}
+
+	// bbcode_code()
+	function bbcode_code($in)
+	{
+		$str_from = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}', '.', '@');
+		$str_to = array('&lt;', '&gt;', '&quot;', '&#58;', '&#91;', '&#93;', '&#40;', '&#41;', '&#123;', '&#125;', '&#46;', '&#64;');
+
+		$in = stripslashes($in);
+		$out = '';
+
+		do
+		{
+//			echo "<font color='blue'>$in</font><hr>";
+
+			$pos = strpos($in, '[/code]') + 7;
+			$buffer = substr($in, 0, $pos);
+			$in = substr($in, $pos);
+
+			while ($in)
+			{
+				$pos = strpos($in, '[/code]') + 7;
+				$sub_buffer = substr($in, 0, $pos);
+
+				if (preg_match('#\[code\]#i', $sub_buffer))
+				{
+					break;
+				}
+				else
+				{
+					$in = substr($in, $pos);
+					$buffer .= $sub_buffer;
+				}
+			}
+
+			$buffer = substr($buffer, 0, -7);
+			$out .= '[code:' . $this->bbcode_uid . ']' . str_replace($str_from, $str_to, $buffer) . '[/code:' . $this->bbcode_uid . ']';
+
+			$pos = strpos($in, '[code]');
+			if ($pos !== FALSE)
+			{
+				$out .= substr($in, 0, $pos);
+				$in = substr($in, $pos + 6);
+			}
+		}
+		while ($in);
+
+		return $out;
+	}
+
+	//
+	// bbcode_list()
+	//
+	function bbcode_list($in)
+	{
+		$tok = ']';
+		$out = '[';
+		$in = stripslashes($in);
+		$in = substr($in, 1);
+		$close_tags = array();
+
+		do
+		{
+			$pos = strlen($in);
+			for ($i = 0; $i < strlen($tok); ++$i)
+			{
+				$tmp_pos = strpos($in, $tok{$i});
+				if ($tmp_pos !== FALSE && $tmp_pos < $pos)
+				{
+					$pos = $tmp_pos;
+				}
+			}
+
+			$buffer = substr($in, 0, $pos);
+			$tok = $in{$pos};
+			$in = substr($in, $pos + 1);
+
+			//echo "<b>$pos</b> $buffer	<font color='red'>$tok</font> <font color='blue'>$in</font> <font color='orange'>$out</font>\n";
+			if ($tok == ']')
+			{
+				if ($buffer == '/list' && count($close_tags))
+				{
+					$tag = array_pop($close_tags);
+					$out .= $tag;
+					$tok = '[';
+				}
+				elseif (preg_match('/list(=?(?:[0-9]|[a-z]|))/i', $buffer, $m))
+				{
+					array_push($close_tags, (($m[1]) ? '/list:o:' . $this->bbcode_uid . ']' : '/list:u:' . $this->bbcode_uid . ']'));
+					$out .= $buffer . ':' . $this->bbcode_uid . ']';
+					$tok = '[';
+				}
+				else
+				{
+					if ($buffer == '*' && count($close_tags))
+					{
+						$buffer = '*:' . $this->bbcode_uid;
+					}
+
+					$out .= $buffer . $tok;
+					$tok = '[]';
+				}
+			}
+			else
+			{
+				$out .= $buffer . $tok;
+				$tok = ($tok == '[') ? ']' : '[]';
+			}
+		}
+		while ($in);
+
+		// Close tags left = some tags still open
+		if (count($close_tags))
+		{
+			$out .= '[' . implode('[', $close_tags);
+		}
+
+		return $out;
+	}
+
+	//
+	// TODO: validate_email() and validate_url()
+	//
+	function validate_email($var1, $var2)
+	{
+		$retval = '[email' . $var1 . ':' . $this->bbcode_uid . ']' . $var2 . '[/email:' . $this->bbcode_uid . ']';
+		return $retval;
+	}
+
+	function validate_url($var1, $var2)
+	{
+		$url = (empty($var1)) ? stripslashes($var2) : stripslashes($var1);
+
+		//
+		// Put validation regexps here
+		//
+		$valid = FALSE;
+		if (preg_match('!^http://!i', $url))
+		{
+			$valid = TRUE;
+		}
+		if ($valid)
+		{
+			return (empty($var1)) ? '[url:' . $this->bbcode_uid . ']' . $url . '[/url:' . $this->bbcode_uid . ']' : "[url=$url:" . $this->bbcode_uid . ']' . $var2 . '[/url:' . $this->bbcode_uid . ']';
+		}
+		return '[url' . $var1 . ']' . $var2 . '[/url]';
 	}
 
 	// Replace magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx.
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 102ecd46b6..50af672441 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -181,15 +181,16 @@ class session
 			$autologin = '';
 			$this->data['user_id'] = $user_id = ANONYMOUS;
 		}
-		
+
+		// Is user banned? Are they excluded?
 		if (!$this->data['user_founder'])
 		{
 			$banned = false;
 
-			$sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end  
-				FROM ' . BANLIST_TABLE . '
-				WHERE ban_end >= ' . time() . '
-					OR ban_end = 0';
+			$sql = "SELECT ban_ip, ban_userid, ban_email, ban_exclude  
+				FROM " . BANLIST_TABLE . "
+				WHERE ban_end >= $current_time
+					OR ban_end = 0";
 			$result = $db->sql_query($sql);
 
 			if ($row = $db->sql_fetchrow($result))
@@ -217,17 +218,10 @@ class session
 
 			if ($banned)
 			{
-				// Initiate environment ... since it won't be set at this stage
-				$this->setup();
-
-				// Determine which message to output 
-				$till_date = (!empty($row['ban_end'])) ? $this->format_date($row['ban_end']) : '';
-				$message = (!empty($row['ban_end'])) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
-	
-				$message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . $config['board_contact'] . '">', '</a>');
-				// More internal HTML ... :D
-				$message .= (!empty($row['ban_show_reason'])) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $row['ban_show_reason']) : '';
-				trigger_error($message);
+				// TODO
+				// Note that at present this doesn't surround the administrator
+				// text with an appropriate URL
+				trigger_error('BOARD_BANNED');
 			}
 		}
 
@@ -396,7 +390,7 @@ class user extends session
 			$this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/';
 			$this->date_format = $config['default_dateformat'];
 			$this->timezone = $config['board_timezone'] * 3600;
-			$this->dst = $config['board_dst'] * 3600;
+			$this->dst = 0;
 
 			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 			{
@@ -515,8 +509,6 @@ class auth
 	{
 		global $db, $cache;
 
-		$this->founder = ($userdata['user_founder']) ? true : false;
-
 		if (!($this->acl_options = $cache->get('acl_options')))
 		{
 			$sql = "SELECT auth_value, is_global, is_local
@@ -571,6 +563,7 @@ class auth
 	// Look up an option
 	function acl_get($opt, $f = 0)
 	{
+		return TRUE;
 		static $cache;
 
 		if (!isset($cache[$f][$opt]))
@@ -585,7 +578,7 @@ class auth
 			}
 		}
 
-		return ($this->founder) ? true : $cache[$f][$opt];
+		return  $cache[$f][$opt];
 	}
 
 	function acl_gets()
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 845411be7f..b3e1f7dcfd 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -107,6 +107,7 @@ $topic_fields = array('topic_status' => 'i', 'topic_first_post_id' => 'i', 'topi
 
 $post_fields = array('post_time' => 'i', 'poster_id' => 'i', 'post_username' => 's', 'post_text' => 's', 'post_subject' => 's', 'post_checksum' => 's', 'post_attachment' => 'i', 'bbcode_uid' => 's', 'enable_magic_url' => 'i', 'enable_sig' => 'i', 'enable_smilies' => 'i', 'enable_bbcode' => 'i');
 
+$sql = '';
 switch ($mode)
 {
 	case 'post':
diff --git a/phpBB/templates/subSilver/mcp_forum.html b/phpBB/templates/subSilver/mcp_forum.html
index 2ad5b04f3f..09a7734848 100644
--- a/phpBB/templates/subSilver/mcp_forum.html
+++ b/phpBB/templates/subSilver/mcp_forum.html
@@ -1,17 +1,18 @@
+<!-- $ Id: $ -->
 <!-- INCLUDE mcp_header.html -->
 
-<form name="form" method="post" action="{S_MCP_ACTION}">
+<form method="post" name="main" action="{S_MCP_ACTION}">
 <table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
 	<tr>
 		<th height="25" colspan="6" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
 	</tr>
 	<tr>
-		<td colspan="2" 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="liteoption" type="submit" name="sort" value="{L_GO}" /></span></td>
-		<td colspan="3" class="cat" height="28" align="right" nowrap="nowrap"><!-- INCLUDE mcp_jumpbox.html --></td>
+		<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="liteoption" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
 	<tr>
 		<th width="4%" nowrap="nowrap">&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th colspan="2" 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 +20,7 @@
 	<!-- BEGIN topicrow -->
 	<tr>
 		<td class="row1" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<td class="row1"><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" 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="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>
@@ -30,24 +31,12 @@
 	</tr>
 	<!-- END topicrow -->
 	<tr align="right">
-		<td class="cat" colspan="5" height="28">{S_HIDDEN_FIELDS}
-			<!-- IF S_CAN_DELETE -->
-			<input type="submit" name="delete_topics" class="liteoption" value="{L_DELETE}" />
-			&nbsp;
-			<!-- ENDIF -->
-			<!-- IF S_CAN_MOVE -->
-			<input type="submit" name="move" class="liteoption" value="{L_MOVE}" />
-			&nbsp;
-			<!-- ENDIF -->
-			<!-- IF S_CAN_LOCK -->
-			<input type="submit" name="lock" class="liteoption" value="{L_LOCK}" />
-			&nbsp;
-			<input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" />
-			&nbsp;
-			<!-- ENDIF -->
-			<!-- IF S_CAN_RESYNC -->
-			<input type="submit" name="resync" class="liteoption" value="{L_RESYNC}" />
-			<!-- ENDIF -->
+		<td class="cat" colspan="6" height="28">
+			<!-- IF S_CAN_DELETE --><input type="submit" name="delete_topics" class="liteoption" value="{L_DELETE}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_MOVE --><input type="submit" name="move" class="liteoption" value="{L_MOVE}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_FORK --><input type="submit" name="fork" class="liteoption" value="{L_FORK}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_LOCK --><input type="submit" name="lock" class="liteoption" value="{L_LOCK}" /> &nbsp;<input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_SYNC --><input type="submit" name="resync" class="liteoption" value="{L_RESYNC}" />&nbsp;<!-- ENDIF -->
 		</td>
 	</tr>
 </table>
@@ -58,11 +47,6 @@
 		<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>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td align="right"><!-- INCLUDE jumpbox.html --></td>
-	</tr>
-</table></
+</form>
 
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_foruminfo.html b/phpBB/templates/subSilver/mcp_foruminfo.html
new file mode 100644
index 0000000000..83ba17b960
--- /dev/null
+++ b/phpBB/templates/subSilver/mcp_foruminfo.html
@@ -0,0 +1,49 @@
+<!-- $ Id: $ -->
+<!-- INCLUDE mcp_header.html -->
+
+<form method="post" name="main" action="{S_MCP_ACTION}">
+<!-- IF S_FORUM_ID -->
+
+<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
+	<tr>
+		<th height="25" colspan="2" nowrap="nowrap">{L_FORUM_INFO}</th>
+	</tr>
+	<tr>
+		<td class="row1"><b class="gen">{L_FORUM_NAME}</b></td>
+		<td class="row2"><input type="text" class="post" name="forum_name" value="{FORUM_NAME}" size="45" /></td>
+	</tr>
+	<tr>
+		<td class="row1"><b class="gen">{L_FORUM_DESC}</b></td>
+		<td class="row2"><textarea class="post" rows="5" cols="45" wrap="virtual" name="forum_desc">{FORUM_DESC}</textarea></td>
+	</tr>
+	<tr>
+		<td class="row1"><b class="gen">{L_FORUM_STYLE}</b></td>
+		<td class="row2"><select name="forum_style">{STYLE_LIST}</select></td>
+	</tr>
+	<tr>
+		<td class="row1"><b class="gen">{L_FORUM_STATUS}</b></td>
+		<td class="row2"><select name="forum_status">{STATUS_LIST}</select></td>
+	</tr>
+	<tr>
+		<td colspan="2" class="cat" align="center"><input type="submit" name="confirm" value="{L_CONFIRM}" class="mainoption" />&nbsp; &nbsp;<input type="submit" name="cancel" value="{L_CANCEL}" class="liteoption" /></td>
+	</tr>
+</table>
+
+<br />
+<!-- INCLUDE mcp_jumpbox.html -->
+
+<!-- ELSE -->
+
+<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
+	<tr>
+		<th height="25"><b>{L_FORUM_INFO}</b></th>
+	</tr>
+	<tr> 
+		<td class="row1" align="center"><br /><!-- INCLUDE mcp_jumpbox.html --><br /><br /></td>
+	</tr>
+</table>
+
+<!-- ENDIF -->
+</form>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_front.html b/phpBB/templates/subSilver/mcp_front.html
index 8240449ae6..ae7a9d944d 100644
--- a/phpBB/templates/subSilver/mcp_front.html
+++ b/phpBB/templates/subSilver/mcp_front.html
@@ -1,6 +1,7 @@
 <!-- $Id$ -->
 <!-- INCLUDE mcp_header.html -->
 
+<!-- IF S_SHOW_UNAPPROVED -->
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
 		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_UNAPPROVED}</span></td>
@@ -22,10 +23,10 @@
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="5" align="center"><span class="gen">{L_UNAPPROVED_TOTAL}</span></td>
+		<td class="row1" colspan="5" align="center"><span class="gen">{L_UNAPPROVED_POSTS_ZERO_TOTAL}</span></td>
 	</tr>
 	<!-- END unapproved -->
-	<!-- IF unapproved -->
+	<!-- IF S_HAS_UNAPPROVED_POSTS -->
 	<tr>
 		<td class="row3" colspan="5"><span class="gensmall">{L_UNAPPROVED_TOTAL}</span></td>
 	</tr>
@@ -33,7 +34,9 @@
 </table>
 
 <br />
+<!-- ENDIF -->
 
+<!-- IF S_SHOW_REPORTS -->
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
 		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_REPORTED}</span></td>
@@ -45,28 +48,30 @@
 		<th>&nbsp;{L_REPORTER}&nbsp;</th>
 		<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
 	</tr>
-	<!-- BEGIN reported -->
+	<!-- BEGIN report -->
 	<tr>
-		<td class="row1" width="15%"><span class="gen">{reported.FORUM}</span></td>
-		<td class="row2" width="18%"><span class="gen">{reported.TOPIC}</span></td>
-		<td class="row1"><span class="gen">{reported.SUBJECT}</span></td>
-		<td class="row2" align="center" width="15%" nowrap="nowrap"><span class="gen">{reported.REPORTER}</span></td>
-		<td class="row1" align="center" width="15%" nowrap="nowrap"><span class="gensmall">{reported.REPORT_TIME}</span></td>
+		<td class="row1" width="15%"><span class="gen">{report.FORUM}</span></td>
+		<td class="row2" width="18%"><span class="gen">{report.TOPIC}</span></td>
+		<td class="row1"><span class="gen">{report.SUBJECT}</span></td>
+		<td class="row2" align="center" width="15%" nowrap="nowrap"><span class="gen">{report.REPORTER}</span></td>
+		<td class="row1" align="center" width="15%" nowrap="nowrap"><span class="gensmall">{report.REPORT_TIME}</span></td>
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="5" align="center"><span class="gen">{L_REPORTED_TOTAL}</span></td>
+		<td class="row1" colspan="5" align="center"><span class="gen">{L_REPORTS_ZERO_TOTAL}</span></td>
 	</tr>
-	<!-- END reported -->
-	<!-- IF reported -->
+	<!-- END report -->
+	<!-- IF S_HAS_REPORTS -->
 	<tr>
-		<td class="row3" colspan="5"><span class="gensmall">{L_REPORTED_TOTAL}</span></td>
+		<td class="row3" colspan="5"><span class="gensmall">{L_REPORTS_TOTAL}</span></td>
 	</tr>
 	<!-- ENDIF -->
 </table>
 
 <br />
+<!-- ENDIF -->
 
+<!-- IF S_SHOW_LOGS -->
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
 		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_LOGS}</span></td>
@@ -94,6 +99,7 @@
 </table>
 
 <br />
+<!-- ENDIF -->
 
 <form name="main" action="{S_MCP_ACTION}" method="post"><!-- INCLUDE mcp_jumpbox.html --></form>
 
diff --git a/phpBB/templates/subSilver/mcp_header.html b/phpBB/templates/subSilver/mcp_header.html
index 0e302a63f0..86958767a7 100644
--- a/phpBB/templates/subSilver/mcp_header.html
+++ b/phpBB/templates/subSilver/mcp_header.html
@@ -6,7 +6,6 @@ function marklist(status)
 {
 	for (i = 0; i < document.forms['main'].length; i++)
 	{
-		// NOTE: all forms in MCP do not have the same name at present
 		document.forms['main'].elements[i].checked = status;
 	}
 }
diff --git a/phpBB/templates/subSilver/mcp_jumpbox.html b/phpBB/templates/subSilver/mcp_jumpbox.html
new file mode 100644
index 0000000000..8367d2504f
--- /dev/null
+++ b/phpBB/templates/subSilver/mcp_jumpbox.html
@@ -0,0 +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() }">
+<!-- IF S_ENABLE_SELECT_ALL -->
+<option value="0">{L_ALL_FORUMS}</option>
+<!-- ELSE -->
+<option value="-1">{L_SELECT_FORUM}</option>
+<!-- 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="liteoption" type="submit" value="{L_GO}" onClick="if(document.main.f.value == -1){return false;}" />
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_move.html b/phpBB/templates/subSilver/mcp_move.html
index 0bcbdc2e4d..23e30c8cb4 100644
--- a/phpBB/templates/subSilver/mcp_move.html
+++ b/phpBB/templates/subSilver/mcp_move.html
@@ -1,13 +1,15 @@
+<!-- $ Id: $ -->
 <!-- INCLUDE overall_header.html -->
-<form action="{S_MCP_ACTION}" method="post"><input type="hidden" name="mode" value="move">
+
+<form action="{S_MCP_ACTION}" name="main" method="post">{S_HIDDEN_FIELDS}
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr> 
 		<td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
 	</tr>
 </table>
-<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
+<table width="100%" cellpadding="4" cellspacing="1" border="0" class="tablebg">
 	<tr> 
-		<th height="25" class="thHead"><b>{L_MOVE}</b></th>
+		<th height="25"><b>{L_MODE_TITLE}</b></th>
 	</tr>
 	<tr>
 		<td class="row1"><table width="100%" border="0" cellspacing="0" cellpadding="1">
@@ -15,22 +17,7 @@
 				<td>&nbsp;</td>
 			</tr>
 			<tr> 
-				<td align="center"><table border="0" cellspacing="0" cellpadding="0">
-					<tr class="gen">
-						<td align="left">
-							{L_SELECTED_TOPICS}<br />
-								<ul><!-- BEGIN topiclist -->
-								<li><a href="{topiclist.U_TOPIC_LINK}" target="_new">{topiclist.TOPIC_TITLE}</a>
-								<!-- END topiclist --></ul>
-						</td>
-					</tr>
-				</table></td>
-			</tr>
-			<tr> 
-				<td align="center"><span class="gen">{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
-					<input type="checkbox" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
-					<br />
-					{S_HIDDEN_FIELDS} 
+				<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 />
 					<input class="mainoption" type="submit" name="confirm" value="{L_CONFIRM}" />
 					&nbsp;&nbsp; 
 					<input class="liteoption" type="submit" name="cancel" value="{L_CANCEL}" />
diff --git a/phpBB/templates/subSilver/mcp_post.html b/phpBB/templates/subSilver/mcp_post.html
index c5fc97e6b5..dd50e456ea 100644
--- a/phpBB/templates/subSilver/mcp_post.html
+++ b/phpBB/templates/subSilver/mcp_post.html
@@ -1,39 +1,70 @@
 <!-- INCLUDE mcp_header.html -->
 
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
-<form method="post" action="{S_FORM_ACTION}">
+<form method="post" name="main" action="{S_FORM_ACTION}">
+<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
 	<tr>
-		<td colspan="2" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td>
+		<th colspan="2" align="center">{L_POST_DETAILS}</th>
+	</th>
+	<tr>
+		<td class="row1"><b class="gen">{L_POSTER}</b></td>
+		<td class="row2"><span class="gen">{POSTER_NAME}</span></td>
 	</tr>
-	<tr> 
-		<td align="left" valign="top" class="row1"><span class="name"><a name="{U_POST_ID}"></a>{POSTER_NAME}</span></td>
-		<td width="100%" valign="top" class="row1"> 
-		<table width="100%" cellspacing="0" cellpadding="3" border="0">
-			<tr> 
-			<td valign="middle"><img src="imagesets/subSilver/icon_minipost.gif" alt="{L_POST}"><span class="postdetails">{L_POSTED}: 
-				{POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {POST_SUBJECT}</span></td>
-			</tr>
-			<tr> 
-			<td valign="top"> 
-				<hr size="1" />
-				<span class="postbody">{MESSAGE}</span></td> 
-			</tr>
-		</table>
-		</td>
+	<!-- 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>
+	</tr>
+	<!-- ENDIF -->
+	<tr>
+		<td class="row1"><b class="gen">{L_POSTED}</b></td>
+		<td class="row2"><span class="postdetails">{POST_DATE}</span></td>
 	</tr>
 	<tr>
-		<td colspan="2" height="1" class="row2">&nbsp;</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 colspan="2" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td>
+		<td class="row1"><b class="gen">{L_MESSAGE_BODY}</b></td>
+		<td class="row2"><span class="gen">{MESSAGE}</span></td>
 	</tr>
+</table>
+
+<!-- IF S_CAN_VIEWIP -->
+<br /><a name="ip"></a>
+
+<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
+	<tr>
+		<th colspan="2" align="center">{L_IP_INFO}</th>
+	</th>
+	<tr>
+		<td colspan="2" height="28" class="cat"><span class="gen">{L_OTHER_USERS}</span></td>
+	</tr>
+	<!-- BEGIN userrow -->
+	<!-- IF userrow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
+		<td><span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.POSTS} ]</span></td>
+		<td align="right"><a href="{userrow.U_SEARCHPOSTS}">{SEARCH_IMG}</a></td>
+	</tr>
+	<!-- END userrow -->
+
+	<tr>
+		<td colspan="2" height="28" class="cat"><span class="gen">{L_OTHER_IPS}</span></td>
+	</tr>
+	<!-- BEGIN iprow -->
+	<!-- IF iprow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
+		<td><span class="gen"><a href="{iprow.U_PROFILE}">{iprow.USERNAME}</a> [ {iprow.POSTS} ]</span></td>
+		<td align="right"><a href="{iprow.U_SEARCHPOSTS}">{SEARCH_IMG}</a></td>
+	</tr>
+	<!-- END iprow -->
+</table>
+<!-- ENDIF -->
+
 </form>
-
-</table>
-<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
-	<tr> 
-		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
-	</tr>
-</table>
-
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_viewip.html b/phpBB/templates/subSilver/mcp_viewip.html
index 5551f7d7cb..864aa04268 100644
--- a/phpBB/templates/subSilver/mcp_viewip.html
+++ b/phpBB/templates/subSilver/mcp_viewip.html
@@ -6,7 +6,7 @@
   </tr>
 </table>
 
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
+<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
   <tr> 
 	<th height="25" class="thHead">{L_IP_INFO}</th>
   </tr>
diff --git a/phpBB/templates/subSilver/mcp_viewlogs.html b/phpBB/templates/subSilver/mcp_viewlogs.html
index 9a4e214a63..5a733becb7 100644
--- a/phpBB/templates/subSilver/mcp_viewlogs.html
+++ b/phpBB/templates/subSilver/mcp_viewlogs.html
@@ -1,7 +1,7 @@
 <!-- $Id$ -->
 <!-- INCLUDE mcp_header.html -->
 
-<form method="post" name="jumpbox" action="{S_MCP_ACTION}" onsubmit="if(document.main.f.value == -1){return false;}">
+<form method="post" name="main" action="{S_MCP_ACTION}">
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
 		<th height="25" colspan="5" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>