Skip to content

Commit

Permalink
complete removing of any citrix urls (execept in namespaces)
Browse files Browse the repository at this point in the history
  • Loading branch information
borzel committed Mar 24, 2020
1 parent 97ef8c8 commit f41e856
Show file tree
Hide file tree
Showing 17 changed files with 67 additions and 69 deletions.
9 changes: 4 additions & 5 deletions Branding/HomePage.mht
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ class=3D"cx-link"=20
<LI title=3D"Network with other Citrix Hypervisor users" =
class=3D"cx-doc-icon"><A=20
class=3D"cx-link" =
href=3D"https://discussions.citrix.com/forum/101-hypervisor-formerly-xens=
erver/">Network=20
href=3D"">Network=20
with other Citrix Hypervisor users</A> </LI>
<LI title=3D"Community Support Partners" class=3D"cx-doc-icon last"><A =
class=3D"cx-link"=20
href=3D"https://www.citrix.com/support">Visit the Citrix Knowledge =
href=3D"Visit the Citrix Knowledge =
Center</A> =20
</LI></UL></DIV>
<DIV class=3D"column right span-6 last"><IMG id=3D"cloudServerGraphic" =
Expand All @@ -76,14 +75,14 @@ Server.png">
<P>Add a Server</P></A> </DIV>
<DIV title=3D"Purchase Support" class=3D"span-6 cx-cards"><A =
class=3D"cx-link" =
href=3D"http://www.citrix.com/xenserver/le/features"><IMG=20
href=3D""><IMG=20
id=3D"purchaseSupport" alt=3D"Purchase Support" =
src=3D"file:///C:/Code/xenadmin/XenAdmin/HomePage/media/icons/cx-icon-pur=
chaseSupport.png">
<P>Purchase Support</P></A> </DIV>
<DIV title=3D"Try Desktop Virtualization" class=3D"span-6 cx-cards =
last"><A class=3D"cx-link"=20
href=3D"http://www.citrix.com/TryXenDesktop"><IMG id=3D"deskTopVirt" =
href=3D""><IMG id=3D"deskTopVirt" =
alt=3D"Try Desktop Virtualization"=20
src=3D"file:///C:/Code/xenadmin/XenAdmin/HomePage/media/icons/cx-icon-try=
Virtualization.png">
Expand Down
9 changes: 4 additions & 5 deletions Branding/HomePage.zh-CN.mht
Original file line number Diff line number Diff line change
Expand Up @@ -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"><A =
class=3D"cx-link"=20
=
href=3D"https://discussions.citrix.com/forum/101-hypervisor-formerly-xens=
erver/">=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</A> =
</LI>
<LI =
title=3D"=E7=A4=BE=E5=8C=BA=E6=94=AF=E6=8C=81=E5=90=88=E4=BD=9C=E4=BC=99=E4=
=BC=B4" class=3D"cx-doc-icon last"><A class=3D"cx-link" =
href=3D"https://www.citrix.com/support">=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</A> =
</LI></UL></DIV>
<DIV class=3D"column right span-6 last"><IMG id=3D"cloudServerGraphic" =
Expand All @@ -84,15 +83,15 @@ Server.png">
<P>=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8</P></A> </DIV>
<DIV title=3D"=E8=B4=AD=E4=B9=B0=E6=94=AF=E6=8C=81" class=3D"span-6 =
cx-cards"><A class=3D"cx-link" =
href=3D"http://www.citrix.com/xenserver/le/features"><IMG=20
href=3D""><IMG=20
id=3D"purchaseSupport" alt=3D"=E8=B4=AD=E4=B9=B0=E6=94=AF=E6=8C=81" =
src=3D"file:///C:/Code/xenadmin/XenAdmin/HomePage/media/icons/cx-icon-pur=
chaseSupport.png">
<P>=E8=B4=AD=E4=B9=B0=E6=94=AF=E6=8C=81</P></A> </DIV>
<DIV =
title=3D"=E8=AF=95=E7=94=A8=E6=A1=8C=E9=9D=A2=E8=99=9A=E6=8B=9F=E5=8C=96"=
class=3D"span-6 cx-cards last"><A class=3D"cx-link" =
href=3D"http://www.citrix.com/TryXenDesktop"><IMG=20
href=3D""><IMG=20
id=3D"deskTopVirt" =
alt=3D"=E8=AF=95=E7=94=A8=E6=A1=8C=E9=9D=A2=E8=99=9A=E6=8B=9F=E5=8C=96" =
src=3D"file:///C:/Code/xenadmin/XenAdmin/HomePage/media/icons/cx-icon-try=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
<value>4</value>
</data>
<data name="link.Text" xml:space="preserve">
<value>http://www.citrix.com/xenserverenterprise</value>
<value></value>
</data>
<data name="link.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.resx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
<value>4</value>
</data>
<data name="link.Text" xml:space="preserve">
<value>http://www.citrix.com/xenserverenterprise</value>
<value></value>
</data>
<data name="link.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
<value>4</value>
</data>
<data name="link.Text" xml:space="preserve">
<value>http://www.citrix.com/xenserverenterprise</value>
<value></value>
</data>
<data name="link.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Expand Down
2 changes: 1 addition & 1 deletion XenModel/HealthCheckSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, string> config)
Expand Down
34 changes: 17 additions & 17 deletions XenModel/InvisibleMessages.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,25 +118,25 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="HEALTH_CHECK_PRIVACY_STATEMENT_URL" xml:space="preserve">
<value>https://cis.citrix.com/legal/</value>
<value></value>
</data>
<data name="HOMEPAGE" xml:space="preserve">
<value>https://www.citrix.co.jp/products/citrix-hypervisor</value>
<value></value>
</data>
<data name="HOMEPAGE_FILENAME" xml:space="preserve">
<value>HomePage.ja.mht</value>
</data>
<data name="HTTP_LICENSES" xml:space="preserve">
<value>www.citrix.com/xenserverenterprise</value>
<value></value>
</data>
<data name="ISL_DEPRECATION_URL" xml:space="preserve">
<value>http://support.citrix.com/article/CTX141433</value>
<value></value>
</data>
<data name="LICENSE_EXPIRY_WEBPAGE" xml:space="preserve">
<value>http://store.citrix.com/XSInProduct</value>
<value></value>
</data>
<data name="LICENSE_SERVER_DOWNLOAD_LINK" xml:space="preserve">
<value>http://www.citrix.com/downloads/licensing/license-server</value>
<value></value>
</data>
<data name="LOCALE" xml:space="preserve">
<value>ja-JP</value>
Expand All @@ -148,31 +148,31 @@
<value>Home.htm</value>
</data>
<data name="OUT_OF_DATE_WEBSITE" xml:space="preserve">
<value>https://www.citrix.com/downloads/citrix-hypervisor</value>
<value></value>
</data>
<data name="PARTNEROFFERS_URL" xml:space="preserve">
<value>http://www.citrix.co.jp/partners.html?posit=glnav</value>
<value></value>
</data>
<data name="PLUGINS_URL" xml:space="preserve">
<value>https://github.com/xenserver/xencenter-samples</value>
<value></value>
</data>
<data name="PRIVACY" xml:space="preserve">
<value>http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US</value>
<value></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>
<value></value>
</data>
<data name="XEN_SEARCH" xml:space="preserve">
<value>xensearch</value>
</data>
<data name="SUPPORT_URL" xml:space="preserve">
<value>http://support.citrix.com/</value>
<value></value>
</data>
<data name="UPSELL_SA" xml:space="preserve">
<value>http://store.citrix.com/XSInProduct</value>
<value></value>
</data>
<data name="XENDESKTOP_URL" xml:space="preserve">
<value>http://www.citrix.com/TryXenDesktop</value>
<value></value>
</data>
<data name="XEN_UPDATE" xml:space="preserve">
<value>xsupdate</value>
Expand All @@ -181,15 +181,15 @@
<value>ISO</value>
</data>
<data name="UPSELL_LEARNMOREURL_TRIAL" xml:space="preserve">
<value>https://www.citrix.com/products/citrix-hypervisor/get-started.html</value>
<value></value>
</data>
<data name="HELP_URL" xml:space="preserve">
<value>http://docs.citrix.com/ja-jp/xencenter/</value>
<value></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="DEPRECATION_URL" xml:space="preserve">
<value>http://docs.citrix.com/ja-jp/citrix-hypervisor/whats-new/removed-features.html</value>
<value></value>
</data>
</root>
34 changes: 17 additions & 17 deletions XenModel/InvisibleMessages.zh-CN.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,25 +118,25 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="HEALTH_CHECK_PRIVACY_STATEMENT_URL" xml:space="preserve">
<value>https://cis.citrix.com/legal/</value>
<value></value>
</data>
<data name="HOMEPAGE" xml:space="preserve">
<value>https://www.citrix.com.cn/products/citrix-hypervisor/</value>
<value></value>
</data>
<data name="HOMEPAGE_FILENAME" xml:space="preserve">
<value>HomePage.zh-CN.mht</value>
</data>
<data name="HTTP_LICENSES" xml:space="preserve">
<value>www.citrix.com/xenserverenterprise</value>
<value</value>
</data>
<data name="ISL_DEPRECATION_URL" xml:space="preserve">
<value>http://support.citrix.com/article/CTX141433</value>
<value></value>
</data>
<data name="LICENSE_EXPIRY_WEBPAGE" xml:space="preserve">
<value>http://store.citrix.com/XSInProduct</value>
<value></value>
</data>
<data name="LICENSE_SERVER_DOWNLOAD_LINK" xml:space="preserve">
<value>http://www.citrix.com/downloads/licensing/license-server</value>
<value></value>
</data>
<data name="LOCALE" xml:space="preserve">
<value>zh-CN</value>
Expand All @@ -148,31 +148,31 @@
<value>Home.htm</value>
</data>
<data name="OUT_OF_DATE_WEBSITE" xml:space="preserve">
<value>https://www.citrix.com/downloads/citrix-hypervisor</value>
<value></value>
</data>
<data name="PARTNEROFFERS_URL" xml:space="preserve">
<value>http://www.citrix.com/buy/partnerlocator.html</value>
<value></value>
</data>
<data name="PLUGINS_URL" xml:space="preserve">
<value>https://github.com/xenserver/xencenter-samples</value>
<value></value>
</data>
<data name="PRIVACY" xml:space="preserve">
<value>http://citrix.com/English/aboutCitrix/legal/privacyStatement.asp?ntref=hp_nav_US</value>
<value></value>
</data>
<data name="PV_GUESTS_CHECK_URL" xml:space="preserve">
<value>https://docs.citrix.com/zh-cn/citrix-hypervisor/system-requirements/guest-os-support.html</value>
<value></value>
</data>
<data name="XEN_SEARCH" xml:space="preserve">
<value>xensearch</value>
</data>
<data name="SUPPORT_URL" xml:space="preserve">
<value>http://support.citrix.com/</value>
<value></value>
</data>
<data name="UPSELL_SA" xml:space="preserve">
<value>http://store.citrix.com/XSInProduct</value>
<value></value>
</data>
<data name="XENDESKTOP_URL" xml:space="preserve">
<value>http://www.citrix.com/TryXenDesktop</value>
<value></value>
</data>
<data name="XEN_UPDATE" xml:space="preserve">
<value>xsupdate</value>
Expand All @@ -181,15 +181,15 @@
<value>iso</value>
</data>
<data name="UPSELL_LEARNMOREURL_TRIAL" xml:space="preserve">
<value>https://www.citrix.com/products/citrix-hypervisor/get-started.html</value>
<value></value>
</data>
<data name="HELP_URL" xml:space="preserve">
<value>http://docs.citrix.com/zh-cn/xencenter/</value>
<value></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="DEPRECATION_URL" xml:space="preserve">
<value>http://docs.citrix.com/zh-cn/citrix-hypervisor/whats-new/removed-features.html</value>
<value></value>
</data>
</root>
6 changes: 3 additions & 3 deletions XenModel/Messages.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions XenModel/Messages.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -6520,10 +6520,10 @@ VM の再起動優先度をクリアしてもよろしいですか?</value>
<value>ユーザー名またはパスワードが無効です。再試行してください。</value>
</data>
<data name="HEALTH_CHECK_CIS_POLICY_URL" xml:space="preserve">
<value>https://cis.citrix.com/legal/</value>
<value>/</value>
</data>
<data name="HEALTH_CHECK_CITRIX_POLICY_URL" xml:space="preserve">
<value>http://www.citrix.co.jp/about/legal/privacy/</value>
<value></value>
</data>
<data name="HEALTH_CHECK_PRIVACY_POLICY" xml:space="preserve">
<value>ヘルス チェックによって [Citrix] Insight Services にアップロードされる情報は、トラブルシューティングや診断サポート、および [Citrix] Insight Services Policy ({0}) と [Citrix] Privacy Policy ({1}) で必要な製品の品質、信頼性、パフォーマンスを改善するために使用されます。</value>
Expand Down Expand Up @@ -8504,7 +8504,7 @@ SCSI ID: {2}
<value>ネットワークを選択してください</value>
</data>
<data name="MY_CITRIX_CREDENTIALS_URL" xml:space="preserve">
<value>http://www.citrix.com/welcome.html</value>
<value></value>
</data>
<data name="NAME" xml:space="preserve">
<value>名前</value>
Expand Down
Loading

0 comments on commit f41e856

Please sign in to comment.