diff --git a/setup/inc/phpgw_setup.inc.php b/setup/inc/phpgw_setup.inc.php index 097441e4ac..67b4d07969 100644 --- a/setup/inc/phpgw_setup.inc.php +++ b/setup/inc/phpgw_setup.inc.php @@ -313,45 +313,5 @@ } */ } - - function setup_header($title = "",$nologoutbutton = False) { - global $phpgw_info, $PHP_SELF; - - // Ok, so it isn't the greatest idea, but it works for now. Setup needs to be rewritten. - if ($phpgw_info["setup"]["dontshowtheheaderagain"]) { - return False; - } - - $phpgw_info["setup"]["dontshowtheheaderagain"] = True; -?> - - phpGroupWare setup <?php echo $title; ?> - - - - - - -
 phpGroupWare version setup - -Logout '; - } - echo "
"; - } - - - } ?> diff --git a/setup/index.php b/setup/index.php index 1789032ecd..94cdb5152a 100644 --- a/setup/index.php +++ b/setup/index.php @@ -27,11 +27,11 @@ $phpgw_setup->show_header("Please login",True); $phpgw_setup->login_form(); exit; - }else{ /* If authentication is sucessful, we load the database. */ - $phpgw_setup->loaddb(); } /* Database actions */ + $phpgw_setup->loaddb(); + $phpgw_info["setup"]["stage"]["db"] = $phpgw_setup->check_db(); switch($action){ case "Delete all my tables and data": $subtitle = "Deleting Tables"; @@ -69,7 +69,6 @@ echo ""; echo ' '; - $phpgw_info["setup"]["stage"]["db"] = $phpgw_setup->check_db(); switch($phpgw_info["setup"]["stage"]["db"]){ case 1: echo ''; diff --git a/setup/lang.php b/setup/lang.php index d85f741887..5cffedc6d0 100644 --- a/setup/lang.php +++ b/setup/lang.php @@ -91,7 +91,7 @@ } else { if (! $included) { - $phpgw_setup->setup_header(); + $phpgw_setup->show_header(); ?>

Step 1 - database management 
O
Your database does not exist.
"> diff --git a/setup/ldap.php b/setup/ldap.php index 8763013f8a..52d48c91c1 100644 --- a/setup/ldap.php +++ b/setup/ldap.php @@ -108,7 +108,7 @@ // Add a check to see if there is no users in LDAP, if not create a default user. - $phpgw_setup->setup_header(); + $phpgw_setup->show_header(); if ($error) { echo "
Error: $error
";