extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 11:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

few slight modifications to better cater for the multi-domain administration

Browse Source
This commit is contained in:
Ralf Becker 2008-01-09 02:01:08 +00:00
parent e40d73091b
commit 2a4eff2ca3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.applications.inc.php
View File

@ -50,7 +50,7 @@
*/ */
function applications($account_id = '') function applications($account_id = '')
{ {
if (is_object($GLOBALS['egw_setup'])) if (is_object($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']->db))
{ {
$this->db = clone($GLOBALS['egw_setup']->db); $this->db = clone($GLOBALS['egw_setup']->db);
} }

6
phpgwapi/inc/class.egw.inc.php
View File

@ -113,12 +113,12 @@
$this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__); $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__);
if ($this->db->next_record()) if ($this->db->next_record())
{ {
echo '<center><b>Fatal Error:</b> You need to <a href="' . $setup_dir . '">update eGroupWare</a> before you can continue using it.</center>'; throw new Exception('<center><b>Fatal Error:</b> You need to <a href="' . $setup_dir . '">update eGroupWare</a> before you can continue using it.</center>',999);
} }
else else
{ {
echo '<center><b>Fatal Error:</b> It appears that you have not created the database tables for ' throw new Exception('<center><b>Fatal Error:</b> It appears that you have not created the database tables for '
.'eGroupWare. Click <a href="' . $setup_dir . '">here</a> to run setup.</center>'; .'eGroupWare. Click <a href="' . $setup_dir . '">here</a> to run setup.</center>',999);
} }
exit; exit;
} }

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

@ -50,11 +50,11 @@ if (!isset($GLOBALS['egw_info']['flags']['currentapp']))
echo '!!! PLEASE CORRECT THIS SITUATION !!!</b></p>'; echo '!!! PLEASE CORRECT THIS SITUATION !!!</b></p>';
} }
include(EGW_API_INC.'/common_functions.inc.php'); include_once(EGW_API_INC.'/common_functions.inc.php');
if (extension_loaded('memcache') && ini_get('session.save_handler') == 'memcache') if (extension_loaded('memcache') && ini_get('session.save_handler') == 'memcache')
{ {
include(EGW_API_INC.'/memcache.inc.php'); include_once(EGW_API_INC.'/memcache.inc.php');
} }
// check if we can restore the eGW enviroment from the php-session // check if we can restore the eGW enviroment from the php-session
if ($GLOBALS['egw_info']['server']['sessions_type'] == 'php4-restore' && $_REQUEST['sessionid']) if ($GLOBALS['egw_info']['server']['sessions_type'] == 'php4-restore' && $_REQUEST['sessionid'])