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

Fixed:

Browse source 
7.	Lync – MeetMeetingMax set to unlimited errors out lots of things

8.	Hosted Organization – When creating an organization manually, the Org
Name is taken as the first accepted domain for exchange, if this org name
is not a domain it creates the org incorrectly. This should take normal names
and not take this as a domain name for the accepted list, we have a good use
for non-domain org names
This commit is contained in:
robvde 2012-10-19 08:34:05 +04:00
parent 2408accc04
commit fdbda91cdd
12 changed files with 193 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
View file

@ -281,7 +281,7 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.WriteError(ex);
}
}
public static int CreateOrganization(int packageId, string organizationId, string organizationName)
public static int CreateOrganization(int packageId, string organizationId, string organizationName, string domainName)
{
int itemId;
int errorCode;
@ -291,6 +291,7 @@ namespace WebsitePanel.EnterpriseServer
// place log record
TaskManager.StartTask("ORGANIZATION", "CREATE_ORG", organizationName);
TaskManager.TaskParameters["Organization ID"] = organizationId;
TaskManager.TaskParameters["DomainName"] = domainName;
try
{
@ -311,7 +312,12 @@ namespace WebsitePanel.EnterpriseServer
return BusinessErrorCodes.ERROR_ORG_ID_EXISTS;
//create temporary domain name;
string domainName = CreateTemporyDomainName(serviceId, organizationId);
if (string.IsNullOrEmpty(domainName))
{
string tmpDomainName = CreateTemporyDomainName(serviceId, organizationId);
if (!string.IsNullOrEmpty(tmpDomainName)) domainName = tmpDomainName;
}
if (string.IsNullOrEmpty(domainName))
{

5
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
View file

@ -9,7 +9,7 @@
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
<add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
-->
<add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
</connectionStrings>
<appSettings>
<!-- A1D4KDHUE83NKHddF -->
@ -17,7 +17,8 @@
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-->
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" /> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true" />
<!-- Web Applications -->
<add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
View file

@ -46,9 +46,9 @@ namespace WebsitePanel.EnterpriseServer
#region Organizations
[WebMethod]
public int CreateOrganization(int packageId, string organizationID, string organizationName)
public int CreateOrganization(int packageId, string organizationID, string organizationName, string domainName)
{
return OrganizationController.CreateOrganization(packageId, organizationID, organizationName);
return OrganizationController.CreateOrganization(packageId, organizationID, organizationName, domainName);
}