Merge Commit

This commit is contained in:
robvde 2014-08-31 09:39:11 +08:00
commit 7ffed2b786
89 changed files with 8740 additions and 1881 deletions

View file

@ -29,6 +29,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
namespace WebsitePanel.Providers.HostedSolution
{
@ -63,5 +64,14 @@ namespace WebsitePanel.Providers.HostedSolution
set { this.disclaimerText = value; }
}
public string WSPUniqueName
{
get
{
Regex r = new Regex(@"[^A-Za-z0-9]");
return "WSPDisclaimer" + ExchangeDisclaimerId.ToString() + "_" + r.Replace(DisclaimerName, "");
}
}
}
}

View file

@ -131,8 +131,10 @@ namespace WebsitePanel.Providers.HostedSolution
void RemoveDevice(string id);
// Disclaimers
int NewDisclaimerTransportRule(string Name, string From, string Text);
int RemoveTransportRule(string Name);
int SetDisclaimer(string name, string text);
int RemoveDisclaimer(string name);
int AddDisclamerMember(string name, string member);
int RemoveDisclamerMember(string name, string member);
// Archiving
ResultObject SetMailBoxArchiving(string organizationId, string accountName, bool archive, long archiveQuotaKB, long archiveWarningQuotaKB, string RetentionPolicy);

View file

@ -199,5 +199,31 @@ namespace WebsitePanel.Providers.Mail
public string ResponderExpirationDate { get; set; }
#endregion
}
#region IceWarp
public int IceWarpAccountType { get; set; }
public int IceWarpAccountState { get; set; }
public int IceWarpRespondType { get; set; }
public bool RespondOnlyBetweenDates { get; set; } // Added this because Calendar Control used did not allow null values
public DateTime RespondFrom { get; set; }
public DateTime RespondTo { get; set; }
public string RespondWithReplyFrom { get; set; }
public int RespondPeriodInDays { get; set; }
public bool DeleteOlder { get; set; }
public int DeleteOlderDays { get; set; }
public bool ForwardOlder { get; set; }
public int ForwardOlderDays { get; set; }
public string ForwardOlderTo { get; set; }
public int MaxMessageSizeMegaByte { get; set; }
public int MegaByteSendLimit { get; set; }
public int NumberSendLimit { get; set; }
public string FullName { get; set; }
#endregion
}
}

View file

@ -365,5 +365,17 @@ namespace WebsitePanel.Providers.Mail
#endregion
}
#region IceWarp
public int MegaByteSendLimit { get; set; }
public int NumberSendLimit { get; set; }
public int DefaultUserQuotaInMB { get; set; }
public int DefaultUserMaxMessageSizeMegaByte { get; set; }
public int DefaultUserMegaByteSendLimit { get; set; }
public int DefaultUserNumberSendLimit { get; set; }
#endregion
}
}

View file

@ -67,4 +67,42 @@ namespace WebsitePanel.Providers.Mail
#endregion
#region IceWarp
public enum IceWarpListMembersSource
{
MembersInFile = 0,
AllDomainUsers = 1,
AllDomainAdmins = 3
}
public enum IceWarpListFromAndReplyToHeader
{
NoChange = 0,
SetToSender = 1,
SetToValue = 2
}
public enum IceWarpListOriginator
{
Blank = 0,
Sender = 1,
Owner = 2
}
[Flags]
public enum IceWarpListDefaultRights
{
Receive = 1,
Post = 2,
Digest = 4
}
public enum IceWarpListConfirmSubscription
{
None = 0,
User = 1,
Owner = 2
}
#endregion
}

View file

@ -280,5 +280,26 @@ namespace WebsitePanel.Providers.Mail
set { requireSmtpAuthentication = value; }
}
#endregion
#region IceWarp
public IceWarpListMembersSource MembersSource { get; set; }
public IceWarpListFromAndReplyToHeader FromHeader { get; set; }
public IceWarpListFromAndReplyToHeader ReplyToHeader { get; set; }
public bool SetReceipientsToToHeader { get; set; }
public IceWarpListOriginator Originator { get; set; }
public IceWarpListDefaultRights DefaultRights { get; set; }
public int MaxMembers { get; set; }
public bool SendToSender { get; set; }
public int MaxMessagesPerMinute { get; set; }
public IceWarpListConfirmSubscription ConfirmSubscription { get; set; }
public bool CommandsInSubject { get; set; }
public bool DisableWhichCommand { get; set; }
public bool DisableReviewCommand { get; set; }
public bool DisableVacationCommand { get; set; }
public string CommandPassword { get; set; }
public bool SuppressCommandResponses { get; set; }
#endregion
}
}