updating because the dbtype was being pulled from teh wrong location

This commit is contained in:
seek3r 2000-11-21 18:17:27 +00:00
parent bfc91f9420
commit c1729c1e6b
2 changed files with 13 additions and 13 deletions

View File

@ -43,12 +43,6 @@
* *
\**********************************************************************/
$ok = true;
$baseDir = $phpgw_info["server"]["server_root"];
include("inc/core_setup.inc.php");
if (!$ok) {
exit;
} else {
echo ' <table border="0" width="100%"><tr>'
. '<td align="left" bgcolor="486591">&nbsp;<font color="fefefe">phpGroupWare version '
. $phpgw_info["server"]["version"] . ' setup</font></td><td align="right" bgcolor="486591">';
@ -58,6 +52,12 @@
echo " </form>\n";
echo "</td></tr></table>";
$ok = true;
$baseDir = $phpgw_info["server"]["server_root"];
include("inc/core_setup.inc.php");
if (!$ok) {
exit;
} else {
echo "<table width=\"70%\" border='0' align='center' bgcolor='#e6e6e6' cellpadding='3' cellspacing='0'>\n";
echo "<tr bgcolor='#486591'>";
echo "<th align=\"center\"><font color='#fefefe'>phpGroupWare Core Staus</font></th>";

View File

@ -18,11 +18,11 @@
}
if ($currentver == "drop"){
include("./sql/".$phpgw_info["server"]["db_type"]."_droptables.inc.php");
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_droptables.inc.php");
$currentver = "new";
}
if ($currentver == "new") {
include("./sql/".$phpgw_info["server"]["db_type"]."_newtables.inc.php");
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_newtables.inc.php");
include("./sql/common_default_records.inc.php");
$included = True;
include($phpgw_info["server"]["server_root"] . "/setup/lang.php");
@ -33,10 +33,10 @@
echo " </tr>\n";
if ($currentver == "7122000" || $currentver == "8032000" || $currentver == "8072000" || $currentver == "8212000" || $currentver == "9052000" || $currentver == "9072000") {
include("./sql/".$phpgw_info["server"]["db_type"]."_upgrade_prebeta.inc.php");
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_prebeta.inc.php");
}
include("./sql/".$phpgw_info["server"]["db_type"]."_upgrade_beta.inc.php");
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_beta.inc.php");
if (!$tablechanges == True){
echo " <tr bgcolor=\"e6e6e6\">\n";