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

* Mail: fixed wrong folders displayed, if Cyrus administration was activated

Browse Source 
$this->disconnect() does nothing anymore, need to use $this->adminConnection(false) instead!
also no need to switch to admin-connection in call to getUserData for current user
This commit is contained in:
Ralf Becker 2014-07-21 10:22:18 +00:00
parent d0cfbf45ea
commit 0e21ee126b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emailadmin/inc/class.emailadmin_imap_cyrus.inc.php
View File

@ -114,7 +114,8 @@ class emailadmin_imap_cyrus extends emailadmin_imap
*/
function getUserData($_username)
{
$this->adminConnection();
// no need to switch to admin-connection for reading quota of current user
if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->adminConnection();
$userData = array();
if(($quota = $this->getQuotaByUser($_username,'ALL')))
@ -124,7 +125,8 @@ class emailadmin_imap_cyrus extends emailadmin_imap
}
//error_log(__LINE__.': '.__METHOD__."('$_username') quota=".array2string($quota).' returning '.array2string($userData));
$this->disconnect();
// $this->disconnect() does nothing anymore, need to use $this->adminConnection(false) instead!
if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->adminConnection(false);
return $userData;
}