extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 05:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing some inconsitencies regarding the get/set Quota (issues with username logintype email)

Browse Source
This commit is contained in:
Klaus Leithoff 2009-09-16 13:31:12 +00:00
parent 4989bd6fa6
commit 6bbf357277
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emailadmin/inc/class.defaultimap.inc.php
View File

@ -310,13 +310,15 @@
if ($this->loginType == 'email')
{
$_username = $_username;
$accountemail = $GLOBALS['egw']->accounts->read($GLOBALS['egw']->accounts->name2id($_username,'account_email'));
$accountID = $GLOBALS['egw']->accounts->name2id($_username);
$accountemail = $GLOBALS['egw']->accounts->id2name($accountID,'account_email');
//$accountemail = $GLOBALS['egw']->accounts->read($GLOBALS['egw']->accounts->name2id($_username,'account_email'));
if (!empty($accountemail))
{
list($username,$domain) = explode('@',$accountemail,2);
if (strtolower($domain) == strtolower($this->domainName) && !empty($username))
list($lusername,$domain) = explode('@',$accountemail,2);
if (strtolower($domain) == strtolower($this->domainName) && !empty($lusername))
{
$_username = $username;
$_username = $lusername;
}
}
}
@ -423,8 +425,8 @@
*/
function getQuotaByUser($_username)
{
$_username = $this->getMailBoxUserName($_username);
$mailboxName = $this->getUserMailboxString($_username);
//error_log(__METHOD__.$mailboxName);
$storageQuota = $this->getStorageQuota($mailboxName);
if(is_array($storageQuota) && isset($storageQuota['QMAX'])) {
@ -444,7 +446,6 @@
function getUserData($_username)
{
$this->openConnection(true);
$_username = $this->getMailBoxUserName($_username);
$userData = array();
if($quota = $this->getQuotaByUser($_username)) {