X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/91b5ae18ae465d0887785aab6dc0eb7abc0d5488..bc4721533e4041a19b42cb247064f9f42c3f9d5f:/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 a689cd99..b971c638 100644
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
@@ -1,9 +1,9 @@
 #include <sys/utsname.h>
 
+#include "stg/version.h"
+#include "stg/common.h"
 #include "info_methods.h"
-#include "version.h"
 #include "rpcconfig.h"
-#include "common.h"
 
 void METHOD_INFO::execute(xmlrpc_c::paramList const & paramList,
                           xmlrpc_c::value *   const   retvalPtr)
@@ -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<xmlrpc_c::value> 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);