page header/footer become functions, forum passwords (I know, I know but it appears a popular feature for some reason ... inclusion not yet set in concrete nor complete), various bug fixes (and no doubt new bugs).

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

phpBB/adm/admin_attachments.php

@@ -159,7 +159,7 @@ switch ($mode)
 
 // Temporary Language Variables
 
-page_header($user->lang[$l_title]);
+adm_page_header($user->lang[$l_title]);
 
 // Search Imagick
 if ($search_imagick)
@@ -847,7 +847,7 @@ if ($mode == 'ext_groups')
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 // Test Settings
 function test_upload(&$error, &$error_msg, $upload_dir, $ftp_path, $ftp_upload_allowed, $create_directory = false)

phpBB/adm/admin_ban.php

@@ -408,7 +408,7 @@ switch ($mode)
 }
 
 // Output page
-page_header($l_title);
+adm_page_header($l_title);
 
 ?>
 
@@ -614,6 +614,6 @@ function display_details(option)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_board.php

@@ -112,7 +112,7 @@ if (isset($_POST['submit']))
 	trigger_error($user->lang['Config_updated']);
 }
 
-page_header($user->lang[$l_title]);
+adm_page_header($user->lang[$l_title]);
 
 ?>
 
@@ -655,6 +655,6 @@ switch ($mode)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_database.php

@@ -81,7 +81,7 @@ switch($mode)
 
 		if (!isset($_POST['backupstart']) && !isset($_GET['backupstart']))
 		{
-			page_header($user->lang['DB_BACKUP']);
+			adm_page_header($user->lang['DB_BACKUP']);
 
 ?>
 
@@ -156,9 +156,9 @@ switch($mode)
 
 			$message = (empty($store_path)) ? $user->lang['Backup_download'] : $user->lang['Backup_writing'];
 
-			page_header($user->lang['DB_Backup'], $meta);
+			adm_page_header($user->lang['DB_Backup'], $meta);
 			page_message($user->lang['DB_Backup'], $message);
-			page_footer();
+			adm_page_footer();
 		}
 
 		$tables = (SQL_LAYER != 'postgresql') ? mysql_get_tables() : pg_get_tables();
@@ -380,7 +380,7 @@ switch($mode)
 		//
 		// Restore page
 		//
-		page_header($user->lang['DB_RESTORE']);
+		adm_page_header($user->lang['DB_RESTORE']);
 
 ?>
 
@@ -430,7 +430,7 @@ switch($mode)
 
 }
 
-page_footer();
+adm_page_footer();
 
 // -----------------------------------------------
 // Begin Functions

phpBB/adm/admin_disallow.php

@@ -99,7 +99,7 @@ if ($row = $db->sql_fetchrow($result))
 }
 
 // Output page
-page_header($user->lang['DISALLOW']);
+adm_page_header($user->lang['DISALLOW']);
 
 ?>
 
@@ -160,6 +160,6 @@ page_header($user->lang['DISALLOW']);
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_email.php

@@ -150,7 +150,7 @@ if ($row = $db->sql_fetchrow($result))
 }
 $select_list .= '</select>';
 
-page_header($user->lang['Mass_Email']);
+adm_page_header($user->lang['Mass_Email']);
 
 ?>
 
@@ -181,6 +181,6 @@ page_header($user->lang['Mass_Email']);
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_forums.php

@@ -82,8 +82,8 @@ switch ($mode)
 		$enable_prune = (!empty($_POST['enable_prune'])) ? 1 : 0;
 		$prune_days = (isset($_POST['prune_days'])) ? intval($_POST['prune_days']) : 7;
 		$prune_freq = (isset($_POST['prune_freq'])) ? intval($_POST['prune_freq']) : 1;
-		$forum_password = (isset($_POST['forum_password'])) ? intval($_POST['forum_password']) : '';
+		$forum_password = (isset($_POST['forum_password'])) ? htmlspecialchars($_POST['forum_password']) : '';
-		$forum_password_confirm = (isset($_POST['forum_password_confirm'])) ? intval($_POST['forum_password_confirm']) : '';
+		$forum_password_confirm = (isset($_POST['forum_password_confirm'])) ? htmlspecialchars($_POST['forum_password_confirm']) : '';
 
 		if (isset($_POST['update']))
 		{
@@ -272,6 +272,7 @@ switch ($mode)
 			$parents_list = make_forum_select($parent_id, $forum_id, false, false, false);
 			$forums_list = make_forum_select($parent_id, $forum_id, false, true, false);
 
+			$forum_password_confirm = $forum_password;
 		}
 		else
 		{
@@ -279,6 +280,19 @@ switch ($mode)
 
 			$forum_id = $parent_id;
 			$parents_list = make_forum_select($parent_id);
+
+			if ($parent_id && !isset($_POST['update']))
+			{
+				$temp_forum_desc = $forum_desc;
+				$temp_forum_name = $forum_name;
+				$temp_forum_type = $forum_type;
+
+				extract(get_forum_info($parent_id));
+				$forum_type = $temp_forum_type;
+				$forum_name = $temp_forum_name;
+				$forum_desc = $temp_forum_desc;
+				$forum_password_confirm = $forum_password;
+			}
 		}
 
 		$forum_type_options = '';
@@ -312,7 +326,7 @@ switch ($mode)
 			$navigation .= ($row['forum_id'] == $forum_id) ? ' -&gt; ' . $row['forum_name'] : ' -&gt; <a href="admin_forums.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '">' . $row['forum_name'] . '</a>';
 		}
 
-		page_header($l_title);
+		adm_page_header($l_title);
 
 ?>
 
@@ -472,11 +486,11 @@ switch ($mode)
 	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['FORUM_PASSWORD'] ?>: <br /><span class="gensmall"><?php echo $user->lang['FORUM_PASSWORD_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="password" name="forum_password" value="<?php echo $password; ?>" size="25" maxlength="200" /></td>
+		<td class="row2"><input type="password" name="forum_password" value="<?php echo $forum_password; ?>" size="25" maxlength="25" /></td>
 	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['FORUM_PASSWORD_CONFIRM'] ?>: <br /><span class="gensmall"><?php echo $user->lang['FORUM_PASSWORD_CONFIRM_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="password" name="forum_password_confirm" value="<?php echo $password_confirm; ?>" size="25" maxlength="200" /></td>
+		<td class="row2"><input type="password" name="forum_password_confirm" value="<?php echo $forum_password_confirm; ?>" size="25" maxlength="25" /></td>
 	</tr>
 <?php
 
@@ -492,7 +506,7 @@ switch ($mode)
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'delete':
@@ -657,7 +671,7 @@ switch ($mode)
 		}
 	
 
-		page_header($user->lang['MANAGE']);
+		adm_page_header($user->lang['MANAGE']);
 		extract(get_forum_info($forum_id));
 
 		$subforums_id = array();
@@ -733,7 +747,7 @@ switch ($mode)
 </table></form>
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'move_up':
@@ -889,7 +903,7 @@ else
 $forum_box = make_forum_select($forum_id);
 
 // Front end
-page_header($user->lang['MANAGE']);
+adm_page_header($user->lang['MANAGE']);
 
 ?>
 
@@ -994,7 +1008,7 @@ while ($row = $db->sql_fetchrow($result))
 </table></form>
 <?php
 
-page_footer();
+adm_page_footer();
 
 //
 // END

phpBB/adm/admin_groups.php

@@ -84,7 +84,7 @@ if (!empty($group_id))
 }
 
 // Page header
-page_header($user->lang['MANAGE']);
+adm_page_header($user->lang['MANAGE']);
 
 // Which page?
 switch ($action)
@@ -906,6 +906,6 @@ function marklist(match, status)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_icons.php

@@ -188,7 +188,7 @@ switch ($action)
 		unset($existing_imgs);
 		unset($imglist);
 	
-		page_header($user->lang[$lang]);
+		adm_page_header($user->lang[$lang]);
 
 ?>
 
@@ -274,7 +274,7 @@ function update_image_dimensions()
 </table></form>
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'create':
@@ -495,7 +495,7 @@ function update_image_dimensions()
 				}
 			}
 
-			page_header($user->lang[$lang]);
+			adm_page_header($user->lang[$lang]);
 
 ?>
 <h1><?php echo $user->lang[$lang] ?></h1>
@@ -540,14 +540,14 @@ function update_image_dimensions()
 ?>
 </table></form>
 <?php
-			page_footer();
+			adm_page_footer();
 
 		}
 		break;
 
 	case 'export':
 
-		page_header($user->lang['EXPORT_' . $lang]);
+		adm_page_header($user->lang['EXPORT_' . $lang]);
 		trigger_error(sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="admin_icons.' . $phpEx . $SID . '&amp;mode=' . $mode . '&amp;action=send">', '</a>'));
 		break;
 
@@ -625,7 +625,7 @@ function update_image_dimensions()
 		$db->sql_freeresult($result);
 
 		// Output the page
-		page_header($user->lang[$lang]);
+		adm_page_header($user->lang[$lang]);
 
 ?>
 
@@ -716,7 +716,7 @@ function update_image_dimensions()
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 		break;
 }

phpBB/adm/admin_permissions.php

@@ -421,7 +421,7 @@ switch ($submit)
 
 
 // Output page header
-page_header($l_title);
+adm_page_header($l_title);
 
 
 // First potential form ... this is for selecting forums, users
@@ -1312,6 +1312,6 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
 }
 
 // Output page footer
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_phpinfo.php

@@ -83,12 +83,12 @@ switch ($layout)
 		break;
 }
 
-page_header($user->lang['PHP_INFO']);
+adm_page_header($user->lang['PHP_INFO']);
 
 echo '<h1>' . $user->lang['PHP_INFO'] . '</h1>';
 echo '<p>' . $user->lang['PHP_INFO_EXPLAIN'] . '</p>';
 echo $output; 
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_prune.php

@@ -54,7 +54,7 @@ if (isset($_POST['doprune']))
 	// Convert days to seconds for timestamp functions...
 	$prunedate = time() - ($prunedays * 86400);
 
-	page_header($user->lang['PRUNE']);
+	adm_page_header($user->lang['PRUNE']);
 
 ?>
 
@@ -124,11 +124,11 @@ if (isset($_POST['doprune']))
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 
-page_header($user->lang['PRUNE']);
+adm_page_header($user->lang['PRUNE']);
 
 ?>
 
@@ -192,6 +192,6 @@ else
 
 }
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_prune_users.php

@@ -62,7 +62,7 @@ if (isset($_POST['prune']))
 
 		$l_message .= '</form>';
 
-		page_header($user->lang['Prune_users']);
+		adm_page_header($user->lang['Prune_users']);
 
 ?>
 
@@ -73,7 +73,7 @@ if (isset($_POST['prune']))
 <?php
 
 		page_message($user->lang['CONFIRM'], $l_message, false);
-		page_footer();
+		adm_page_footer();
 
 	}
 	else if (isset($_POST['confirm']))
@@ -208,7 +208,7 @@ foreach ($find_time as $key => $value)
 //
 //
 //
-page_header($user->lang['Prune_users']);
+adm_page_header($user->lang['Prune_users']);
 
 ?>
 
@@ -255,6 +255,6 @@ page_header($user->lang['Prune_users']);
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_ranks.php

@@ -98,7 +98,7 @@ if ($mode != '')
 			$rank_info['rank_special'] = 0;
 		}
 
-		page_header($user->lang['RANKS']);
+		adm_page_header($user->lang['RANKS']);
 
 ?>
 
@@ -133,7 +133,7 @@ if ($mode != '')
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 	}
 	else if ($mode == 'save')
@@ -218,7 +218,7 @@ if ($mode != '')
 	}
 }
 
-page_header($user->lang['RANKS']);
+adm_page_header($user->lang['RANKS']);
 
 ?>
 
@@ -268,6 +268,6 @@ if ($row = $db->sql_fetchrow($result))
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_search.php

@@ -269,7 +269,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 	else
 	{
 		set_config('board_disable', 0);
-		page_header($user->lang['SEARCH_INDEX']);
+		adm_page_header($user->lang['SEARCH_INDEX']);
 
 ?>
 
@@ -279,7 +279,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 	}
 
@@ -289,7 +289,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 else if (isset($_POST['cancel']))
 {
 	set_config('board_disable', 0);
-	page_header($user->lang['SEARCH_INDEX']);
+	adm_page_header($user->lang['SEARCH_INDEX']);
 
 ?>
 
@@ -299,12 +299,12 @@ else if (isset($_POST['cancel']))
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 else
 {
-	page_header($user->lang['Search_index']);
+	adm_page_header($user->lang['Search_index']);
 
 ?>
 
@@ -320,7 +320,7 @@ else
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 

phpBB/adm/admin_styles.php

@@ -71,7 +71,7 @@ switch ($mode)
 		closedir($dp);
 
 		// Output page
-		page_header($user->lang['Edit_Imageset']);
+		adm_page_header($user->lang['Edit_Imageset']);
 
 ?>
 
@@ -129,7 +129,7 @@ switch ($mode)
 
 	}
 
-		page_footer();
+		adm_page_footer();
 
 		break;
 
@@ -214,7 +214,7 @@ switch ($mode)
 		closedir($dp);
 
 		//
-		page_header($user->lang['Edit_template']);
+		adm_page_header($user->lang['Edit_template']);
 
 ?>
 
@@ -246,7 +246,7 @@ switch ($mode)
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'edittheme':
@@ -278,7 +278,7 @@ switch ($mode)
 			}
 		}
 
-		page_header($user->lang['Edit_theme']);
+		adm_page_header($user->lang['Edit_theme']);
 
 		$sql = "SELECT theme_id, theme_name
 			FROM " . STYLES_CSS_TABLE;
@@ -338,7 +338,7 @@ switch ($mode)
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 		break;
 }

phpBB/adm/admin_users.php

@@ -108,7 +108,7 @@ if (isset($_POST['username']) || isset($_REQUEST['u']))
 
 
 	// Output relevant page
-	page_header($user->lang['MANAGE']);
+	adm_page_header($user->lang['MANAGE']);
 
 ?>
 
@@ -280,7 +280,7 @@ if (isset($_POST['username']) || isset($_REQUEST['u']))
 
 	}
 
-	page_footer();
+	adm_page_footer();
 
 }
 
@@ -290,7 +290,7 @@ if (!$auth->acl_get('a_user'))
 	trigger_error($user->lang['No_admin']);
 }
 
-page_header($user->lang['Manage']);
+adm_page_header($user->lang['Manage']);
 
 ?>
 
@@ -310,7 +310,7 @@ page_header($user->lang['Manage']);
 <?php
 
 
-page_footer();
+adm_page_footer();
 
 // ---------
 // FUNCTIONS

phpBB/adm/admin_viewlogs.php

@@ -99,7 +99,7 @@ $sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'
 
 
 // Output page
-page_header($l_title);
+adm_page_header($l_title);
 
 ?>
 
@@ -221,6 +221,6 @@ function marklist(status)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>

phpBB/adm/admin_words.php

@@ -91,7 +91,7 @@ if ($mode != '')
 				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '" />';
 			}
 
-			page_header($user->lang['WORDS_TITLE']);
+			adm_page_header($user->lang['WORDS_TITLE']);
 
 ?>
 
@@ -118,7 +118,7 @@ if ($mode != '')
 
 <?php
 
-			page_footer();
+			adm_page_footer();
 			break;
 
 		case 'save':
@@ -172,7 +172,7 @@ if ($mode != '')
 else
 {
 
-	page_header($user->lang['WORDS_TITLE']);
+	adm_page_header($user->lang['WORDS_TITLE']);
 
 ?>
 
@@ -222,7 +222,7 @@ else
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 

phpBB/adm/index.php

@@ -38,7 +38,7 @@ if (!$auth->acl_get('a_'))
 // Generate relevant output
 if (isset($_GET['pane']) && $_GET['pane'] == 'top')
 {
-	page_header('', '', false);
+	adm_page_header('', '', false);
 
 ?>
 
@@ -51,13 +51,13 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'top')
 
 <?php
 
-	page_footer(false);
+	adm_page_footer(false);
 
 }
 else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 {
 	// Cheat and use the meta tag to change some stylesheet info
-	page_header('', '<style type="text/css">body {background-color: #98AAB1}</style>', false);
+	adm_page_header('', '<style type="text/css">body {background-color: #98AAB1}</style>', false);
 
 	// Grab module information using Bart's "neat-o-module" system (tm)
 	$dir = @opendir('.');
@@ -134,7 +134,7 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 <?php
 
 	// Output footer but don't include copyright info
-	page_footer(false);
+	adm_page_footer(false);
 
 }
 elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
@@ -419,7 +419,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 		$dbsize = ($dbsize >= 1048576) ? sprintf('%.2f MB', ($dbsize / 1048576)) : (($dbsize >= 1024) ? sprintf('%.2f KB', ($dbsize / 1024)) : sprintf('%.2f Bytes', $dbsize));
 	}
 
-	page_header($user->lang['ADMIN_INDEX']);
+	adm_page_header($user->lang['ADMIN_INDEX']);
 
 ?>
 
@@ -595,7 +595,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 
 	}
 
-	page_footer();
+	adm_page_footer();
 
 }
 else

phpBB/adm/pagestart.php

@@ -44,7 +44,7 @@ $auth->acl($user->data);
 
 // -----------------------------
 // Functions
-function page_header($sub_title, $meta = '', $table_html = true)
+function adm_page_header($sub_title, $meta = '', $table_html = true)
 {
 	global $config, $db, $user, $phpEx;
 
@@ -107,7 +107,7 @@ td.cat	{ background-image: url('images/cellpic1.gif') }
 
 }
 
-function page_footer($copyright_html = true)
+function adm_page_footer($copyright_html = true)
 {
 	global $cache, $config, $db, $phpEx;
 
@@ -144,7 +144,7 @@ function page_footer($copyright_html = true)
 	exit;
 }
 
-function page_message($title, $message, $show_header = false)
+function adm_page_message($title, $message, $show_header = false)
 {
 	global $phpEx, $SID, $user;
 

phpBB/download.php

@@ -275,11 +275,19 @@ $sql = 'SELECT *
 	WHERE attach_id = ' . intval($download_id);
 $result = $db->sql_query($sql);
 
-if (!$attachment = $db->sql_fetchrow($result))
+if (!($attachment = $db->sql_fetchrow($result)))
 {
 	trigger_error('ERROR_NO_ATTACHMENT');
 }
 
+/*
+if ($row['forum_password'])
+{
+	// Do something else ... ?
+	login_forum_box($row);
+}
+*/
+
 // get forum_id for attachment authorization or private message authorization
 $authorised = FALSE;
 
@@ -290,7 +298,7 @@ $sql = "SELECT a.*, p.forum_id
 		AND (a.post_id = p.post_id OR a.post_id = 0)";
 $result = $db->sql_query($sql);
 
-$auth_pages = $db->sql_fetchrowset($result);
+$auth_pages = $db->sql_fetchrowset($result); // loop through rather than rowset if poss
 
 for ($i = 0; $i < count($auth_pages) && $authorised == FALSE; $i++)
 {

phpBB/faq.php

@@ -121,14 +121,13 @@ for($i = 0; $i < count($faq_block); $i++)
 	}
 }
 
-$page_title = $l_title;
+page_header($l_title);
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 $template->set_filenames(array(
 	'body' => 'faq_body.html')
 );
 make_jumpbox('viewforum.'.$phpEx, $forum_id);
 
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+page_footer();
 
 ?>

phpBB/includes/functions.php

@@ -55,7 +55,7 @@ function get_userdata($user)
 	$sql = "SELECT *
 		FROM " . USERS_TABLE . "
 		WHERE ";
-	$sql .= ((is_int($user)) ? "user_id = $user" : "username = '" .  $db->sql_escape($user) . "'") . " AND user_id <> " . ANONYMOUS;
+	$sql .= ((is_integer($user)) ? "user_id = $user" : "username = '" .  $db->sql_escape($user) . "'") . " AND user_id <> " . ANONYMOUS;
 	$result = $db->sql_query($sql);
 
 	return ($row = $db->sql_fetchrow($result)) ? $row : false;
@@ -149,8 +149,8 @@ function get_forum_parents($forum_data)
 				WHERE left_id < ' . $forum_data['left_id'] . '
 					AND right_id > ' . $forum_data['right_id'] . '
 				ORDER BY left_id ASC';
-
 			$result = $db->sql_query($sql);
+
 			while ($row = $db->sql_fetchrow($result))
 			{
 				$forum_parents[$row['forum_id']] = $row['forum_name'];
@@ -338,8 +338,23 @@ function make_jumpbox($action, $forum_id = false, $select_all = false)
 // Pick a language, any language ...
 function language_select($default = '')
 {
-	global $phpbb_root_path, $phpEx;
+	global $db, $phpbb_root_path, $phpEx;
+/*
+	$sql = "SELECT lang_iso, lang_local_name 
+		FROM " . LANG_TABLE . "
+		ORDER BY lang_english_name";
+	$result = $db->sql_query($sql);
 
+	$lang_options = '';
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$selected = ($row['lang_iso'] == $default) ? ' selected="selected"' : '';
+		$lang_options .= '<option value="' . $row['lang_iso'] . '"' . $selected . '>' . $row['lang_local_name'] . '</option>';
+	}
+	$db->sql_freeresult($result);
+
+	return $lang_options;
+*/
 	$dir = @opendir($phpbb_root_path . 'language');
 
 	$user = array();
@@ -382,14 +397,15 @@ function style_select($default = '')
 		ORDER BY style_name, style_id";
 	$result = $db->sql_query($sql);
 
+	$style_options = '';
 	while ($row = $db->sql_fetchrow($result))
 	{
 		$selected = ($row['style_id'] == $default) ? ' selected="selected"' : '';
-
+		$style_options .= '<option value="' . $row['style_id'] . '"' . $selected . '>' . $row['style_name'] . '</option>';
-		$style_select .= '<option value="' . $row['style_id'] . '"' . $selected . '>' . $row['style_name'] . '</option>';
 	}
+	$db->sql_freeresult($result);
 
-	return $style_select;
+	return $style_options;
 }
 
 // Pick a timezone
@@ -450,6 +466,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat
 				}
 
 				meta_refresh(3, "view$mode.$phpEx$SID&amp;$u_url=$match_id&amp;start=$start");
+
 				$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . "view$mode.$phpEx$SID&amp;" . $u_url . "=$match_id&amp;start=$start" . '">', '</a>');
 				trigger_error($message);
 			}
@@ -481,6 +498,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat
 				}
 
 				meta_refresh(3, "view$mode.$phpEx$SID&amp;$u_url=$match_id&amp;start=$start");
+
 				$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . "view$mode.$phpEx$SID&amp;" . $u_url . "=$match_id&amp;start=$start" . '">', '</a>');
 				trigger_error($message);
 			}
@@ -895,7 +913,7 @@ function meta_refresh($time, $url)
 // Generate login box or verify password
 function login_box($s_action, $s_hidden_fields = '', $login_explain = '')
 {
-	global $SID, $db, $user, $template, $auth, $phpbb_root_path, $phpEx;
+	global $SID, $db, $user, $template, $auth, $phpEx;
 
 	$err = '';
 	if (isset($_POST['login']))
@@ -930,17 +948,63 @@ function login_box($s_action, $s_hidden_fields = '', $login_explain = '')
 		'S_HIDDEN_FIELDS' 	=> $s_hidden_fields)
 	);
 
-	$page_title = $user->lang['LOGIN'];
+	page_header($user->lang['LOGIN']);
-	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 	$template->set_filenames(array(
 		'body' => 'login_body.html')
 	);
 	make_jumpbox('viewforum.'.$phpEx);
 
-	include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+	page_footer();
 }
 
+// TODO
+// If forum has parents, check to see if password has been entered
+// for those (if it/they are the same as this forums).? If they are 
+// different then we ignore them as if they were blank
+function login_forum_box(&$forum_data)
+{
+	global $db, $config, $user, $template, $phpEx;
+
+	if ($user->data['user_id'] == ANONYMOUS)
+	{
+		login_box(preg_replace('#.*?([a-z]+?\.' . $phpEx . '.*?)$#i', '\1', htmlspecialchars($_SERVER['REQUEST_URI'])), '', $user->lang['LOGIN_VIEWFORUM']);
+	}
+
+	$sql = 'SELECT * 
+		FROM phpbb_forum_access 
+		WHERE forum_id = ' . $forum_data['forum_id'] . '
+			AND user_id = ' . $user->data['user_id'] . "
+			AND session_id = '$user->session_id'";
+	$result = $db->sql_query($sql);
+
+	if ($row = $db->sql_fetchrow($result))
+	{
+		$db->sql_freeresult($result);
+		return true;
+	}
+	$db->sql_freeresult($result);
+
+	if (!empty($_POST['password']))
+	{
+		if ($_POST['password'] == $forum_data['forum_password'])
+		{
+			$sql = 'INSERT INTO phpbb_forum_access (forum_id, user_id, session_id)
+				VALUES (' . $forum_data['forum_id'] . ', ' . $user->data['user_id'] . ", '$user->session_id')";
+			$db->sql_query($sql);
+
+			return true;
+		}
+
+		$template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']);
+	}
+
+	page_header();
+	$template->set_filenames(array(
+		'body' => 'login_forum.html')
+	);
+	page_footer();
+}
 
 // Error and message handler, call with trigger_error if reqd
 function msg_handler($errno, $msg_text, $errfile, $errline)
@@ -969,6 +1033,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			{
 				$db->sql_close();
 			}
+
 			if (isset($cache))
 			{
 				$cache->unload();
@@ -988,15 +1053,6 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			break;
 
 		case E_USER_NOTICE:
-			// 20021125 Bartvb (todo)
-			// This is a hack just to show something useful.
-			// $msg_text won't contain anything if $user isn't there yet.
-			// I ran into this problem when installing without makeing config_cache.php writable
-			if (!isset($user))
-			{
-				die("Unable to show notice, \$user class hasn't been instantiated yet.<br />Error triggered in: " . $errfile .":". $errline);
-			}
-			
 			if (empty($user->data))
 			{
 				$user->start();
@@ -1006,24 +1062,24 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				$user->setup();
 			}
 
-			$msg_text = (!empty($user->lang[$msg_text])) ? $user->lang[$msg_text] : $msg_text;
-
 			if (!defined('HEADER_INC'))
 			{
 				if (defined('IN_ADMIN'))
 				{
-					page_header('', '', false);
+					adm_page_header('', '', false);
 				}
 				else
 				{
-					include($phpbb_root_path . 'includes/page_header.' . $phpEx);
+					page_header();
 				}
 			}
 
+			$msg_text = (!empty($user->lang[$msg_text])) ? $user->lang[$msg_text] : $msg_text;
+
 			if (defined('IN_ADMIN'))
 			{
-				page_message($msg_title, $msg_text, $display_header);
+				adm_page_message($msg_title, $msg_text, $display_header);
-				page_footer();
+				adm_page_footer();
 			}
 			else
 			{
@@ -1036,17 +1092,17 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 					'MESSAGE_TEXT'	=> $msg_text)
 				);
 
-				include($phpbb_root_path . 'includes/page_tail.' . $phpEx);
+				page_footer();
 			}
 			exit;
 			break;
 	}
 }
-/*
+
 //
 function page_header($page_title = '')
 {
-	global $db, $config, $template, $user, $auth, $cache;
+	global $db, $config, $template, $SID, $user, $auth, $phpEx;
 
 	define('HEADER_INC', TRUE);
 
@@ -1062,12 +1118,12 @@ function page_header($page_title = '')
 	// Generate logged in/logged out status
 	if ($user->data['user_id'] != ANONYMOUS)
 	{
-		$u_login_logout = 'ucp.'.$phpEx. $SID . '&amp;mode=logout';
+		$u_login_logout = "ucp.$phpEx$SID&amp;mode=logout";
 		$l_login_logout = sprintf($user->lang['LOGOUT_USER'], $user->data['username']);
 	}
 	else
 	{
-		$u_login_logout = 'ucp.'.$phpEx . $SID . '&amp;mode=login';
+		$u_login_logout = "ucp.$phpEx$SID&amp;mode=login";
 		$l_login_logout = $user->lang['LOGIN'];
 	}
 
@@ -1088,9 +1144,9 @@ function page_header($page_title = '')
 			$reading_sql = "AND s.session_page LIKE '%f=" . intval($_REQUEST['f']) . "%'";
 		}
 
-		$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_colour, s.session_ip, s.session_allow_viewonline
+		$sql = 'SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_colour, s.session_ip, s.session_allow_viewonline
-			FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s
+			FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . ' s
-			WHERE s.session_time >= " . (time() - (intval($config['load_online_time']) * 60)) . "
+			WHERE s.session_time >= ' . (time() - (intval($config['load_online_time']) * 60)) . "
 				$reading_sql
 				AND u.user_id = s.session_user_id
 			ORDER BY u.username ASC, s.session_ip ASC";
@@ -1122,7 +1178,7 @@ function page_header($page_title = '')
 
 					if ($row['user_allow_viewonline'] || $auth->acl_get('u_viewonline'))
 					{
-						$user_online_link = '<a href="' . "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '">' . $user_online_link . '</a>';
+						$user_online_link = "<a href=\"memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '">' . $user_online_link . '</a>';
 						$online_userlist .= ($online_userlist != '') ? ', ' . $user_online_link : $user_online_link;
 					}
 				}
@@ -1148,11 +1204,11 @@ function page_header($page_title = '')
 
 		if (empty($_REQUEST['f']))
 		{
-			$online_userlist = $user->lang['Registered_users'] . ' ' . $online_userlist;
+			$online_userlist = $user->lang['REGISTERED_USERS'] . ' ' . $online_userlist;
 		}
 		else
 		{
-			$l_online = ($guests_online == 1) ? $user->lang['Browsing_forum_guest'] : $user->lang['Browsing_forum_guests'];
+			$l_online = ($guests_online == 1) ? $user->lang['BROWSING_FORUM_GUEST'] : $user->lang['BROWSING_FORUM_GUESTS'];
 			$online_userlist = sprintf($l_online, $online_userlist, $guests_online);
 		}
 
@@ -1210,9 +1266,9 @@ function page_header($page_title = '')
 
 			if ($user->data['user_last_privmsg'] > $user->data['session_last_visit'])
 			{
-				$sql = "UPDATE " . USERS_TABLE . "
+				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_last_privmsg = " . $user->data['session_last_visit'] . "
+					SET user_last_privmsg = ' . $user->data['session_last_visit'] . '
-					WHERE user_id = " . $user->data['user_id'];
+					WHERE user_id = ' . $user->data['user_id'];
 				$db->sql_query($sql);
 
 				$s_privmsg_new = 1;
@@ -1241,7 +1297,7 @@ function page_header($page_title = '')
 
 	// Generate HTML required for Mozilla Navigation bar
 	$nav_links_html = '';
-	*
+	/*
 	$nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
 	foreach ($nav_links as $nav_item => $nav_array)
 	{
@@ -1258,7 +1314,7 @@ function page_header($page_title = '')
 			}
 		}
 	}
-	*
+	*/
 
 	// Which timezone?
 	$tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone']));
@@ -1317,7 +1373,7 @@ function page_header($page_title = '')
 		'NAV_LINKS' => $nav_links_html)
 	);
 
-	if ($config['send_encoding'])
+	if (!empty($config['send_encoding']))
 	{
 		header ('Content-type: text/html; charset: ' . $user->lang['ENCODING']);
 	}
@@ -1331,7 +1387,7 @@ function page_header($page_title = '')
 //
 function page_footer()
 {
-	global $db, $config, $template, $user, $auth, $cache, $starttime;
+	global $db, $config, $template, $SID, $user, $auth, $cache, $starttime, $phpEx;
 
 	// Close our DB connection.
 	$db->sql_close();
@@ -1375,6 +1431,5 @@ function page_footer()
 
 	exit;
 }
-*/
 
 ?>

phpBB/includes/functions_display.php

@@ -108,20 +108,8 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 				$branch_root_id = $forum_id;
 			}
 
-			// Show most recent last post info on parent if we're a subforum
-			if (isset($forum_rows[$parent_id]) && $row['forum_last_post_time'] > $forum_rows[$parent_id]['forum_last_post_time'])
-			{
-				$forum_rows[$parent_id]['forum_last_post_id'] = $row['forum_last_post_id'];
-				$forum_rows[$parent_id]['forum_last_post_time'] = $row['forum_last_post_time'];
-				$forum_rows[$parent_id]['forum_last_poster_id'] = $row['forum_last_poster_id'];
-				$forum_rows[$parent_id]['forum_last_poster_name'] = $row['forum_last_poster_name'];
 			$forum_rows[$parent_id]['forum_id_last_post'] = $row['forum_id'];
 		}
-			else
-			{
-				$forum_rows[$forum_id]['forum_id_last_post'] = $row['forum_id'];
-			}
-		}
 		elseif ($row['forum_type'] != FORUM_CAT)
 		{
 			$subforums[$parent_id]['display'] = ($row['display_on_index']) ? true : false;;
@@ -131,7 +119,6 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 			$forum_rows[$parent_id]['forum_topics'] += $row['forum_topics'];
 			$forum_rows[$parent_id]['forum_posts'] += $row['forum_posts'];
 
-			// Show most recent last post info on parent if we're a subforum
 			if (isset($forum_rows[$parent_id]) && $row['forum_last_post_time'] > $forum_rows[$parent_id]['forum_last_post_time'])
 			{
 				$forum_rows[$parent_id]['forum_last_post_id'] = $row['forum_last_post_id'];
@@ -142,7 +129,7 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 			}
 			else
 			{
-				$forum_rows[$forum_id]['forum_id_last_post'] = $row['forum_id'];
+				$forum_rows[$parent_id]['forum_id_last_post'] = $row['forum_id'];
 			}
 		}
 

phpBB/index.php

@@ -57,15 +57,15 @@ $newest_uid = $config['newest_user_id'];
 
 if ($total_users == 0)
 {
-	$l_total_user_s = $user->lang['Registered_users_zero_total'];
+	$l_total_user_s = $user->lang['REGISTERED_USERS_ZERO_TOTAL'];
 }
 else if ($total_users == 1)
 {
-	$l_total_user_s = $user->lang['Registered_user_total'];
+	$l_total_user_s = $user->lang['REGISTERED_USER_TOTAL'];
 }
 else
 {
-	$l_total_user_s = $user->lang['Registered_users_total'];
+	$l_total_user_s = $user->lang['REGISTERED_USERS_TOTAL'];
 }
 
 include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
@@ -73,28 +73,28 @@ display_forums();
 
 if ($total_posts == 0)
 {
-	$l_total_post_s = $user->lang['Posted_articles_zero_total'];
+	$l_total_post_s = $user->lang['POSTED_ARTICLES_ZERO_TOTAL'];
 }
 else if ($total_posts == 1)
 {
-	$l_total_post_s = $user->lang['Posted_article_total'];
+	$l_total_post_s = $user->lang['POSTED_ARTICLE_TOTAL'];
 }
 else
 {
-	$l_total_post_s = $user->lang['Posted_articles_total'];
+	$l_total_post_s = $user->lang['POSTED_ARTICLES_TOTAL'];
 }
 
 if ($total_topics == 0)
 {
-	$l_total_topic_s = $user->lang['Posted_topics_zero_total'];
+	$l_total_topic_s = $user->lang['POSTED_TOPICS_ZERO_TOTAL'];
 }
 else if ($total_topics == 1)
 {
-	$l_total_topic_s = $user->lang['Posted_topic_total'];
+	$l_total_topic_s = $user->lang['POSTED_TOPIC_TOTAL'];
 }
 else
 {
-	$l_total_topic_s = $user->lang['Posted_topics_total'];
+	$l_total_topic_s = $user->lang['POSTED_TOPICS_TOTAL'];
 }
 
 
@@ -115,7 +115,7 @@ while ($row = $db->sql_fetchrow($result))
 $template->assign_vars(array(
 	'TOTAL_POSTS'	=> sprintf($l_total_post_s, $total_posts),
 	'TOTAL_USERS'	=> sprintf($l_total_user_s, $total_users),
-	'NEWEST_USER'	=> sprintf($user->lang['Newest_user'], "<a href=\"memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=$newest_uid \">", $newest_user, '</a>'), 
+	'NEWEST_USER'	=> sprintf($user->lang['NEWEST_USER'], "<a href=\"memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=$newest_uid \">", $newest_user, '</a>'), 
 	'LEGEND'		=> $legend, 
 
 	'FORUM_IMG'			=>	$user->img('forum', 'NO_NEW_POSTS'),
@@ -128,17 +128,12 @@ $template->assign_vars(array(
 );
 
 // Output page
-$page_title = $user->lang['Index'];
+page_header($user->lang['INDEX']);
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
-//page_header($user->lang['INDEX']);
 
 $template->set_filenames(array(
 	'body' => 'index_body.html')
 );
 
-//page_footer();
+page_footer();
-
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
 ?>

phpBB/install/schemas/mysql_schema.sql

@@ -211,6 +211,7 @@ CREATE TABLE phpbb_forums (
    forum_password varchar(32) DEFAULT '' NOT NULL, 
    forum_style tinyint(4) UNSIGNED,
    forum_image varchar(50) DEFAULT '' NOT NULL,
+   forum_topics_per_page tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
    forum_type tinyint(4) DEFAULT '0' NOT NULL,
    forum_status tinyint(4) DEFAULT '0' NOT NULL,
    forum_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -232,6 +233,18 @@ CREATE TABLE phpbb_forums (
 );
 
 
+# --------------------------------------------------------
+#
+# Table structure for table `phpbb_forum_access`
+#
+CREATE TABLE phpbb_forum_access (
+  forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+  user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+  session_id char(32) DEFAULT '' NOT NULL,
+  PRIMARY KEY  (forum_id,user_id,session_id)
+) 
+
+
 # --------------------------------------------------------
 #
 # Table structure for table 'phpbb_forums_marking'

phpBB/language/en/lang_main.php

@@ -102,12 +102,126 @@ $lang = array(
 	'RANK'	=> 'Rank',
 	'FORUM_INDEX' => 'Board Index', 
 
+	'ALL_TIMES' => 'All times are %s %s',
+	'-13'	=> 'GMT - 13 Hours',
+	'-12'	=> 'GMT - 12 Hours',
+	'-11'	=> 'GMT - 11 Hours',
+	'-10'	=> 'GMT - 10 Hours',
+	'-9'	=> 'GMT - 9 Hours',
+	'-8'	=> 'GMT - 8 Hours',
+	'-7'	=> 'GMT - 7 Hours',
+	'-6'	=> 'GMT - 6 Hours',
+	'-5'	=> 'GMT - 5 Hours',
+	'-4'	=> 'GMT - 4 Hours',
+	'-3.5'	=> 'GMT - 3.5 Hours',
+	'-3'	=> 'GMT - 3 Hours',
+	'-2.5'	=> 'GMT - 2.5 Hours',
+	'-2'	=> 'GMT - 2 Hours',
+	'-1'	=> 'GMT - 1 Hours',
+	'0'		=> 'GMT',
+	'1'		=> 'GMT + 1 Hour',
+	'2'		=> 'GMT + 2 Hours',
+	'3'		=> 'GMT + 3 Hours',
+	'3.5'	=> 'GMT + 3.5 Hours',
+	'4'		=> 'GMT + 4 Hours',
+	'4.5'	=> 'GMT + 4.5 Hours',
+	'5'		=> 'GMT + 5 Hours',
+	'5.5'	=> 'GMT + 5.5 Hours',
+	'6'		=> 'GMT + 6 Hours',
+	'6.5'	=> 'GMT + 6.5 Hours',
+	'7'		=> 'GMT + 7 Hours',
+	'8'		=> 'GMT + 8 Hours',
+	'9'		=> 'GMT + 9 Hours',
+	'9.5'	=> 'GMT + 9.5 Hours',
+	'10'	=> 'GMT + 10 Hours',
+	'10.5'	=> 'GMT + 10.5 Hours',
+	'11'	=> 'GMT + 11 Hours',
+	'12'	=> 'GMT + 12 Hours',
+	'13'	=> 'GMT + 13 Hours',
+	'tz'	=> array(
+		'-13'	=> 'GMT - 13 Hours',
+		'-12'	=> 'GMT - 12 Hours',
+		'-11'	=> 'GMT - 11 Hours',
+		'-10'	=> 'GMT - 10 Hours',
+		'-9'	=> 'GMT - 9 Hours',
+		'-8'	=> 'GMT - 8 Hours',
+		'-7'	=> 'GMT - 7 Hours',
+		'-6'	=> 'GMT - 6 Hours',
+		'-5'	=> 'GMT - 5 Hours',
+		'-4'	=> 'GMT - 4 Hours',
+		'-3.5'	=> 'GMT - 3.5 Hours',
+		'-3'	=> 'GMT - 3 Hours',
+		'-2.5'	=> 'GMT - 2.5 Hours',
+		'-2'	=> 'GMT - 2 Hours',
+		'-1'	=> 'GMT - 1 Hours',
+		'0'		=> 'GMT',
+		'1'		=> 'GMT + 1 Hour',
+		'2'		=> 'GMT + 2 Hours',
+		'3'		=> 'GMT + 3 Hours',
+		'3.5'	=> 'GMT + 3.5 Hours',
+		'4'		=> 'GMT + 4 Hours',
+		'4.5'	=> 'GMT + 4.5 Hours',
+		'5'		=> 'GMT + 5 Hours',
+		'5.5'	=> 'GMT + 5.5 Hours',
+		'6'		=> 'GMT + 6 Hours',
+		'6.5'	=> 'GMT + 6.5 Hours',
+		'7'		=> 'GMT + 7 Hours',
+		'8'		=> 'GMT + 8 Hours',
+		'9'		=> 'GMT + 9 Hours',
+		'9.5'	=> 'GMT + 9.5 Hours',
+		'10'	=> 'GMT + 10 Hours',
+		'10.5'	=> 'GMT + 10.5 Hours',
+		'11'	=> 'GMT + 11 Hours',
+		'12'	=> 'GMT + 12 Hours',
+		'13'	=> 'GMT + 13 Hours',
+		'dst'	=> '[ DST ]'
+	),
+	'AM' => 'AM',
+	'PM' => 'PM', 
+	'datetime' => array(
+		'Sunday'	=> 'Sunday',
+		'Monday'	=> 'Monday',
+		'Tuesday'	=> 'Tuesday',
+		'Wednesday' => 'Wednesday',
+		'Thursday'	=> 'Thursday',
+		'Friday'	=> 'Friday',
+		'Saturday'	=> 'Saturday',
+		'Sun' => 'Sun',
+		'Mon' => 'Mon',
+		'Tue' => 'Tue',
+		'Wed' => 'Wed',
+		'Thu' => 'Thu',
+		'Fri' => 'Fri',
+		'Sat' => 'Sat',
+		'January'	=> 'January',
+		'February'	=> 'February',
+		'March'		=> 'March',
+		'April'		=> 'April',
+		'May'		=> 'May',
+		'June'		=> 'June',
+		'July'		=> 'July',
+		'August'	=> 'August',
+		'September' => 'September',
+		'October'	=> 'October',
+		'November'	=> 'November',
+		'December'	=> 'December',
+		'Jan' => 'Jan',
+		'Feb' => 'Feb',
+		'Mar' => 'Mar',
+		'Apr' => 'Apr',
+		'Jun' => 'Jun',
+		'Jul' => 'Jul',
+		'Aug' => 'Aug',
+		'Sep' => 'Sep',
+		'Oct' => 'Oct',
+		'Nov' => 'Nov',
+		'Dec' => 'Dec',
+	),
 
 	'POST_NEW_TOPIC'	=> 'Post new topic',
 	'REPLY_TO_TOPIC'	=> 'Reply to topic',
 	'REPLY_WITH_QUOTE'	=> 'Reply with quote',
 
-
 	'RETURN_INDEX'	=> 'Click %sHere%s to return to the index',
 	'RETURN_TOPIC'	=> 'Click %sHere%s to return to the topic',
 	'RETURN_FORUM'	=> 'Click %sHere%s to return to the forum',
@@ -118,15 +232,12 @@ $lang = array(
 	'URL_REDIRECT'	=> 'If your browser does not support meta redirection please click %sHERE%s to be redirected.', 
 
 	'INFORMATION'		=> 'Information',
-
 	'BOARD_DISABLE'		=> 'Sorry but this board is currently unavailable',
 	'BOARD_UNAVAILABLE' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes',
 	'BOARD_BAN_TIME'	=> 'You have been banned from this board until <b>%1$s</b>.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
 	'BOARD_BAN_PERM'	=> 'You have been <b>permanently</b> banned from this board.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.', 
 	'BOARD_BAN_REASON'	=> 'Reason given for ban: <b>%s</b>', 
-
+	'EMAIL_DISABLED'	=> 'Sorry but all email related functions have been disabled.', 
-	'EMAIL_DISABLED'	=> 'Sorry but all emailing functions have been disabled.', 
-
 
 	'G_ADMINISTRATORS' 	=> 'ADMINISTRATORS',
 	'G_SUPER_MODERATORS'=> 'SUPER MODERATORS',
@@ -135,12 +246,17 @@ $lang = array(
 	'G_INACTIVE' 		=> 'INACTIVE USERS',
 	'G_GUESTS' 			=> 'GUESTS',
 
+	'NO_NEW_POSTS'		=> 'No new posts',
+	'NEW_POSTS'			=> 'New posts',
+	'NEW_POST'			=> 'New post',
+	'NO_NEW_POSTS_HOT'	=> 'No new posts [ Popular ]',
+	'NEW_POSTS_HOT'		=> 'New posts [ Popular ]',
+	'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]',
+	'NEW_POSTS_LOCKED'	=> 'New posts [ Locked ]',
+	'FORUM_LOCKED'		=> 'Forum Locked', 
 
 	'YOU_LAST_VISIT'	=> 'You last visited on %s',
 	'CURRENT_TIME'		=> 'The time now is %s',
-	'SEARCH_NEW'		=> 'View posts since last visit',
-	'SEARCH_SELF'		=> 'View your posts',
-	'SEARCH_UNANSWERED' => 'View unanswered posts',
 
 	'LOGIN'			=> 'Login', 
 	'LOGOUT_USER'	=> 'Logout [ %s ]', 
@@ -166,11 +282,29 @@ $lang = array(
 	'You_no_new_pm' => 'No new private messages are waiting for you',
 
 	'LEGEND'				=> 'Legend', 
-	'RECORD_ONLINE_USERS'	=> 'Most users ever online was <b>%1$s</b> on %2$s',
+	'REGISTERED_USERS'		=> 'Registered Users:',
-	'Registered_users'		=> 'Registered Users:',
+	'BROWSING_FORUM_GUEST'	=> 'Users browsing this forum: %1$s and %2$d guest',
-	'Browsing_forum_guest'	=> 'Users browsing this forum: %1$s and %2$d guest',
+	'BROWSING_FORUM_GUESTS'	=> 'Users browsing this forum: %1$s and %2$d guests',
-	'Browsing_forum_guests'	=> 'Users browsing this forum: %1$s and %2$d guests',
 
+	'GUEST' => 'Guest',
+	'ACP' => '[ %sAdministration Control Panel%s ]',
+	'MCP' => '[ %sModerator Control Panel%s ]',
+
+	'LOGIN_FORUM'	=> 'To view or post in this forum you must enter a password.', 
+	'WRONG_PASSWORD'=> 'You entered an incorrect password.', 
+
+	'INDEX'			=> 'Index page', 
+	'REDIRECTS'		=> 'Total redirects', 
+	'WHO_IS_ONLINE'	=> 'Who is Online',
+
+	'SEARCH_NEW'		=> 'View posts since last visit',
+	'SEARCH_SELF'		=> 'View your posts',
+	'SEARCH_UNANSWERED' => 'View unanswered posts',
+
+	'MARK_FORUMS_READ'	=> 'Mark all forums read',
+	'FORUMS_MARKED'		=> 'All forums have been marked read',
+
+	'RECORD_ONLINE_USERS'		=> 'Most users ever online was <b>%1$s</b> on %2$s',
 	'ONLINE_USERS_ZERO_TOTAL'	=> 'In total there are <b>0</b> users online :: ',
 	'ONLINE_USERS_TOTAL'		=> 'In total there are <b>%d</b> users online :: ',
 	'ONLINE_USER_TOTAL'			=> 'In total there is <b>%d</b> user online :: ',
@@ -184,26 +318,17 @@ $lang = array(
 	'GUEST_USERS_TOTAL'			=> '%d Guests',
 	'GUEST_USER_TOTAL'			=> '%d Guest',
 
-	'Posted_articles_zero_total'=> 'Our users have posted a total of <b>0</b> article',
+	'POSTED_ARTICLES_ZERO_TOTAL'=> 'Our users have posted a total of <b>0</b> article',
-	'Posted_articles_total'		=> 'Our users have posted a total of <b>%d</b> articles',
+	'POSTED_ARTICLES_TOTAL'		=> 'Our users have posted a total of <b>%d</b> articles',
-	'Posted_article_total'		=> 'Our users have posted a total of <b>%d</b> article',
+	'POSTED_ARTICLE_TOTAL'		=> 'Our users have posted a total of <b>%d</b> article',
-	'Posted_topics_zero_total'	=> 'Our users have posted a total of <b>0</b> topic',
+	'POSTED_TOPICS_ZERO_TOTAL'	=> 'Our users have posted a total of <b>0</b> topic',
-	'Posted_topics_total'		=> 'Our users have posted a total of <b>%d</b> topics',
+	'POSTED_TOPICS_TOTAL'		=> 'Our users have posted a total of <b>%d</b> topics',
-	'Posted_topic_total'		=> 'Our users have posted a total of <b>%d</b> topic',
+	'POSTED_TOPIC_TOTAL'		=> 'Our users have posted a total of <b>%d</b> topic',
+	'NEWEST_USER'				=> 'The newest registered user is <b>%s%s%s</b>',
+	'REGISTERED_USERS_ZERO_TOTAL'	=> 'We have <b>0</b> registered users',
+	'REGISTERED_USERS_TOTAL'		=> 'We have <b>%d</b> registered users',
+	'REGISTERED_USER_TOTAL'			=> 'We have <b>%d</b> registered user',
 
-	'Registered_users_zero_total'	=> 'We have <b>0</b> registered users',
-	'Registered_users_total'		=> 'We have <b>%d</b> registered users',
-	'Registered_user_total'			=> 'We have <b>%d</b> registered user',
-	'Newest_user'	=> 'The newest registered user is <b>%s%s%s</b>',
-
-	'NO_NEW_POSTS'		=> 'No new posts',
-	'NEW_POSTS'			=> 'New posts',
-	'NEW_POST'			=> 'New post',
-	'NO_NEW_POSTS_HOT'	=> 'No new posts [ Popular ]',
-	'NEW_POSTS_HOT'		=> 'New posts [ Popular ]',
-	'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]',
-	'NEW_POSTS_LOCKED'	=> 'New posts [ Locked ]',
-	'FORUM_LOCKED'		=> 'Forum Locked', 
 
 	'POST_STICKY' 		=> 'Sticky',
 	'POST_ANNOUNCEMENT' => 'Announcement',
@@ -216,7 +341,6 @@ $lang = array(
 	'LIST_USERS'=> '%d Users',
 
 
-	'REDIRECTS'		=> 'Total redirects', 
 	'LOGIN'			=> 'Login',
 	'TERMS_USE'		=> 'Terms of Use', 
 	'PRIVACY'		=> 'Privacy Policy', 
@@ -231,18 +355,16 @@ $lang = array(
 	'Private_Messages' => 'Private Messages',
 	'View_forum' => 'View Forum',
 
-	'WHO_IS_ONLINE'		=> 'Who is Online',
+
 	'DISPLAY_TOPICS'	=> 'Display topics from previous',
 	'ALL_TOPICS'		=> 'All Topics',
 
-	'VIEW_TOPIC_ANNOUNCEMENT'=> 'Announcement:',
-	'VIEW_TOPIC_STICKY'		=> 'Sticky:',
-	'VIEW_TOPIC_MOVED'		=> 'Moved:',
-	'VIEW_TOPIC_POLL'		=> 'Poll:',
-	'VIEW_TOPIC_LOCKED'		=> 'Locked:',
 
-	'MARK_FORUMS_READ'	=> 'Mark all forums read',
+	'VIEW_TOPIC_ANNOUNCEMENT'=> 'Announcement',
-	'FORUMS_MARKED'		=> 'All forums have been marked read',
+	'VIEW_TOPIC_STICKY'		=> 'Sticky',
+	'VIEW_TOPIC_MOVED'		=> 'Moved',
+	'VIEW_TOPIC_POLL'		=> 'Poll',
+	'VIEW_TOPIC_LOCKED'		=> 'Locked',
 
 	'MARK_TOPICS_READ'	=> 'Mark all topics read',
 	'TOPICS_MARKED'		=> 'The topics for this forum have now been marked read',
@@ -264,10 +386,6 @@ $lang = array(
 	'RULES_VOTE_CANNOT'		=> 'You <b>cannot</b> vote in polls in this forum',
 
 
-	'GUEST' => 'Guest',
-	'ACP' => '[ %sAdministration Control Panel%s ]',
-	'MCP' => '[ %sModerator Control Panel%s ]',
-
 	'NO_MODE'	=> 'No mode specified.', 
 	'NO_FORUMS' => 'This board has no forums',
 	'NO_FORUM'	=> 'The forum you selected does not exist',
@@ -480,29 +598,32 @@ $lang = array(
 	'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options',
 	'NO_DELETE_POLL_OPTIONS'=> 'You cannot delete existing poll options',
 
-	'GENERAL_UPLOAD_ERROR'	=> 'Upload Error: Could not upload Attachment to %s',
+	'GENERAL_UPLOAD_ERROR'	=> 'Could not upload Attachment to %s',
-	'TOO_MANY_ATTACHMENTS'	=> 'Attachment cannot be added, since the max. number of %d Attachments in this post was achieved',
+	'TOO_MANY_ATTACHMENTS'	=> 'Cannot add another attacment, %d is the maxmimum.',
 	'INVALID_FILENAME'		=> '%s is an invalid filename',
-	'ATTACHMENT_PHP_SIZE_NA'=> 'The Attachment is too big.<br />Couldn\'t get the maximum Size defined in PHP.<br />The Attachment Mod is unable to determine the maximum Upload Size defined in the php.ini file.',
-	'ATTACHMENT_PHP_SIZE_OVERRUN' => 'The Attachment is too big.<br />Maximum Upload Size: %d MB.<br />Please note that this Size is defined in php.ini, this means it\'s set by PHP and the Attachment Mod can not override this value.',
 	'DISALLOWED_EXTENSION'	=> 'The Extension %s is not allowed',
 	'ALLOWED'				=> 'Allowed',
+	'ATTACHMENT_PHP_SIZE_NA'		=> 'The attachment is too big.<br />Could not get determine the maximum size defined by PHP in php.ini.',
+	'ATTACHMENT_PHP_SIZE_OVERRUN'	=> 'The attachment is too big, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
+	'ATTACHMENT_TOO_BIG'	=> 'The attachment is too big, maximum size is %1d %2s',
+	'ATTACH_QUOTA_REACHED'	=> 'Sorry, the board attachment quota has been reached.',
 	'BYTES' => 'Bytes',
 	'KB'	=> 'KB',
 	'MB'	=> 'MB',
-	'ATTACHMENT_TOO_BIG'	=> 'The Attachment is too big, maximum size is %1d %2s',
-	'ATTACH_QUOTA_REACHED'	=> 'Sorry, the total board attachment quota has been reached.',
 	
-	'EXTENSION_DISABLED_AFTER_POSTING' => 'The Extension \'%s\' has been deactivated by an board admin, therefore this Attachment is not displayed.', // used in Posts and PM's, replace %s with extension
+	'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <b>%s</b> has been deactivated and can no longer be displayed.', // used in Posts and PM's, replace %s with extension
 	'DESCRIPTION'			=> 'Description',
 	'DOWNLOAD'				=> 'Download',
 	'FILESIZE'				=> 'Filesize',
-	'FILE_NOT_FOUND_404'	=> '<b>404 File Not Found:</b> The File <i>%s</i> does not exist.',
+	'FILE_NOT_FOUND_404'	=> 'The file <b>%s</b> does not exist.',
 	'DOWNLOADED'			=> 'Downloaded',
 	'VIEWED'				=> 'Viewed',
-	'DOWNLOAD_NUMBER'		=> '%d Time(s)', // replace %d with count
+	'DOWNLOAD_NUMBER'		=> '%d Time(s)', // replace %d with count <-- NEEDS CHANGING TO FOLLOWING
+	'DOWNLOAD_NONE'			=> '0 Times',	// replace %d with count
+	'DOWNLOAD_COUNT'		=> '%d Time',	// replace %d with count
+	'DOWNLOAD_COUNTS'		=> '%d Times',	// replace %d with count
 
-	'User_control_panel' => 'User Control Panel',
+	'UCP'			=> 'User Control Panel',
 	'UCP_Main'		=> 'Control Panel',
 	'UCP_Profile' => 'Profile Settings',
 	'UCP_Lists' => 'Black/White Lists',
@@ -557,7 +678,6 @@ $lang = array(
 	'Disable_Smilies_pm' => 'Disable Smilies in this message',
 	'Message_sent' => 'Your message has been sent',
 	'Click_return_inbox' => 'Click %sHere%s to return to your Inbox',
-	'Click_return_index' => 'Click %sHere%s to return to the Index',
 	'Send_a_new_message' => 'Send a new private message',
 	'Send_a_reply' => 'Reply to a private message',
 	'Edit_message' => 'Edit private message',
@@ -666,6 +786,7 @@ $lang = array(
 	'Account_active_admin' => 'The account has now been activated',
 	'Reactivate' => 'Reactivate your account!',
 	'Already_activated' => 'You have already activated your account',
+
 	'COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
 	'REGISTRATION' => 'Registration Agreement Terms',
 	'REG_AGREEMENT' => 'While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you	have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.',
@@ -747,6 +868,7 @@ $lang = array(
 	'SEND_MSN'		=> 'Please note that you need Microsoft (or MSN) Messenger installed to use this.', 
 	'SEND_AIM'		=> 'Please note that you need AOL Instant Messenger installed to use this.', 
 
+
 	'Group_Control_Panel' => 'Group Control Panel',
 	'Group_member_details' => 'Group Membership Details',
 	'Group_member_join' => 'Join a Group',
@@ -831,165 +953,34 @@ $lang = array(
 	'Found_search_match' => 'Search found %d match',
 	'Found_search_matches' => 'Search found %d matches',
 
-	'Sorry_auth_announce' => 'Sorry but only %s can post announcements in this forum',
+	
-	'Sorry_auth_sticky' => 'Sorry but only %s can post sticky messages in this forum',
-	'Sorry_auth_read' => 'Sorry but only %s can read topics in this forum',
-	'Sorry_auth_post' => 'Sorry but only %s can post topics in this forum',
-	'Sorry_auth_reply' => 'Sorry but only %s can reply to posts in this forum',
-	'Sorry_auth_edit' => 'Sorry but only %s can edit posts in this forum',
-	'Sorry_auth_delete' => 'Sorry but only %s can delete posts in this forum',
-	'Sorry_auth_vote' => 'Sorry but only %s can vote in polls in this forum',
-	'Auth_Anonymous_Users' => '<b>anonymous users</b>',
-	'Auth_Registered_Users' => '<b>registered users</b>',
-	'Auth_Users_granted_access' => '<b>users granted special access</b>',
-	'Auth_Moderators' => '<b>moderators</b>',
-	'Auth_Administrators' => '<b>administrators</b>',
 	'Not_Moderator'		=> 'You are not a moderator of this forum',
 	'Not_Authorised'	=> 'Not Authorised',
 
 
-	'Reg_users_zero_online' => 'There are 0 Registered users and ',
+	'REG_USERS_ZERO_ONLINE'	=> 'There are 0 Registered users and ',
-	'Reg_users_online' => 'There are %d Registered users and ',
+	'REG_USERS_ONLINE'		=> 'There are %d Registered users and ',
-	'Reg_user_online' => 'There is %d Registered user and ',
+	'REG_USER_ONLINE'		=> 'There is %d Registered user and ',
-	'Hidden_users_zero_online' => '0 Hidden users online',
+	'HIDDEN_USERS_ZERO_ONLINE'=> '0 Hidden users online',
-	'Hidden_users_online' => '%d Hidden users online',
+	'HIDDEN_USERS_ONLINE'	=> '%d Hidden users online',
-	'Hidden_user_online' => '%d Hidden user online',
+	'HIDDEN_USER_ONLINE'	=> '%d Hidden user online',
-	'Guest_users_online' => 'There are %d Guest users online',
+	'GUEST_USERS_ONLINE'	=> 'There are %d Guest users online',
-	'Guest_users_zero_online' => 'There are 0 Guest users online',
+	'GUEST_USERS_ZERO_ONLINE'=> 'There are 0 Guest users online',
-	'Guest_user_online' => 'There is %d Guest user online',
+	'GUEST_USER_ONLINE'		=> 'There is %d Guest user online',
-	'No_users_browsing' => 'There are no users currently browsing this forum',
+
 	'VIEW_ONLINE_TIME'	=> 'This data is based on users active over the past %d minute', // 1 minute
 	'VIEW_ONLINE_TIMES' => 'This data is based on users active over the past %d minutes', // 2 minutes, etc.
-	'Forum_Location' => 'Forum Location',
+	'FORUM_LOCATION'	=> 'Forum Location',
-	'Last_updated' => 'Last Updated',
+	'LAST_UPDATED'		=> 'Last Updated',
-	'Forum_index' => 'Forum index',
 	'READING_FORUM'		=> 'Viewing topics in %s', 
 	'READING_TOPIC'		=> 'Reading topic in %s',
-	'Logging_on' => 'Logging on',
 	'POSTING_MESSAGE'	=> 'Posting message in %s',
 	'REPLYING_MESSAGE'	=> 'Replying to message in %s',
-	'Searching_forums' => 'Searching forums',
+	'SEARCHING_FORUMS'	=> 'Searching forums',
-	'Viewing_profile' => 'Viewing profile',
+	'VIEWING_ONLINE'	=> 'Viewing who is online',
-	'Viewing_online' => 'Viewing who is online',
+	'VIEWING_MEMBERS'	=> 'Viewing member details',
-	'Viewing_member_list' => 'Viewing member list',
+	'VIEWING_MESSAGES'	=> 'Viewing Private Messages',
-	'Viewing_priv_msgs' => 'Viewing Private Messages',
+	'VIEWING_FAQ'		=> 'Viewing FAQ', 
-	'Viewing_FAQ' => 'Viewing FAQ', 
-
-	'ALL_TIMES' => 'All times are %s %s',
-	'-13'	=> 'GMT - 13 Hours',
-	'-12'	=> 'GMT - 12 Hours',
-	'-11'	=> 'GMT - 11 Hours',
-	'-10'	=> 'GMT - 10 Hours',
-	'-9'	=> 'GMT - 9 Hours',
-	'-8'	=> 'GMT - 8 Hours',
-	'-7'	=> 'GMT - 7 Hours',
-	'-6'	=> 'GMT - 6 Hours',
-	'-5'	=> 'GMT - 5 Hours',
-	'-4'	=> 'GMT - 4 Hours',
-	'-3.5'	=> 'GMT - 3.5 Hours',
-	'-3'	=> 'GMT - 3 Hours',
-	'-2.5'	=> 'GMT - 2.5 Hours',
-	'-2'	=> 'GMT - 2 Hours',
-	'-1'	=> 'GMT - 1 Hours',
-	'0'		=> 'GMT',
-	'1'		=> 'GMT + 1 Hour',
-	'2'		=> 'GMT + 2 Hours',
-	'3'		=> 'GMT + 3 Hours',
-	'3.5'	=> 'GMT + 3.5 Hours',
-	'4'		=> 'GMT + 4 Hours',
-	'4.5'	=> 'GMT + 4.5 Hours',
-	'5'		=> 'GMT + 5 Hours',
-	'5.5'	=> 'GMT + 5.5 Hours',
-	'6'		=> 'GMT + 6 Hours',
-	'6.5'	=> 'GMT + 6.5 Hours',
-	'7'		=> 'GMT + 7 Hours',
-	'8'		=> 'GMT + 8 Hours',
-	'9'		=> 'GMT + 9 Hours',
-	'9.5'	=> 'GMT + 9.5 Hours',
-	'10'	=> 'GMT + 10 Hours',
-	'10.5'	=> 'GMT + 10.5 Hours',
-	'11'	=> 'GMT + 11 Hours',
-	'12'	=> 'GMT + 12 Hours',
-	'13'	=> 'GMT + 13 Hours',
-	'tz'	=> array(
-		'-13'	=> 'GMT - 13 Hours',
-		'-12'	=> 'GMT - 12 Hours',
-		'-11'	=> 'GMT - 11 Hours',
-		'-10'	=> 'GMT - 10 Hours',
-		'-9'	=> 'GMT - 9 Hours',
-		'-8'	=> 'GMT - 8 Hours',
-		'-7'	=> 'GMT - 7 Hours',
-		'-6'	=> 'GMT - 6 Hours',
-		'-5'	=> 'GMT - 5 Hours',
-		'-4'	=> 'GMT - 4 Hours',
-		'-3.5'	=> 'GMT - 3.5 Hours',
-		'-3'	=> 'GMT - 3 Hours',
-		'-2.5'	=> 'GMT - 2.5 Hours',
-		'-2'	=> 'GMT - 2 Hours',
-		'-1'	=> 'GMT - 1 Hours',
-		'0'		=> 'GMT',
-		'1'		=> 'GMT + 1 Hour',
-		'2'		=> 'GMT + 2 Hours',
-		'3'		=> 'GMT + 3 Hours',
-		'3.5'	=> 'GMT + 3.5 Hours',
-		'4'		=> 'GMT + 4 Hours',
-		'4.5'	=> 'GMT + 4.5 Hours',
-		'5'		=> 'GMT + 5 Hours',
-		'5.5'	=> 'GMT + 5.5 Hours',
-		'6'		=> 'GMT + 6 Hours',
-		'6.5'	=> 'GMT + 6.5 Hours',
-		'7'		=> 'GMT + 7 Hours',
-		'8'		=> 'GMT + 8 Hours',
-		'9'		=> 'GMT + 9 Hours',
-		'9.5'	=> 'GMT + 9.5 Hours',
-		'10'	=> 'GMT + 10 Hours',
-		'10.5'	=> 'GMT + 10.5 Hours',
-		'11'	=> 'GMT + 11 Hours',
-		'12'	=> 'GMT + 12 Hours',
-		'13'	=> 'GMT + 13 Hours',
-		'dst'	=> '[ DST ]'
-	),
-	'AM' => 'AM',
-	'PM' => 'PM', 
-	'datetime' => array(
-		'Sunday'	=> 'Sunday',
-		'Monday'	=> 'Monday',
-		'Tuesday'	=> 'Tuesday',
-		'Wednesday' => 'Wednesday',
-		'Thursday'	=> 'Thursday',
-		'Friday'	=> 'Friday',
-		'Saturday'	=> 'Saturday',
-		'Sun' => 'Sun',
-		'Mon' => 'Mon',
-		'Tue' => 'Tue',
-		'Wed' => 'Wed',
-		'Thu' => 'Thu',
-		'Fri' => 'Fri',
-		'Sat' => 'Sat',
-		'January'	=> 'January',
-		'February'	=> 'February',
-		'March'		=> 'March',
-		'April'		=> 'April',
-		'May'		=> 'May',
-		'June'		=> 'June',
-		'July'		=> 'July',
-		'August'	=> 'August',
-		'September' => 'September',
-		'October'	=> 'October',
-		'November'	=> 'November',
-		'December'	=> 'December',
-		'Jan' => 'Jan',
-		'Feb' => 'Feb',
-		'Mar' => 'Mar',
-		'Apr' => 'Apr',
-		'Jun' => 'Jun',
-		'Jul' => 'Jul',
-		'Aug' => 'Aug',
-		'Sep' => 'Sep',
-		'Oct' => 'Oct',
-		'Nov' => 'Nov',
-		'Dec' => 'Dec',
-	)
 );
 
 

phpBB/mcp.php

@@ -840,7 +840,7 @@ switch ($mode)
 				));
 
 				mcp_header('mcp_move.html');
-				include($phpbb_root_path . 'includes/page_tail.' . $phpEx);
+				page_footer();
 			}
 			else
 			{
@@ -1977,7 +1977,7 @@ switch ($mode)
 		));
 }
 
-include($phpbb_root_path . 'includes/page_tail.' . $phpEx);
+page_footer();
 
 // -----------------------
 // Page specific functions
@@ -1989,14 +1989,13 @@ function mcp_header($template_name, $jumpbox_acl = FALSE, $forum_nav = FALSE)
 
 	$forum_id = (!empty($forum_id)) ? $forum_id : FALSE;
 
-	$page_title = sprintf($user->lang['MCP'], '', '');
+	page_header(sprintf($user->lang['MCP'], '', ''));
-	include($phpbb_root_path . 'includes/page_header.' . $phpEx);
 
 	$template->set_filenames(array(
-		'body' => $template_name
+		'body' => $template_name)
-	));
+	);
 
-	if (preg_match('/mod_queue|post_reports|viewlogs/', $mode))
+	if (preg_match('#mod_queue|post_reports|viewlogs#', $mode))
 	{
 		$enable_select_all = TRUE;
 	}

phpBB/memberlist.php

@@ -24,11 +24,13 @@ $phpbb_root_path = './';
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
 
+
 // Start session management
 $user->start();
 $user->setup();
 $auth->acl($user->data);
 
+
 // Grab data
 $mode = (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : '';
 $user_id = (isset($_GET['u'])) ? intval($_GET['u']) : ANONYMOUS;
@@ -38,9 +40,10 @@ switch ($mode)
 {
 	case 'email':
 		break;
+
 	default:
 		// Can this user view profiles/memberslist?
-		if (!$auth->acl_gets('u_viewprofile', 'a_'))
+		if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
 		{
 			if ($user->data['user_id'] != ANONYMOUS)
 			{
@@ -94,7 +97,7 @@ $db->sql_freeresult($result);
 switch ($mode)
 {
 	case 'leaders':
-		// Display a listing of board admins, moderators
+		// Display a listing of board admins, moderators?
 		break;
 
 	case 'contact':
@@ -141,6 +144,8 @@ switch ($mode)
 		}
 		$db->sql_freeresult($result);
 		
+
+
 		// Which forums does this user have an enabled post count?
 		// Really auth should be handling this capability ...
 		$post_count_sql = array();
@@ -157,6 +162,8 @@ switch ($mode)
 		$post_count_sql = (sizeof($post_count_sql)) ? 'AND f.forum_id IN (' . implode(', ', $post_count_sql) . ')' : '';
 		unset($auth2);
 
+
+
 		// Grab all the relevant data
 		$sql = "SELECT COUNT(p.post_id) AS num_posts   
 			FROM " . POSTS_TABLE . " p, " . FORUMS_TABLE . " f
@@ -581,14 +588,14 @@ switch ($mode)
 
 
 // Output the page
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+page_header($page_title);
 
 $template->set_filenames(array(
 	'body' => $template_html)
 );
 make_jumpbox('viewforum.'.$phpEx);
 
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+page_footer();
 
 
 // ---------
@@ -694,6 +701,8 @@ function show_profile($data)
 	$search_img = '<a href="' . $temp_url . '">' . $user->img('btn_search', $user->lang['SEARCH']) . '</a>';
 	$search = '<a href="' . $temp_url . '">' . $user->lang['SEARCH'] . '</a>';
 
+
+
 	if ($data['user_sig_bbcode_bitfield'])
 	{
 		if (!isset($bbcode))
@@ -704,6 +713,8 @@ function show_profile($data)
 		$bbcode->bbcode_second_pass($data['user_sig'], $data['user_sig_bbcode_uid'], $data['user_sig_bbcode_bitfield']);
 	}
 
+
+
 	$last_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit'];
 
 	$template_vars = array(

phpBB/posting.php

@@ -167,6 +167,11 @@ if ($sql != '')
 	$topic_id = intval($row['topic_id']);
 	$post_id = intval($row['post_id']);
 
+	if ($row['forum_password'])
+	{
+		login_forum_box($row);
+	}
+
 	foreach ($forum_fields as $var => $type)
 	{
 		switch ($type)
@@ -466,8 +471,7 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['
 	{
 		$s_hidden_fields = '<input type="hidden" name="p" value="' . $post_id . '" /><input type="hidden" name="mode" value="delete" />';
 
-		$page_title = $user->lang['DELETE_MESSAGE'];
+		page_header($user->lang['DELETE_MESSAGE']);
-		include($phpbb_root_path . 'includes/page_header.' . $phpEx);
 
 		$template->set_filenames(array(
 			'body' => 'confirm_body.html')
@@ -481,7 +485,7 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields)
 		);
 		
-		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+		page_footer();
 	}
 }
 
@@ -1120,7 +1124,7 @@ if (($perm['f_attach']) || ($perm['m_edit']))
 }
 
 // Output page ...
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+page_header($page_title);
 
 $template->set_filenames(array(
 	'body' => 'posting_body.html')
@@ -1134,7 +1138,7 @@ if ($mode == 'reply' || $mode == 'quote')
 	topic_review($topic_id, true);
 }
 
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+page_footer();
 
 // FUNCTIONS
 
@@ -1265,7 +1269,7 @@ function topic_review($topic_id, $is_inline_review = false)
 			'body' => 'posting_topic_review.html')
 		);
 
-		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+		page_footer();
 	}
 }
 

phpBB/report.php

@@ -149,16 +149,16 @@ while ($row = $db->sql_fetchrow($result))
 $template->assign_var('S_CAN_NOTIFY', ($user->data['user_id'] == ANONYMOUS) ? FALSE : TRUE);
 
 
-// Start output of page
-$page_title = $user->lang['REPORT_TO_ADMIN'];
-include($phpbb_root_path . 'includes/page_header.' . $phpEx);
-
 generate_forum_nav($forum_data);
 
+
+// Start output of page
+page_header($user->lang['REPORT_TO_ADMIN']);
+
 $template->set_filenames(array(
 	'body' => 'report_body.html')
 );
 
-include($phpbb_root_path . 'includes/page_tail.' . $phpEx);
+page_tail();
 
 ?>

phpBB/search.php

@@ -1134,19 +1134,18 @@ if ( $search_keywords != '' || $search_author != '' || $search_id )
 			'L_GOTO_PAGE' => $user->lang['Goto_page'])
 		);
 
-		$page_title = $user->lang['Search'];
+		page_header($user->lang['SEARCH']);
-		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 		$template->set_filenames(array(
 			'body' =>  ( $show_results == 'posts' ) ? 'search_results_posts.html' : 'search_results_topics.html')
 		);
 		make_jumpbox('viewforum.'.$phpEx);
 
-		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+		page_footer();
 	}
 	else
 	{
-		message_die(MESSAGE, $user->lang['No_search_match']);
+		trigger_error($user->lang['No_search_match']);
 	}
 }
 
@@ -1262,14 +1261,13 @@ $template->assign_vars(array(
 //
 // Output the basic page
 //
-$page_title = $user->lang['Search'];
+page_header($user->lang['SEARCH']);
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 $template->set_filenames(array(
 	'body' => 'search_body.html')
 );
 make_jumpbox('viewforum.'.$phpEx);
 
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+page_footer();
 
 ?>

phpBB/templates/subSilver/viewonline_body.html

@@ -9,7 +9,7 @@
 <table class="tablebg" width="100%" cellpadding="2" cellspacing="1" border="0">
 	<tr> 
 		<th width="35%" height="25">&nbsp;{L_USERNAME}&nbsp;</th>
-		<th width="25%">&nbsp;{L_LAST_UPDATE}&nbsp;</th>
+		<th width="25%">&nbsp;{L_LAST_UPDATED}&nbsp;</th>
 		<th width="40%">&nbsp;{L_FORUM_LOCATION}&nbsp;</th>
 	</tr>
 	<tr> 

phpBB/ucp.php

@@ -296,13 +296,12 @@ $db->sql_freeresult($result);
 
 
 // Output the page
-$page_title = $user->lang['User_control_panel'] . ' - ' . $this_section;
+page_header($user->lang['UCP'] . ' - ' . $this_section);
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 $template->set_filenames(array(
 	'body' => 'usercp_main.html')
 );
 
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+page_footer();
 
 ?>

phpBB/viewforum.php

@@ -116,11 +116,11 @@ if ($forum_data['forum_link'])
 $user->setup(false, $forum_data['forum_style']);
 
 
-// Does a password exist for this forum? If so do the necessary
+// Forum is passworded ... check whether access has been granted to this
+// user this session, if not show login box
 if ($forum_data['forum_password'])
 {
-
+	login_forum_box($forum_data);
-
 }
 
 
@@ -555,17 +555,15 @@ $nav_links['up'] = array(
 );
 */
 
-// Dump out the page header and load viewforum template
-$page_title = $user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name'];
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
+// Dump out the page header and load viewforum template
+page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name']);
 
 $template->set_filenames(array(
 	'body' => 'viewforum_body.html')
 );
 make_jumpbox("viewforum.$phpEx$SID", $forum_id);
 
-
+page_footer();
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
 ?>

phpBB/viewonline.php

@@ -24,38 +24,35 @@ $phpbb_root_path = './';
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
 
+
 // Start session management
 $user->start();
 $user->setup();
 $auth->acl($user->data);
 
+
 // Forum info
-$sql = "SELECT forum_id, forum_name
+$sql = 'SELECT forum_id, forum_name
-	FROM " . FORUMS_TABLE;
+	FROM ' . FORUMS_TABLE;
 $result = $db->sql_query($sql);
 
 while ($row = $db->sql_fetchrow($result))
 {
 	$forum_data[$row['forum_id']] = $row['forum_name'];
 }
+$db->sql_freeresult($result);
+
 
 // Get user list
-$sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_colour, s.session_time, s.session_page, s.session_ip, s.session_allow_viewonline
+$sql = 'SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_colour, s.session_time, s.session_page, s.session_ip, s.session_allow_viewonline
-	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
+	FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . ' s
 	WHERE u.user_id = s.session_user_id
-		AND s.session_time >= ".(time() - ($config['load_online_time'] * 60)) . "
+		AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) . '
-	ORDER BY u.username ASC, s.session_ip ASC, s.session_time DESC";
+	ORDER BY u.username ASC, s.session_ip ASC, s.session_time DESC';
 $result = $db->sql_query($sql);
 
-$guest_users = 0;
-$registered_users = 0;
-$hidden_users = 0;
-
-$reg_counter = 0;
-$guest_counter = 0;
-$prev_user = 0;
 $prev_ip = '';
-
+$logged_visible_online = $logged_hidden_online = $guests_online = $reg_counter = $guest_counter = $prev_user = 0;
 while ($row = $db->sql_fetchrow($result))
 {
 	$view_online = false;
@@ -76,14 +73,14 @@ while ($row = $db->sql_fetchrow($result))
 			if (!$row['user_allow_viewonline'] || !$row['session_allow_viewonline'])
 			{
 				$view_online = ($auth->acl_gets('u_viewonline')) ? true : false;
-				$hidden_users++;
+				$logged_hidden_online++;
 
 				$username = '<i>' . $username . '</i>';
 			}
 			else
 			{
 				$view_online = true;
-				$registered_users++;
+				$logged_visible_online++;
 			}
 
 			$which_counter = 'reg_counter';
@@ -97,7 +94,7 @@ while ($row = $db->sql_fetchrow($result))
 		{
 			$username = $user->lang['GUEST'];
 			$view_online = true;
-			$guest_users++;
+			$guests_online++;
 
 			$which_counter = 'guest_counter';
 			$which_row = 'guest_user_row';
@@ -113,7 +110,7 @@ while ($row = $db->sql_fetchrow($result))
 		switch ($on_page[1])
 		{
 			case 'index':
-				$location = $user->lang['Forum_index'];
+				$location = $user->lang['INDEX'];
 				$location_url = "index.$phpEx$SID";
 				break;
 
@@ -123,7 +120,7 @@ while ($row = $db->sql_fetchrow($result))
 				preg_match('#f=([0-9]+)#', $row['session_page'], $forum_id);
 				$forum_id = $forum_id[1];
 
-				if ($auth->acl_gets('f_list', 'a_', $forum_id))
+				if ($auth->acl_get('f_list', $forum_id))
 				{
 					$location = '';
 					switch ($on_page[1])
@@ -156,38 +153,33 @@ while ($row = $db->sql_fetchrow($result))
 				}
 				else
 				{
-					$location = $user->lang['Forum_index'];
+					$location = $user->lang['INDEX'];
 					$location_url = "index.$phpEx$SID";
 				}
 				break;
 
 			case 'search':
-				$location = $user->lang['Searching_forums'];
+				$location = $user->lang['SEARCHING_FORUMS'];
 				$location_url = "search.$phpEx$SID";
 				break;
 
-			case 'profile':
-				$location = $user->lang['Viewing_profile'];
-				$location_url = "index.$phpEx$SID";
-				break;
-
 			case 'faq':
-				$location = $user->lang['Viewing_FAQ'];
+				$location = $user->lang['VIEWING_FAQ'];
 				$location_url = "faq.$phpEx$SID";
 				break;
 
 			case 'viewonline':
-				$location = $user->lang['Viewing_online'];
+				$location = $user->lang['VIEWING_ONLINE'];
 				$location_url = "viewonline.$phpEx$SID";
 				break;
 
 			case 'memberslist':
-				$location = $user->lang['Viewing_member_list'];
+				$location = $user->lang['VIEWING_MEMBERS'];
 				$location_url = "memberlist.$phpEx$SID";
 				break;
 
 			default:
-				$location = $user->lang['Forum_index'];
+				$location = $user->lang['INDEX'];
 				$location_url = "index.$phpEx$SID";
 				break;
 		}
@@ -199,52 +191,42 @@ while ($row = $db->sql_fetchrow($result))
 
 			'S_ROW_COUNT'	=> $$which_counter,
 
-			'U_USER_PROFILE'	=> "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $user_id,
+			'U_USER_PROFILE'	=> "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id",
 			'U_FORUM_LOCATION'	=> $location_url)
 		);
 
 		$$which_counter++;
 	}
 }
+$db->sql_freeresult($result);
 
-if($registered_users == 0)
-{
-	$l_r_user_s = $user->lang['Reg_users_zero_online'];
-}
-else if($registered_users == 1)
-{
-	$l_r_user_s = $user->lang['Reg_user_online'];
-}
-else
-{
-	$l_r_user_s = $user->lang['Reg_users_online'];
-}
 
-if($hidden_users == 0)
+// Generate reg/hidden/guest online text
-{
+$vars_online = array(
-	$l_h_user_s = $user->lang['Hidden_users_zero_online'];
+	'REG'	=> array('logged_visible_online', 'l_r_user_s'),
-}
+	'HIDDEN'=> array('logged_hidden_online', 'l_h_user_s'),
-else if($hidden_users == 1)
+	'GUEST'	=> array('guests_online', 'l_g_user_s')
-{
+);
-	$l_h_user_s = $user->lang['Hidden_user_online'];
-}
-else
-{
-	$l_h_user_s = $user->lang['Hidden_users_online'];
-}
 
-if($guest_users == 0)
+foreach ($vars_online as $l_prefix => $var_ary)
 {
-	$l_g_user_s = $user->lang['Guest_users_zero_online'];
+	switch ($$var_ary[0])
-}
-else if($guest_users == 1)
 	{
-	$l_g_user_s = $user->lang['Guest_user_online'];
+		case 0:
+			$$var_ary[1] = $user->lang[$l_prefix . '_USERS_ZERO_ONLINE'];
+			break;
+
+		case 1:
+			$$var_ary[1] = $user->lang[$l_prefix . '_USER_ONLINE'];
+			break;
+
+		default:
+			$$var_ary[1] = $user->lang[$l_prefix . '_USERS_ONLINE'];
+			break;
 	}
-else
-{
-	$l_g_user_s = $user->lang['Guest_users_online'];
 }
+unset($vars_online);
+
 
 // Grab group details for legend display
 $sql = "SELECT group_name, group_colour, group_type  
@@ -258,31 +240,27 @@ while ($row = $db->sql_fetchrow($result))
 {
 	$legend .= (($legend != '') ? ', ' : '') . '<span style="color:#' . $row['group_colour'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</span>';
 }
+$db->sql_freeresult($result);
 
+
+// Send data to template
 $template->assign_vars(array(
-	'TOTAL_REGISTERED_USERS_ONLINE'	=> sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users),
+	'TOTAL_REGISTERED_USERS_ONLINE'	=> sprintf($l_r_user_s, $logged_visible_online) . sprintf($l_h_user_s, $logged_hidden_online),
-	'TOTAL_GUEST_USERS_ONLINE'		=> sprintf($l_g_user_s, $guest_users),
+	'TOTAL_GUEST_USERS_ONLINE'		=> sprintf($l_g_user_s, $guests_online),
 	'LEGEND'						=> $legend, 
 
-	'META' => '<meta http-equiv="refresh" content="60; url=viewonline.' . $phpEx . $SID . '">',
+	'META' => '<meta http-equiv="refresh" content="60; url=viewonline.' . $phpEx . $SID . '">')
-
-	'L_WHOSONLINE'		=> $user->lang['Who_is_online'],
-	'L_ONLINE_EXPLAIN'	=> $user->lang['Online_explain'],
-	'L_USERNAME'		=> $user->lang['Username'],
-	'L_FORUM_LOCATION'	=> $user->lang['Forum_Location'],
-	'L_LAST_UPDATE'		=> $user->lang['Last_updated'],
-	'L_NO_GUESTS_BROWSING'			=> $user->lang['No_users_browsing'],
-	'L_NO_REGISTERED_USERS_BROWSING'=> $user->lang['No_users_browsing'])
 );
 
-$page_title = $user->lang['Who_is_online'];
+
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+// Output the page
+page_header($user->lang['WHO_IS_ONLINE']);
 
 $template->set_filenames(array(
 	'body' => 'viewonline_body.html')
 );
 make_jumpbox('viewforum.'.$phpEx);
 
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+page_footer();
 
 ?>

phpBB/viewtopic.php

@@ -155,7 +155,7 @@ else
 	}
 }
 $extra_fields = (!$post_id)  ? '' : ", COUNT(p2.post_id) AS prev_posts";
-$order_sql = (!$post_id) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.poll_max_options, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_desc, f.forum_parents, f.parent_id, f.left_id, f.right_id, f.forum_status, f.forum_id, f.forum_style ORDER BY p.post_id ASC";
+$order_sql = (!$post_id) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.poll_max_options, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_desc, f.forum_parents, f.parent_id, f.left_id, f.right_id, f.forum_status, f.forum_id, f.forum_style, f.forum_password ORDER BY p.post_id ASC";
 
 if ($user->data['user_id'] != ANONYMOUS)
 {
@@ -177,13 +177,16 @@ if ($user->data['user_id'] != ANONYMOUS)
 // is done so navigation, forum name, etc. remain consistent with where
 // user clicked to view a global topic
 
+
+
+
 // Note2: after much inspection, having to find a valid forum_id when making return_to_topic links for global announcements in mcp is a pain. The easiest solution is to let admins choose under what forum topics should be seen when forum_id is not specified (preferably a public forum)
 if (!$forum_id)
 {
 	$forum_id = 2;
 }
-$sql = "SELECT t.topic_id, t.forum_id AS real_forum_id, t.topic_title, t.topic_attachment, t.topic_status, " . (($auth->acl_get('m_approve')) ? 't.topic_replies_real AS topic_replies' : 't.topic_replies') . ", t.topic_last_post_id, t.topic_time, t.topic_type, t.poll_max_options, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_desc, f.forum_parents, f.parent_id, f.left_id, f.right_id, f.forum_status, f.forum_id, f.forum_style" . $extra_fields . "
+$sql = 'SELECT t.topic_id, t.forum_id AS real_forum_id, t.topic_title, t.topic_attachment, t.topic_status, ' . (($auth->acl_get('m_approve')) ? 't.topic_replies_real AS topic_replies' : 't.topic_replies') . ', t.topic_last_post_id, t.topic_time, t.topic_type, t.poll_max_options, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_desc, f.forum_parents, f.parent_id, f.left_id, f.right_id, f.forum_status, f.forum_id, f.forum_style, f.forum_password' . $extra_fields . '
-	FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . "
+	FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f' . $join_sql_table . "
 	WHERE $join_sql
 		AND (f.forum_id = t.forum_id
 			OR (t.forum_id = 0 AND 
@@ -192,15 +195,29 @@ $sql = "SELECT t.topic_id, t.forum_id AS real_forum_id, t.topic_title, t.topic_a
 		$order_sql";
 $result = $db->sql_query($sql);
 
+
+
+
 if (!$topic_data = $db->sql_fetchrow($result))
 {
 	trigger_error('NO_TOPIC');
 }
-extract($topic_data);
 
 
 // Setup look and feel
-$user->setup(false, $forum_style);
+$user->setup(false, $topic_data['forum_style']);
+
+
+// Forum is passworded ... check whether access has been granted to this
+// user this session, if not show login box
+if ($topic_data['forum_password'])
+{
+	login_forum_box($topic_data);
+}
+
+
+// Extract the data
+extract($topic_data);
 
 
 // Start auth check
@@ -1369,14 +1386,13 @@ if ($force_encoding != '')
 
 
 // Output the page
-$page_title = $user->lang['VIEW_TOPIC'] .' - ' . $topic_title;
+page_header($user->lang['VIEW_TOPIC'] .' - ' . $topic_title);
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 $template->set_filenames(array(
 	'body' => (isset($_GET['view']) && $_GET['view'] == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html')
 );
 make_jumpbox('viewforum.'.$phpEx, $forum_id);
 
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+page_footer();
 
 ?>