X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/250a7d6e7a4c8ffd644931b7b3964289a8f99151..ee882f766d3173ed8ffb6e52b06749c10832f1bf:/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp index 1287bf51..75be7537 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp @@ -21,7 +21,9 @@ #include "parser_server_info.h" -#include "stg/common.h" +#include "stg/settings.h" +#include "stg/users.h" +#include "stg/tariffs.h" #include "stg/version.h" #include "stg/const.h" @@ -32,6 +34,8 @@ using STG::PARSER::GET_SERVER_INFO; +const char * GET_SERVER_INFO::tag = "GetServerInfo"; + void GET_SERVER_INFO::CreateAnswer() { struct utsname utsn; @@ -42,16 +46,16 @@ void GET_SERVER_INFO::CreateAnswer() utsn.machine + " " + utsn.nodename; - answer = GetOpenTag() + "<version value=\"" + SERVER_VERSION + "\"/>" + - "<tariff_num value=\"" + x2str(tariffs.Count()) + "\"/>" + - "<tariff value=\"2\"/>" + - "<user_num value=\"" + x2str(users.Count()) + "\"/>" + - "<uname value=\"" + name + "\"/>" + - "<dir_num value=\"" + x2str(DIR_NUM) + "\"/>" + - "<day_fee value=\"" + x2str(settings.GetDayFee()) + "\"/>"; + m_answer = std::string("<ServerInfo><version value=\"") + SERVER_VERSION + "\"/>" + + "<tariff_num value=\"" + x2str(m_tariffs.Count()) + "\"/>" + + "<tariff value=\"2\"/>" + + "<user_num value=\"" + x2str(m_users.Count()) + "\"/>" + + "<uname value=\"" + name + "\"/>" + + "<dir_num value=\"" + x2str(DIR_NUM) + "\"/>" + + "<day_fee value=\"" + x2str(m_settings.GetDayFee()) + "\"/>"; for (size_t i = 0; i< DIR_NUM; i++) - answer += "<dir_name_" + x2str(i) + " value=\"" + Encode12str(settings.GetDirName(i)) + "\"/>"; + m_answer += "<dir_name_" + x2str(i) + " value=\"" + Encode12str(m_settings.GetDirName(i)) + "\"/>"; - answer += GetCloseTag(); + m_answer += "</ServerInfo>"; }