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

Wed, 28 Feb 2001 16:21:16 +0000

Browse Source 
Ra�l Alexis Betancort Santana <rabs@dimension-virtual.com>

	Fixed the *config* table name problem on phpgw_setup.inc.php
This commit is contained in:
el_latino 2001-02-28 16:24:56 +00:00
parent 0f2edfd4a8
commit 86a3f8da81
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,11 @@
if(file_exists('../header.inc.php')) { include('../header.inc.php'); } if(file_exists('../header.inc.php')) { include('../header.inc.php'); }
include('./inc/phpgw_setup.inc.php'); include('./inc/phpgw_setup.inc.php');
// include('./inc/phpgw_schema_proc.inc.php'); include('./inc/phpgw_schema_proc.inc.php');
include('./inc/phpgw_schema_current.inc.php');
$phpgw_setup = new phpgw_setup; $phpgw_setup = new phpgw_setup;
/*$phpgw_setup12 = new phpgw_schema_proc('mysql');
$phpgw_setup13 = new phpgw_schema_proc('pgsql');
$phpgw_setup12->GenerateScripts($phpgw_tables,true);
$phpgw_setup13->GenerateScripts($phpgw_tables,true);*/
?> ?>

4
setup/inc/phpgw_schema_proc.inc.php
View File

@ -21,10 +21,10 @@ class phpgw_schema_proc
function phpgw_schema_proc($dbms) function phpgw_schema_proc($dbms)
{ {
include("phpgw_schema_proc_" . $dbms . ".inc.php"); include("./inc/phpgw_schema_proc_" . $dbms . ".inc.php");
eval("\$this->m_oTranslator = new phpgw_schema_proc_$dbms;"); eval("\$this->m_oTranslator = new phpgw_schema_proc_$dbms;");
include("phpgw_schema_proc_array.inc.php"); include("./inc/phpgw_schema_proc_array.inc.php");
$this->m_oDeltaProc = new phpgw_schema_proc_array; $this->m_oDeltaProc = new phpgw_schema_proc_array;
$this->m_aTables = array(); $this->m_aTables = array();
$this->m_bDeltaOnly = false; // Default to false here in case it's just a CreateTable script $this->m_bDeltaOnly = false; // Default to false here in case it's just a CreateTable script

8
setup/inc/phpgw_setup.inc.php
View File

@ -247,7 +247,13 @@
$this->db->Halt_On_Error = "no"; $this->db->Halt_On_Error = "no";
if ($phpgw_info["setup"]["stage"]["db"] != 10){return "";} if ($phpgw_info["setup"]["stage"]["db"] != 10){return "";}
$this->db->query("select config_value from config where config_name='freshinstall'"); // Since 0.9.10pre6 config table is named as phpgw_config
$config_table="config";
$ver = explode(".",$phpgw_info["server"]["versions"]["phpgwapi"]);
if(ereg("([0-9]+)(pre)([0-9]+)",$ver[2],$regs))
if(($regs[1] == "10") && ($regs[3] >= "6"))
$config_table="phpgw_config";
$this->db->query("select config_value from $config_table where config_name='freshinstall'");
$this->db->next_record(); $this->db->next_record();
$configed = $this->db->f("config_value"); $configed = $this->db->f("config_value");
if ($configed){ if ($configed){