extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

use imap-server-class capability to decide if the server type handles all loginnames as lowercase

Browse Source
This commit is contained in:
Klaus Leithoff 2013-07-11 11:38:32 +00:00
parent 504855be4e
commit 3aa3be37ae
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
felamimail/inc/class.uipreferences.inc.php
View File

@ -81,7 +81,8 @@
//fetch the imapClass //fetch the imapClass
//_debug_array($bofelamimail->icServer); //_debug_array($bofelamimail->icServer);
$imapClassName = get_class($bofelamimail->icServer); $imapClassName = get_class($bofelamimail->icServer);
$alllowercase = false;
if (!empty($imapClassName) && stripos(constant($imapClassName.'::CAPABILITIES'),'lowercaseloginname') !== false) $alllowercase=true;
//fetch the smtpClass //fetch the smtpClass
//_debug_array($bofelamimail->ogServer); //_debug_array($bofelamimail->ogServer);
$smtpClassName = get_class($bofelamimail->ogServer); $smtpClassName = get_class($bofelamimail->ogServer);
@ -105,8 +106,14 @@
$accounts = $GLOBALS['egw']->accounts->search(array('type'=>'accounts')); $accounts = $GLOBALS['egw']->accounts->search(array('type'=>'accounts'));
$groups = array(); $groups = array();
if ($imapClassName=='managementserver_imap') $groups = $GLOBALS['egw']->accounts->search(array('type'=>'groups')); if ($imapClassName=='managementserver_imap') $groups = $GLOBALS['egw']->accounts->search(array('type'=>'groups'));
$domainName = $bofelamimail->icServer->domainName;
if ($alllowercase)
{
$domainName = lcase($domainName);
}
foreach ($accounts as $k => $v) foreach ($accounts as $k => $v)
{ {
if ($alllowercase) $v['account_lid']=lcase($v['account_lid']);
$isgroup=$v['account_id']<0?constant("$imapClassName::ACL_GROUP_PREFIX"):''; $isgroup=$v['account_id']<0?constant("$imapClassName::ACL_GROUP_PREFIX"):'';
$dfn = common::display_fullname($v['account_lid']); $dfn = common::display_fullname($v['account_lid']);
if ($bofelamimail->icServer->loginType=='standard') // means username if ($bofelamimail->icServer->loginType=='standard') // means username
@ -119,16 +126,17 @@
} }
elseif ($bofelamimail->icServer->loginType=='vmailmgr') // means username + domainname elseif ($bofelamimail->icServer->loginType=='vmailmgr') // means username + domainname
{ {
$accountList[$isgroup.trim($v['account_lid'].'@'.$bofelamimail->icServer->domainName)] = $dfn; $accountList[$isgroup.trim($v['account_lid'].'@'.$domainName)] = $dfn;
} }
elseif ($bofelamimail->icServer->loginType=='uidNumber') // userid + domain elseif ($bofelamimail->icServer->loginType=='uidNumber') // userid + domain
{ {
$accountList[$isgroup.trim($v['account_id'].'@'.$bofelamimail->icServer->domainName)] = $dfn; $accountList[$isgroup.trim($v['account_id'].'@'.$domainName)] = $dfn;
} }
} }
natcasesort($accountList); natcasesort($accountList);
foreach ($groups as $k => $v) foreach ($groups as $k => $v)
{ {
if ($alllowercase) $v['account_lid']=lcase($v['account_lid']);
$isgroup=$v['account_id']<0?constant("$imapClassName::ACL_GROUP_PREFIX"):''; $isgroup=$v['account_id']<0?constant("$imapClassName::ACL_GROUP_PREFIX"):'';
$dfn = common::display_fullname($v['account_lid']); $dfn = common::display_fullname($v['account_lid']);
if ($bofelamimail->icServer->loginType=='standard') // means username if ($bofelamimail->icServer->loginType=='standard') // means username
@ -141,11 +149,11 @@
} }
elseif ($bofelamimail->icServer->loginType=='vmailmgr') // means username + domainname elseif ($bofelamimail->icServer->loginType=='vmailmgr') // means username + domainname
{ {
$groupList[$isgroup.trim($v['account_lid'].'@'.$bofelamimail->icServer->domainName)] = $dfn; $groupList[$isgroup.trim($v['account_lid'].'@'.$domainName)] = $dfn;
} }
elseif ($bofelamimail->icServer->loginType=='uidNumber') // userid + domain elseif ($bofelamimail->icServer->loginType=='uidNumber') // userid + domain
{ {
$groupList[$isgroup.trim($v['account_id'].'@'.$bofelamimail->icServer->domainName)] = $dfn; $groupList[$isgroup.trim($v['account_id'].'@'.$domainName)] = $dfn;
} }
} }
natcasesort($groupList); natcasesort($groupList);