X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1a21bad6c7e114808ad31d526fd5f12040afb467..0cfa021cfd1395e2f6146d52f9e5ffa64be17976:/stglibs/srvconf.lib/parsers/chg_user.cpp

diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp
index 73eddfd2..f0027968 100644
--- a/stglibs/srvconf.lib/parsers/chg_user.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_user.cpp
@@ -34,22 +34,10 @@
 
 using namespace STG;
 
-namespace
-{
-
-RESETABLE<std::string> MaybeEncode(const RESETABLE<std::string> & value)
-{
-RESETABLE<std::string> res;
-if (!value.empty())
-    res = Encode12str(value.data());
-return res;
-}
-
-}
-
-CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d)
+CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d, const std::string & e)
     : callback(f),
       data(d),
+      encoding(e),
       depth(0)
 {
 }
@@ -84,7 +72,7 @@ else
     callback(false, "Invalid response.", data);
 }
 
-std::string CHG_USER::Serialize(const USER_CONF_RES & conf, const USER_STAT_RES & stat)
+std::string CHG_USER::Serialize(const USER_CONF_RES & conf, const USER_STAT_RES & stat, const std::string & encoding)
 {
 std::ostringstream stream;
 
@@ -102,18 +90,18 @@ appendResetable(stream, "ip", conf.ips); // TODO: ip -> ips
 if (!conf.nextTariff.empty())
     stream << "<tariff delayed=\"" << conf.nextTariff.data() << "\"/>";
 else if (!conf.tariffName.empty())
-    stream << "<tariff now=\"" << conf.nextTariff.data() << "\"/>";
+    stream << "<tariff now=\"" << conf.tariffName.data() << "\"/>";
 
-appendResetable(stream, "note", MaybeEncode(conf.note));
-appendResetable(stream, "name", MaybeEncode(conf.realName)); // TODO: name -> realName
-appendResetable(stream, "address", MaybeEncode(conf.address));
-appendResetable(stream, "email", MaybeEncode(conf.email));
-appendResetable(stream, "phone", MaybeEncode(conf.phone));
-appendResetable(stream, "group", MaybeEncode(conf.group));
-appendResetable(stream, "corp", conf.group);
+appendResetable(stream, "note", MaybeEncode(MaybeIconv(conf.note, encoding, "koi8-ru")));
+appendResetable(stream, "name", MaybeEncode(MaybeIconv(conf.realName, encoding, "koi8-ru"))); // TODO: name -> realName
+appendResetable(stream, "address", MaybeEncode(MaybeIconv(conf.address, encoding, "koi8-ru")));
+appendResetable(stream, "email", MaybeEncode(MaybeIconv(conf.email, encoding, "koi8-ru")));
+appendResetable(stream, "phone", MaybeEncode(MaybeIconv(conf.phone, encoding, "cp1251")));
+appendResetable(stream, "group", MaybeEncode(MaybeIconv(conf.group, encoding, "koi8-ru")));
+appendResetable(stream, "corp", conf.corp);
 
 for (size_t i = 0; i < conf.userdata.size(); ++i)
-    appendResetable(stream, "userdata", i, MaybeEncode(conf.userdata[i]));
+    appendResetable(stream, "userdata", i, MaybeEncode(MaybeIconv(conf.userdata[i], encoding, "koi8-ru")));
 
 if (!conf.services.empty())
     {
@@ -126,9 +114,9 @@ if (!conf.services.empty())
 // Stat
 
 if (!stat.cashAdd.empty())
-    stream << "<cash add=\"" << stat.cashAdd.data().first << "\" msg=\"" << Encode12str(stat.cashAdd.data().second) << "\"/>";
+    stream << "<cash add=\"" << stat.cashAdd.data().first << "\" msg=\"" << IconvString(Encode12str(stat.cashAdd.data().second), encoding, "koi8-ru") << "\"/>";
 else if (!stat.cashSet.empty())
-    stream << "<cash set=\"" << stat.cashAdd.data().first << "\" msg=\"" << Encode12str(stat.cashAdd.data().second) << "\"/>";
+    stream << "<cash set=\"" << stat.cashSet.data().first << "\" msg=\"" << IconvString(Encode12str(stat.cashSet.data().second), encoding, "koi8-ru") << "\"/>";
 
 appendResetable(stream, "freeMb", stat.freeMb);