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

Incorrect displaying of shared/dedicated IP on website details screen.

Browse source
This commit is contained in:
feodor_fitsner 2012-09-26 10:24:01 -07:00
parent 25654d2607
commit 21e91d2931
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,6 +133,18 @@ namespace WebsitePanel.EnterpriseServer
if(ip != null) if(ip != null)
site.SiteIPAddress = ip.ExternalIP; site.SiteIPAddress = ip.ExternalIP;
// check if site has dedicated IP assigned
var siteIpAddresses = ServerController.GetItemIPAddresses(siteItemId, IPAddressPool.None);
foreach (var siteIp in siteIpAddresses)
{
var packageIpAddress = ServerController.GetPackageIPAddress(siteIp.AddressID);
if (packageIpAddress != null && packageIpAddress.ExternalIP == site.SiteIPAddress)
{
site.IsDedicatedIP = true;
break;
}
}
// truncate home folder // truncate home folder
site.ContentPath = FilesController.GetVirtualPackagePath(siteItem.PackageId, site.ContentPath); site.ContentPath = FilesController.GetVirtualPackagePath(siteItem.PackageId, site.ContentPath);
@ -654,8 +666,6 @@ namespace WebsitePanel.EnterpriseServer
{ {
TaskManager.CompleteTask(); TaskManager.CompleteTask();
} }
return 0;
} }
public static int SwitchWebSiteToSharedIP(int siteItemId) public static int SwitchWebSiteToSharedIP(int siteItemId)
@ -717,9 +727,6 @@ namespace WebsitePanel.EnterpriseServer
{ {
TaskManager.CompleteTask(); TaskManager.CompleteTask();
} }
return 0;
} }
private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords, private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords,

7
WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/WebSite.cs
View file

@ -47,6 +47,7 @@ namespace WebsitePanel.Providers.Web
private string siteId; private string siteId;
private string siteIPAddress; private string siteIPAddress;
private int siteIPAddressId; private int siteIPAddressId;
private bool isDedicatedIP;
private string dataPath; private string dataPath;
private ServerBinding[] bindings; private ServerBinding[] bindings;
private bool frontPageAvailable; private bool frontPageAvailable;
@ -85,6 +86,12 @@ namespace WebsitePanel.Providers.Web
set { siteIPAddressId = value; } set { siteIPAddressId = value; }
} }
public bool IsDedicatedIP
{
get { return isDedicatedIP; }
set { isDedicatedIP = value; }
}
/// <summary> /// <summary>
/// Gets or sets logs path for the web site /// Gets or sets logs path for the web site
/// </summary> /// </summary>

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

@ -176,15 +176,13 @@ namespace WebsitePanel.Portal
ddlIpAddresses.Items.Add(new ListItem(fullIP, ip.PackageAddressID.ToString())); ddlIpAddresses.Items.Add(new ListItem(fullIP, ip.PackageAddressID.ToString()));
} }
bool isDedicatedIP = false; if (site.IsDedicatedIP)
if (!String.IsNullOrEmpty(site.SiteIPAddress))
{ {
litIPAddress.Text = site.SiteIPAddress; litIPAddress.Text = site.SiteIPAddress;
isDedicatedIP = true;
} }
dedicatedIP.Visible = isDedicatedIP; dedicatedIP.Visible = site.IsDedicatedIP;
sharedIP.Visible = !isDedicatedIP; sharedIP.Visible = !site.IsDedicatedIP;
cmdSwitchToDedicatedIP.Visible = (ddlIpAddresses.Items.Count > 0); cmdSwitchToDedicatedIP.Visible = (ddlIpAddresses.Items.Count > 0);