From b92f042dadde689c6e30b150b7411dc07fe79b7d Mon Sep 17 00:00:00 2001
From: sjb4891 <sjb4891@alumni.egroupware.org>
Date: Mon, 6 Nov 2000 03:52:45 +0000
Subject: [PATCH] More fixes for first step

---
 setup/inc/core_setup.inc.php | 7 ++++---
 setup/index.php              | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup/inc/core_setup.inc.php b/setup/inc/core_setup.inc.php
index b2b01a666c..690ba08006 100644
--- a/setup/inc/core_setup.inc.php
+++ b/setup/inc/core_setup.inc.php
@@ -24,6 +24,7 @@
   // if true, ../index.php falls through to app setup
   $ok = true;
 
+  $incdir = $phpgw_info["server"]["server_root"]."/setup/inc/";
 
   if (!isset($oldversion)){
     @$db->query("select app_version from applications where app_name='admin'");
@@ -135,7 +136,7 @@
       echo "  </tr>\n";
       $db->Halt_On_Error = "report";
       $currentver = "drop";
-      include ("../sql/common_main.inc.php");
+      include ($incdir."/sql/common_main.inc.php");
       $db->Halt_On_Error = "no";
       echo "  <tr bgcolor=\"486591\">\n";
       echo "    <td colspan=\"2\"><font color=\"fefefe\">&nbsp;<b>Status</b></font></td>\n";
@@ -158,7 +159,7 @@
       echo "</table>\n";
       $currentver = $oldversion;
       $db->Halt_On_Error = "report";
-      include ("../sql/common_main.inc.php");
+      include ($incdir."/sql/common_main.inc.php");
       $db->Halt_On_Error = "no";
       echo "<table border=\"0\" align=\"center\">\n";
       echo "  <tr bgcolor=\"486591\">\n";
@@ -192,7 +193,7 @@
             echo "  </tr>\n";
             $db->Halt_On_Error = "report";
             $currentver = "new";
-            include ("../sql/common_main.inc.php");
+            include ($incdir."/sql/common_main.inc.php");
             $db->Halt_On_Error = "no";
             echo "  <tr bgcolor=\"486591\">\n";
             echo "    <td colspan=\"2\"><font color=\"fefefe\">&nbsp;<b>Status</b></font></td>\n";
diff --git a/setup/index.php b/setup/index.php
index dcffb0d17c..cb5fe6b097 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -63,6 +63,7 @@
    *                                                                    *
   \**********************************************************************/
   $ok = true;
+  $baseDir = $phpgw_info["server"]["server_root"];
   include("inc/core_setup.inc.php");
   if (!$ok) {
     exit;