From 3415fcd4e3a363c21a608bf58eb6c8fe17f50dda Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 11 Feb 2017 20:53:25 +0100 Subject: [PATCH] Revert selection of alias domains in sender acl --- data/web/inc/functions.inc.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php index 91c1a96b..d7993388 100644 --- a/data/web/inc/functions.inc.php +++ b/data/web/inc/functions.inc.php @@ -4787,22 +4787,6 @@ function mailbox_get_sender_acl_handles($mailbox) { while ($row_domain = array_shift($rows_domain)) { if (is_valid_domain_name($row_domain['domain']) && hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $row_domain['domain'])) { $data['sender_acl_domains']['selectable'][] = $row_domain['domain']; - $stmt = $pdo->prepare("SELECT `alias_domain` FROM `alias_domain` - WHERE `target_domain` = :target_domain - AND `alias_domain` NOT IN ( - SELECT REPLACE(`send_as`, '@', '') FROM `sender_acl` - WHERE `logged_in_as` = :logged_in_as - AND `send_as` LIKE '@%')"); - $stmt->execute(array( - ':target_domain' => $row_domain['domain'], - ':logged_in_as' => $mailbox, - )); - $rows_ad = $stmt->fetchAll(PDO::FETCH_ASSOC); - while ($row_ad = array_shift($rows_ad)) { - if (is_valid_domain_name($row_ad['alias_domain']) && hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $row_ad['alias_domain'])) { - $data['sender_acl_domains']['selectable'][] = $row_ad['alias_domain']; - } - } } }