Skip to content

Commit

Permalink
[SmarterMail100] Fix for issue where alias has include domian users s…
Browse files Browse the repository at this point in the history
…et and 1 target email address. This will now be treated as a group

Tested with SmarterMail 100.0.9088.25586 (Nov 18, 2024)
  • Loading branch information
FuseCP-TRobinson committed Dec 15, 2024
1 parent e9240eb commit e0f5ad4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
10 changes: 8 additions & 2 deletions SolidCP/Sources/SolidCP.Providers.Base/Mail/MailAlias.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,17 @@ namespace SolidCP.Providers.Mail
public class MailAlias : MailAccount
{
private string forwardTo;

private bool includealldomainusers;
public string ForwardTo
{
get { return this.forwardTo; }
set { this.forwardTo = value; }
}
}

public bool IncludeAllDomainUsers
{
get { return this.includealldomainusers; }
set { this.includealldomainusers = value; }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1469,8 +1469,10 @@ public MailAlias[] GetMailAliases(string domainName)
}
}

mailAlias.IncludeAllDomainUsers = alias["includeAllDomainUsers"];

if(members.ToArray().Length == 1)

if (members.ToArray().Length == 1 && mailAlias.IncludeAllDomainUsers == false)
{
Log.WriteInfo("GetMailAliases - Found {0}", alias["name"].ToString());
mailAlias.ForwardTo = alias["targets"][0].ToString();
Expand Down Expand Up @@ -1662,7 +1664,9 @@ public MailGroup[] GetGroups(string domainName)
}
}

if (members.ToArray().Length != 1)
mailGroup.IncludeAllDomainUsers = alias["includeAllDomainUsers"];

if (members.ToArray().Length != 1 || mailGroup.IncludeAllDomainUsers == true)
{
mailGroup.Members = members.ToArray();
groups.Add(mailGroup);
Expand Down

0 comments on commit e0f5ad4

Please sign in to comment.