From f41e856c0f6793dc4ba02bafc1ed0db9bbd8eabb Mon Sep 17 00:00:00 2001 From: Alexander Schulz Date: Wed, 25 Mar 2020 00:31:56 +0100 Subject: [PATCH] complete removing of any citrix urls (execept in namespaces) --- Branding/HomePage.mht | 9 +++-- Branding/HomePage.zh-CN.mht | 9 +++-- .../LicenseWarningDialog.ja.resx | 2 +- .../WarningDialogs/LicenseWarningDialog.resx | 2 +- .../LicenseWarningDialog.zh-CN.resx | 2 +- .../GetHealthCheckAnalysisResultAction.cs | 2 +- .../HealthCheckAuthenticationAction.cs | 10 +++--- .../UploadServerStatusReportAction.cs | 2 +- .../HealthCheck/XenServerHealthCheckUpload.cs | 2 +- XenModel/HealthCheckSettings.cs | 2 +- XenModel/InvisibleMessages.ja.resx | 34 +++++++++---------- XenModel/InvisibleMessages.zh-CN.resx | 34 +++++++++---------- XenModel/Messages.Designer.cs | 6 ++-- XenModel/Messages.ja.resx | 6 ++-- XenModel/Messages.resx | 6 ++-- XenModel/Messages.zh-CN.resx | 6 ++-- XenServerHealthCheck/Registry.cs | 2 +- 17 files changed, 67 insertions(+), 69 deletions(-) diff --git a/Branding/HomePage.mht b/Branding/HomePage.mht index 32c31e949f..290aa40394 100644 --- a/Branding/HomePage.mht +++ b/Branding/HomePage.mht @@ -53,12 +53,11 @@ class=3D"cx-link"=20
  • Network=20 +href=3D"">Network=20 with other Citrix Hypervisor users
  • Visit the Citrix Knowledge = + href=3D"Visit the Citrix Knowledge = Center =20

    • Add a Server

    Purchase Support
    3D"Try diff --git a/Branding/HomePage.zh-CN.mht b/Branding/HomePage.zh-CN.mht index 71a05581ba..71ff514c86 100644 --- a/Branding/HomePage.zh-CN.mht +++ b/Branding/HomePage.zh-CN.mht @@ -58,14 +58,13 @@ href=3D"xencenter://HelpContents/">=E4=BA=86=E8=A7=A3=E5=A6=82=E4=BD=95=E4= =E7=94=A8=E6=88=B7=E8=81=94=E7=BD=91" class=3D"cx-doc-icon">=E4=B8=8E=E5=85=B6=E4=BB=96=20 +href=3D"">=E4=B8=8E=E5=85=B6=E4=BB=96=20 Citrix Hypervisor =E7=94=A8=E6=88=B7=E8=81=94=E7=BD=91 =
  • =E8=AE=BF=E9=97=AE=20 +href=3D"">=E8=AE=BF=E9=97=AE=20 Citrix =E7=9F=A5=E8=AF=86=E4=B8=AD=E5=BF=83 =

    • =E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8

    @@ -92,7 +91,7 @@ chaseSupport.png">
    4 - http://www.citrix.com/xenserverenterprise + MiddleLeft diff --git a/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.resx b/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.resx index 954e26c1aa..50be2aa7d2 100644 --- a/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.resx +++ b/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.resx @@ -265,7 +265,7 @@ 4 - http://www.citrix.com/xenserverenterprise + MiddleLeft diff --git a/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.zh-CN.resx b/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.zh-CN.resx index 4bffdf2bb8..fc90f26800 100644 --- a/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.zh-CN.resx +++ b/XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.zh-CN.resx @@ -265,7 +265,7 @@ 4 - http://www.citrix.com/xenserverenterprise + MiddleLeft diff --git a/XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs b/XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs index e982f49282..a56ce41f43 100644 --- a/XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs +++ b/XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs @@ -46,7 +46,7 @@ public class GetHealthCheckAnalysisResultAction: AsyncAction private const string DIAG_RESULT_URL = "/diag_sdk/diag_results/"; private const string ANALYSIS_PROGRESS_URL = "/diag_sdk/analysis_progress/"; - private readonly string diagnosticDomainName = "https://cis.citrix.com"; + private readonly string diagnosticDomainName = ""; public GetHealthCheckAnalysisResultAction(Pool pool, bool suppressHistory) : base(pool.Connection, Messages.ACTION_GET_HEALTH_CHECK_RESULT, Messages.ACTION_GET_HEALTH_CHECK_RESULT_PROGRESS, suppressHistory) diff --git a/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs b/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs index da333e1e10..fc7aedc089 100644 --- a/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs +++ b/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs @@ -54,12 +54,12 @@ public class HealthCheckAuthenticationAction : AsyncAction private const string uploadTokenUrl = "/feeds/api/create_upload/"; private const string diagnosticTokenUrl = "/diag_sdk/token_grant/"; - private readonly string identityTokenDomainName = "https://cis.citrix.com"; - private readonly string uploadGrantTokenDomainName = "https://rttf.citrix.com"; - private readonly string uploadTokenDomainName = "https://rttf.citrix.com"; - private readonly string diagnosticTokenDomainName = " https://cis.citrix.com"; + private readonly string identityTokenDomainName = ""; + private readonly string uploadGrantTokenDomainName = ""; + private readonly string uploadTokenDomainName = ""; + private readonly string diagnosticTokenDomainName = ""; - private readonly string productKey = "1a2d94a4263cd016dd7a7d510bde87f058a0b75d"; + private readonly string productKey = ""; public HealthCheckAuthenticationAction(string username, string password, long tokenExpiration, bool suppressHistory) : base(null, Messages.ACTION_HEALTHCHECK_AUTHENTICATION, Messages.ACTION_HEALTHCHECK_AUTHENTICATION_PROGRESS, suppressHistory) diff --git a/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs b/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs index e2f743fbd4..1ba08e6b8e 100644 --- a/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs +++ b/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs @@ -45,7 +45,7 @@ public class UploadServerStatusReportAction: AsyncAction private readonly string caseNumber; private const string UPLOAD_URL = "/feeds/api/"; - private readonly string UPLOAD_DOMAIN_NAME = "https://rttf.citrix.com"; + private readonly string UPLOAD_DOMAIN_NAME = ""; private CancellationTokenSource cts; diff --git a/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs b/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs index cea838ed73..2184bcfc68 100644 --- a/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs +++ b/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs @@ -45,7 +45,7 @@ namespace XenServerHealthCheck public class XenServerHealthCheckUpload : IDisposable { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - private readonly string uploadUrl = "https://rttf.citrix.com/feeds/api/"; + private readonly string uploadUrl = ""; private const string UPLOAD_CHUNK_STRING = "{0}upload_raw_chunk/?id={1}&offset={2}"; private const string INITIATE_UPLOAD_STRING = "{0}bundle/?size={1}&name={2}"; diff --git a/XenModel/HealthCheckSettings.cs b/XenModel/HealthCheckSettings.cs index 6f3c94b769..da55a48fd4 100644 --- a/XenModel/HealthCheckSettings.cs +++ b/XenModel/HealthCheckSettings.cs @@ -97,7 +97,7 @@ public class HealthCheckSettings public const string REPORT_ANALYSIS_UPLOAD_TIME = "ReportAnalysis.UploadTime"; - private const string REPORT_LINK_DOMAIN_NAME = "https://cis.citrix.com"; + private const string REPORT_LINK_DOMAIN_NAME = ""; private const string REPORT_LINK_PATH = "AutoSupport/analysis/upload_overview"; public HealthCheckSettings(Dictionary config) diff --git a/XenModel/InvisibleMessages.ja.resx b/XenModel/InvisibleMessages.ja.resx index 61a1ebeb0a..e0e7b71847 100644 --- a/XenModel/InvisibleMessages.ja.resx +++ b/XenModel/InvisibleMessages.ja.resx @@ -118,25 +118,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - https://cis.citrix.com/legal/ + - https://www.citrix.co.jp/products/citrix-hypervisor + HomePage.ja.mht - www.citrix.com/xenserverenterprise + - http://support.citrix.com/article/CTX141433 + - http://store.citrix.com/XSInProduct + - http://www.citrix.com/downloads/licensing/license-server + ja-JP @@ -148,31 +148,31 @@ Home.htm - https://www.citrix.com/downloads/citrix-hypervisor + - http://www.citrix.co.jp/partners.html?posit=glnav + - https://github.com/xenserver/xencenter-samples + - http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US + - https://docs.citrix.com/ja-jp/citrix-hypervisor/system-requirements/guest-os-support.html + xensearch - http://support.citrix.com/ + - http://store.citrix.com/XSInProduct + - http://www.citrix.com/TryXenDesktop + xsupdate @@ -181,15 +181,15 @@ ISO - https://www.citrix.com/products/citrix-hypervisor/get-started.html + - http://docs.citrix.com/ja-jp/xencenter/ + ?utm_campaign={0}&utm_medium=ui_link&utm_source={1} - http://docs.citrix.com/ja-jp/citrix-hypervisor/whats-new/removed-features.html + \ No newline at end of file diff --git a/XenModel/InvisibleMessages.zh-CN.resx b/XenModel/InvisibleMessages.zh-CN.resx index 9b9a2c5984..56007232ea 100644 --- a/XenModel/InvisibleMessages.zh-CN.resx +++ b/XenModel/InvisibleMessages.zh-CN.resx @@ -118,25 +118,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - https://cis.citrix.com/legal/ + - https://www.citrix.com.cn/products/citrix-hypervisor/ + HomePage.zh-CN.mht - www.citrix.com/xenserverenterprise + - http://support.citrix.com/article/CTX141433 + - http://store.citrix.com/XSInProduct + - http://www.citrix.com/downloads/licensing/license-server + zh-CN @@ -148,31 +148,31 @@ Home.htm - https://www.citrix.com/downloads/citrix-hypervisor + - http://www.citrix.com/buy/partnerlocator.html + - https://github.com/xenserver/xencenter-samples + - http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US + - https://docs.citrix.com/zh-cn/citrix-hypervisor/system-requirements/guest-os-support.html + xensearch - http://support.citrix.com/ + - http://store.citrix.com/XSInProduct + - http://www.citrix.com/TryXenDesktop + xsupdate @@ -181,15 +181,15 @@ iso - https://www.citrix.com/products/citrix-hypervisor/get-started.html + - http://docs.citrix.com/zh-cn/xencenter/ + ?utm_campaign={0}&utm_medium=ui_link&utm_source={1} - http://docs.citrix.com/zh-cn/citrix-hypervisor/whats-new/removed-features.html + \ No newline at end of file diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 2cd026e4b5..60dafe570b 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -18598,7 +18598,7 @@ public static string HEALTH_CHECK_AUTHENTICATION_INVALID_CREDENTIALS { } /// - /// Sucht eine lokalisierte Zeichenfolge, die https://cis.citrix.com/legal/ ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die ähnelt. /// public static string HEALTH_CHECK_CIS_POLICY_URL { get { @@ -18607,7 +18607,7 @@ public static string HEALTH_CHECK_CIS_POLICY_URL { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.citrix.com/about/legal/privacy.html ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die ähnelt. /// public static string HEALTH_CHECK_CITRIX_POLICY_URL { get { @@ -24528,7 +24528,7 @@ public static string MUST_SELECT_NETWORK { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.citrix.com/welcome.html ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die ähnelt. /// public static string MY_CITRIX_CREDENTIALS_URL { get { diff --git a/XenModel/Messages.ja.resx b/XenModel/Messages.ja.resx index 2806fb8f46..f8a81b2cbf 100755 --- a/XenModel/Messages.ja.resx +++ b/XenModel/Messages.ja.resx @@ -6520,10 +6520,10 @@ VM の再起動優先度をクリアしてもよろしいですか? ユーザー名またはパスワードが無効です。再試行してください。 - https://cis.citrix.com/legal/ + / - http://www.citrix.co.jp/about/legal/privacy/ + ヘルス チェックによって [Citrix] Insight Services にアップロードされる情報は、トラブルシューティングや診断サポート、および [Citrix] Insight Services Policy ({0}) と [Citrix] Privacy Policy ({1}) で必要な製品の品質、信頼性、パフォーマンスを改善するために使用されます。 @@ -8504,7 +8504,7 @@ SCSI ID: {2} ネットワークを選択してください - http://www.citrix.com/welcome.html + 名前 diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 11a4a95ed1..4a0031460a 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -6539,10 +6539,10 @@ Click Configure HA to alter the settings displayed below. Invalid user name or password. Please try again. - https://cis.citrix.com/legal/ + - http://www.citrix.com/about/legal/privacy.html + The information that Health Check uploads to [Citrix] Insight Services will be used for troubleshooting and diagnostics support purposes, as well as to improve the quality, reliability, and performance of our products subject to the [Citrix] Insight Services Policy at {0} and [Citrix] Privacy Policy at {1}. @@ -8526,7 +8526,7 @@ To ensure system stability, it is strongly recommended that you use multipathing You must select a network - http://www.citrix.com/welcome.html + Name diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index dfa29cb069..25349ba360 100755 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -6514,10 +6514,10 @@ 无效用户名或密码。请重试。 - https://cis.citrix.com/legal/ + - http://www.citrix.com.cn/about/legal/privacy.html + 根据 [Citrix] Insight Services 策略(网址为 {0})和 [Citrix] 隐私策略(网址为 {1})的规定，运行状况检查上载到 [Citrix] Insight Services 的信息将用于故障排除和诊断支持目的，以及改进我们的产品质量、可靠性和性能。 @@ -8499,7 +8499,7 @@ SCSI ID: {2} 必须选择一个网络 - http://www.citrix.com/welcome.html + 名称 diff --git a/XenServerHealthCheck/Registry.cs b/XenServerHealthCheck/Registry.cs index 82ed321aca..fea074f4f5 100755 --- a/XenServerHealthCheck/Registry.cs +++ b/XenServerHealthCheck/Registry.cs @@ -106,7 +106,7 @@ public static string HealthCheckUploadDomainName { string domain_name = ReadKey(HEALTH_CHECK_UPLOAD_DOMAIN_NAME); if (string.IsNullOrEmpty(domain_name)) - return "https://rttf.citrix.com/feeds/api/"; + return ""; return domain_name; } }