From f4efac55bb15ab66aa973a83fb3423accfbbf5c4 Mon Sep 17 00:00:00 2001
From: jengo <jengo@alumni.egroupware.org>
Date: Thu, 27 Sep 2001 23:59:39 +0000
Subject: [PATCH] - Fixed logout button not working correctly - Re-enabled the
 logout button in lang.php, not sure why it was disabled

---
 setup/inc/class.setup_html.inc.php | 2 +-
 setup/lang.php                     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php
index 58a99886f1..ed65a9e4e8 100644
--- a/setup/inc/class.setup_html.inc.php
+++ b/setup/inc/class.setup_html.inc.php
@@ -55,7 +55,7 @@
 			}
 			else
 			{
-				$btn_logout = '<a href="'.basename($GLOBALS['HTTP_SERVER_VARS']['REQUEST_URI']).'?FormLogout='.$logoutfrom.'" class="link">'.lang('Logout').'</a>';
+				$btn_logout = '<a href="index.php?FormLogout=' . $logoutfrom . '" class="link">'.lang('Logout').'</a>';
 			}
 
 			$GLOBALS['setup_tpl']->set_var('lang_setup', lang('setup'));
diff --git a/setup/lang.php b/setup/lang.php
index df2fa7c1a1..fda6b7dc22 100644
--- a/setup/lang.php
+++ b/setup/lang.php
@@ -204,8 +204,7 @@
 			$setup_tpl->set_var('lang_install',lang('install'));
 			$setup_tpl->set_var('lang_cancel',lang('cancel'));
 
-			// True = do not show logout link in top right corner
-			$phpgw_setup->show_header("$stage_title",True,'config',$ConfigDomain . '(' . $phpgw_domain[$ConfigDomain]['db_type'] . ')');
+			$phpgw_setup->show_header("$stage_title",False,'config',$ConfigDomain . '(' . $phpgw_domain[$ConfigDomain]['db_type'] . ')');
 			$setup_tpl->pparse('out','T_lang_main');
 			$phpgw_setup->show_footer();
 		}