Merge pull request #3194 from xenserver/master

Master->feature/cdn-updates
xenserver · Aug 9, 2023 · e4012a7 · e4012a7
2 parents 2af72aa + 4d0d232
commit e4012a7
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 138 deletions.
diff --git a/XenAdmin/Diagnostics/Checks/UpgradeRequiresEUA.cs b/XenAdmin/Diagnostics/Checks/UpgradeRequiresEUA.cs
@@ -78,7 +78,7 @@ public UpgradeRequiresEua(Control control, List<Host> hosts, Dictionary<string,
         private void FetchHostEua(Host host)
         {
             string eua = null;
-            if (Helpers.YangtzeOrGreater(host) && !Helpers.TryLoadHostEua(host, _targetUri, out eua))
+            if (Helpers.YangtzeOrGreater(host) && !Helpers.TryLoadHostEua(host, _targetUri?.OriginalString, out eua))
             {
                 Log.Warn($"Could not fetch EUA file for {host.Name()}");
                 lock (_hostsFailedToFetchEua)

diff --git a/XenAdmin/Diagnostics/Problems/PoolProblem/PoolHasFCoESrWarning.cs b/XenAdmin/Diagnostics/Problems/PoolProblem/PoolHasFCoESrWarning.cs
@@ -42,7 +42,7 @@ internal class PoolHasFCoESrWarning : WarningWithMoreInfo
 
         public override string Title => Description;
         public override string LinkText => Messages.LEARN_MORE;
-        public override string LinkData => InvisibleMessages.FCOE_SR_DEPRECATION_URL;
+        public override string LinkData => InvisibleMessages.DEPRECATION_URL;
 
         public override string Message => string.Format(_upgradingToVersionWithDeprecation
                 ? Messages.POOL_HAS_DEPRECATED_FCOE_WARNING

diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs b/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs
@@ -45,7 +45,6 @@ public partial class LicenseManager : XenDialogBase, ILicenseManagerView
         public LicenseManager(LicenseManagerController lmcontroller)
         {
             InitializeComponent();
-            downloadLicenseServerLink.Text = string.Format(downloadLicenseServerLink.Text, BrandManager.CompanyNameLegacy);
             checkableDataGridView.StatusImageColumn = statusImageColumn;
             SetupControllers(lmcontroller);
         }

diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseManager.resx b/XenAdmin/Dialogs/LicenseManager/LicenseManager.resx
@@ -223,13 +223,13 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="downloadLicenseServerLink.Size" type="System.Drawing.Size, System.Drawing">
-    <value>254, 15</value>
+    <value>284, 15</value>
   </data>
   <data name="downloadLicenseServerLink.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
   <data name="downloadLicenseServerLink.Text" xml:space="preserve">
-    <value>Download a {0} License Server virtual appliance</value>
+    <value>Learn how to install and configure the License Server</value>
   </data>
   <data name="downloadLicenseServerLink.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>

diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs b/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs
@@ -201,7 +201,7 @@ public void ReleaseLicenses(List<CheckableDataGridViewRow> rowsChecked)
 
         public void DownloadLicenseManager()
         {
-            LaunchUrl(InvisibleMessages.LICENSE_SERVER_DOWNLOAD_LINK).Invoke();
+            LaunchUrl(InvisibleMessages.LICENSE_SERVER_DOCS_LINK).Invoke();
         }
 
         private Action LaunchUrl(string url)

diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs
@@ -1481,7 +1481,7 @@ private List<TabPage> GetNewTabPages()
             // empty (i.e. at startup).
             bool show_home = SelectionManager.Selection.Count == 1 && SelectionManager.Selection[0].Value == null;
             // The upsell pages use the first selected XenObject: but they're only shown if there is only one selected object (see calls to ShowTab() below).
-            bool ha_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictHA) && (selectionPool != null && !selectionPool.ha_enabled);
+            bool ha_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictHA) && selectionPool != null && !selectionPool.ha_enabled;
             bool wlb_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictWLB);
             bool ad_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictAD);
             bool is_connected = selectionConnection != null && selectionConnection.IsConnected;
@@ -1574,7 +1574,7 @@ private List<TabPage> GetNewTabPages()
             if (!wlb_upsell && !multi && !SearchMode && isPoolSelected)
                 newTabs.Add(TabPageWLB);
 
-            if (!multi && !SearchMode && (isPoolSelected || isHostSelected && isHostLive))
+            if (!multi && !SearchMode && (isPoolSelected || isPoolOrLiveStandaloneHost))
                 newTabs.Add(ad_upsell ? TabPageADUpsell : TabPageAD);
 
             if (!multi && !SearchMode && isPoolOrLiveStandaloneHost && !Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictPvsCache)

diff --git a/XenAdmin/SettingsPanels/PerfmonAlertOptionsPage.cs b/XenAdmin/SettingsPanels/PerfmonAlertOptionsPage.cs
@@ -222,8 +222,8 @@ public AsyncAction SaveSettings()
                 mailDestination = EmailAddressTextBox.Text;
                 mailHub = SmtpServerAddrTextBox.Text + ":" + SmtpServerPortTextBox.Text;
 
-                if (MailLanguageComboBox.Visible && MailLanguageComboBox.SelectedValue != null)
-                    mailLangCode = MailLanguageComboBox.SelectedValue.ToString();
+                if (MailLanguageComboBox.Visible && MailLanguageComboBox.SelectedItem is ToStringWrapper<string> stringWrapper && !string.IsNullOrEmpty(stringWrapper.item))
+                    mailLangCode = stringWrapper.item;
             }
 
             return new PerfmonOptionsDefinitionAction(_XenModelObject.Connection, mailDestination, mailHub, mailLangCode, true);

diff --git a/XenAdmin/TabPages/GeneralTabPage.cs b/XenAdmin/TabPages/GeneralTabPage.cs
@@ -1981,7 +1981,7 @@ private void SetupDeprecationBanner()
                 Banner.WarningMessage = string.Format(
                     Messages.FCOE_DEPRECATION_WARNING, string.Format(Messages.STRING_SPACE_STRING, BrandManager.ProductBrand, BrandManager.ProductVersionPost82));
                 Banner.LinkText = Messages.PATCHING_WIZARD_WEBPAGE_CELL;
-                Banner.LinkUri = new Uri(InvisibleMessages.FCOE_SR_DEPRECATION_URL);
+                Banner.LinkUri = new Uri(InvisibleMessages.DEPRECATION_URL);
                 Banner.Visible = true;
             }
             else

diff --git a/XenAdmin/TabPages/ManageUpdatesPage.cs b/XenAdmin/TabPages/ManageUpdatesPage.cs
@@ -1240,7 +1240,7 @@ private void informationLabel_Click(object sender, EventArgs e)
             }
             catch (Exception)
             {
-                using (var dlg = new ErrorDialog(string.Format(Messages.LICENSE_SERVER_COULD_NOT_OPEN_LINK, InvisibleMessages.LICENSE_SERVER_DOWNLOAD_LINK)))
+                using (var dlg = new ErrorDialog(string.Format(Messages.LICENSE_SERVER_COULD_NOT_OPEN_LINK, InvisibleMessages.LICENSE_BUY_URL)))
                 {
                     dlg.ShowDialog(this);
                 }

diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs
@@ -74,7 +74,7 @@ private void SetupDeprecationBanner(SrWizardType srWizardType)
                     BrandManager.ProductBrand, BrandManager.ProductVersionPost82);
                 deprecationBanner.BannerType = DeprecationBanner.Type.Deprecation;
                 deprecationBanner.FeatureName = Messages.SOFTWARE_FCOE_STORAGE_REPOSITORIES;
-                deprecationBanner.LinkUri = new Uri(InvisibleMessages.FCOE_SR_DEPRECATION_URL);
+                deprecationBanner.LinkUri = new Uri(InvisibleMessages.DEPRECATION_URL);
                 deprecationBanner.Visible = !HiddenFeatures.LinkLabelHidden;
             }
             else

diff --git a/XenModel/InvisibleMessages.Designer.cs b/XenModel/InvisibleMessages.Designer.cs
diff --git a/XenModel/InvisibleMessages.ja.resx b/XenModel/InvisibleMessages.ja.resx
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-    <xsd:element msdata:IsDataSet="true" name="root">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element minOccurs="0" name="value" type="xsd:string"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element minOccurs="0" msdata:Ordinal="1" name="value" type="xsd:string"/>
-                <xsd:element minOccurs="0" msdata:Ordinal="2" name="comment" type="xsd:string"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute msdata:Ordinal="1" name="name" type="xsd:string" use="required"/>
-              <xsd:attribute msdata:Ordinal="3" name="type" type="xsd:string"/>
-              <xsd:attribute msdata:Ordinal="4" name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element minOccurs="0" msdata:Ordinal="1" name="value" type="xsd:string"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -118,36 +118,15 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="DEPRECATION_URL" xml:space="preserve">
-    <value>http://docs.citrix.com/ja-jp/citrix-hypervisor/whats-new/removed-features.html</value>
+    <value>https://docs.xenserver.com/ja-jp/citrix-hypervisor/whats-new/removed-features.html</value>
   </data>
   <data name="DOCS_URL" xml:space="preserve">
-    <value>http://docs.citrix.com/ja-jp/</value>
-  </data>
-  <data name="HELP_URL_QUERY" xml:space="preserve">
-    <value>?utm_campaign={0}&amp;utm_medium=ui_link&amp;utm_source={1}</value>
-  </data>
-  <data name="HOMEPAGE" xml:space="preserve">
-    <value>https://www.citrix.com/ja-jp/products/citrix-hypervisor</value>
-  </data>
-  <data name="LICENSE_SERVER_DOWNLOAD_LINK" xml:space="preserve">
-    <value>http://www.citrix.com/downloads/licensing/license-server</value>
+    <value>https://docs.xenserver.com/ja-jp/</value>
   </data>
   <data name="LOCALE" xml:space="preserve">
     <value>ja-JP</value>
   </data>
-  <data name="OUT_OF_DATE_WEBSITE" xml:space="preserve">
-    <value>https://www.citrix.com/downloads/citrix-hypervisor</value>
-  </data>
-  <data name="PLUGINS_URL" xml:space="preserve">
-    <value>https://github.com/xenserver/xencenter-samples</value>
-  </data>
-  <data name="PRIVACY" xml:space="preserve">
-    <value>http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US</value>
-  </data>
   <data name="PV_GUESTS_CHECK_URL" xml:space="preserve">
-    <value>https://docs.citrix.com/ja-jp/citrix-hypervisor/system-requirements/guest-os-support.html</value>
-  </data>
-  <data name="UPSELL_LEARNMOREURL_TRIAL" xml:space="preserve">
-    <value>https://www.citrix.com/products/citrix-hypervisor/get-started.html</value>
+    <value>https://docs.xenserver.com/ja-jp/citrix-hypervisor/system-requirements/guest-os-support.html</value>
   </data>
 </root>
diff --git a/XenModel/InvisibleMessages.resx b/XenModel/InvisibleMessages.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -127,31 +127,28 @@
     <value>https://www.citrix.com/support/programs/</value>
   </data>
   <data name="DEPRECATION_URL" xml:space="preserve">
-    <value>http://docs.citrix.com/en-us/citrix-hypervisor/whats-new/removed-features.html</value>
+    <value>https://docs.xenserver.com/en-us/xenserver/8/whats-new/removed-features.html</value>
   </data>
   <data name="DOCS_URL" xml:space="preserve">
-    <value>http://docs.citrix.com/en-us/</value>
-  </data>
-  <data name="FCOE_SR_DEPRECATION_URL" xml:space="preserve">
-    <value>https://docs.citrix.com/en-us/citrix-hypervisor/CH-0011.html</value>
+    <value>https://docs.xenserver.com/</value>
   </data>
   <data name="HELP_URL_QUERY" xml:space="preserve">
     <value>?utm_campaign={0}&amp;utm_medium=ui_link&amp;utm_source={1}</value>
   </data>
   <data name="HOMEPAGE" xml:space="preserve">
-    <value>https://www.citrix.com/products/citrix-hypervisor</value>
+    <value>https://www.xenserver.com/</value>
   </data>
   <data name="LICENSE_BUY_URL" xml:space="preserve">
     <value>https://xenserver.com/buy</value>
   </data>
-  <data name="LICENSE_SERVER_DOWNLOAD_LINK" xml:space="preserve">
-    <value>http://www.citrix.com/downloads/licensing/license-server</value>
+  <data name="LICENSE_SERVER_DOCS_LINK" xml:space="preserve">
+    <value>https://docs.citrix.com/en-us/licensing/current-release/license-server-getting-started.html</value>
   </data>
   <data name="LOCALE" xml:space="preserve">
     <value>en-US</value>
   </data>
   <data name="OUT_OF_DATE_WEBSITE" xml:space="preserve">
-    <value>https://www.citrix.com/downloads/citrix-hypervisor</value>
+    <value>https://www.xenserver.com/downloads</value>
   </data>
   <data name="PLUGINS_URL" xml:space="preserve">
     <value>https://github.com/xenserver/xencenter-samples</value>
@@ -160,18 +157,18 @@
     <value>http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US</value>
   </data>
   <data name="PV_GUESTS_CHECK_URL" xml:space="preserve">
-    <value>https://docs.citrix.com/en-us/citrix-hypervisor/system-requirements/guest-os-support.html</value>
+    <value>https://docs.xenserver.com/en-us/xenserver/8/system-requirements/guest-os-support.html</value>
   </data>
   <data name="RELEASE_NOTES_URL" xml:space="preserve">
-    <value>https://docs.citrix.com/en-us/citrix-hypervisor/citrix-hypervisor-center/whats-new</value>
+    <value>https://docs.xenserver.com/en-us/xencenter/current-release/whats-new.html</value>
   </data>
   <data name="TOKEN_API_URL" xml:space="preserve">
     <value>https://fileservice.citrix.com/api/session/token</value>
   </data>
   <data name="UPDATE_URL_PREFIX" xml:space="preserve">
-  <value>https://fileservice.citrix.com/direct/v2/download/</value>
-</data>
+    <value>https://fileservice.citrix.com/direct/v2/download/</value>
+  </data>
   <data name="UPSELL_LEARNMOREURL_TRIAL" xml:space="preserve">
-    <value>https://www.citrix.com/products/citrix-hypervisor/get-started.html</value>
+    <value>https://www.xenserver.com/</value>
   </data>
 </root>