Skip to content

Commit 8e3c5e5

Browse files
author
Till Brehm
committed
Merge branch '5374-mail-last-accessed-frontend' into 'develop'
Show last access information for mail users - frontendonly Closes #5374 See merge request ispconfig/ispconfig3!1790
2 parents 775bc59 + 6aab4e1 commit 8e3c5e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+137
-18
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `active`, `ca_name`, `ca_issue`, `ca_wildcard`, `ca_iodef`, `ca_critical`) VALUES
22
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0);
3+
4+
-- 5374-mail-last-accessed-frontend
5+
ALTER TABLE `mail_user` ADD `last_access` int(11) NULL DEFAULT NULL after `disabledoveadm`;
6+
37
ALTER TABLE `web_domain` ADD `disable_symlinknotowner` enum('n','y') NOT NULL default 'n' AFTER `last_jailkit_hash`;
48
UPDATE `web_domain` SET `backup_format_web` = 'tar_gzip' WHERE `backup_format_web` = 'rar';
59
UPDATE `web_domain` SET `backup_format_db` = 'zip' WHERE `backup_format_db` = 'rar';

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,7 @@ CREATE TABLE `mail_user` (
10971097
`disablelda` enum('n','y') NOT NULL default 'n',
10981098
`disablelmtp` enum('n','y') NOT NULL default 'n',
10991099
`disabledoveadm` enum('n','y') NOT NULL default 'n',
1100+
`last_access` int(11) NULL DEFAULT NULL,
11001101
`disablequota-status` enum('n','y') NOT NULL default 'n',
11011102
`disableindexer-worker` enum('n','y') NOT NULL default 'n',
11021103
`last_quota_notification` date NULL default NULL,

‎interface/lib/classes/quota_lib.inc.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,13 @@ public function get_mailquota_data($clientid = null, $readable = true, $email =
252252
for($i=0;$i<sizeof($emails);$i++){
253253
$email = $emails[$i]['email'];
254254

255+
if (empty($emails[$i]['last_access'])) {
256+
$emails[$i]['last_access'] = $app->lng('never_accessed_txt');
257+
}
258+
else {
259+
$emails[$i]['last_access'] = date($app->lng('conf_format_dateshort'), $emails[$i]['last_access']);
260+
}
261+
255262
$emails[$i]['name'] = $app->functions->htmlentities($emails[$i]['name']);
256263
$emails[$i]['used'] = isset($monitor_data[$email]['used']) ? $monitor_data[$email]['used'] : array(1 => 0);
257264

‎interface/lib/lang/ar.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,6 @@ $wb['datalog_status_u_dns_template'] = 'Update DNS template';
186186
$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
187187
$wb['datalog_status_i_sys_group'] = 'Create new client group';
188188
$wb['datalog_status_u_sys_ini'] = 'Update main config';
189+
$wb['last_accessed_txt'] = 'Last accessed';
190+
$wb['never_accessed_txt'] = 'Never or unknown';
189191
?>

‎interface/lib/lang/bg.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,6 @@ $wb['datalog_status_u_dns_template'] = 'Update DNS template';
186186
$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
187187
$wb['datalog_status_i_sys_group'] = 'Create new client group';
188188
$wb['datalog_status_u_sys_ini'] = 'Update main config';
189+
$wb['last_accessed_txt'] = 'Last accessed';
190+
$wb['never_accessed_txt'] = 'Never or unknown';
189191
?>

‎interface/lib/lang/br.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,6 @@ $wb['datalog_status_u_dns_template'] = 'Update DNS template';
186186
$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
187187
$wb['datalog_status_i_sys_group'] = 'Create new client group';
188188
$wb['datalog_status_u_sys_ini'] = 'Update main config';
189+
$wb['last_accessed_txt'] = 'Last accessed';
190+
$wb['never_accessed_txt'] = 'Never or unknown';
189191
?>

‎interface/lib/lang/ca.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,6 @@ $wb['datalog_status_u_dns_template'] = 'Update DNS template';
186186
$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
187187
$wb['datalog_status_i_sys_group'] = 'Create new client group';
188188
$wb['datalog_status_u_sys_ini'] = 'Update main config';
189+
$wb['last_accessed_txt'] = 'Last accessed';
190+
$wb['never_accessed_txt'] = 'Never or unknown';
189191
?>

‎interface/lib/lang/cn.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,6 @@ $wb['datalog_status_u_dns_template'] = 'Update DNS template';
187187
$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
188188
$wb['datalog_status_i_sys_group'] = 'Create new client group';
189189
$wb['datalog_status_u_sys_ini'] = 'Update main config';
190+
$wb['last_accessed_txt'] = 'Last accessed';
191+
$wb['never_accessed_txt'] = 'Never or unknown';
190192
?>

‎interface/lib/lang/cz.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,6 @@ $wb['datalog_status_u_dns_template'] = 'Update DNS template';
186186
$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
187187
$wb['datalog_status_i_sys_group'] = 'Create new client group';
188188
$wb['datalog_status_u_sys_ini'] = 'Update main config';
189+
$wb['last_accessed_txt'] = 'Last accessed';
190+
$wb['never_accessed_txt'] = 'Never or unknown';
189191
?>

‎interface/lib/lang/de.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,6 @@ $wb['datalog_status_u_dns_template'] = 'DNS-Vorlage aktualisieren';
186186
$wb['datalog_status_d_dns_template'] = 'DNS-Vorlage löschen';
187187
$wb['datalog_status_i_sys_group'] = 'Neue Gruppe für Kunde erstellen';
188188
$wb['datalog_status_u_sys_ini'] = 'Aktualisiere Hauptkonfiguration';
189+
$wb['last_accessed_txt'] = 'Last accessed';
190+
$wb['never_accessed_txt'] = 'Never or unknown';
189191
?>

0 commit comments

Comments
 (0)