From f0ee0192c8585837aae96a731632693d71097d81 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 5 Dec 2019 21:22:32 +0100
Subject: [PATCH] Add last accessed column to mail quota table

---
 interface/lib/classes/quota_lib.inc.php                   | 5 ++++-
 interface/lib/lang/en.lng                                 | 3 ++-
 interface/lib/lang/nl.lng                                 | 1 +
 interface/web/dashboard/dashlets/templates/mailquota.htm  | 2 ++
 interface/web/dashboard/lib/lang/en_dashlet_mailquota.lng | 3 ++-
 interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng | 1 +
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index 3946b216dd..f9fe852f2d 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -243,7 +243,10 @@ class quota_lib {
 		if(is_array($emails) && !empty($emails)){
 			for($i=0;$i<sizeof($emails);$i++){
 				$email = $emails[$i]['email'];
-				
+
+                               if (empty($emails[$i]['last_access'])) {
+                                       $emails[$i]['last_access'] = $app->lng('never_accessed');
+                               }
 				$emails[$i]['name'] = $app->functions->htmlentities($emails[$i]['name']);
 				$emails[$i]['used'] = isset($monitor_data[$email]['used']) ? $monitor_data[$email]['used'] : array(1 => 0);
 		
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 66f4ee3811..b42430e1a1 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -159,4 +159,5 @@ $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
 $wb['select_directive_snippet_txt'] = 'Directive Snippets';
 $wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
-?>
\ No newline at end of file
+$wb['never_accessed'] = 'Never or unknown';
+?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 888f9c0200..97c9df1fc1 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
 $wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
 $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
 $wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['never_accessed'] = 'Niet of onbekend';
 ?>
diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm
index 3573ef1ab9..673bb7ff90 100644
--- a/interface/web/dashboard/dashlets/templates/mailquota.htm
+++ b/interface/web/dashboard/dashlets/templates/mailquota.htm
@@ -6,6 +6,7 @@
 			<th>{tmpl_var name='email_txt'}</th>
 			<th>{tmpl_var name='name_txt'}</th>
 			<th>{tmpl_var name='used_txt'}</th>
+			<th>{tmpl_var name='last_accessed_txt'}</th>
 			<th colspan="2">{tmpl_var name='quota_txt'}</th>
 		  </tr>
 		</thead>
@@ -15,6 +16,7 @@
 				<td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{tmpl_var name='email'}">{tmpl_var name='email'}</a></td>
 				<td>{tmpl_var name='name'}</td>
 				<td>{tmpl_var name='used'}</td>
+				<td>{tmpl_var name='last_access'}</td>
 				<td>{tmpl_var name='quota'}</td>
 				<td>
 				<div class='progress'>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/en_dashlet_mailquota.lng
index 2c2b6cd7ae..8a0f8d3559 100644
--- a/interface/web/dashboard/lib/lang/en_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/en_dashlet_mailquota.lng
@@ -5,4 +5,5 @@ $wb["name_txt"] = 'Name';
 $wb["used_txt"] = 'Used Space';
 $wb["quota_txt"] = 'Quota';
 $wb["no_email_accounts_txt"] = 'No email accounts found.';
-?>
\ No newline at end of file
+$wb["last_accessed_txt"] = 'Last accessed';
+?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng
index 28af96bdab..98437e91fa 100644
--- a/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng
@@ -5,4 +5,5 @@ $wb['name_txt'] = 'Naam';
 $wb['used_txt'] = 'Gebruikte ruimte';
 $wb['quota_txt'] = 'Quota';
 $wb['no_email_accounts_txt'] = 'Geen e-mail accounts gevonden.';
+$wb["last_accessed_txt"] = 'Laatst gebruikt';
 ?>
-- 
GitLab