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

Adjusted: Webhosting: In webhosting hostname support disabledmode, used

Browse source 
domainnames by a site are not shown when creating a site.
This commit is contained in:
robvde 2012-10-15 07:16:24 +04:00
parent 389dfe7c7b
commit d323eeb4df
3 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,12 +5,18 @@
</configSections> </configSections>
<!-- Connection strings --> <!-- Connection strings -->
<connectionStrings> <connectionStrings>
<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" 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" />
-->
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- Encryption util settings --> <!--
<add key="WebsitePanel.CryptoKey" value="1234567890" /> <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<!-- A1D4KDHUE83NKHddF --> <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-->
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<add key="WebsitePanel.EncryptionEnabled" value="true" /> <add key="WebsitePanel.EncryptionEnabled" value="true" />
<!-- Web Applications --> <!-- Web Applications -->
<add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" /> <add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />

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

@ -38,6 +38,7 @@ using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls; using System.Web.UI.HtmlControls;
using WebsitePanel.EnterpriseServer; using WebsitePanel.EnterpriseServer;
using WebsitePanel.Providers.Web;
namespace WebsitePanel.Portal namespace WebsitePanel.Portal
{ {
@ -108,6 +109,10 @@ namespace WebsitePanel.Portal
{ {
DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PackageId); DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PackageId);
WebSite[] sites = null;
if (HideWebSites)
sites = ES.Services.WebServers.GetWebSites(PackageId, false);
ddlDomains.Items.Clear(); ddlDomains.Items.Clear();
// add "select" item // add "select" item
@ -115,8 +120,26 @@ namespace WebsitePanel.Portal
foreach (DomainInfo domain in domains) foreach (DomainInfo domain in domains)
{ {
if (HideWebSites && domain.WebSiteId > 0) if (HideWebSites)
{
if (domain.WebSiteId > 0)
{
continue; continue;
}
else
{
bool bFound = false;
foreach (WebSite w in sites)
{
if (w.Name.ToLower() == domain.DomainName.ToLower())
{
bFound = true;
break;
}
}
if (bFound) continue;
}
}
else if (HideInstantAlias && domain.IsInstantAlias) else if (HideInstantAlias && domain.IsInstantAlias)
continue; continue;
else if (HideMailDomains && domain.MailDomainId > 0) else if (HideMailDomains && domain.MailDomainId > 0)

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesAddSite.ascx.cs
View file

@ -62,10 +62,10 @@ namespace WebsitePanel.Portal
private void ToggleControls() private void ToggleControls()
{ {
rowDedicatedIP.Visible = rbDedicatedIP.Checked;
PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId); PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
rowDedicatedIP.Visible = rbDedicatedIP.Checked;
if (Utils.CheckQouta(Quotas.WEB_ENABLEHOSTNAMESUPPORT, cntx)) if (Utils.CheckQouta(Quotas.WEB_ENABLEHOSTNAMESUPPORT, cntx))
{ {
txtHostName.Visible = chkIgnoreGlobalDNSRecords.Visible = lblIgnoreGlobalDNSRecords.Visible = lblTheDotInTheMiddle.Visible = true; txtHostName.Visible = chkIgnoreGlobalDNSRecords.Visible = lblIgnoreGlobalDNSRecords.Visible = lblTheDotInTheMiddle.Visible = true;
@ -78,6 +78,7 @@ namespace WebsitePanel.Portal
txtHostName.Visible = chkIgnoreGlobalDNSRecords.Visible = lblIgnoreGlobalDNSRecords.Visible = lblTheDotInTheMiddle.Visible = false; txtHostName.Visible = chkIgnoreGlobalDNSRecords.Visible = lblIgnoreGlobalDNSRecords.Visible = lblTheDotInTheMiddle.Visible = false;
chkIgnoreGlobalDNSRecords.Checked = true; chkIgnoreGlobalDNSRecords.Checked = true;
txtHostName.Text = ""; txtHostName.Text = "";
domainsSelectDomainControl.HideWebSites = true;
} }
} }