[eGroupWare-svn] r53049 - in /trunk/emailadmin/inc: class.emailadmin_imap.inc.php class.emailadmin_imap_dovecot.inc.php

[<ral...@us...>]

Author: ralfbecker
Date: Sat Jul  4 20:52:23 2015
New Revision: 53049

URL: http://svn.stylite.de/viewvc/egroupware?rev=53049&view=rev
Log:
* EMailAdmin: fixed not shown (used) quota for arbitrary user in admin

Modified:
    trunk/emailadmin/inc/class.emailadmin_imap.inc.php
    trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_imap.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imap.inc.php?rev=53049&r1=53048&r2=53049&view=diff
==============================================================================
--- trunk/emailadmin/inc/class.emailadmin_imap.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imap.inc.php Sat Jul  4 20:52:23 2015
@@ -197,7 +197,7 @@
 	 *
 	 * Plugins can overwrite it to eg. construct a special admin user name
 	 *
-	 * @param string $_username =null create an admin connection for given user or $this->acc_imap_username
+	 * @param string $_username =true create an admin connection for given user or $this->acc_imap_username
 	 */
 	function adminConnection($_username=true)
 	{

Modified: trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php?rev=53049&r1=53048&r2=53049&view=diff
==============================================================================
--- trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php Sat Jul  4 20:52:23 2015
@@ -57,9 +57,9 @@
 	 *
 	 * Prefixes adminUsername with real username (separated by an asterisk)
 	 *
-	 * @param string $_username =null create an admin connection for given user or $this->acc_imap_username
-	 */
-	function adminConnection($_username=null)
+	 * @param string $_username =true create an admin connection for given user or $this->acc_imap_username
+	 */
+	function adminConnection($_username=true)
 	{
 		// generate admin user name of $username
 		if (($pos = strpos($this->acc_imap_admin_username, '*')) !== false)	// remove evtl. set username
@@ -231,8 +231,8 @@
 		// we are authenticated with master but for current user
 		if(($quota = $this->getStorageQuotaRoot('INBOX')))
 		{
-			$userData['quotaLimit'] = (int) ($quota['limit'] / 1024);
-			$userData['quotaUsed'] = (int) ($quota['usage'] / 1024);
+			$userData['quotaLimit'] = (int) ($quota['QMAX'] / 1024);
+			$userData['quotaUsed'] = (int) ($quota['USED'] / 1024);
 		}
 		$this->username = $bufferUsername;
 		$this->loginName = $bufferLoginName;