Merge contribution from vfportero
This commit is contained in:
commit
01ee994424
2 changed files with 223 additions and 143 deletions
|
@ -58,6 +58,13 @@ namespace WebsitePanel.Providers.Mail
|
||||||
{
|
{
|
||||||
return (maxMailboxSize < 0);
|
return (maxMailboxSize < 0);
|
||||||
}
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (value)
|
||||||
|
{
|
||||||
|
maxMailboxSize = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string ReplyTo
|
public string ReplyTo
|
||||||
|
|
|
@ -188,6 +188,9 @@ Public Class Merak
|
||||||
domainItem.CatchAllAccount = GetEmailAlias(CStr(domainObjectClass.GetProperty("D_UnknownForwardTo")))
|
domainItem.CatchAllAccount = GetEmailAlias(CStr(domainObjectClass.GetProperty("D_UnknownForwardTo")))
|
||||||
domainItem.AbuseAccount = ""
|
domainItem.AbuseAccount = ""
|
||||||
|
|
||||||
|
domainItem.Enabled = CInt(domainObjectClass.GetProperty("D_DisableLogin")) = 0
|
||||||
|
domainItem.MaxMailboxSizeInMB = CInt(domainObjectClass.GetProperty("D_UserMailbox")) / 1024
|
||||||
|
|
||||||
'Dim abuseEmail As String = "abuse@" + domainName
|
'Dim abuseEmail As String = "abuse@" + domainName
|
||||||
|
|
||||||
'If MailboxExists(abuseEmail) Then
|
'If MailboxExists(abuseEmail) Then
|
||||||
|
@ -252,6 +255,8 @@ Public Class Merak
|
||||||
apiObject.SetProperty(MerakInterop.C_Config_UseDomainLimits, 1)
|
apiObject.SetProperty(MerakInterop.C_Config_UseDomainLimits, 1)
|
||||||
|
|
||||||
domainObject.SetProperty(MerakInterop.D_DisableLogin, IIf(domain.Enabled, 0, 1))
|
domainObject.SetProperty(MerakInterop.D_DisableLogin, IIf(domain.Enabled, 0, 1))
|
||||||
|
domainObject.SetProperty("D_UserMailbox", domain.MaxMailboxSizeInMB * 1024)
|
||||||
|
|
||||||
|
|
||||||
'create abuse account mailbox
|
'create abuse account mailbox
|
||||||
'If Not Utils.IsStringNullOrEmpty(domain.AbuseAccount, True) Then
|
'If Not Utils.IsStringNullOrEmpty(domain.AbuseAccount, True) Then
|
||||||
|
@ -1234,6 +1239,76 @@ ContinueFor1:
|
||||||
Next
|
Next
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Public Overrides Function GetServiceItemsBandwidth(items() As ServiceProviderItem, since As Date) As ServiceProviderItemBandwidth()
|
||||||
|
Dim itemsBandwidth As List(Of ServiceProviderItemBandwidth) = New List(Of ServiceProviderItemBandwidth)
|
||||||
|
Dim item As ServiceProviderItem
|
||||||
|
|
||||||
|
For Each item In items
|
||||||
|
If TypeOf item Is MailAccount Then
|
||||||
|
Dim name As String = item.Name
|
||||||
|
|
||||||
|
Dim bandwidth As New ServiceProviderItemBandwidth()
|
||||||
|
|
||||||
|
bandwidth.ItemId = item.Id
|
||||||
|
bandwidth.Days = GetDailyStatistics(since, name)
|
||||||
|
|
||||||
|
itemsBandwidth.Add(bandwidth)
|
||||||
|
|
||||||
|
End If
|
||||||
|
Next item
|
||||||
|
Return itemsBandwidth.ToArray()
|
||||||
|
|
||||||
|
End Function
|
||||||
|
|
||||||
|
Public Function GetDailyStatistics(since As Date, mailAccount As String) As DailyStatistics()
|
||||||
|
Dim days As List(Of DailyStatistics) = New List(Of DailyStatistics)
|
||||||
|
|
||||||
|
|
||||||
|
Dim currentDate As DateTime = since
|
||||||
|
Dim now As DateTime = DateTime.Now
|
||||||
|
|
||||||
|
|
||||||
|
While currentDate < now
|
||||||
|
days.Add(GetSingleDayBandwidthStatistics(currentDate, mailAccount))
|
||||||
|
|
||||||
|
' advance day
|
||||||
|
currentDate = currentDate.AddDays(1)
|
||||||
|
End While
|
||||||
|
|
||||||
|
|
||||||
|
Return days.ToArray()
|
||||||
|
End Function
|
||||||
|
|
||||||
|
|
||||||
|
Public Function GetSingleDayBandwidthStatistics(day As Date, mailAccount As String) As DailyStatistics
|
||||||
|
Const ReceivedAmmountPositionInString As Int32 = 18
|
||||||
|
Const SentOutAmmountPositionInString As Int32 = 22
|
||||||
|
|
||||||
|
Dim apiObject = CreateObject(API_PROGID)
|
||||||
|
Dim result As New DailyStatistics()
|
||||||
|
Dim formatedDate As String
|
||||||
|
formatedDate = Format(day, "yyyy/MM/dd")
|
||||||
|
|
||||||
|
result.Day = day.Day
|
||||||
|
result.Month = day.Month
|
||||||
|
result.Year = day.Year
|
||||||
|
result.BytesReceived = 0
|
||||||
|
result.BytesSent = 0
|
||||||
|
|
||||||
|
Try
|
||||||
|
Dim apiResult As String = apiObject.GetUserStatistics(formatedDate, formatedDate, mailAccount)
|
||||||
|
|
||||||
|
Dim apiResultSplit As String() = apiResult.Split(",")
|
||||||
|
|
||||||
|
result.BytesReceived = apiResultSplit(ReceivedAmmountPositionInString)
|
||||||
|
result.BytesSent = apiResultSplit(SentOutAmmountPositionInString)
|
||||||
|
Catch ex As Exception
|
||||||
|
Log.WriteError(String.Format("Merak: Error calculating '{0}' bandwidth at {1}", mailAccount, day.ToShortDateString()), ex)
|
||||||
|
End Try
|
||||||
|
|
||||||
|
Return result
|
||||||
|
End Function
|
||||||
|
|
||||||
Public Overrides Function GetServiceItemsDiskSpace(ByVal items() As ServiceProviderItem) As ServiceProviderItemDiskSpace()
|
Public Overrides Function GetServiceItemsDiskSpace(ByVal items() As ServiceProviderItem) As ServiceProviderItemDiskSpace()
|
||||||
Dim itemsDiskspace As List(Of ServiceProviderItemDiskSpace) = New List(Of ServiceProviderItemDiskSpace)
|
Dim itemsDiskspace As List(Of ServiceProviderItemDiskSpace) = New List(Of ServiceProviderItemDiskSpace)
|
||||||
Dim item As ServiceProviderItem
|
Dim item As ServiceProviderItem
|
||||||
|
@ -1297,8 +1372,6 @@ ContinueFor1:
|
||||||
|
|
||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
'/ Provides constant values for easier interoperability with Merak COM library
|
'/ Provides constant values for easier interoperability with Merak COM library
|
||||||
'/ </summary>
|
'/ </summary>
|
||||||
Private Class MerakInterop
|
Private Class MerakInterop
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue