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

Bugfix for empty domain list when creating CSR request.

Browse source
This commit is contained in:
Grzegorz 2011-11-03 10:18:55 +01:00
parent 85fdf37a52
commit 04bc588a6a
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
View file

@ -107,15 +107,23 @@ namespace WebsitePanel.Portal
} }
} }
private void BindListOfAvailableSslDomains(ServerBinding[] siteBindings, SSLCertificate[] siteCertificates) private void BindListOfAvailableSslDomains(ServerBinding[] siteBindings, SSLCertificate[] siteCertificates, string websiteName = "")
{ {
lstDomains.Items.Clear(); lstDomains.Items.Clear();
// //
foreach (ServerBinding binding in siteBindings) foreach (ServerBinding binding in siteBindings)
{ {
// //
lstDomains.Items.Add(new ListItem(binding.Host, binding.Host)); if (binding.IP.ToString().Length > 0 && binding.Host.Length == 0)
} {
lstDomains.Items.Add(new ListItem(websiteName, websiteName));
lstDomains.Items.Add(new ListItem(String.Format("www.{0}", websiteName), String.Format("www.{0}", websiteName)));
}
else
{
lstDomains.Items.Add(new ListItem(binding.Host, binding.Host));
}
}
} }
public void BindWebItem(WebVirtualDirectory item) public void BindWebItem(WebVirtualDirectory item)
@ -137,7 +145,7 @@ namespace WebsitePanel.Portal
SSLNotInstalled.Visible = true; SSLNotInstalled.Visible = true;
// //
BindListOfAvailableSslDomains(webSite.Bindings, certificates); BindListOfAvailableSslDomains(webSite.Bindings, certificates, webSite.Name);
if (certificates.Length > 0) if (certificates.Length > 0)
{ {
@ -560,7 +568,7 @@ namespace WebsitePanel.Portal
SSLNotInstalled.Visible = true; SSLNotInstalled.Visible = true;
// //
BindListOfAvailableSslDomains(item.Bindings, certificates); BindListOfAvailableSslDomains(item.Bindings, certificates, item.Name);
if (certificates.Length > 0) if (certificates.Length > 0)
{ {