3 files changed, 170 insertions, 126 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index ae636d0e07..53dd87e3ab 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -24,110 +24,134 @@
 
 define(HEADER_INC, TRUE);
 
-
 // Parse and show the overall header.
 $template->set_filenames(array("overall_header" => "overall_header.tpl",
-			  "overall_footer" => "overall_footer.tpl"));
+	"overall_footer" => "overall_footer.tpl"));
 
+//
+// Generate logged in/logged out status
+//
 if($userdata['session_logged_in'])
 {
-     $logged_in_status = "You are logged in as <b>".$userdata["username"]."</b>.";
-	  $logged_in_status .= " [<A HREF=\"login.php?submit=logout\">Logout</A>]";
+	$logged_in_status = "You are logged in as <b>".$userdata["username"]."</b>.";
+	$logged_in_status .= " [<A HREF=\"login.php?submit=logout\">Logout</A>]";
 }
 else
 {
-      $logged_in_status = "You are not logged in.";
+	$logged_in_status = "You are not logged in.";
 }
 
-$template->assign_vars(array("SITENAME" => $sitename,
-			"PHPEX" => $phpEx,
-			 "PAGE_TITLE" => $page_title,
-			 "LOGIN_STATUS" => $logged_in_status,
-			 "META_INFO" => $meta_tags,
-			 "L_USERNAME" => $l_username,
-			 "L_PASSWORD" => $l_password,
-			 "L_WELCOMETO" => $l_welcometo,
-			 "L_REGISTER" => $l_register,
-			 "L_PROFILE" => $l_profile,
-			 "L_SEARCH" => $l_search,
-			 "L_PRIVATEMSGS" => $l_privmsgs,
-			 "L_MEMBERLIST" => $l_memberslist,
-			 "L_FAQ" => $l_faq,
-			 "L_FORUM" => $l_forum,
-			 "L_TOPICS" => $l_topics,
-			 "L_REPLIES" => $l_replies,
-			 "L_VIEWS" => $l_views,
-			 "L_POSTS" => $l_posts,
-			 "L_LASTPOST" => $l_lastpost,
-			 "L_MODERATOR" => $l_moderator,
-			 "L_MESSAGES" => $l_messages,
-			 "L_POSTEDTOTAL" => $l_postedtotal,
-			 "L_WEHAVE" => $l_wehave,
-			 "L_REGUSERS" => $l_regedusers,
-			 "L_NEWESTUSER" => $l_newestuser,
-			 "L_BROWSING" => $l_browsing,
-			 "L_ARECURRENTLY" => $l_arecurrently,
-			 "L_THEFORUMS" => $l_theforums,
-			 "L_NONEWPOSTS" => $l_nonewposts,
-			 "L_NEWPOSTS" => $l_newposts));
+//
+// Do timezone text output
+//
+if($sys_timezone < 0)
+{
+	$s_timezone = "$l_all_times GMT $sys_timezone $l_hours";
+}
+else if($sys_timezone == 0)
+{
+	$s_timezone = "$l_all_times GMT";
+}
+else
+{
+	$s_timezone = "$l_all_times GMT + $sys_timezone $l_hours";
+}
+
+$template->assign_vars(array(
+	"SITENAME" => $sitename,
+	"PHPEX" => $phpEx,
+	"PHPSELF" => $PHP_SELF,
+	"L_USERNAME" => $l_username,
+	"L_PASSWORD" => $l_password,
+	"L_WELCOMETO" => $l_welcometo,
+	"L_REGISTER" => $l_register,
+	"L_PROFILE" => $l_profile,
+	"L_SEARCH" => $l_search,
+	"L_PRIVATEMSGS" => $l_privmsgs,
+	"L_MEMBERLIST" => $l_memberslist,
+	"L_FAQ" => $l_faq,
+	"L_FORUM" => $l_forum,
+	"L_TOPICS" => $l_topics,
+	"L_REPLIES" => $l_replies,
+	"L_VIEWS" => $l_views,
+	"L_POSTS" => $l_posts,
+	"L_LASTPOST" => $l_lastpost,
+	"L_MODERATOR" => $l_moderator,
+	"L_MESSAGES" => $l_messages,
+	"L_POSTEDTOTAL" => $l_postedtotal,
+	"L_WEHAVE" => $l_wehave,
+	"L_REGUSERS" => $l_regedusers,
+	"L_NEWESTUSER" => $l_newestuser,
+	"L_BROWSING" => $l_browsing,
+	"L_ARECURRENTLY" => $l_arecurrently,
+	"L_THEFORUMS" => $l_theforums,
+	"L_NONEWPOSTS" => $l_nonewposts,
+	"L_NEWPOSTS" => $l_newposts,
+	"S_TIMEZONE" => $s_timezone,
+	"PAGE_TITLE" => $page_title,
+	"LOGIN_STATUS" => $logged_in_status,
+	"META_INFO" => $meta_tags));
 
 $template->pparse("overall_header");
 
-// Do a switch on page type, this way we only load the templates that we need at the time
+//
+// Do a switch on page type, this way we only load
+// the templates that we need at the time
+//
 switch($pagetype)
 {
- case 'index':
-   $template->set_filenames(array("header" => "index_header.tpl",
-			     "body" => "index_body.tpl",
-			     "footer" => "index_footer.tpl"));
-
-   $template->assign_vars(array("TOTAL_POSTS" => $total_posts,
-			    "TOTAL_USERS" => $total_users,
-			    "NEWEST_USER" => $newest_user,
-			    "NEWEST_UID" => $newest_uid,
-			    "USERS_BROWSING" => $users_browsing));
-
-   $template->pparse("header");
-   break;
-
- case 'viewforum':
-   $template->set_filenames(array("header" => "viewforum_header.tpl",
-			     "body" => "viewforum_body.tpl",
-			     "jumpbox" => "jumpbox.tpl",
-			     "footer" => "viewforum_footer.tpl"));
 
-   $jumpbox = make_jumpbox();
-   $template->assign_vars(array("JUMPBOX_LIST" => $jumpbox,
-			    "JUMPBOX_ACTION" => "viewforum.".$phpEx,
-			    "SELECT_NAME" => POST_FORUM_URL));
-
-   $template->assign_var_from_handle("JUMPBOX", "jumpbox");
-
-   $template->assign_vars(array("FORUM_ID" => $forum_id,
-			    "FORUM_NAME" => $forum_name,
-			    "MODERATORS" => $forum_moderators));
-
-   $template->pparse("header");
-   break;
- case 'viewtopic':
-   $template->set_filenames(array("header" => "viewtopic_header.tpl",
-			     "body" => "viewtopic_body.tpl",
-			     "jumpbox" => "jumpbox.tpl",
-			     "footer" => "viewtopic_footer.tpl"));
-   $jumpbox = make_jumpbox();
-   $template->assign_vars(array("JUMPBOX_LIST" => $jumpbox,
-			    "JUMPBOX_ACTION" => "viewforum.".$phpEx,
-			    "SELECT_NAME" => POST_FORUM_URL));
-
-   $template->assign_var_from_handle("JUMPBOX", "jumpbox");
+	case 'index':
+		$template->set_filenames(array(
+			"header" => "index_header.tpl",
+			"body" => "index_body.tpl",
+			"footer" => "index_footer.tpl"));
+		$template->assign_vars(array(
+			"TOTAL_POSTS" => $total_posts,
+			"TOTAL_USERS" => $total_users,
+			"NEWEST_USER" => $newest_user,
+			"NEWEST_UID" => $newest_uid,
+			"USERS_BROWSING" => $users_browsing));
+		$template->pparse("header");
+		break;
 
-   $template->assign_vars(array("FORUM_ID" => $forum_id,
-			    "FORUM_NAME" => $forum_name,
-			    "TOPIC_ID" => $topic_id,
-			    "TOPIC_TITLE" => $topic_title,
-				"POST_FORUM_URL" => POST_FORUM_URL));
-   $template->pparse("header");
-   break;
+	case 'viewforum':
+		$template->set_filenames(array(
+			"header" => "viewforum_header.tpl",
+			"body" => "viewforum_body.tpl",
+			"jumpbox" => "jumpbox.tpl",
+			"footer" => "viewforum_footer.tpl"));
+		$jumpbox = make_jumpbox();
+		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+		$template->assign_vars(array(
+			"JUMPBOX_LIST" => $jumpbox,
+			"JUMPBOX_ACTION" => "viewforum.".$phpEx,
+			"SELECT_NAME" => POST_FORUM_URL,
+			"FORUM_ID" => $forum_id,
+			"FORUM_NAME" => $forum_name,
+			"MODERATORS" => $forum_moderators));
+		$template->pparse("header");
+		break;
+		
+	case 'viewtopic':
+		$template->set_filenames(array(
+			"header" => "viewtopic_header.tpl",
+			"body" => "viewtopic_body.tpl",
+			"jumpbox" => "jumpbox.tpl",
+			"footer" => "viewtopic_footer.tpl"));
+		$jumpbox = make_jumpbox();
+		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+		$template->assign_vars(array(
+			"JUMPBOX_LIST" => $jumpbox,
+		    "JUMPBOX_ACTION" => "viewforum.".$phpEx,
+		    "SELECT_NAME" => POST_FORUM_URL,
+			"FORUM_ID" => $forum_id,
+		    "FORUM_NAME" => $forum_name,
+		    "TOPIC_ID" => $topic_id,
+		    "TOPIC_TITLE" => $topic_title,
+			"POST_FORUM_URL" => POST_FORUM_URL));
+		$template->pparse("header");
+		break;
 
 	case 'viewonline':
 		$template->set_filenames(array("header" => "viewonline_header.tpl",
@@ -135,43 +159,61 @@ switch($pagetype)
 			"jumpbox" => "jumpbox.tpl",
 			"footer" => "viewonline_footer.tpl"));
 		$jumpbox = make_jumpbox();
-		$template->assign_vars(array("TOTAL_POSTS" => $total_posts,
+		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+		$template->assign_vars(array(
+			"JUMPBOX_LIST" => $jumpbox,
+			"JUMPBOX_ACTION" => "viewforum.".$phpEx,
+			"SELECT_NAME" => POST_FORUM_URL,
+			"TOTAL_POSTS" => $total_posts,
 			"TOTAL_USERS" => $total_users,
 			"POST_USER_URL" => POST_USERS_URL,
 			"NEWEST_USER" => $newest_user,
-			"NEWEST_UID" => $newest_uid,
+			"NEWEST_UID" => $newest_uid));
+		$template->pparse("header");
+		break;
+
+	case 'login':
+		$template->set_filenames(array("body" => "login_body.tpl"));
+		break;
+		
+	case 'newtopic':
+		$template->set_filenames(array(
+			"header" => "newtopic_header.tpl",
+			"body" => "posting_body.tpl"));
+		$jumpbox = make_jumpbox();
+		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+		$template->assign_vars(array(
 			"JUMPBOX_LIST" => $jumpbox,
 			"JUMPBOX_ACTION" => "viewforum.".$phpEx,
-			"SELECT_NAME" => POST_FORUM_URL));
-		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+			"SELECT_NAME" => POST_FORUM_URL,
+			"L_POSTNEWIN" => $l_postnewin,
+			"FORUM_ID" => $forum_id,
+			"FORUM_NAME" => $forum_name));
 		$template->pparse("header");
 		break;
 
- case 'newtopic':
-   $template->set_filenames(array("header" => "newtopic_header.tpl",
-			     "body" => "posting_body.tpl"));
-   $template->assign_vars(array("FORUM_ID" => $forum_id,
-			    "FORUM_NAME" => $forum_name,
-			    "L_POSTNEWIN" => $l_postnewin));
-   $template->pparse("header");
-   break;
-   case 'register':
-   	if(!isset($agreed))
-   	{
-   		if(!isset($coppa))
-   		{
-   			$coppa = FALSE;
-   		}
-   		$template->set_filenames(array("body" => "agreement.tpl"));
-			$template->assign_vars(array("COPPA" => $coppa));
-   	}
-   	else
-   	{
-   		$template->set_filenames(array("body" => "profile_add_body.tpl"));
-   	}
-   break;
-   case 'profile':
-   	$template->set_filenames(array("body" => "profile_view_body.tpl"));
+	case 'register':
+		if(!isset($agreed))
+		{
+			if(!isset($coppa))
+			{
+				$coppa = FALSE;
+			}
+			$template->set_filenames(array(
+				"body" => "agreement.tpl"));
+			$template->assign_vars(array(
+				"COPPA" => $coppa));
+		}
+		else
+		{
+			$template->set_filenames(array(
+				"body" => "profile_add_body.tpl"));
+		}
+		break;
+		
+	case 'profile':
+		$template->set_filenames(array(
+			"body" => "profile_view_body.tpl"));
    break;
 }
 
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index ffd5a013c2..0d28d4b04a 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -42,6 +42,8 @@ $l_emailaddress	= "Email Address";
 $l_preferences	= "Preferences";
 $l_welcometo    = "Welcome to";
 
+$l_all_times = "All times are";
+
 $l_anonymous	= "Anonymous";  // Post
 $l_guest	= "Guest"; // Whosonline
 $l_noposts	= "No $l_posts";
diff --git a/phpBB/templates/Default/index_footer.tpl b/phpBB/templates/Default/index_footer.tpl
index f3efd5f55f..6b413345b0 100644
--- a/phpBB/templates/Default/index_footer.tpl
+++ b/phpBB/templates/Default/index_footer.tpl
@@ -1,11 +1,11 @@
 	<tr>
-	  <td>
-	   <table border="0" align="center" width="100%" bgcolor="#FFFFFF" cellpadding="0" cellspacing="1">
-	    <tr align="left">
-	      <td style="{font-size: 8pt;}"><img src="images/folder.gif"> = {L_NEWPOSTS}.<br>
-	          <img src="images/red_folder.gif"> = {L_NONEWPOSTS}.<br>
-	      </td>
-	    </tr>
-	    </table>
-	   </td>
-	</tr>
+		<td align="center"><table border="0" width="100%" cellpadding="0" cellspacing="1">
+			<tr>
+				<td style="{font-size: 8pt;}"><img src="images/folder.gif"> = {L_NEWPOSTS}</td>
+				<td style="{font-size: 8pt;}" align="right"><b>{S_TIMEZONE}</b></td>
+			</tr>
+			<tr>
+				<td style="{font-size: 8pt;}"><img src="images/red_folder.gif"> = {L_NONEWPOSTS}</td>
+			</tr>
+		</table></td>
+	</tr>
+\ No newline at end of file