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

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationCreateOrganization.ascx.resx
View file

@ -156,4 +156,7 @@
<data name="valRequireOrgName.Text" xml:space="preserve">
<value>*</value>
</data>
<data name="locDomainName.Text" xml:space="preserve">
<value>Domain Name:</value>
</data>
</root>

15
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddDomainName.ascx.cs
View file

@ -27,6 +27,10 @@
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
using System.Data;
using System.Text;
using System.Collections.Generic;
using WebsitePanel.EnterpriseServer;
using WebsitePanel.Providers.HostedSolution;
@ -38,7 +42,16 @@ namespace WebsitePanel.Portal.ExchangeServer
{
DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId);
OrganizationDomainName[] list = ES.Services.Organizations.GetOrganizationDomains(PanelRequest.ItemID);
Organization[] orgs = ES.Services.Organizations.GetOrganizations(PanelSecurity.PackageId, false);
List<OrganizationDomainName> list = new List<OrganizationDomainName>();
foreach (Organization o in orgs)
{
OrganizationDomainName[] tmpList = ES.Services.Organizations.GetOrganizationDomains(o.Id);
foreach (OrganizationDomainName name in tmpList) list.Add(name);
}
foreach (DomainInfo d in domains)
{

6
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateOrganization.ascx
View file

@ -43,6 +43,12 @@
ValidationGroup="CreateOrganization">*</asp:RegularExpressionValidator>
</td>
</tr>
<tr>
<td class="FormLabel150"><asp:Localize ID="locDomainName" runat="server" meta:resourcekey="locDomainName" Text="Domain Name:"></asp:Localize></td>
<td>
<asp:DropDownList id="ddlDomains" runat="server" CssClass="NormalTextBox" DataTextField="DomainName" DataValueField="DomainID" style="vertical-align:middle;"></asp:DropDownList>
</td>
</tr>
</table>
<div class="FormFooterClean">
<asp:Button id="btnCreate" runat="server" Text="Create Organization" CssClass="Button1" OnClick="btnCreate_Click"

44
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateOrganization.ascx.cs
View file

@ -27,7 +27,11 @@
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
using System.Data;
using System.Text;
using System.Collections.Generic;
using WebsitePanel.EnterpriseServer;
using WebsitePanel.Providers.HostedSolution;
namespace WebsitePanel.Portal.ExchangeServer
{
@ -35,7 +39,42 @@ namespace WebsitePanel.Portal.ExchangeServer
{
protected void Page_Load(object sender, EventArgs e)
{
DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId);
Organization[] orgs = ES.Services.Organizations.GetOrganizations(PanelSecurity.PackageId, false);
List<OrganizationDomainName> list = new List<OrganizationDomainName>();
foreach (Organization o in orgs)
{
OrganizationDomainName[] tmpList = ES.Services.Organizations.GetOrganizationDomains(o.Id);
foreach (OrganizationDomainName name in tmpList) list.Add(name);
}
foreach (DomainInfo d in domains)
{
if (!d.IsDomainPointer)
{
bool bAdd = true;
foreach (OrganizationDomainName acceptedDomain in list)
{
if (d.DomainName.ToLower() == acceptedDomain.DomainName.ToLower())
{
bAdd = false;
break;
}
}
if (bAdd) ddlDomains.Items.Add(d.DomainName.ToLower());
}
}
if (ddlDomains.Items.Count == 0)
{
ddlDomains.Visible = btnCreate.Enabled = false;
}
}
protected void btnCreate_Click(object sender, EventArgs e)
@ -52,7 +91,8 @@ namespace WebsitePanel.Portal.ExchangeServer
{
int itemId = ES.Services.Organizations.CreateOrganization(PanelSecurity.PackageId,
txtOrganizationID.Text.Trim().ToLower(), txtOrganizationName.Text.Trim().ToLower());
txtOrganizationID.Text.Trim().ToLower(), txtOrganizationName.Text.Trim().ToLower(),
ddlDomains.SelectedValue.Trim().ToLower());
if (itemId < 0)
{

27
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateOrganization.ascx.designer.cs generated
View file

@ -120,6 +120,24 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// </remarks>
protected global::System.Web.UI.WebControls.RegularExpressionValidator valRequireCorrectOrgID;
/// <summary>
/// locDomainName control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locDomainName;
/// <summary>
/// ddlDomains control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlDomains;
/// <summary>
/// btnCreate control.
/// </summary>
@ -137,14 +155,5 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
/// <summary>
/// FormComments control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize FormComments;
}
}

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

@ -171,7 +171,7 @@ namespace WebsitePanel.Portal
if (user.Role != UserRole.Reseller)
{
ES.Services.Organizations.CreateOrganization(result.Result, domainName.ToLower(), domainName.ToLower());
ES.Services.Organizations.CreateOrganization(result.Result, domainName.ToLower(), domainName.ToLower(), domainName.ToLower());
if (result.Result < 0)
{