From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 25 Oct 2015 16:45:42 +0000 (+0200)
Subject: Fixed parsers.
X-Git-Tag: 2.409~174^2~13
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/3f99b236ec80087c9cede047b4d6c3e8eea6f8ab?hp=-c

Fixed parsers.
---

3f99b236ec80087c9cede047b4d6c3e8eea6f8ab
diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp
index 1873b9bb..75be7537 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp
@@ -46,7 +46,7 @@ void GET_SERVER_INFO::CreateAnswer()
                        utsn.machine + " " +
                        utsn.nodename;
 
-    m_answer = GetOpenTag() + "<version value=\"" + SERVER_VERSION + "\"/>" +
+    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()) + "\"/>" +
@@ -57,5 +57,5 @@ void GET_SERVER_INFO::CreateAnswer()
     for (size_t i = 0; i< DIR_NUM; i++)
         m_answer += "<dir_name_" + x2str(i) + " value=\"" + Encode12str(m_settings.GetDirName(i)) + "\"/>";
 
-    m_answer += GetCloseTag();
+    m_answer += "</ServerInfo>";
 }
diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
index c54ae8eb..2e9d7087 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -52,9 +52,9 @@ std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_
     std::string answer;
 
     if (loginInStart)
-        answer += "<User result=\"ok\">";
+        answer += "<User login=\"" + user.GetLogin() + "\" result=\"ok\">";
     else
-        answer += "<User result=\"ok\" login=\"" + user.GetLogin() + "\">";
+        answer += "<User result=\"ok\">";
 
     answer += "<Login value=\"" + user.GetLogin() + "\"/>";