From e2bbebee9a6d242dff7553324a9c12a526914add Mon Sep 17 00:00:00 2001
From: seek3r <seek3r@alumni.egroupware.org>
Date: Fri, 1 Dec 2000 22:26:12 +0000
Subject: [PATCH] fixed upgrade path

---
 setup/inc/functions.inc.php   | 2 +-
 setup/sql/common_main.inc.php | 4 ++++
 setup/tables.php              | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index 7eb9362ad0..2073b3e136 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.inc.php
@@ -215,7 +215,7 @@
       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 "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=\"useglobalconfigsettings\">\n";
       echo "<input type=\"submit\" name=\"action\" value=\"Upgrade\">\n";
diff --git a/setup/sql/common_main.inc.php b/setup/sql/common_main.inc.php
index a5af962fbd..5cc38906a7 100644
--- a/setup/sql/common_main.inc.php
+++ b/setup/sql/common_main.inc.php
@@ -25,7 +25,11 @@
     include("./sql/common_default_records.inc.php");
     $included = True;
     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") {
       include("./sql/".$phpgw_domain[$SetupDomain]["db_type"]."_upgrade_prebeta.inc.php");
     }
diff --git a/setup/tables.php b/setup/tables.php
index 31bb47b3be..646ef15708 100644
--- a/setup/tables.php
+++ b/setup/tables.php
@@ -41,7 +41,6 @@
      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.";
   }
-
   /* Database setup */
   switch($action){
     case "Delete all my tables and data":
@@ -54,7 +53,8 @@
       $subtitle = "Upgrading Tables";
       $submsg = "At your request, this script is going to attempt to upgrade your old tables to the new format.";
       $subaction = "upgraded";
-      $currentver = $oldversion;
+//      $currentver = $oldversion;
+      $currentver = "oldversion";
       break;      
     case "Create":
       $subtitle = "Creating Tables";
@@ -63,6 +63,7 @@
       $currentver = "new";
       break;      
   }
+
   $stage = 2.5;
   show_header($header_msg);
   show_steps($stage);