Frontend part from 5374-mail-last-accessed branch

Author: helmo

install/sql/incremental/upd_dev_collection.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE `mail_user` ADD `last_access` timestamp NULL DEFAULT NULL after `disabledoveadm`;

install/sql/ispconfig3.sql

@@ -1096,6 +1096,7 @@ CREATE TABLE `mail_user` (
   `disablelda` enum('n','y') NOT NULL default 'n',
   `disablelmtp` enum('n','y') NOT NULL default 'n',
   `disabledoveadm` enum('n','y') NOT NULL default 'n',
+  `last_access` itimestamp NULL DEFAULT NULL,
   `disablequota-status` enum('n','y') NOT NULL default 'n',
   `disableindexer-worker` enum('n','y') NOT NULL default 'n',
   `last_quota_notification` date NULL default NULL,

interface/lib/classes/quota_lib.inc.php

@@ -244,6 +244,13 @@ public function get_mailquota_data($clientid = null, $readable = true) {
 			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_txt');
+				}
+				else {
+					$emails[$i]['last_access'] = date($app->lng('conf_format_datetime'), $emails[$i]['last_access']);
+				}
+
 				$emails[$i]['name'] = $app->functions->htmlentities($emails[$i]['name']);
 				$emails[$i]['used'] = isset($monitor_data[$email]['used']) ? $monitor_data[$email]['used'] : array(1 => 0);
 

interface/lib/lang/en.lng

@@ -175,4 +175,6 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/nl.lng

@@ -174,4 +174,6 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Sluiten';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Kopieer naar klembord';
+$wb['last_accessed_txt'] = 'Laatst gebruikt';
+$wb['never_accessed_txt'] = 'Niet of onbekend';
 ?>

interface/web/dashboard/dashlets/mailquota.php

@@ -14,6 +14,7 @@ function show() {
 		$wb = array();
 		$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dashlet_mailquota.lng';
 		if(is_file($lng_file)) include $lng_file;
+               $wb['last_accessed_txt'] = $app->lng('last_accessed_txt');
 		$tpl->setVar($wb);
 
 		$emails = $app->quota_lib->get_mailquota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
@@ -27,6 +28,7 @@ function show() {
 			unset($email);
 			// email username is quoted in quota.lib already, so no htmlentities here to prevent double encoding
 			//$emails = $app->functions->htmlentities($emails);
+			$email['last_access'] = date($app->lng('conf_format_datetime'), $email['last_access']);
 			$tpl->setloop('mailquota', $emails);
 			$has_mailquota = isset($emails[0]['used']);
 		}

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>
 			  {tmpl_if name="quota_raw" op="!=" value="-1"}<td>
 			  <div class='progress'>

interface/web/mail/list/mail_user.list.php

@@ -133,5 +133,13 @@
 	'suffix' => "",
 	'width'  => "",
 	'value'  => array('n' => $app->lng('yes_txt'), 'y' => $app->lng('no_txt')));
+$liste["item"][] = array( 'field'  => "last_access",
+       'datatype' => "DATE",
+       'formtype' => "TEXT",
+       'op'  => "=",
+       'prefix' => "",
+       'suffix' => "",
+       'width'  => "",
+       'value'  => "");
 
 ?>

interface/web/mail/mail_user_edit.php

@@ -136,6 +136,13 @@ function onShowEnd() {
 			$app->tpl->setVar("enable_custom_login", 0);
 		}
 
+		if (!empty($this->dataRecord['last_access'])) {
+			$app->tpl->setVar("last_access", date($app->lng('conf_format_datetime'), $this->dataRecord['last_access']));
+		}
+		else {
+			$app->tpl->setVar("last_access", $app->lng('never_accessed_txt'));
+		}
+
 		$csrf_token = $app->auth->csrf_token_get('mail_user_del');
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);

interface/web/mail/templates/mail_user_list.htm

@@ -61,7 +61,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                 <tbody>
                 <tmpl_loop name="records">
                     <tr>
-                        <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='email'}">{tmpl_var name="email"}</a></td>
+                        <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="<tmpl_if name="last_access">{tmpl_var name='last_accessed_txt'}: {tmpl_var name='last_access'}</tmpl_if>">{tmpl_var name="email"}</a></td>
                         <tmpl_if name="enable_custom_login"><td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="login"}</a></td></tmpl_if>
                         <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
                         <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="autoresponder"}</a></td>