diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php index dce64d50e9..8bb02d3e15 100644 --- a/setup/inc/functions.inc.php +++ b/setup/inc/functions.inc.php @@ -207,4 +207,45 @@ $db->query("DROP TABLE phpgw_testrights"); } } + + function setup_header($title = "",$nologoutbutton = False) { + global $phpgw_info, $PHP_SELF, $dontshowtheheaderagain; + + // Ok, so it isn't the greatest idea, but it works for now. Setup needs to be rewritten. + if ($dontshowtheheaderagain) { + return False; + } + + $dontshowtheheaderagain = True; + ?> + + + phpGroupWare setup <?php echo $title; ?> + + + + + + +
 phpGroupWare version setup + + Logout '; + } + + echo "
"; + } + + ?> diff --git a/setup/ldap.php b/setup/ldap.php index 1bde0879ad..e2b8f140e2 100644 --- a/setup/ldap.php +++ b/setup/ldap.php @@ -14,14 +14,18 @@ $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "home", "noapi" => True); include("../header.inc.php"); + include("./inc/functions.inc.php"); // Authorize the user to use setup app and load the database - include("./inc/setup_auth.inc.php"); + // include("./inc/setup_auth.inc.php"); // Does not return unless user is authorized + $phpgw_info["server"]["api_dir"] = + $phpgw_info["server"]["include_root"]."/phpgwapi"; include($phpgw_info["server"]["api_dir"] . "/phpgw_common.inc.php"); $common = new common; - + loaddb(); + $db->query("select config_name,config_value from config where config_name like 'ldap%'",__LINE__,__FILE__); while ($db->next_record()) { $config[$db->f("config_name")] = $db->f("config_value");