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

uidNumber login-type also for imap loginName

Browse Source
This commit is contained in:
Ralf Becker 2010-08-31 13:39:51 +00:00
parent 16668b146c
commit 4538f4eac6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emailadmin/inc/class.emailadmin_bo.inc.php
View File

@ -585,7 +585,8 @@ class emailadmin_bo extends so_sql
list($data['imapLoginType'],$imapAuthType) = explode('#',$data['imapLoginType'],2);
$icServer->loginType = $data['imapLoginType'];
$icServer->domainName = $data['defaultDomain'];
$icServer->loginName = $data['imapLoginType'] == 'standard' ? $GLOBALS['egw_info']['user']['account_lid'] : $GLOBALS['egw_info']['user']['account_lid'].'@'.$data['defaultDomain'];
// $icServer->loginName = $data['imapLoginType'] == 'standard' ? $GLOBALS['egw_info']['user']['account_lid'] : $GLOBALS['egw_info']['user']['account_lid'].'@'.$data['defaultDomain'];
$icServer->loginName = emailadmin_smtp_ldap::mailbox_addr($GLOBALS['egw_info']['user'],$data['defaultDomain'],$data['imapLoginType']);
$icServer->enableCyrusAdmin = ($data['imapEnableCyrusAdmin'] == 'yes');
$icServer->adminUsername = $data['imapAdminUsername'];
$icServer->adminPassword = $data['imapAdminPW'];

2
emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
View File

@ -431,7 +431,7 @@ class emailadmin_smtp_ldap extends defaultsmtp
* default use $GLOBALS['egw_info']['server']['mail_login_type']
* @return string
*/
static public function mailbox_addr($account,$domain=null,$mail_login_type=null)
/*static*/ public function mailbox_addr($account,$domain=null,$mail_login_type=null)
{
if (is_null($domain)) $domain = $this->domain;
if (is_null($mail_login_type)) $mail_login_type = $GLOBALS['egw_info']['server']['mail_login_type'];