3 files changed, 35 insertions, 4 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 8d6a34f5e0..275cb674f8 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -37,11 +37,17 @@ $template->set_filenames(array(
 if($userdata['session_logged_in'])
 {
 	$logged_in_status = "You are logged in as <b>".$userdata["username"]."</b>.";
-	$logged_in_status .= " [<A HREF=\"login.$phpEx?submit=logout\">Logout</A>]";
+	$logged_in_status .= " [<a href=\"login.$phpEx?submit=logout\">Logout</a>]";
+
+	$u_login_logout = "login.$phpEx?submit=logout";
+	$l_login_logout = "$l_logout : ".$userdata["username"]."";
 }
 else
 {
 	$logged_in_status = "You are not logged in.";
+
+	$u_login_logout = "login.$phpEx";
+	$l_login_logout = "$l_login";
 }
 
 //
@@ -111,6 +117,7 @@ $template->assign_vars(array(
 	"L_PASSWORD" => $l_password,
 	"L_LOG_ME_IN" => $l_log_me_in,
 	"L_WELCOMETO" => $l_welcometo,
+	"L_INDEX" => $l_indextitle,
 	"L_REGISTER" => $l_register,
 	"L_PROFILE" => $l_profile,
 	"L_SEARCH" => $l_search,
@@ -134,6 +141,23 @@ $template->assign_vars(array(
 	"L_THEFORUMS" => $l_theforums,
 	"L_NONEWPOSTS" => $l_nonewposts,
 	"L_NEWPOSTS" => $l_newposts,
+	"L_POSTED" => $l_posted,
+	"L_JOINED" => $l_joined,
+
+	"L_AUTO_LOGIN" => $l_autologin,
+	"L_AUTHOR" => $l_author,
+	"L_MESSAGE" => $l_message,
+
+	"L_LOGIN_LOGOUT" => $l_login_logout,
+
+	"U_REGISTER" => "profile.".$phpEx."?mode=register",
+	"U_PROFILE" => "profile.".$phpEx."?mode=editprofile",
+	"U_PRIVATEMSGS" => "priv_msgs.".$phpEx."?mode=read",
+	"U_SEARCH" => "search.".$phpEx,
+	"U_MEMBERLIST" => "memberlist.".$phpEx,
+	"U_FAQ" => "faq.".$phpEx,
+	"U_VIEWONLINE" => "viewonline.$phpEx",
+	"U_LOGIN_LOGOUT" => $u_login_logout,
 
 	"S_TIMEZONE" => $s_timezone,
 	"S_FORUMS_URL" => POST_FORUM_URL,
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 729aa99cb5..9d1d4939cc 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -34,7 +34,7 @@ $l_messages	= "Messages";
 $l_subject	= "Subject";
 $l_body		= "$l_message Body";
 $l_from		= "From";   // Message from
-$l_moderator 	= "Moderator";
+$l_moderator 	= "Moderator/s";
 $l_username 	= "Username";
 $l_password 	= "Password";
 $l_email 	= "Email";
diff --git a/phpBB/login.php b/phpBB/login.php
index 97332c9983..a15351aac8 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -96,13 +96,19 @@ else
 	//
 	$page_title = "Log In";
 	include('includes/page_header.'.$phpEx);
-	$template->set_filenames(array("body" => "login_body.tpl"));
+	$template->set_filenames(
+		array(
+			"header" => "login_header.tpl",
+			"body" => "login_body.tpl",
+			"footer" => "login_footer.tpl"
+		)
+	);
+	$template->pparse("header");
 
 	$template->assign_vars(array(
 		"L_USERNAME" => $l_username,
 		"L_PASSWORD" => $l_password,
 		"L_SEND_PASSWORD" => $l_resend_password,
-		"L_AUTO_LOGIN" => $l_autologin,
 		"L_LOGIN" => $l_login,
 		"U_SEND_PASSWORD" => "sendpassword.".$phpEx,
 
@@ -111,6 +117,7 @@ else
 	);
 
 	$template->pparse("body");
+	$template->pparse("footer");
 
 	include('includes/page_tail.'.$phpEx);