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

Fixed: Domain Aliases removed from SpaceQuota from

Browse source 
Fixed: Alignment of "Create Website" check box on AddDomains
Fixed: Lync Organization Creation remote access and enterprise voice properties
not properly set
This commit is contained in:
robvde 2012-10-19 10:44:21 +04:00
parent e628b7a2b1
commit b9161581b0
7 changed files with 30 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

23
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/LyncController.cs
View file

@ -198,8 +198,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_CONFERENCING].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_ALLOWVIDEO].QuotaAllocatedValue),
Convert.ToInt32(cntx.Quotas[Quotas.LYNC_MAXPARTICIPANTS].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_CONFERENCING].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_CONFERENCING].QuotaAllocatedValue));
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_FEDERATION].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_ENTERPRISEVOICE].QuotaAllocatedValue));
if (string.IsNullOrEmpty(org.LyncTenantId))
{
@ -837,8 +837,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_CONFERENCING].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_ALLOWVIDEO].QuotaAllocatedValue),
Convert.ToInt32(cntx.Quotas[Quotas.LYNC_MAXPARTICIPANTS].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_CONFERENCING].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_CONFERENCING].QuotaAllocatedValue));
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_FEDERATION].QuotaAllocatedValue),
Convert.ToBoolean(cntx.Quotas[Quotas.LYNC_ENTERPRISEVOICE].QuotaAllocatedValue));
if (string.IsNullOrEmpty(org.LyncTenantId))
{
@ -851,7 +851,20 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
lync = GetLyncServer(lyncServiceId, org.ServiceId);
lync.AddFederationDomain(org.OrganizationId, domainName, proxyFqdn);
bool bDomainExists = false;
LyncFederationDomain[] domains = GetFederationDomains(itemId);
foreach (LyncFederationDomain d in domains)
{
if (d.DomainName.ToLower() == domainName.ToLower())
{
bDomainExists = true;
break;
}
}
if (!bDomainExists)
lync.AddFederationDomain(org.OrganizationId, domainName.ToLower(), proxyFqdn);
}
catch (Exception ex)
{