- updated so masterserver url does not require trailing / in ini
This commit is contained in:
parent
c64693898f
commit
0d8b3d6c63
|
@ -951,6 +951,9 @@ void MenuStateConnectedGame::simpleTask(BaseThread *callingThread,void *userdata
|
||||||
|
|
||||||
if(config.getString("Masterserver","") != "") {
|
if(config.getString("Masterserver","") != "") {
|
||||||
string baseURL = config.getString("Masterserver");
|
string baseURL = config.getString("Masterserver");
|
||||||
|
if(baseURL != "") {
|
||||||
|
endPathWithSlash(baseURL,false);
|
||||||
|
}
|
||||||
string phpVersionParam = config.getString("phpVersionParam","?version=0.1");
|
string phpVersionParam = config.getString("phpVersionParam","?version=0.1");
|
||||||
string gameVersion = "&glestVersion=" + SystemFlags::escapeURL(glestVersionString);
|
string gameVersion = "&glestVersion=" + SystemFlags::escapeURL(glestVersionString);
|
||||||
string playerUUID = "&uuid=" + SystemFlags::escapeURL(config.getString("PlayerId",""));
|
string playerUUID = "&uuid=" + SystemFlags::escapeURL(config.getString("PlayerId",""));
|
||||||
|
|
|
@ -3160,7 +3160,11 @@ void MenuStateCustomGame::simpleTaskForMasterServer(BaseThread *callingThread) {
|
||||||
if(republish == true) {
|
if(republish == true) {
|
||||||
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
|
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
string request = Config::getInstance().getString("Masterserver") + "addServerInfo.php?";
|
string request = Config::getInstance().getString("Masterserver");
|
||||||
|
if(request != "") {
|
||||||
|
endPathWithSlash(request,false);
|
||||||
|
}
|
||||||
|
request += "addServerInfo.php?";
|
||||||
|
|
||||||
//CURL *handle = SystemFlags::initHTTP();
|
//CURL *handle = SystemFlags::initHTTP();
|
||||||
CURL *handle = callingThread->getGenericData<CURL>();
|
CURL *handle = callingThread->getGenericData<CURL>();
|
||||||
|
|
|
@ -1005,8 +1005,13 @@ void MenuStateMasterserver::simpleTask(BaseThread *callingThread,void *userdata)
|
||||||
CURL *handle = SystemFlags::initHTTP();
|
CURL *handle = SystemFlags::initHTTP();
|
||||||
|
|
||||||
string playerUUID = "?uuid=" + SystemFlags::escapeURL(Config::getInstance().getString("PlayerId",""));
|
string playerUUID = "?uuid=" + SystemFlags::escapeURL(Config::getInstance().getString("PlayerId",""));
|
||||||
std::string localServerInfoString = SystemFlags::getHTTP(
|
|
||||||
Config::getInstance().getString("Masterserver") + "showServersForGlest.php" + playerUUID,handle);
|
string baseURL = Config::getInstance().getString("Masterserver");
|
||||||
|
if(baseURL != "") {
|
||||||
|
endPathWithSlash(baseURL,false);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string localServerInfoString = SystemFlags::getHTTP(baseURL + "showServersForGlest.php" + playerUUID,handle);
|
||||||
SystemFlags::cleanupHTTP(&handle);
|
SystemFlags::cleanupHTTP(&handle);
|
||||||
if(callingThread->getQuitStatus() == true) {
|
if(callingThread->getQuitStatus() == true) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -427,6 +427,10 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
|
||||||
|
|
||||||
if(config.getString("Masterserver","") != "") {
|
if(config.getString("Masterserver","") != "") {
|
||||||
string baseURL = config.getString("Masterserver");
|
string baseURL = config.getString("Masterserver");
|
||||||
|
if(baseURL != "") {
|
||||||
|
endPathWithSlash(baseURL,false);
|
||||||
|
}
|
||||||
|
|
||||||
string phpVersionParam = config.getString("phpVersionParam","?version=0.1");
|
string phpVersionParam = config.getString("phpVersionParam","?version=0.1");
|
||||||
string playerUUID = "&uuid=" + SystemFlags::escapeURL(Config::getInstance().getString("PlayerId",""));
|
string playerUUID = "&uuid=" + SystemFlags::escapeURL(Config::getInstance().getString("PlayerId",""));
|
||||||
string gameVersion = "&glestVersion=" + SystemFlags::escapeURL(glestVersionString);
|
string gameVersion = "&glestVersion=" + SystemFlags::escapeURL(glestVersionString);
|
||||||
|
|
|
@ -2988,7 +2988,11 @@ void ServerInterface::simpleTask(BaseThread *callingThread,void *userdata) {
|
||||||
if(needToRepublishToMasterserver == true) {
|
if(needToRepublishToMasterserver == true) {
|
||||||
try {
|
try {
|
||||||
if(Config::getInstance().getString("Masterserver","") != "") {
|
if(Config::getInstance().getString("Masterserver","") != "") {
|
||||||
string request = Config::getInstance().getString("Masterserver") + "addServerInfo.php?";
|
string request = Config::getInstance().getString("Masterserver");
|
||||||
|
if(request != "") {
|
||||||
|
endPathWithSlash(request,false);
|
||||||
|
}
|
||||||
|
request += "addServerInfo.php?";
|
||||||
|
|
||||||
std::map<string,string> newPublishToServerInfo = publishToMasterserver();
|
std::map<string,string> newPublishToServerInfo = publishToMasterserver();
|
||||||
|
|
||||||
|
@ -3012,7 +3016,12 @@ void ServerInterface::simpleTask(BaseThread *callingThread,void *userdata) {
|
||||||
std::string serverInfo = SystemFlags::getHTTP(request,handle);
|
std::string serverInfo = SystemFlags::getHTTP(request,handle);
|
||||||
//printf("Result:\n%s\n",serverInfo .c_str());
|
//printf("Result:\n%s\n",serverInfo .c_str());
|
||||||
|
|
||||||
string requestStats = Config::getInstance().getString("Masterserver") + "addGameStats.php?";
|
string requestStats = Config::getInstance().getString("Masterserver");
|
||||||
|
if(requestStats != "") {
|
||||||
|
endPathWithSlash(requestStats,false);
|
||||||
|
}
|
||||||
|
requestStats += "addGameStats.php?";
|
||||||
|
|
||||||
std::map<string,string> newPublishToServerInfoStats = publishToMasterserverStats();
|
std::map<string,string> newPublishToServerInfoStats = publishToMasterserverStats();
|
||||||
if(newPublishToServerInfoStats.empty() == false) {
|
if(newPublishToServerInfoStats.empty() == false) {
|
||||||
for(std::map<string,string>::const_iterator iterMap = newPublishToServerInfoStats.begin();
|
for(std::map<string,string>::const_iterator iterMap = newPublishToServerInfoStats.begin();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user