From b29b62bbe84c980e3c61b548d3ca7b7da90e8fa7 Mon Sep 17 00:00:00 2001 From: doctogonzo Date: Thu, 30 Apr 2015 16:17:51 +0200 Subject: [PATCH] "IP address: Shared" fix --- .../WebsitePanel/WebSitesEditSite.ascx.cs | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs index eb8ddab0..3f36fcf9 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs @@ -204,9 +204,25 @@ namespace WebsitePanel.Portal bool generalIPExists = ipsGeneral.Any() && !string.IsNullOrEmpty(ipsGeneral[0].ExternalIP); if (generalIPExists) { - lblSharedIP.Text = string.Format("({0})", ipsGeneral[0].ExternalIP); + lblSharedIP.Text = string.Format("({0})", ipsGeneral[0].ExternalIP); } - lblSharedIP.Visible = generalIPExists; + else + { + string[] settings = ES.Services.Servers.GetServiceSettings(site.ServiceId); + foreach (string setting in settings) + { + int idx = setting.IndexOf('='); + string option = setting.Substring(0, idx); + if (String.Compare(option, "publicsharedip", true) == 0) + { + string res = setting.Substring(idx + 1); + if (!String.IsNullOrEmpty(res)) + lblSharedIP.Text = string.Format("({0})", res); + break; + } + } + } + lblSharedIP.Visible = !String.IsNullOrEmpty(lblSharedIP.Text); } dedicatedIP.Visible = site.IsDedicatedIP;