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

Fixed: Portal: SSL tab disappears when selecting

Browse source 
Fixed: Switch dedicated/shared ip ensured all bindings are cleared when
switching
This commit is contained in:
robvde 2012-10-02 20:14:11 +04:00
parent 3d8fa9cf38
commit 37c44cdd63
3 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
View file

@ -646,11 +646,17 @@ namespace WebsitePanel.EnterpriseServer
DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false); DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false);
// clear binding left overs // clear binding left overs
List<ServerBinding> newBindings = new List<ServerBinding>();
WebServer web = new WebServer(); WebServer web = new WebServer();
ServiceProviderProxy.Init(web, siteItem.ServiceId); ServiceProviderProxy.Init(web, siteItem.ServiceId);
WebSite site = web.GetSite(siteItem.SiteId); try
List<ServerBinding> newBindings = new List<ServerBinding>(); {
web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true); web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true);
}
catch (Exception)
{
}
// update site item // update site item
siteItem.SiteIPAddressId = addressId; siteItem.SiteIPAddressId = addressId;
@ -744,9 +750,16 @@ namespace WebsitePanel.EnterpriseServer
// clear binding left overs // clear binding left overs
WebServer web = new WebServer(); WebServer web = new WebServer();
ServiceProviderProxy.Init(web, siteItem.ServiceId); ServiceProviderProxy.Init(web, siteItem.ServiceId);
WebSite site = web.GetSite(siteItem.SiteId);
List<ServerBinding> newBindings = new List<ServerBinding>(); List<ServerBinding> newBindings = new List<ServerBinding>();
try
{
web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true); web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true);
}
catch (Exception)
{
}
//figure out the PackageAddressId //figure out the PackageAddressId

3
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs
View file

@ -441,7 +441,8 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
int i = 0; int i = 0;
while (i < iisObject.Bindings.Count) while (i < iisObject.Bindings.Count)
{ {
if (String.Equals(iisObject.Bindings[i].Protocol, Uri.UriSchemeHttp, StringComparison.InvariantCultureIgnoreCase)) if ((String.Equals(iisObject.Bindings[i].Protocol, Uri.UriSchemeHttp, StringComparison.InvariantCultureIgnoreCase)) |
(bindings.Length == 0))
{ {
iisObject.Bindings.RemoveAt(i); iisObject.Bindings.RemoveAt(i);
continue; continue;

13
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
View file

@ -66,6 +66,7 @@ namespace WebsitePanel.Portal
new Tab { Id = "mime", ResourceKey = "Tab.MIMETypes", Quota = Quotas.WEB_MIME, ViewId = "tabMimes" }, new Tab { Id = "mime", ResourceKey = "Tab.MIMETypes", Quota = Quotas.WEB_MIME, ViewId = "tabMimes" },
new Tab { Id = "coldfusion", ResourceKey = "Tab.ColdFusion", Quota = Quotas.WEB_COLDFUSION, ViewId = "tabCF" }, new Tab { Id = "coldfusion", ResourceKey = "Tab.ColdFusion", Quota = Quotas.WEB_COLDFUSION, ViewId = "tabCF" },
new Tab { Id = "webman", ResourceKey = "Tab.WebManagement", Quota = Quotas.WEB_REMOTEMANAGEMENT, ViewId = "tabWebManagement" }, new Tab { Id = "webman", ResourceKey = "Tab.WebManagement", Quota = Quotas.WEB_REMOTEMANAGEMENT, ViewId = "tabWebManagement" },
new Tab { Id = "SSL", ResourceKey = "Tab.SSL", Quota = Quotas.WEB_SSL, ViewId = "SSL" },
}; };
private int PackageId private int PackageId
@ -256,15 +257,13 @@ namespace WebsitePanel.Portal
webSitesCustomErrorsControl.BindWebItem(site); webSitesCustomErrorsControl.BindWebItem(site);
if (site.SiteIPAddress != null) if (site.SiteIPAddress != null)
{ {
TabsList.Add(new Tab { Id = "SSL", ResourceKey = "Tab.SSL", Quota = Quotas.WEB_SSL, ViewId = "SSL" }); WebsitesSSLControl.Visible = true;
TabsList.ForEach((x) =>
{
x.Name = GetLocalizedString(x.ResourceKey);
x.ResourceGroup = x.ResourceGroup ?? ResourceGroups.Web;
});
WebsitesSSLControl.BindWebItem(site); WebsitesSSLControl.BindWebItem(site);
} }
else
{
WebsitesSSLControl.Visible = false;
}
BindVirtualDirectories(); BindVirtualDirectories();