[workitem:59] Added domain smart host options for MailEnable

This commit is contained in:
peter 2012-05-04 15:29:37 +10:00
parent 99c0ebf7db
commit e56ff1a28a

View file

@ -137,9 +137,22 @@ Public Class MailEnable
domain.Status = -1 domain.Status = -1
If (domain.GetDomain() = 1) Then If (domain.GetDomain() = 1) Then
Dim newStatus As Integer = IIf(info.Enabled, 1, 0) Dim newStatus As Integer = IIf(info.Enabled, 1, 0)
Dim newRedirectionStatus As Integer = IIf(info.RedirectionActive, 1, 0) Dim newRedirectionStatus As Integer = IIf(info.RedirectionActive, 1, 0)
'redirection status has 3 states, so we don't use redirectionaction
'0=off, 1=on, 2=on for authenticated only
If info("MailEnable_SmartHostEnabled") Then
If info("MailEnable_SmartHostAuth") Then
newRedirectionStatus = 2
Else
newRedirectionStatus = 1
End If
Else
newRedirectionStatus = 0
End If
domain.EditDomain( _ domain.EditDomain( _
info.Name, _ info.Name, _
newStatus, _ newStatus, _
@ -280,6 +293,7 @@ Public Class MailEnable
blacklist.AddBlacklist() blacklist.AddBlacklist()
Next Next
End If End If
End Sub End Sub
@ -377,6 +391,18 @@ Public Class MailEnable
info.Name = domain.DomainName info.Name = domain.DomainName
info.RedirectionHosts = domain.DomainRedirectionHosts info.RedirectionHosts = domain.DomainRedirectionHosts
info.RedirectionActive = (domain.DomainRedirectionStatus = 1) info.RedirectionActive = (domain.DomainRedirectionStatus = 1)
If domain.DomainRedirectionStatus = 2 Then
info("MailEnable_SmartHostAuth") = True
info("MailEnable_SmartHostEnabled") = True
ElseIf domain.DomainRedirectionStatus = 1 Then
info("MailEnable_SmartHostEnabled") = True
info("MailEnable_SmartHostAuth") = False
Else
info("MailEnable_SmartHostEnabled") = false
info("MailEnable_SmartHostAuth") = False
End If
info.Enabled = (domain.Status = 1) info.Enabled = (domain.Status = 1)
' '
@ -842,6 +868,8 @@ Public Class MailEnable
' build autoresponder file ' build autoresponder file
WriteMailboxAutoresponderFile(info) WriteMailboxAutoresponderFile(info)
End Sub End Sub
Public Overridable Sub DeleteAccount(ByVal name As String) Implements IMailServer.DeleteAccount Public Overridable Sub DeleteAccount(ByVal name As String) Implements IMailServer.DeleteAccount