Merge branch '6552-mail_quota_show' into 'develop'

Show use mail quota on mail user edit form

Closes #6552

See merge request ispconfig/ispconfig3!1784

Author: Till Brehm

interface/lib/classes/quota_lib.inc.php

@@ -218,7 +218,7 @@ public function get_ftptrafficquota_data($clientid = null, $lastdays = 0) {
 		return $traffic_data;
 	}
 
-	public function get_mailquota_data($clientid = null, $readable = true) {
+       public function get_mailquota_data($clientid = null, $readable = true, $email = null) {
 		global $app;
 
 		$tmp_rec =  $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'email_quota' ORDER BY created DESC");
@@ -236,6 +236,14 @@ public function get_mailquota_data($clientid = null, $readable = true) {
 		}
 		//print_r($monitor_data);
 
+               if ($email !== null && !empty($email)) {
+				   if(isset($monitor_data[$email])) {
+					   return $monitor_data[$email];
+				   } else {
+					   return '';
+				   }
+                       
+               }
 		// select all email accounts or email accounts belonging to client
 		$emails = $app->db->queryAllRecords("SELECT * FROM mail_user".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : '') . " ORDER BY email", $clientid);
 

interface/web/mail/lib/lang/ar_mail_user.lng

@@ -77,5 +77,6 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>

interface/web/mail/lib/lang/bg_mail_user.lng

@@ -77,5 +77,6 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>

interface/web/mail/lib/lang/br_mail_user.lng

@@ -74,4 +74,5 @@ $wb['purge_trash_days_txt'] = 'Esvazia lixeira automaticamente após N dias';
 $wb['tooltip_purge_trash_days_txt'] = '0 = desabilitado';
 $wb['purge_junk_days_txt'] = 'Esvazia pasta Junk automaticamente após N dias';
 $wb['tooltip_purge_junk_days_txt'] = '0 = desabilitado';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';

interface/web/mail/lib/lang/ca_mail_user.lng

@@ -76,5 +76,6 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>

interface/web/mail/lib/lang/cn_mail_user.lng

@@ -74,5 +74,6 @@ $wb['purge_trash_days_txt'] = '自动在 X 天后清空垃圾箱';
 $wb['tooltip_purge_trash_days_txt'] = '0 = 禁用';
 $wb['purge_junk_days_txt'] = '自动在 X 天后清空垃圾邮件';
 $wb['tooltip_purge_junk_days_txt'] = '0 = 禁用';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>

interface/web/mail/lib/lang/cz_mail_user.lng

@@ -75,4 +75,5 @@ $wb['tooltip_purge_trash_days_txt'] = '0 = neaktivní';
 $wb['purge_junk_days_txt'] = 'Vyčistit nevyžádanou poštu \"Junk\" automaticky po X dnech.';
 $wb['tooltip_purge_junk_days_txt'] = '0 = neaktivní';
 $wb['disablesmtp_txt'] = 'Zakázat SMTP (pouze odesílání)';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';

interface/web/mail/lib/lang/de_mail_user.lng

@@ -74,8 +74,7 @@ $wb['purge_trash_days_txt'] = 'Papierkorb automatisch nach X Tagen leeren';
 $wb['tooltip_purge_trash_days_txt'] = '0 = deaktiviert';
 $wb['purge_junk_days_txt'] = 'Junk-Ordner automatisch nach X Tagen leeren';
 $wb['tooltip_purge_junk_days_txt'] = '0 = deaktiviert';
+$wb['used_txt'] = 'Verwendet';
 $wb['imap_prefix_txt'] = 'IMAP-Präfix';
 $wb['tooltip_imap_prefix_txt'] = 'In den meisten Fällen sollte dies leer gelassen werden. Um eine nahtlose Migration von Altsystemen zu ermöglichen, können Sie ein Präfix, gefolgt vom Hierarchietrennzeichen, angeben, z. B: \'INBOX.\'';
-?>
-
 $wb['mail_addresses_txt'] = 'Receives also mail for';

interface/web/mail/lib/lang/dk_mail_user.lng

@@ -76,5 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';
-?>

interface/web/mail/lib/lang/el_mail_user.lng

@@ -76,5 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['used_txt'] = 'Used';
 $wb['mail_addresses_txt'] = 'Receives also mail for';
-?>