holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed upgrade path

Browse Source
This commit is contained in:
seek3r 2000-12-01 22:26:12 +00:00
parent aa2246dd9e
commit e2bbebee9a
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/inc/functions.inc.php
View File

@ -215,7 +215,7 @@
echo "You appear to be running version $oldversion of phpGroupWare.<br>\n"; echo "You appear to be running version $oldversion of phpGroupWare.<br>\n";
echo "We will automaticly update your tables/records to ".$phpgw_info["server"]["version"].", but we highly recommend backing up your tables in case the script causes damage to your data.\n"; echo "We will automaticly update your tables/records to ".$phpgw_info["server"]["version"].", but we highly recommend backing up your tables in case the script causes damage to your data.\n";
echo "These automated scripts can easily destroy your data. Please backup before going any further!\n"; echo "These automated scripts can easily destroy your data. Please backup before going any further!\n";
echo "<form method=\"POST\" action=\"$PHP_SELF\">\n"; echo "<form method=\"POST\" action=\"tables.php\">\n";
echo "<input type=\"hidden\" name=\"oldversion\" value=\"".$oldversion."\">\n"; echo "<input type=\"hidden\" name=\"oldversion\" value=\"".$oldversion."\">\n";
echo "<input type=\"hidden\" name=\"useglobalconfigsettings\">\n"; echo "<input type=\"hidden\" name=\"useglobalconfigsettings\">\n";
echo "<input type=\"submit\" name=\"action\" value=\"Upgrade\">\n"; echo "<input type=\"submit\" name=\"action\" value=\"Upgrade\">\n";

4
setup/sql/common_main.inc.php
View File

@ -25,7 +25,11 @@
include("./sql/common_default_records.inc.php"); include("./sql/common_default_records.inc.php");
$included = True; $included = True;
include($phpgw_info["server"]["server_root"] . "/setup/lang.php"); include($phpgw_info["server"]["server_root"] . "/setup/lang.php");
$currentver = "oldversion";
}
if ($currentver == "oldversion") {
$currentver = $oldversion;
if ($currentver == "7122000" || $currentver == "8032000" || $currentver == "8072000" || $currentver == "8212000" || $currentver == "9052000" || $currentver == "9072000") { if ($currentver == "7122000" || $currentver == "8032000" || $currentver == "8072000" || $currentver == "8212000" || $currentver == "9052000" || $currentver == "9072000") {
include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_prebeta.inc.php"); include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_prebeta.inc.php");
} }

5
setup/tables.php
View File

@ -41,7 +41,6 @@
echo "You appear to be running an old version of PHP. It its recommend that you upgrade " echo "You appear to be running an old version of PHP. It its recommend that you upgrade "
. "to a new version. Older version of PHP might not run phpGroupWare correctly, if at all."; . "to a new version. Older version of PHP might not run phpGroupWare correctly, if at all.";
} }
/* Database setup */ /* Database setup */
switch($action){ switch($action){
case "Delete all my tables and data": case "Delete all my tables and data":
@ -54,7 +53,8 @@
$subtitle = "Upgrading Tables"; $subtitle = "Upgrading Tables";
$submsg = "At your request, this script is going to attempt to upgrade your old tables to the new format."; $submsg = "At your request, this script is going to attempt to upgrade your old tables to the new format.";
$subaction = "upgraded"; $subaction = "upgraded";
$currentver = $oldversion; // $currentver = $oldversion;
$currentver = "oldversion";
break; break;
case "Create": case "Create":
$subtitle = "Creating Tables"; $subtitle = "Creating Tables";
@ -63,6 +63,7 @@
$currentver = "new"; $currentver = "new";
break; break;
} }
$stage = 2.5; $stage = 2.5;
show_header($header_msg); show_header($header_msg);
show_steps($stage); show_steps($stage);