extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for first step

Browse Source
This commit is contained in:
sjb4891 2000-11-06 03:52:45 +00:00
parent 7b1d3ff865
commit b92f042dad
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/inc/core_setup.inc.php
View File

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

1
setup/index.php
View File

@ -63,6 +63,7 @@
* * * *
\**********************************************************************/ \**********************************************************************/
$ok = true; $ok = true;
$baseDir = $phpgw_info["server"]["server_root"];
include("inc/core_setup.inc.php"); include("inc/core_setup.inc.php");
if (!$ok) { if (!$ok) {
exit; exit;