From 04bc588a6a4acbcd681fe1e583a53bfe41ffd906 Mon Sep 17 00:00:00 2001
From: Grzegorz <Grzegorz@Grzegorz-PC>
Date: Thu, 3 Nov 2011 10:18:55 +0100
Subject: [PATCH] Bugfix for empty domain list when creating CSR request.

---
 .../WebsitePanel/WebsitesSSL.ascx.cs          | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
index f642d00d..a5e71f64 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
@@ -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();
-			//
-			foreach (ServerBinding binding in siteBindings)
-			{
-				//
-				lstDomains.Items.Add(new ListItem(binding.Host, binding.Host));
-			}
+            lstDomains.Items.Clear();
+            //
+            foreach (ServerBinding binding in siteBindings)
+            {
+                //
+                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)
@@ -137,7 +145,7 @@ namespace WebsitePanel.Portal
 
 				SSLNotInstalled.Visible = true;
 				//
-				BindListOfAvailableSslDomains(webSite.Bindings, certificates);
+                BindListOfAvailableSslDomains(webSite.Bindings, certificates, webSite.Name);
 
 				if (certificates.Length > 0)
 				{
@@ -560,7 +568,7 @@ namespace WebsitePanel.Portal
 
 				SSLNotInstalled.Visible = true;
 				//
-				BindListOfAvailableSslDomains(item.Bindings, certificates);
+				BindListOfAvailableSslDomains(item.Bindings, certificates, item.Name);
 
 				if (certificates.Length > 0)
 				{