diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index a42c7988b..c687c10a5 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -328,11 +328,11 @@ CClientConfig::CClientConfig() DisplayAccountButtons = true; CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register"; - ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php"; + ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html"; EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings"; - BetaAccountURL = "http://www.ryzom.com/profile"; + BetaAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings"; ForgetPwdURL = "http://shard.ryzomcore.org/ams/index.php?page=forgot_password"; - FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1"; + FreeTrialURL = "http://shard.ryzomcore.org/ams/index.php?page=register"; LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php"; Position = CVector(0.f, 0.f, 0.f); // Default Position. Heading = CVector(0.f, 1.f, 0.f); // Default Heading. @@ -433,11 +433,11 @@ CClientConfig::CClientConfig() PatchVersion.clear(); PatchServer.clear(); - WebIgMainDomain = "atys.ryzom.com"; + WebIgMainDomain = "shard.ryzomcore.org"; WebIgTrustedDomains.push_back(WebIgMainDomain); - RingReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes_ring/index.php"; - ReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes/index.php"; + RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php"; + ReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes/index.php"; /////////////// diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index b251689ea..60f4fedb9 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -176,8 +176,8 @@ struct CStatThread : public NLMISC::IRunnable if(!curl) return; curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); // curl_easy_setopt(curl, CURLOPT_USERAGENT, "unknown"); - curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)"); - curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzom.com/"+referer).c_str()); + curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)"); // FIXME + curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzomcore.org/" + referer).c_str()); curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); CURLcode res = curl_easy_perform(curl); curl_easy_cleanup(curl); @@ -232,7 +232,7 @@ struct CStatThread : public NLMISC::IRunnable addParam(params, "page", ""); addParam(params, "pagetitle", referer); addParam(params, "screen", toString("%dx%d", ClientCfg.ConfigFile.getVar("Width").asInt(), ClientCfg.ConfigFile.getVar("Height").asInt())); - addParam(params, "referer", "http%3A%2F%2Fwww.ryzom.com%2F"+referer); + addParam(params, "referer", "http%3A%2F%2Fwww.ryzomcore.org%2F" + referer); time_t rawtime; struct tm * timeinfo; char buffer [80]; @@ -255,7 +255,7 @@ struct CStatThread : public NLMISC::IRunnable default: shard= "unknown"; break; } addParam(params, "cv_Shard", shard); - get("http://ryzom.com.woopra-ns.com/visit/"+params); + /* get("http://ryzom.com.woopra-ns.com/visit/" + params); */// FIXME return true; } @@ -265,7 +265,7 @@ struct CStatThread : public NLMISC::IRunnable std::string params; addParam(params, "cookie", cookie()); addParam(params, "ra", randomString()); - get("http://ryzom.com.woopra-ns.com/ping/"+params); + /* get("http://ryzom.com.woopra-ns.com/ping/" + params); */// FIXME } void run() diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 45e3fea51..210afcea9 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -1084,7 +1084,7 @@ void initShardDisplay() for (uint fff = 0; fff < 20; ++fff) { CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",fff), - 32*fff%46546, "32.32.32.32", "http://www.ryzom.com" ); + 32*fff%46546, "32.32.32.32", "http://www.ryzomcore.org" ); Shards.push_back(s); }*/ @@ -1211,7 +1211,7 @@ void onlogin(bool vanishScreen = true) // for (uint fff = 0; fff < 20; ++fff) // { // CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",fff), -// 32*fff%46546, "32.32.32.32", "http://www.ryzom.com" ); +// 32*fff%46546, "32.32.32.32", "http://www.ryzomcore.org" ); // Shards.push_back(s); // }*/ // diff --git a/code/ryzom/client/src/release.cpp b/code/ryzom/client/src/release.cpp index b40d68b35..722cbfe57 100644 --- a/code/ryzom/client/src/release.cpp +++ b/code/ryzom/client/src/release.cpp @@ -655,7 +655,7 @@ void release() #if FINAL_VERSION - // openURL ("http://ryzom.com/exit/"); + // openURL ("http://www.ryzomcore.org/exit/"); #endif }// release //