forked from extern/egroupware
Use config_app='phpgwapi' for filling 'server' array, to avoid conflicts
This commit is contained in:
parent
131fb588ca
commit
eb0aa37eaa
@ -241,30 +241,31 @@
|
|||||||
{
|
{
|
||||||
$setup_dir = ereg_replace($PHP_SELF,'index.php','setup/');
|
$setup_dir = ereg_replace($PHP_SELF,'index.php','setup/');
|
||||||
echo '<center><b>Fatal Error:</b> It appears that you have not created the database tables for '
|
echo '<center><b>Fatal Error:</b> It appears that you have not created the database tables for '
|
||||||
.'phpGroupWare. Click <a href="' . $setup_dir . '">here</a> run for setup.</center>';
|
.'phpGroupWare. Click <a href="' . $setup_dir . '">here</a> run for setup.</center>';
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
$phpgw->db->Halt_On_Error = 'yes';
|
$phpgw->db->Halt_On_Error = 'yes';
|
||||||
|
|
||||||
/* Fill phpgw_info["server"] array */
|
/* Fill phpgw_info["server"] array */
|
||||||
$phpgw->db->query("select * from phpgw_config",__LINE__,__FILE__);
|
$phpgw->db->query("select * from phpgw_config WHERE config_app='phpgwapi'",__LINE__,__FILE__);
|
||||||
while ($phpgw->db->next_record()) {
|
while ($phpgw->db->next_record())
|
||||||
$phpgw_info["server"][$phpgw->db->f("config_name")] = stripslashes($phpgw->db->f("config_value"));
|
{
|
||||||
|
$phpgw_info['server'][$phpgw->db->f('config_name')] = stripslashes($phpgw->db->f('config_value'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************\
|
/************************************************************************\
|
||||||
* Required classes *
|
* Required classes *
|
||||||
\************************************************************************/
|
\************************************************************************/
|
||||||
$phpgw->common = CreateObject("phpgwapi.common");
|
$phpgw->common = CreateObject('phpgwapi.common');
|
||||||
$phpgw->hooks = CreateObject("phpgwapi.hooks");
|
$phpgw->hooks = CreateObject('phpgwapi.hooks');
|
||||||
$phpgw->auth = createobject("phpgwapi.auth");
|
$phpgw->auth = CreateObject('phpgwapi.auth');
|
||||||
$phpgw->acl = CreateObject("phpgwapi.acl");
|
$phpgw->acl = CreateObject('phpgwapi.acl');
|
||||||
$phpgw->accounts = createobject("phpgwapi.accounts");
|
$phpgw->accounts = CreateObject('phpgwapi.accounts');
|
||||||
$phpgw->session = CreateObject("phpgwapi.sessions");
|
$phpgw->session = CreateObject('phpgwapi.sessions');
|
||||||
$phpgw->preferences = CreateObject("phpgwapi.preferences");
|
$phpgw->preferences = CreateObject('phpgwapi.preferences');
|
||||||
$phpgw->applications = CreateObject("phpgwapi.applications");
|
$phpgw->applications = CreateObject('phpgwapi.applications');
|
||||||
$phpgw->translation = CreateObject("phpgwapi.translation");
|
$phpgw->translation = CreateObject('phpgwapi.translation');
|
||||||
// $phpgw->datetime = CreateObject('phpgwapi.datetime');
|
// $phpgw->datetime = CreateObject('phpgwapi.datetime');
|
||||||
print_debug('main class loaded');
|
print_debug('main class loaded');
|
||||||
|
|
||||||
/****************************************************************************\
|
/****************************************************************************\
|
||||||
|
Loading…
Reference in New Issue
Block a user