From fe9a23f542bc56c1c0b6dc30257418e38ff7bd3a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Sat, 08 Jun 2013 18:57:40 -0400
Subject: [PATCH] - Fixed FS#2936 - Please check and limit username input length.
---
server/plugins-available/maildeliver_plugin.inc.php | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 9df9fd6..6d55dd3 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -158,16 +158,51 @@
//* Set alias addresses for autoresponder
$sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
$records = $app->db->queryAllRecords($sql);
- $addresses = '';
+
+ $addresses = array();
+ $addresses[] = $data["new"]["email"];
if(is_array($records) && count($records) > 0) {
- $addresses .= ':addresses ["'.$data["new"]["email"].'",';
foreach($records as $rec) {
- $addresses .= '"'.$rec['source'].'",';
+ $addresses[] = $rec['source'];
}
- $addresses = substr($addresses,0,-1);
- $addresses .= ']';
}
- $tpl->setVar('addresses',$addresses);
+
+ $app->log("Found " . count($addresses) . " addresses.",LOGLEVEL_DEBUG);
+
+ $alias_addresses = array();
+
+ $email_parts = explode('@',$data["new"]["email"]);
+ $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = '@".$app->db->quote($email_parts[1])."'";
+ $records = $app->db->queryAllRecords($sql);
+ if(is_array($records) && count($records) > 0) {
+ $app->log("Found " . count($records) . " records (aliasdomains).",LOGLEVEL_DEBUG);
+ foreach($records as $rec) {
+ $aliasdomain = substr($rec['source'],1);
+ foreach($addresses as $email) {
+ $email_parts = explode('@',$email);
+ $alias_addresses[] = $email_parts[0].'@'.$aliasdomain;
+ }
+ }
+ }
+
+ $app->log("Found " . count($addresses) . " addresses at all.",LOGLEVEL_DEBUG);
+
+ $addresses = array_unique(array_merge($addresses, $alias_addresses));
+
+ $app->log("Found " . count($addresses) . " unique addresses at all.",LOGLEVEL_DEBUG);
+
+ $address_str = '';
+ if(is_array($addresses) && count($addresses) > 0) {
+ $address_str .= ':addresses [';
+ foreach($addresses as $rec) {
+ $address_str .= '"'.$rec.'",';
+ }
+ $address_str = substr($address_str,0,-1);
+ $address_str .= ']';
+ }
+
+
+ $tpl->setVar('addresses',$address_str);
file_put_contents($sieve_file,$tpl->grab());
--
Gitblit v1.9.1