extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

changing the way the account object gets instanciated again a bit, as the new setup stuff wasnt working fully after the last fix

Browse Source
This commit is contained in:
Ralf Becker 2007-12-14 01:28:33 +00:00
parent 6651f0efc4
commit 86001bea68
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -900,7 +900,8 @@
$GLOBALS['egw']->db = clone($this->db); $GLOBALS['egw']->db = clone($this->db);
$GLOBALS['egw']->common =& CreateObject('phpgwapi.common'); $GLOBALS['egw']->common =& CreateObject('phpgwapi.common');
$GLOBALS['egw']->accounts = $this->accounts = new accounts($config); $this->accounts = new accounts($config);
if (!is_object($GLOBALS['egw']->accounts)) $GLOBALS['egw']->accounts = $this->accounts;
$this->accounts->cache_invalidate(); // the cache is shared for all instances of the class $this->accounts->cache_invalidate(); // the cache is shared for all instances of the class
if(($GLOBALS['egw_info']['server']['account_repository'] == 'ldap') && if(($GLOBALS['egw_info']['server']['account_repository'] == 'ldap') &&

1
setup/inc/class.setup_cmd.inc.php
View File

@ -157,6 +157,7 @@ abstract class setup_cmd extends admin_cmd
if (!is_null(self::$egw_accounts_backup)) if (!is_null(self::$egw_accounts_backup))
{ {
$GLOBALS['egw']->accounts = self::$egw_accounts_backup; $GLOBALS['egw']->accounts = self::$egw_accounts_backup;
$GLOBALS['egw']->accounts->cache_invalidate();
unset(self::$egw_accounts_backup); unset(self::$egw_accounts_backup);
} }
} }

3
setup/inc/class.setup_cmd_config.inc.php
View File

@ -85,6 +85,8 @@ class setup_cmd_config extends setup_cmd
return lang('Configuration changed.'); return lang('Configuration changed.');
} }
$this->restore_db();
return lang('Nothing to change.'); return lang('Nothing to change.');
} }
@ -165,6 +167,7 @@ class setup_cmd_config extends setup_cmd
'--ldap-context' => 'ldap_context', '--ldap-context' => 'ldap_context',
'--ldap-search-filter' => 'ldap_search_filter', '--ldap-search-filter' => 'ldap_search_filter',
'--ldap-group-context' => 'ldap_group_context', '--ldap-group-context' => 'ldap_group_context',
'--allow-remote-admin' => 'allow_remote_admin',
); );
/** /**

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

@ -94,6 +94,8 @@ class setup_cmd_install extends setup_cmd
if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n"; if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n";
$setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config); $setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
$this->restore_db();
return lang('Installation finished'); return lang('Installation finished');
} }
} }