From 4538f4eac62844366095adf0db33b7bffa6b36e7 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 31 Aug 2010 13:39:51 +0000 Subject: [PATCH] uidNumber login-type also for imap loginName --- emailadmin/inc/class.emailadmin_bo.inc.php | 3 ++- emailadmin/inc/class.emailadmin_smtp_ldap.inc.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/emailadmin/inc/class.emailadmin_bo.inc.php b/emailadmin/inc/class.emailadmin_bo.inc.php index a8bb92fb4d..3b2af03fb2 100644 --- a/emailadmin/inc/class.emailadmin_bo.inc.php +++ b/emailadmin/inc/class.emailadmin_bo.inc.php @@ -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']; diff --git a/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php b/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php index 1efc82807f..d228d9ff38 100644 --- a/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php +++ b/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php @@ -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'];