From: bones_was_here <bones_was_here@xa.org.au>
Date: Tue, 29 Mar 2022 22:19:12 +0000 (+1000)
Subject: Use https to access xonotic.org services
X-Git-Tag: xonotic-v0.8.5~97^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=15750f3e0e5a30959aba6986b5de1f87bfec21a3;p=xonotic%2Fxonotic-data.pk3dir.git

Use https to access xonotic.org services
---

diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh
index d5664d9d6..4e52b83e0 100644
--- a/qcsrc/common/playerstats.qh
+++ b/qcsrc/common/playerstats.qh
@@ -98,7 +98,7 @@ const float PS_B_STATUS_WAITING = 0;
 const float PS_B_STATUS_RECEIVED = 1;
 const float PS_B_STATUS_UPDATING = 2;
 .float playerstats_basicstatus;
-string autocvar_g_playerstats_playerbasic_uri = "http://stats.xonotic.org";
+string autocvar_g_playerstats_playerbasic_uri = "https://stats.xonotic.org";
 
 void PlayerStats_PlayerBasic(entity joiningplayer, float newrequest);
 void PlayerStats_PlayerBasic_CheckUpdate(entity joiningplayer);
@@ -112,7 +112,7 @@ const float PS_D_STATUS_IDLE = -1;
 const float PS_D_STATUS_WAITING = 0;
 const float PS_D_STATUS_RECEIVED = 1;
 float PlayerStats_PlayerDetail_Status = PS_D_STATUS_IDLE;
-string autocvar_g_playerstats_playerdetail_uri = "http://stats.xonotic.org/player/me";
+string autocvar_g_playerstats_playerdetail_uri = "https://stats.xonotic.org/player/me";
 float autocvar_g_playerstats_playerdetail_autoupdatetime = 1800; // automatically update every 30 minutes anyway
 void PlayerStats_PlayerDetail();
 void PlayerStats_PlayerDetail_CheckUpdate();
diff --git a/qcsrc/menu/xonotic/dialog_termsofservice.qh b/qcsrc/menu/xonotic/dialog_termsofservice.qh
index 9231f3063..037450f0a 100644
--- a/qcsrc/menu/xonotic/dialog_termsofservice.qh
+++ b/qcsrc/menu/xonotic/dialog_termsofservice.qh
@@ -1,7 +1,7 @@
 #pragma once
 
 int autocvar__termsofservice_accepted;
-const string termsofservice_url = "http://update.xonotic.org/tos.txt";
+const string termsofservice_url = "https://update.xonotic.org/tos.txt";
 
 #include "rootdialog.qh"
 CLASS(XonoticToSDialog, XonoticRootDialog)
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 82f0efee9..691404ac1 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -476,7 +476,7 @@ void updateCheck()
 	{
 		_Nex_ExtResponseSystem_Queried = 1;
 		cvar_set("cl_startcount", ftos(cvar("cl_startcount") + 1));
-		uri_get("http://update.xonotic.org/checkupdate.txt", URI_GET_UPDATENOTIFICATION);
+		uri_get("https://update.xonotic.org/checkupdate.txt", URI_GET_UPDATENOTIFICATION);
 	}
 
 	if(_Nex_ExtResponseSystem_PacksStep > 0)
diff --git a/quake.rc b/quake.rc
index 9330d6a67..42e48ca67 100644
--- a/quake.rc
+++ b/quake.rc
@@ -10,6 +10,6 @@ stuffcmds
 //startdemos demos/demo1 demos/demo2 demos/demo3
 //startdemos
 //play announcer/male/welcome.ogg
-crypto_keygen 0 http://ca.xonotic.org/?ca=0&key=
+crypto_keygen 0 https://ca.xonotic.org/?ca=0&key=
 
 exec post-config.cfg
diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 0be38b303..041ac633c 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -549,8 +549,8 @@ set g_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 // player statistics
 set g_playerstats_gamereport_uri "https://stats.xonotic.org/stats/submit" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory."
 set g_playerstats_gamereport_ladder ""
-set g_playerstats_playerbasic_uri "http://stats.xonotic.org"
-set g_playerstats_playerdetail_uri "http://stats.xonotic.org/player/me"
+set g_playerstats_playerbasic_uri "https://stats.xonotic.org"
+set g_playerstats_playerdetail_uri "https://stats.xonotic.org/player/me"
 set g_playerstats_playerdetail_autoupdatetime 1800 // automatically update every 30 minutes anyway
 
 // autoscreenshots