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

fixed forwarding of authentication (ldap or ads) homedirectory attribute to egw_info and vfs

Browse Source
This commit is contained in:
Ralf Becker 2011-11-15 19:16:09 +00:00
parent 8ab9b0d2f2
commit f6fe40f2d9
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ class auth_ads implements auth_backend
$GLOBALS['auto_create_acct'] = array();
if (isset($allValues[0]['homedirectory']))
{
$GLOBALS['auto_create_acct']['homedirectory'] = $allValues[0]['homedirectory'];
$GLOBALS['auto_create_acct']['homedirectory'] = $allValues[0]['homedirectory'][0];
}
if ($GLOBALS['egw_info']['server']['auto_create_acct'])
{

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

@ -92,7 +92,7 @@ class auth_ldap implements auth_backend
$GLOBALS['auto_create_acct'] = array();
if (isset($allValues[0]['homedirectory']))
{
$GLOBALS['auto_create_acct']['homedirectory'] = $allValues[0]['homedirectory'];
$GLOBALS['auto_create_acct']['homedirectory'] = $allValues[0]['homedirectory'][0];
}
if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')))
{

14
phpgwapi/inc/class.egw_session.inc.php
View File

@ -1430,9 +1430,19 @@ class egw_session
$this->user = $GLOBALS['egw']->accounts->read_repository();
// set homedirectory from auth_ldap or auth_ads, to be able to use it in vfs
if (!isset($this->user['homedirectory']) && isset($GLOBALS['auto_create_acct']['homedirectory']))
if (!isset($this->user['homedirectory']))
{
$this->user['homedirectory'] = $GLOBALS['auto_create_acct']['homedirectory'];
// authentication happens in login.php, which does NOT yet create egw-object in session
// --> need to store homedirectory in session
if(isset($GLOBALS['auto_create_acct']['homedirectory']))
{
egw_cache::setSession(__CLASS__, 'homedirectory',
$this->user['homedirectory'] = $GLOBALS['auto_create_acct']['homedirectory']);
}
else
{
$this->user['homedirectory'] = egw_cache::getSession(__CLASS__, 'homedirectory');
}
}
$this->user['acl'] = $GLOBALS['egw']->acl->read_repository();
$this->user['preferences'] = $GLOBALS['egw']->preferences->read_repository();