From fd321350724186b006810c158d7647eaeb191bba Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Mon, 9 Nov 2015 10:04:43 +0100
Subject: [PATCH] Changed: Removed unused/invalid URLs and updated some of them

---
 code/ryzom/client/client_default.cfg | 10 ++++++----
 code/ryzom/client/src/client_cfg.cpp | 12 +++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 58ecf36a5..a433cf318 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -42,12 +42,12 @@ Gamma_max	= 1.0;
 Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
 BackgroundDownloader = 0;
 PatchServer = "http://dl.ryzom.com/patch_live";
-SignUpURL = "http://www.ryzom.com/subscribe";
 StartupHost = "shard.ryzom.com:40916";
 StartupPage = "/login/r2_login.php";
 InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
-CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
-InstallWebPage = "http://dl.ryzom.com/installer/";
+
+ConditionsTermsURL = "http://app.ryzom.com/app_forum/index.php?page=topic/view/21885/1&post148782=en#1";
+LoginSupportURL    = "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=en#1";
 
 
 ////////////////
@@ -559,7 +559,9 @@ HelpPages =
 	"fr=http://forums.ryzom.com/forum/showthread.php?t=29130",
 	"en=http://forums.ryzom.com/forum/showthread.php?t=29129",
 	"wk=http://forums.ryzom.com/forum/showthread.php?t=29129",
-	"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
+	"de=http://forums.ryzom.com/forum/showthread.php?t=29131",
+	"es=http://forums.ryzom.com/forum/showthread.php?t=29131",
+	"ru=http://forums.ryzom.com/forum/showthread.php?t=29131"
 };
 
 WebIgMainDomain      = "app.ryzom.com";
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 59db73dc9..7cb3d41b6 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -326,12 +326,8 @@ CClientConfig::CClientConfig()
 
 	DisplayAccountButtons = true;
 	CreateAccountURL	= "https://secure.ryzom.com/signup/from_client.php";
-	ConditionsTermsURL	= "https://secure.ryzom.com/signup/terms_of_use.php";
 	EditAccountURL		= "https://secure.ryzom.com/payment_profile/index.php";
-	BetaAccountURL		= "http://www.ryzom.com/profile";
 	ForgetPwdURL		= "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
-	FreeTrialURL		= "http://www.ryzom.com/join/?freetrial=1";
-	LoginSupportURL		= "http://www.ryzom.com/en/support.html";
 	Position			= CVector(0.f, 0.f, 0.f);	// Default Position.
 	Heading				= CVector(0.f, 1.f, 0.f);	// Default Heading.
 	EyesHeight			= 1.5f;						// Default User Eyes Height.
@@ -876,11 +872,13 @@ void CClientConfig::setValues()
 	READ_BOOL_DEV(DisplayAccountButtons)
 	READ_STRING_DEV(CreateAccountURL)
 	READ_STRING_DEV(EditAccountURL)
-	READ_STRING_DEV(ConditionsTermsURL)
-	READ_STRING_DEV(BetaAccountURL)
 	READ_STRING_DEV(ForgetPwdURL)
+	READ_STRING_DEV(BetaAccountURL)
 	READ_STRING_DEV(FreeTrialURL)
-	READ_STRING_DEV(LoginSupportURL)
+
+	// defined in client_default.cfg
+	READ_STRING_FV(ConditionsTermsURL)
+	READ_STRING_FV(LoginSupportURL)
 
 #ifndef RZ_NO_CLIENT
 	// if cookie is not empty, it means that the client was launch