X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c26f4f6b17d688b3defb790486daf42392068aa3..e337600f4c621ccd847d2e852ee5e2b6a0cd8dd6:/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp index e4a75a87..b971c638 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp @@ -26,9 +26,9 @@ un += " "; un += utsn.nodename; structVal["version"] = xmlrpc_c::value_string(SERVER_VERSION); -structVal["tariff_num"] = xmlrpc_c::value_int(tariffs->GetTariffsNum()); +structVal["tariff_num"] = xmlrpc_c::value_int(tariffs->Count()); structVal["tariff"] = xmlrpc_c::value_int(2); -structVal["users_num"] = xmlrpc_c::value_int(users->GetUserNum()); +structVal["users_num"] = xmlrpc_c::value_int(users->Count()); structVal["uname"] = xmlrpc_c::value_string(un); structVal["dir_num"] = xmlrpc_c::value_int(DIR_NUM); structVal["day_fee"] = xmlrpc_c::value_int(dayFee); @@ -37,9 +37,7 @@ std::vector dirnameVal; for (int i = 0; i< DIR_NUM; i++) { - std::string dn2e; - Encode12str(dn2e, dirNames[i]); - dirnameVal.push_back(xmlrpc_c::value_string(dn2e)); + dirnameVal.push_back(xmlrpc_c::value_string(IconvString(dirNames[i], "KOI8-RU", "UTF-8"))); } structVal["dir_names"] = xmlrpc_c::value_array(dirnameVal);