Merge
This commit is contained in:
commit
3b6fe9c4bb
204 changed files with 23591 additions and 9818 deletions
|
@ -6050,6 +6050,7 @@ namespace WebsitePanel.Providers.HostedSolution
|
|||
Command cmd = new Command("Set-AcceptedDomain");
|
||||
cmd.Parameters.Add("Identity", id);
|
||||
cmd.Parameters.Add("DomainType", domainType.ToString());
|
||||
cmd.Parameters.Add("AddressBookEnabled", !(domainType == ExchangeAcceptedDomainType.InternalRelay));
|
||||
cmd.Parameters.Add("Confirm", false);
|
||||
ExecuteShellCommand(runSpace, cmd);
|
||||
ExchangeLog.LogEnd("SetAcceptedDomainType");
|
||||
|
@ -6874,5 +6875,76 @@ namespace WebsitePanel.Providers.HostedSolution
|
|||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Disclaimers
|
||||
|
||||
public int NewDisclaimerTransportRule(string Name, string From, string Text)
|
||||
{
|
||||
return NewDisclaimerTransportRuleInternal(Name, From, Text);
|
||||
}
|
||||
|
||||
public int RemoveTransportRule(string Name)
|
||||
{
|
||||
return RemoveTransportRuleInternal(Name);
|
||||
}
|
||||
|
||||
internal virtual int NewDisclaimerTransportRuleInternal(string Name, string From, string Text)
|
||||
{
|
||||
ExchangeLog.LogStart("NewDisclaimerTransportRuleInternal");
|
||||
Runspace runSpace = null;
|
||||
try
|
||||
{
|
||||
runSpace = OpenRunspace();
|
||||
Command cmd = new Command("New-TransportRule");
|
||||
cmd.Parameters.Add("Name", Name);
|
||||
cmd.Parameters.Add("From", From);
|
||||
cmd.Parameters.Add("Enabled", true);
|
||||
cmd.Parameters.Add("ApplyHtmlDisclaimerLocation", "Append");
|
||||
cmd.Parameters.Add("ApplyHtmlDisclaimerText", Text);
|
||||
cmd.Parameters.Add("ApplyHtmlDisclaimerFallbackAction", "Wrap");
|
||||
ExecuteShellCommand(runSpace, cmd);
|
||||
}
|
||||
catch (Exception exc)
|
||||
{
|
||||
ExchangeLog.LogError(exc);
|
||||
return -1;
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseRunspace(runSpace);
|
||||
}
|
||||
ExchangeLog.LogEnd("NewDisclaimerTransportRuleInternal");
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
internal virtual int RemoveTransportRuleInternal(string Name)
|
||||
{
|
||||
ExchangeLog.LogStart("RemoveTransportRuleInternal");
|
||||
Runspace runSpace = null;
|
||||
try
|
||||
{
|
||||
runSpace = OpenRunspace();
|
||||
Command cmd = new Command("Remove-TransportRule");
|
||||
cmd.Parameters.Add("Identity", Name);
|
||||
cmd.Parameters.Add("Confirm", false);
|
||||
ExecuteShellCommand(runSpace, cmd);
|
||||
}
|
||||
catch(Exception exc)
|
||||
{
|
||||
ExchangeLog.LogError(exc);
|
||||
return -1;
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseRunspace(runSpace);
|
||||
}
|
||||
ExchangeLog.LogEnd("RemoveTransportRuleInternal");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue