zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: Lync unable to delete federation domain

Browse source 
Adjusted: certain input items forced to lower case
This commit is contained in:
robvde 2012-10-20 22:49:19 +04:00
parent 16c40cf9ac
commit 317653269f
5 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
View file

@ -162,6 +162,7 @@ namespace WebsitePanel.Providers.HostedSolution
#region organization #region organization
private string CreateOrganizationInternal(string organizationId, string sipDomain, bool enableConferencing, bool enableConferencingVideo, int maxConferenceSize, bool enabledFederation, bool enabledEnterpriseVoice) private string CreateOrganizationInternal(string organizationId, string sipDomain, bool enableConferencing, bool enableConferencingVideo, int maxConferenceSize, bool enabledFederation, bool enabledEnterpriseVoice)
{ {
sipDomain = sipDomain.ToLower();
HostedSolutionLog.LogStart("CreateOrganizationInternal"); HostedSolutionLog.LogStart("CreateOrganizationInternal");
HostedSolutionLog.DebugInfo("organizationId: {0}", organizationId); HostedSolutionLog.DebugInfo("organizationId: {0}", organizationId);
HostedSolutionLog.DebugInfo("sipDomain: {0}", sipDomain); HostedSolutionLog.DebugInfo("sipDomain: {0}", sipDomain);
@ -839,6 +840,9 @@ namespace WebsitePanel.Providers.HostedSolution
HostedSolutionLog.DebugInfo("organizationId: {0}", organizationId); HostedSolutionLog.DebugInfo("organizationId: {0}", organizationId);
HostedSolutionLog.DebugInfo("domainName: {0}", domainName); HostedSolutionLog.DebugInfo("domainName: {0}", domainName);
domainName = domainName.ToLower();
proxyFqdn = proxyFqdn.ToLower();
Runspace runSpace = null; Runspace runSpace = null;
try try
{ {
@ -926,9 +930,19 @@ namespace WebsitePanel.Providers.HostedSolution
if (GetPSObjectProperty(result[0], "AllowedDomains").GetType().ToString() == "Microsoft.Rtc.Management.WritableConfig.Settings.Edge.AllowList") if (GetPSObjectProperty(result[0], "AllowedDomains").GetType().ToString() == "Microsoft.Rtc.Management.WritableConfig.Settings.Edge.AllowList")
{ {
HostedSolutionLog.DebugInfo("Remove DomainName: {0}", domainName);
allowList = (AllowList)GetPSObjectProperty(result[0], "AllowedDomains"); allowList = (AllowList)GetPSObjectProperty(result[0], "AllowedDomains");
DomainPattern domain = new DomainPattern(domainName); DomainPattern domain = null;
allowList.AllowedDomain.Remove(domain); foreach (DomainPattern d in allowList.AllowedDomain)
{
if (d.Domain.ToLower() == domainName.ToLower())
{
domain = d;
break;
}
}
if (domain != null)
allowList.AllowedDomain.Remove(domain);
} }
cmd = new Command("Set-CsTenantFederationConfiguration"); cmd = new Command("Set-CsTenantFederationConfiguration");

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
View file

@ -225,7 +225,7 @@ namespace WebsitePanel.Portal
{ {
domainId = ES.Services.Servers.AddDomainWithProvisioning(PanelSecurity.PackageId, domainId = ES.Services.Servers.AddDomainWithProvisioning(PanelSecurity.PackageId,
domainName.ToLower(), type, CreateWebSite.Checked, pointWebSiteId, pointMailDomainId, domainName.ToLower(), type, CreateWebSite.Checked, pointWebSiteId, pointMailDomainId,
EnableDns.Checked, CreateInstantAlias.Checked, AllowSubDomains.Checked, (PointWebSite.Checked && WebSitesList.Items.Count > 0) ? string.Empty : txtHostName.Text); EnableDns.Checked, CreateInstantAlias.Checked, AllowSubDomains.Checked, (PointWebSite.Checked && WebSitesList.Items.Count > 0) ? string.Empty : txtHostName.Text.ToLower());
if (domainId < 0) if (domainId < 0)
{ {

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxEmailAddresses.ascx.cs
View file

@ -91,7 +91,7 @@ namespace WebsitePanel.Portal.ExchangeServer
try try
{ {
int result = ES.Services.ExchangeServer.AddMailboxEmailAddress( int result = ES.Services.ExchangeServer.AddMailboxEmailAddress(
PanelRequest.ItemID, PanelRequest.AccountID, email.Email); PanelRequest.ItemID, PanelRequest.AccountID, email.Email.ToLower());
if (result < 0) if (result < 0)
{ {

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx.cs
View file

@ -92,8 +92,8 @@ namespace WebsitePanel.Portal.HostedSolution
try try
{ {
int accountId = ES.Services.Organizations.CreateUser(PanelRequest.ItemID, txtDisplayName.Text.Trim(), int accountId = ES.Services.Organizations.CreateUser(PanelRequest.ItemID, txtDisplayName.Text.Trim(),
email.AccountName, email.AccountName.ToLower(),
email.DomainName, email.DomainName.ToLower(),
password.Password, password.Password,
txtSubscriberNumber.Text.Trim(), txtSubscriberNumber.Text.Trim(),
false, false,

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesAddPointer.ascx.cs
View file

@ -67,7 +67,7 @@ namespace WebsitePanel.Portal
{ {
try try
{ {
int result = ES.Services.WebServers.AddWebSitePointer(PanelRequest.ItemID, txtHostName.Text, domainsSelectDomainControl.DomainId); int result = ES.Services.WebServers.AddWebSitePointer(PanelRequest.ItemID, txtHostName.Text.ToLower(), domainsSelectDomainControl.DomainId);
if (result < 0) if (result < 0)
{ {
ShowResultMessage(result); ShowResultMessage(result);