Merge 7fc9ba58fe into 6fcc6dcf88

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';
 

data/web/mailbox.php

@@ -138,6 +138,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 							<th class="sort-table" style="min-width: 86px;"><?=$lang['mailbox']['domain'];?></th>
 							<th class="sort-table" style="min-width: 75px;"><?=$lang['mailbox']['quota'];?></th>
 							<th class="sort-table" style="min-width: 99px;"><?=$lang['mailbox']['in_use'];?></th>
+							<th class="sort-table" style="min-width: 100px;"><?=$lang['mailbox']['temp_aliases'];?></th>
 							<th class="sort-table" style="min-width: 100px;"><?=$lang['mailbox']['msg_num'];?></th>
 							<th class="sort-table" style="min-width: 76px;"><?=$lang['mailbox']['active'];?></th>
 							<th style="text-align: right; min-width: 200px;" data-sortable="false"><?=$lang['mailbox']['action'];?></th>
@@ -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;
+                  }
+                  ?>
 						<tr id="data">
 							<td><?=($mailboxdata['is_relayed'] == "0") ? htmlspecialchars($mailboxdata['username']) : '<span data-toggle="tooltip" title="Relayed"><i class="glyphicon glyphicon-forward"></i>' . htmlspecialchars($mailboxdata['username']) . '</span>';?></td>
 							<td><?=htmlspecialchars($mailboxdata['name'], ENT_QUOTES, 'UTF-8');?></td>
@@ -163,6 +181,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 									</div>
 								</div>
 							</td>
+							<td><?=$temp_alias[0]['spamalias'];?></td>
 							<td><?=$mailboxdata['messages'];?></td>
 							<td><?=$mailboxdata['active'];?></td>
 							<td style="text-align: right;">
@@ -180,7 +199,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
               }
               else {
                   ?>
-                  <tr id="no-data"><td colspan="8" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr>
+                  <tr id="no-data"><td colspan="9" style="text-align: center; font-style: italic;"><?=sprintf($lang['mailbox']['no_record'], $domain);?></td></tr>
                   <?php
               }
             }
@@ -188,7 +207,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 					</tbody>
 					<tfoot>
 						<tr id="no-data">
-							<td colspan="8" style="text-align: center; border-top: 1px solid #e7e7e7;">
+							<td colspan="9" style="text-align: center; border-top: 1px solid #e7e7e7;">
 								<a href="/add.php?mailbox"><?=$lang['mailbox']['add_mailbox'];?></a>
 							</td>
 						</tr>