diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index 7abafe13..fee84eb0 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -245,6 +245,7 @@ $lang['mailbox']['add_domain_alias'] = 'Add domain alias';
$lang['mailbox']['add_mailbox'] = 'Add mailbox';
$lang['mailbox']['add_resource'] = 'Add resource';
$lang['mailbox']['add_alias'] = 'Add alias';
+$lang['mailbox']['temp_aliases'] = 'Temp. aliases';
$lang['info']['no_action'] = 'No action applicable';
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index 08798ffe..4caf15fa 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -138,6 +138,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
=$lang['mailbox']['domain'];?> |
=$lang['mailbox']['quota'];?> |
=$lang['mailbox']['in_use'];?> |
+ =$lang['mailbox']['temp_aliases'];?> |
=$lang['mailbox']['msg_num'];?> |
=$lang['mailbox']['active'];?> |
=$lang['mailbox']['action'];?> |
@@ -150,7 +151,24 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
if (!empty($mailboxes)) {
foreach ($mailboxes as $mailbox) {
$mailboxdata = mailbox_get_mailbox_details($mailbox);
- ?>
+ try {
+ $stmt = $pdo->prepare("SELECT IFNULL(COUNT(`address`), 0) AS `spamalias`
+ FROM `spamalias`
+ WHERE `goto` = :username
+ AND `validity` >= :unixnow");
+ $stmt->execute(array(
+ ':username' => $mailboxdata['username'],
+ ':unixnow' => time()
+ ));
+ $temp_alias = $stmt->fetchAll(PDO::FETCH_ASSOC);
+ } catch (PDOException $e) {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => 'MySQL: '.$e
+ );
+ return false;
+ }
+ ?>
=($mailboxdata['is_relayed'] == "0") ? htmlspecialchars($mailboxdata['username']) : '' . htmlspecialchars($mailboxdata['username']) . '';?> |
=htmlspecialchars($mailboxdata['name'], ENT_QUOTES, 'UTF-8');?> |
@@ -163,6 +181,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
+ =$temp_alias[0]['spamalias'];?> |
=$mailboxdata['messages'];?> |
=$mailboxdata['active'];?> |
@@ -180,7 +199,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
}
else {
?>
- |
=sprintf($lang['mailbox']['no_record'], $domain);?> |
+ =sprintf($lang['mailbox']['no_record'], $domain);?> |
-
+ |
=$lang['mailbox']['add_mailbox'];?>
|