Merging change fixing domains dropdown population on SSL page.
This commit is contained in:
commit
04bcb4843a
3 changed files with 21 additions and 13 deletions
|
@ -5,11 +5,11 @@
|
||||||
</configSections>
|
</configSections>
|
||||||
<!-- Connection strings -->
|
<!-- Connection strings -->
|
||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<add name="EnterpriseServer" connectionString="${installer.connectionstring}" providerName="System.Data.SqlClient"/>
|
<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=WebsitePanel;pwd=Password12" providerName="System.Data.SqlClient"/>
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<!-- Encryption util settings -->
|
<!-- Encryption util settings -->
|
||||||
<add key="WebsitePanel.CryptoKey" value="${installer.cryptokey}"/>
|
<add key="WebsitePanel.CryptoKey" value="1234567890"/>
|
||||||
<!-- A1D4KDHUE83NKHddF -->
|
<!-- A1D4KDHUE83NKHddF -->
|
||||||
<add key="WebsitePanel.EncryptionEnabled" value="true"/>
|
<add key="WebsitePanel.EncryptionEnabled" value="true"/>
|
||||||
<!-- Web Applications -->
|
<!-- Web Applications -->
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
<!-- Perform security check -->
|
<!-- Perform security check -->
|
||||||
<enabled value="true"/>
|
<enabled value="true"/>
|
||||||
<!-- Server password -->
|
<!-- Server password -->
|
||||||
<password value="${installer.server.password}"/>
|
<password value="Z6JYIY9o9rX3FCWTz0sffYdiLdg="/>
|
||||||
</security>
|
</security>
|
||||||
</websitepanel.server>
|
</websitepanel.server>
|
||||||
<system.web>
|
<system.web>
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue