Skip to content

Commit 710a652

Browse files
committed
Add missing mailbox_show_last_access setVars
1 parent 2a9aff0 commit 710a652

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

interface/web/dashboard/dashlets/mailquota.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ function show() {
1717
$wb['last_accessed_txt'] = $app->lng('last_accessed_txt');
1818
$tpl->setVar($wb);
1919

20+
$app->uses('getconf');
21+
$mail_config = $app->getconf->get_global_config('mail');
22+
$tpl->setVar('mailbox_show_last_access', $mail_config['mailbox_show_last_access']);
23+
2024
$emails = $app->quota_lib->get_mailquota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
2125
//print_r($emails);
2226

interface/web/mail/mail_user_edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function onShowEnd() {
136136
$app->tpl->setVar("enable_custom_login", 0);
137137
}
138138

139-
$app->tpl->setVar('mailbox_show_last_access', $global_config['mail']['mailbox_show_last_access']);
139+
$app->tpl->setVar('mailbox_show_last_access', $mail_config['mailbox_show_last_access']);
140140
if (!empty($this->dataRecord['last_access'])) {
141141
$app->tpl->setVar("last_access", date($app->lng('conf_format_datetime'), $this->dataRecord['last_access']));
142142
}

interface/web/mail/mail_user_list.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,20 @@ function onShow() {
2424
global $app, $conf;
2525

2626
$app->uses('getconf');
27-
$global_config = $app->getconf->get_global_config('mail');
27+
$mail_config = $app->getconf->get_global_config('mail');
2828

29-
if($global_config['mailboxlist_webmail_link'] == 'y') {
29+
if($mail_config['mailboxlist_webmail_link'] == 'y') {
3030
$app->tpl->setVar('mailboxlist_webmail_link', 1);
3131
} else {
3232
$app->tpl->setVar('mailboxlist_webmail_link', 0);
3333
}
3434

35-
if($global_config["enable_custom_login"] == "y") {
35+
if($mail_config["enable_custom_login"] == "y") {
3636
$app->tpl->setVar("enable_custom_login", 1);
3737
} else {
3838
$app->tpl->setVar("enable_custom_login", 0);
3939
}
40+
$app->tpl->setVar('mailbox_show_last_access', $mail_config['mailbox_show_last_access']);
4041

4142
parent::onShow();
4243
}

0 commit comments

Comments
 (0)