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

renamed our db-class to egw_db to allow easier integration of other code (eg. Lars SyncML stuff which is partially from horde)

Browse Source
This commit is contained in:
Ralf Becker 2005-06-19 12:43:00 +00:00
parent 1e3124d099
commit d4760bb15c
4 changed files with 1572 additions and 1505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1473
phpgwapi/inc/class.db.inc.php
View File

File diff suppressed because it is too large Load Diff

1539
phpgwapi/inc/class.egw_db.inc.php Normal file
View File

File diff suppressed because it is too large Load Diff

63
phpgwapi/inc/functions.inc.php
View File

@ -37,7 +37,9 @@
exit; exit;
} }
include(PHPGW_API_INC.'/common_functions.inc.php'); if (!defined('EGW_API_INC')) define('EGW_API_INC',PHPGW_API_INC); // this is to support the header upgrade
include(EGW_API_INC.'/common_functions.inc.php');
/*! /*!
@function lang @function lang
@ -58,7 +60,7 @@
} }
/* Make sure the header.inc.php is current. */ /* Make sure the header.inc.php is current. */
if (!isset($GLOBALS['egw_info']) || $GLOBALS['egw_info']['server']['versions']['header'] < $GLOBALS['egw_info']['server']['versions']['current_header']) if (!isset($GLOBALS['egw_domain']) || $GLOBALS['egw_info']['server']['versions']['header'] < $GLOBALS['egw_info']['server']['versions']['current_header'])
{ {
echo '<center><b>You need to port your settings to the new header.inc.php version by running <a href="setup/manageheader.php">setup/headeradmin</a>.</b></center>'; echo '<center><b>You need to port your settings to the new header.inc.php version by running <a href="setup/manageheader.php">setup/headeradmin</a>.</b></center>';
exit; exit;
@ -81,12 +83,6 @@
* Multi-Domain support * * Multi-Domain support *
\****************************************************************************/ \****************************************************************************/
/* make them fix their header */
if (!isset($GLOBALS['egw_domain']))
{
echo '<center><b>The administrator must upgrade the header.inc.php file before you can continue.</b></center>';
exit;
}
if (!isset($GLOBALS['egw_info']['server']['default_domain']) || // allow to overwrite the default domain if (!isset($GLOBALS['egw_info']['server']['default_domain']) || // allow to overwrite the default domain
!isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['server']['default_domain']])) !isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['server']['default_domain']]))
{ {
@ -139,13 +135,13 @@
* These lines load up the API, fill up the $phpgw_info array, etc * * These lines load up the API, fill up the $phpgw_info array, etc *
\****************************************************************************/ \****************************************************************************/
/* Load main class */ /* Load main class */
$GLOBALS['egw'] = CreateObject('phpgwapi.egw'); $GLOBALS['egw'] =& CreateObject('phpgwapi.egw');
// for the migration // for the migration
$GLOBALS['phpgw'] =& $GLOBALS['egw']; $GLOBALS['phpgw'] =& $GLOBALS['egw'];
/************************************************************************\ /************************************************************************\
* Load up the main instance of the db class. * * Load up the main instance of the db class. *
\************************************************************************/ \************************************************************************/
$GLOBALS['egw']->db = CreateObject('phpgwapi.db'); $GLOBALS['egw']->db =& CreateObject('phpgwapi.egw_db');
if ($GLOBALS['egw']->debug) if ($GLOBALS['egw']->debug)
{ {
$GLOBALS['egw']->db->Debug = 1; $GLOBALS['egw']->db->Debug = 1;
@ -232,17 +228,17 @@
/************************************************************************\ /************************************************************************\
* Required classes * * Required classes *
\************************************************************************/ \************************************************************************/
$GLOBALS['egw']->log = CreateObject('phpgwapi.errorlog'); $GLOBALS['egw']->log =& CreateObject('phpgwapi.errorlog');
$GLOBALS['egw']->translation = CreateObject('phpgwapi.translation'); $GLOBALS['egw']->translation =& CreateObject('phpgwapi.translation');
$GLOBALS['egw']->common = CreateObject('phpgwapi.common'); $GLOBALS['egw']->common =& CreateObject('phpgwapi.common');
$GLOBALS['egw']->hooks = CreateObject('phpgwapi.hooks'); $GLOBALS['egw']->hooks =& CreateObject('phpgwapi.hooks');
$GLOBALS['egw']->auth = CreateObject('phpgwapi.auth'); $GLOBALS['egw']->auth =& CreateObject('phpgwapi.auth');
$GLOBALS['egw']->accounts = CreateObject('phpgwapi.accounts'); $GLOBALS['egw']->accounts =& CreateObject('phpgwapi.accounts');
$GLOBALS['egw']->acl = CreateObject('phpgwapi.acl'); $GLOBALS['egw']->acl =& CreateObject('phpgwapi.acl');
$GLOBALS['egw']->session = CreateObject('phpgwapi.sessions',$domain_names); $GLOBALS['egw']->session =& CreateObject('phpgwapi.sessions',$domain_names);
$GLOBALS['egw']->preferences = CreateObject('phpgwapi.preferences'); $GLOBALS['egw']->preferences =& CreateObject('phpgwapi.preferences');
$GLOBALS['egw']->applications = CreateObject('phpgwapi.applications'); $GLOBALS['egw']->applications =& CreateObject('phpgwapi.applications');
$GLOBALS['egw']->contenthistory = CreateObject('phpgwapi.contenthistory'); $GLOBALS['egw']->contenthistory =& CreateObject('phpgwapi.contenthistory');
print_debug('main class loaded', 'messageonly','api'); print_debug('main class loaded', 'messageonly','api');
if (! isset($GLOBALS['egw_info']['flags']['included_classes']['error']) || if (! isset($GLOBALS['egw_info']['flags']['included_classes']['error']) ||
! $GLOBALS['egw_info']['flags']['included_classes']['error']) ! $GLOBALS['egw_info']['flags']['included_classes']['error'])
@ -301,7 +297,7 @@
print_debug('User ID',$login_id,'app'); print_debug('User ID',$login_id,'app');
$GLOBALS['egw']->accounts->accounts($login_id); $GLOBALS['egw']->accounts->accounts($login_id);
$GLOBALS['egw']->preferences->preferences($login_id); $GLOBALS['egw']->preferences->preferences($login_id);
$GLOBALS['egw']->datetime = CreateObject('phpgwapi.datetime'); $GLOBALS['egw']->datetime =& CreateObject('phpgwapi.datetime');
} }
} }
/**************************************************************************\ /**************************************************************************\
@ -331,7 +327,7 @@
exit; exit;
} }
$GLOBALS['egw']->datetime = CreateObject('phpgwapi.datetime'); $GLOBALS['egw']->datetime =& CreateObject('phpgwapi.datetime');
/* A few hacker resistant constants that will be used throught the program */ /* A few hacker resistant constants that will be used throught the program */
define('EGW_TEMPLATE_DIR', $GLOBALS['egw']->common->get_tpl_dir('phpgwapi')); define('EGW_TEMPLATE_DIR', $GLOBALS['egw']->common->get_tpl_dir('phpgwapi'));
@ -366,7 +362,7 @@
{ {
$enable_class = str_replace('enable_','',$phpgw_class_name[0]); $enable_class = str_replace('enable_','',$phpgw_class_name[0]);
$enable_class = str_replace('_class','',$enable_class); $enable_class = str_replace('_class','',$enable_class);
eval('$GLOBALS["phpgw"]->' . $enable_class . ' = createobject(\'phpgwapi.' . $enable_class . '\');'); eval('$GLOBALS["phpgw"]->' . $enable_class . ' =& CreateObject(\'phpgwapi.' . $enable_class . '\');');
} }
} }
unset($enable_class); unset($enable_class);
@ -377,7 +373,7 @@
\*************************************************************************/ \*************************************************************************/
if(!@$GLOBALS['egw_info']['flags']['disable_Template_class']) if(!@$GLOBALS['egw_info']['flags']['disable_Template_class'])
{ {
$GLOBALS['egw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); $GLOBALS['egw']->template =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
} }
/*************************************************************************\ /*************************************************************************\
@ -464,7 +460,7 @@
if(!is_object($GLOBALS['egw']->datetime)) if(!is_object($GLOBALS['egw']->datetime))
{ {
$GLOBALS['egw']->datetime = CreateObject('phpgwapi.datetime'); $GLOBALS['egw']->datetime =& CreateObject('phpgwapi.datetime');
} }
$GLOBALS['egw']->applications->read_installed_apps(); // to get translated app-titles $GLOBALS['egw']->applications->read_installed_apps(); // to get translated app-titles
@ -480,17 +476,14 @@
* Load the app include files if the exists * * Load the app include files if the exists *
\*************************************************************************/ \*************************************************************************/
/* Then the include file */ /* Then the include file */
if (PHPGW_APP_INC != "" && if (EGW_APP_INC != "" && ! preg_match ('/phpgwapi/i', EGW_APP_INC) &&
! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(EGW_APP_INC . '/functions.inc.php') && !isset($_GET['menuaction']))
file_exists(PHPGW_APP_INC . '/functions.inc.php') &&
!isset($_GET['menuaction']))
{ {
include(PHPGW_APP_INC . '/functions.inc.php'); include(EGW_APP_INC . '/functions.inc.php');
} }
if (!@$GLOBALS['egw_info']['flags']['noheader'] && if (!@$GLOBALS['egw_info']['flags']['noheader'] && !@$GLOBALS['egw_info']['flags']['noappheader'] &&
!@$GLOBALS['egw_info']['flags']['noappheader'] && file_exists(EGW_APP_INC . '/header.inc.php') && !isset($_GET['menuaction']))
file_exists(PHPGW_APP_INC . '/header.inc.php') && !isset($_GET['menuaction']))
{ {
include(PHPGW_APP_INC . '/header.inc.php'); include(EGW_APP_INC . '/header.inc.php');
} }
} }

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

@ -63,7 +63,7 @@
{ {
$GLOBALS['egw_info']['server']['db_persistent'] = False; $GLOBALS['egw_info']['server']['db_persistent'] = False;
} }
$this->db =& CreateObject('phpgwapi.db'); $this->db =& CreateObject('phpgwapi.egw_db');
$this->db->Host = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_host']; $this->db->Host = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_host'];
$this->db->Port = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_port']; $this->db->Port = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_port'];
$this->db->Type = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_type']; $this->db->Type = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_type'];