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

Fixed: When a domain is assigned to an email domain as an alias, you are still

Browse source 
able to create and assign email accounts under that domain
This commit is contained in:
robvde 2012-11-18 13:46:58 +04:00
parent 8fdd24c19f
commit 1c7d232f7c
3 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
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=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;" /> <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- A1D4KDHUE83NKHddF --> <!-- A1D4KDHUE83NKHddF -->
@ -17,7 +17,7 @@
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" /> <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" /> <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
--> -->
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" /> <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
<!-- A1D4KDHUE83NKHddF --> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true" /> <add key="WebsitePanel.EncryptionEnabled" value="true" />

34
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs
View file

@ -62,6 +62,13 @@ namespace WebsitePanel.Portal
set { ViewState["HideMailDomains"] = value; } set { ViewState["HideMailDomains"] = value; }
} }
public bool HideMailDomainPointers
{
get { return (ViewState["HideMailDomainPointers"] != null) ? (bool)ViewState["HideMailDomainPointers"] : false; }
set { ViewState["HideMailDomainPointers"] = value; }
}
public bool HideDomainPointers public bool HideDomainPointers
{ {
get { return (ViewState["HideDomainPointers"] != null) ? (bool)ViewState["HideDomainPointers"] : false; } get { return (ViewState["HideDomainPointers"] != null) ? (bool)ViewState["HideDomainPointers"] : false; }
@ -111,6 +118,7 @@ namespace WebsitePanel.Portal
WebSite[] sites = null; WebSite[] sites = null;
Hashtable htSites = new Hashtable(); Hashtable htSites = new Hashtable();
Hashtable htMailDomainPointers = new Hashtable();
if (HideWebSites) if (HideWebSites)
{ {
sites = ES.Services.WebServers.GetWebSites(PackageId, false); sites = ES.Services.WebServers.GetWebSites(PackageId, false);
@ -127,6 +135,25 @@ namespace WebsitePanel.Portal
} }
} }
if (HideMailDomainPointers)
{
Providers.Mail.MailDomain[] mailDomains = ES.Services.MailServers.GetMailDomains(PackageId, false);
foreach (Providers.Mail.MailDomain mailDomain in mailDomains)
{
DomainInfo[] pointers = ES.Services.MailServers.GetMailDomainPointers(mailDomain.Id);
if (pointers != null)
{
foreach (DomainInfo p in pointers)
{
if (htMailDomainPointers[p.DomainName.ToLower()] == null) htMailDomainPointers.Add(p.DomainName.ToLower(), 1);
}
}
}
}
ddlDomains.Items.Clear(); ddlDomains.Items.Clear();
// add "select" item // add "select" item
@ -149,6 +176,13 @@ namespace WebsitePanel.Portal
} }
} }
if (HideMailDomainPointers)
{
if (htMailDomainPointers[domain.DomainName.ToLower()] != null) continue;
}
if (HideInstantAlias && domain.IsInstantAlias) if (HideInstantAlias && domain.IsInstantAlias)
continue; continue;
else if (HideMailDomains && domain.MailDomainId > 0) else if (HideMailDomains && domain.MailDomainId > 0)

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/MailEditAddress.ascx
View file

@ -9,7 +9,7 @@
<td id="EditEmailPanel" runat="server"> <td id="EditEmailPanel" runat="server">
<uc2:UsernameControl ID="txtName" runat="server" width="120px" /> <uc2:UsernameControl ID="txtName" runat="server" width="120px" />
&nbsp;@&nbsp; &nbsp;@&nbsp;
<dnc:SelectDomain id="domainsSelectDomainControl" runat="server" HideDomainPointers="true" HideInstantAlias="false"></dnc:SelectDomain> <dnc:SelectDomain id="domainsSelectDomainControl" runat="server" HideDomainPointers="true" HideInstantAlias="false" HideMailDomainPointers="true"></dnc:SelectDomain>
</td> </td>
<td id="DisplayEmailPanel" runat="server"> <td id="DisplayEmailPanel" runat="server">
<asp:Label ID="litName" Runat="server" Visible="False" CssClass="Huge"></asp:Label> <asp:Label ID="litName" Runat="server" Visible="False" CssClass="Huge"></asp:Label>