3 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index c4cddbf6c2..1c51163eb4 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -69,6 +69,9 @@ define(POST_TOPIC_URL, 't');
 define(POST_FORUM_URL, 'f');
 define(POST_USERS_URL, 'u');
 
+// Session parameters
+define(AUTOLOGON, 0);
+
 define('BANLIST_TABLE', $table_prefix.'banlist');
 define('CATEGORIES_TABLE', $table_prefix.'categories');
 define('CONFIG_TABLE', $table_prefix.'config');
@@ -81,7 +84,7 @@ define('POSTS_TABLE', $table_prefix.'posts');
 define('POSTS_TEXT_TABLE', $table_prefix.'posts_text');
 define('PRIV_MSGS_TABLE', $table_prefix.'priv_msgs');
 define('RANKS_TABLE', $table_prefix.'ranks');
-define('SESSIONS_TABLE', $table_prefix.'sessions');
+define('SESSIONS_TABLE', $table_prefix.'session');
 define('THEMES_TABLE', $table_prefix.'themes');
 define('TOPICS_TABLE', $table_prefix.'topics');
 define('USERS_TABLE', $table_prefix.'users');
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 35841cb682..ff7da1e86b 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -28,9 +28,10 @@ DEFINE(HEADER_INC, TRUE);
 $template->set_filenames(array("overall_header" => "overall_header.tpl",
 			  "overall_footer" => "overall_footer.tpl"));
 
-if($user_logged_in)
+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>]";
 }
 else
 {
diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php
index d050c6f537..9adf612948 100644
--- a/phpBB/includes/page_tail.php
+++ b/phpBB/includes/page_tail.php
@@ -41,7 +41,7 @@ switch($pagetype)
 }
 
 // Show the overall footer.
-if($user_logged_in) 
+if($userdata['session_logged_in']) 
 {
    $admin_link = "<a href=\"admin/index.php\">Administration Panel</a>";
 }