X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7dc3852ce6e3c2344e2de0815c1c79fc6b849bcf..1cb912e4f90473f78d2f0f10ab5c9b2c5bd36440:/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp index 0e7ac9d6..38e9a260 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp @@ -1,12 +1,17 @@ -#include +#include "user_helper.h" #include "stg/tariffs.h" +#include "stg/tariff.h" #include "stg/admin.h" #include "stg/store.h" +#include "stg/users.h" +#include "stg/user.h" #include "stg/user_ips.h" -#include "stg/common.h" #include "stg/user_property.h" -#include "user_helper.h" +#include "stg/common.h" +#include "stg/const.h" + +#include //------------------------------------------------------------------------------ @@ -20,62 +25,62 @@ structVal["login"] = xmlrpc_c::value_string(ptr->GetLogin()); if (!hidePassword) { - structVal["password"] = xmlrpc_c::value_string(ptr->GetProperty().password.Get()); + structVal["password"] = xmlrpc_c::value_string(ptr->GetProperties().password.Get()); } else { structVal["password"] = xmlrpc_c::value_string("++++++++"); } -structVal["cash"] = xmlrpc_c::value_double(ptr->GetProperty().cash.Get()); -structVal["freemb"] = xmlrpc_c::value_double(ptr->GetProperty().freeMb.Get()); -structVal["credit"] = xmlrpc_c::value_double(ptr->GetProperty().credit.Get()); +structVal["cash"] = xmlrpc_c::value_double(ptr->GetProperties().cash.Get()); +structVal["freemb"] = xmlrpc_c::value_double(ptr->GetProperties().freeMb.Get()); +structVal["credit"] = xmlrpc_c::value_double(ptr->GetProperties().credit.Get()); -if (ptr->GetProperty().nextTariff.Get() != "") +if (ptr->GetProperties().nextTariff.Get() != "") { structVal["tariff"] = xmlrpc_c::value_string( - ptr->GetProperty().tariffName.Get() + + ptr->GetProperties().tariffName.Get() + "/" + - ptr->GetProperty().nextTariff.Get() + ptr->GetProperties().nextTariff.Get() ); } else { - structVal["tariff"] = xmlrpc_c::value_string(ptr->GetProperty().tariffName.Get()); + structVal["tariff"] = xmlrpc_c::value_string(ptr->GetProperties().tariffName.Get()); } -structVal["note"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().note, "KOI8-RU", "UTF-8")); +structVal["note"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().note, "KOI8-RU", "UTF-8")); -structVal["phone"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().phone, "KOI8-RU", "UTF-8")); +structVal["phone"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().phone, "KOI8-RU", "UTF-8")); -structVal["address"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().address, "KOI8-RU", "UTF-8")); +structVal["address"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().address, "KOI8-RU", "UTF-8")); -structVal["email"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().email, "KOI8-RU", "UTF-8")); +structVal["email"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().email, "KOI8-RU", "UTF-8")); std::vector userdata; -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata0.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata1.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata2.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata3.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata4.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata5.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata6.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata7.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata8.Get(), "KOI8-RU", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperty().userdata9.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata0.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata1.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata2.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata3.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata4.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata5.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata6.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata7.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata8.Get(), "KOI8-RU", "UTF-8"))); +userdata.push_back(xmlrpc_c::value_string(IconvString(ptr->GetProperties().userdata9.Get(), "KOI8-RU", "UTF-8"))); structVal["userdata"] = xmlrpc_c::value_array(userdata); -structVal["name"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().realName, "KOI8-RU", "UTF-8")); +structVal["name"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().realName, "KOI8-RU", "UTF-8")); -structVal["group"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().group, "KOI8-RU", "UTF-8")); +structVal["group"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().group, "KOI8-RU", "UTF-8")); structVal["status"] = xmlrpc_c::value_boolean(ptr->GetConnected()); -structVal["aonline"] = xmlrpc_c::value_boolean(ptr->GetProperty().alwaysOnline.Get()); +structVal["aonline"] = xmlrpc_c::value_boolean(ptr->GetProperties().alwaysOnline.Get()); structVal["currip"] = xmlrpc_c::value_string(inet_ntostring(ptr->GetCurrIP())); structVal["pingtime"] = xmlrpc_c::value_int(static_cast(ptr->GetPingTime())); -structVal["ips"] = xmlrpc_c::value_string(ptr->GetProperty().ips.Get().GetIpStr()); +structVal["ips"] = xmlrpc_c::value_string(ptr->GetProperties().ips.Get().toString()); std::map traffInfo; std::vector mu(DIR_NUM); @@ -83,26 +88,17 @@ std::vector md(DIR_NUM); std::vector su(DIR_NUM); std::vector sd(DIR_NUM); -DIR_TRAFF upload; -DIR_TRAFF download; -DIR_TRAFF supload; -DIR_TRAFF sdownload; -download = ptr->GetProperty().down.Get(); -upload = ptr->GetProperty().up.Get(); -sdownload = ptr->GetSessionUpload(); -supload = ptr->GetSessionDownload(); +auto upload = ptr->GetProperties().up.Get(); +auto download = ptr->GetProperties().down.Get(); +auto supload = ptr->GetSessionUpload(); +auto sdownload = ptr->GetSessionDownload(); for (int j = 0; j < DIR_NUM; j++) { - std::string value; - x2str(upload[j], value); - mu[j] = xmlrpc_c::value_string(value); - x2str(download[j], value); - md[j] = xmlrpc_c::value_string(value); - x2str(supload[j], value); - su[j] = xmlrpc_c::value_string(value); - x2str(sdownload[j], value); - sd[j] = xmlrpc_c::value_string(value); + mu[j] = xmlrpc_c::value_string(std::to_string(upload[j])); + md[j] = xmlrpc_c::value_string(std::to_string(download[j])); + su[j] = xmlrpc_c::value_string(std::to_string(supload[j])); + sd[j] = xmlrpc_c::value_string(std::to_string(sdownload[j])); } traffInfo["mu"] = xmlrpc_c::value_array(mu); @@ -112,13 +108,13 @@ traffInfo["sd"] = xmlrpc_c::value_array(sd); structVal["traff"] = xmlrpc_c::value_struct(traffInfo); -structVal["down"] = xmlrpc_c::value_boolean(ptr->GetProperty().disabled.Get()); -structVal["disableddetailstat"] = xmlrpc_c::value_boolean(ptr->GetProperty().disabledDetailStat.Get()); -structVal["passive"] = xmlrpc_c::value_boolean(ptr->GetProperty().passive.Get()); -structVal["lastcash"] = xmlrpc_c::value_double(ptr->GetProperty().lastCashAdd.Get()); -structVal["lasttimecash"] = xmlrpc_c::value_int(static_cast(ptr->GetProperty().lastCashAddTime.Get())); -structVal["lastactivitytime"] = xmlrpc_c::value_int(static_cast(ptr->GetProperty().lastActivityTime.Get())); -structVal["creditexpire"] = xmlrpc_c::value_int(static_cast(ptr->GetProperty().creditExpire.Get())); +structVal["down"] = xmlrpc_c::value_boolean(ptr->GetProperties().disabled.Get()); +structVal["disableddetailstat"] = xmlrpc_c::value_boolean(ptr->GetProperties().disabledDetailStat.Get()); +structVal["passive"] = xmlrpc_c::value_boolean(ptr->GetProperties().passive.Get()); +structVal["lastcash"] = xmlrpc_c::value_double(ptr->GetProperties().lastCashAdd.Get()); +structVal["lasttimecash"] = xmlrpc_c::value_int(static_cast(ptr->GetProperties().lastCashAddTime.Get())); +structVal["lastactivitytime"] = xmlrpc_c::value_int(static_cast(ptr->GetProperties().lastActivityTime.Get())); +structVal["creditexpire"] = xmlrpc_c::value_int(static_cast(ptr->GetProperties().creditExpire.Get())); *info = xmlrpc_c::value_struct(structVal); } @@ -126,10 +122,10 @@ structVal["creditexpire"] = xmlrpc_c::value_int(static_cast(ptr->GetPropert //------------------------------------------------------------------------------ bool USER_HELPER::SetUserInfo(const xmlrpc_c::value & info, - const ADMIN * admin, + const STG::Admin& admin, const std::string & login, - const STORE & store, - TARIFFS * tariffs) + const STG::Store & store, + STG::Tariffs * tariffs) { std::map structVal( static_cast >(xmlrpc_c::value_struct(info)) @@ -138,17 +134,17 @@ std::map structVal( std::map::iterator it; bool check = false; -bool alwaysOnline = ptr->GetProperty().alwaysOnline; +bool alwaysOnline = ptr->GetProperties().alwaysOnline; if ((it = structVal.find("aonline")) != structVal.end()) { check = true; alwaysOnline = xmlrpc_c::value_boolean(it->second); } -bool onlyOneIP = ptr->GetProperty().ips.ConstData().OnlyOneIP(); +bool onlyOneIP = ptr->GetProperties().ips.ConstData().onlyOneIP(); if ((it = structVal.find("ips")) != structVal.end()) { check = true; - onlyOneIP = StrToIPS(xmlrpc_c::value_string(it->second)).OnlyOneIP(); + onlyOneIP = STG::UserIPs::parse(xmlrpc_c::value_string(it->second)).onlyOneIP(); } if (check && alwaysOnline && !onlyOneIP) @@ -159,12 +155,12 @@ if (check && alwaysOnline && !onlyOneIP) if ((it = structVal.find("ips")) != structVal.end()) { - USER_IPS ips; - ips = StrToIPS(xmlrpc_c::value_string(it->second)); + auto ips = STG::UserIPs::parse(xmlrpc_c::value_string(it->second)); - for (size_t i = 0; i < ips.Count(); ++i) + for (size_t i = 0; i < ips.count(); ++i) { - CONST_USER_PTR user; + using ConstUserPtr = const STG::User*; + ConstUserPtr user; uint32_t ip = ips[i].ip; if (users.IsIPInUse(ip, login, &user)) { @@ -173,191 +169,143 @@ if ((it = structVal.find("ips")) != structVal.end()) } } - if (!ptr->GetProperty().ips.Set(ips, - admin, - login, - &store)) + if (!ptr->GetProperties().ips.Set(ips, admin, login, store)) return true; } if ((it = structVal.find("aonline")) != structVal.end()) { bool value(xmlrpc_c::value_boolean(it->second)); - if (ptr->GetProperty().alwaysOnline.Get() != value) - if (!ptr->GetProperty().alwaysOnline.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().alwaysOnline.Get() != value) + if (!ptr->GetProperties().alwaysOnline.Set(value, admin, login, store)) return true; } if ((it = structVal.find("password")) != structVal.end()) { std::string value(xmlrpc_c::value_string(it->second)); - if (ptr->GetProperty().password.Get() != value) - if (!ptr->GetProperty().password.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().password.Get() != value) + if (!ptr->GetProperties().password.Set(value, admin, login, store)) return true; } if ((it = structVal.find("address")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); - if (ptr->GetProperty().address.Get() != value) - if (!ptr->GetProperty().address.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().address.Get() != value) + if (!ptr->GetProperties().address.Set(value, admin, login, store)) return true; } if ((it = structVal.find("phone")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); - if (ptr->GetProperty().phone.Get() != value) - if (!ptr->GetProperty().phone.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().phone.Get() != value) + if (!ptr->GetProperties().phone.Set(value, admin, login, store)) return true; } if ((it = structVal.find("email")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); - if (ptr->GetProperty().email.Get() != value) - if (!ptr->GetProperty().email.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().email.Get() != value) + if (!ptr->GetProperties().email.Set(value, admin, login, store)) return true; } if ((it = structVal.find("cash")) != structVal.end()) { double value(xmlrpc_c::value_double(it->second)); - if (std::fabs(ptr->GetProperty().cash.Get() - value) > 1.0e-3) - if (!ptr->GetProperty().cash.Set(value, - admin, - login, - &store)) + if (std::fabs(ptr->GetProperties().cash.Get() - value) > 1.0e-3) + if (!ptr->GetProperties().cash.Set(value, admin, login, store)) return true; } if ((it = structVal.find("creditexpire")) != structVal.end()) { time_t value(xmlrpc_c::value_int(it->second)); - if (ptr->GetProperty().creditExpire.Get() != value) - if (!ptr->GetProperty().creditExpire.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().creditExpire.Get() != value) + if (!ptr->GetProperties().creditExpire.Set(value, admin, login, store)) return true; } if ((it = structVal.find("credit")) != structVal.end()) { double value(xmlrpc_c::value_double(it->second)); - if (std::fabs(ptr->GetProperty().credit.Get() - value) > 1.0e-3) - if (!ptr->GetProperty().credit.Set(value, - admin, - login, - &store)) + if (std::fabs(ptr->GetProperties().credit.Get() - value) > 1.0e-3) + if (!ptr->GetProperties().credit.Set(value, admin, login, store)) return true; } if ((it = structVal.find("freemb")) != structVal.end()) { double value(xmlrpc_c::value_double(it->second)); - if (std::fabs(ptr->GetProperty().freeMb.Get() - value) > 1.0e-3) - if (!ptr->GetProperty().freeMb.Set(value, - admin, - login, - &store)) + if (std::fabs(ptr->GetProperties().freeMb.Get() - value) > 1.0e-3) + if (!ptr->GetProperties().freeMb.Set(value, admin, login, store)) return true; } if ((it = structVal.find("down")) != structVal.end()) { bool value(xmlrpc_c::value_boolean(it->second)); - if (ptr->GetProperty().disabled.Get() != value) - if (!ptr->GetProperty().disabled.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().disabled.Get() != value) + if (!ptr->GetProperties().disabled.Set(value, admin, login, store)) return true; } if ((it = structVal.find("passive")) != structVal.end()) { bool value(xmlrpc_c::value_boolean(it->second)); - if (ptr->GetProperty().passive.Get() != value) - if (!ptr->GetProperty().passive.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().passive.Get() != value) + if (!ptr->GetProperties().passive.Set(value, admin, login, store)) return true; } if ((it = structVal.find("disableddetailstat")) != structVal.end()) { bool value(xmlrpc_c::value_boolean(it->second)); - if (ptr->GetProperty().disabledDetailStat.Get() != value) - if (!ptr->GetProperty().disabledDetailStat.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().disabledDetailStat.Get() != value) + if (!ptr->GetProperties().disabledDetailStat.Set(value, admin, login, store)) return true; } if ((it = structVal.find("name")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); - if (ptr->GetProperty().realName.Get() != value) - if (!ptr->GetProperty().realName.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().realName.Get() != value) + if (!ptr->GetProperties().realName.Set(value, admin, login, store)) return true; } if ((it = structVal.find("group")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); - if (ptr->GetProperty().group.Get() != value) - if (!ptr->GetProperty().group.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().group.Get() != value) + if (!ptr->GetProperties().group.Set(value, admin, login, store)) return true; } if ((it = structVal.find("note")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); - if (ptr->GetProperty().note.Get() != value) - if (!ptr->GetProperty().note.Set(value, - admin, - login, - &store)) + if (ptr->GetProperties().note.Get() != value) + if (!ptr->GetProperties().note.Set(value, admin, login, store)) return true; } if ((it = structVal.find("userdata")) != structVal.end()) { - std::vector *> userdata; - userdata.push_back(ptr->GetProperty().userdata0.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata1.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata2.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata3.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata4.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata5.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata6.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata7.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata8.GetPointer()); - userdata.push_back(ptr->GetProperty().userdata9.GetPointer()); + std::vector *> userdata; + userdata.push_back(ptr->GetProperties().userdata0.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata1.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata2.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata3.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata4.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata5.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata6.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata7.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata8.GetPointer()); + userdata.push_back(ptr->GetProperties().userdata9.GetPointer()); std::vector udata( xmlrpc_c::value_array(it->second).vectorValueValue() @@ -367,10 +315,7 @@ if ((it = structVal.find("userdata")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(udata[i]), "UTF-8", "KOI8-RU")); if (userdata[i]->Get() != value) - if (!userdata[i]->Set(value, - admin, - login, - &store)) + if (!userdata[i]->Set(value, admin, login, store)) return true; } } @@ -381,8 +326,7 @@ if ((it = structVal.find("traff")) != structVal.end()) static_cast >(xmlrpc_c::value_struct(it->second)) ); - DIR_TRAFF dtData; - dtData = ptr->GetProperty().up.Get(); + auto dtData = ptr->GetProperties().up.Get(); if ((it = traff.find("mu")) != traff.end()) { std::vector data(xmlrpc_c::value_array(it->second).vectorValueValue()); @@ -395,13 +339,10 @@ if ((it = structVal.find("traff")) != structVal.end()) else dtData[i] = value; } - if (!ptr->GetProperty().up.Set(dtData, - admin, - login, - &store)) + if (!ptr->GetProperties().up.Set(dtData, admin, login, store)) return true; } - dtData = ptr->GetProperty().down.Get(); + dtData = ptr->GetProperties().down.Get(); if ((it = traff.find("md")) != traff.end()) { std::vector data(xmlrpc_c::value_array(it->second).vectorValueValue()); @@ -414,10 +355,7 @@ if ((it = structVal.find("traff")) != structVal.end()) else dtData[i] = value; } - if (!ptr->GetProperty().down.Set(dtData, - admin, - login, - &store)) + if (!ptr->GetProperties().down.Set(dtData, admin, login, store)) return true; } } @@ -433,35 +371,29 @@ if ((it = structVal.find("tariff")) != structVal.end()) tariff = tariff.substr(0, pos); } - const TARIFF * newTariff = tariffs->FindByName(tariff); + const auto newTariff = tariffs->FindByName(tariff); if (newTariff) { - const TARIFF * currentTariff = ptr->GetTariff(); - std::string message = currentTariff->TariffChangeIsAllowed(*newTariff); + const auto currentTariff = ptr->GetTariff(); + std::string message = currentTariff->TariffChangeIsAllowed(*newTariff, time(NULL)); if (message.empty()) { - if (ptr->GetProperty().tariffName.Get() != tariff) + if (ptr->GetProperties().tariffName.Get() != tariff) { - if (!ptr->GetProperty().tariffName.Set(tariff, - admin, - login, - &store)) + if (!ptr->GetProperties().tariffName.Set(tariff, admin, login, store)) return true; } } else { - GetStgLogger()("Tariff change is prohibited for user %s. %s", ptr->GetLogin().c_str(), message.c_str()); + STG::PluginLogger::get("conf_rpc")("Tariff change is prohibited for user %s. %s", ptr->GetLogin().c_str(), message.c_str()); } } if (nextTariff != "" && tariffs->FindByName(nextTariff)) - if (ptr->GetProperty().nextTariff.Get() != nextTariff) - if (!ptr->GetProperty().nextTariff.Set(tariff, - admin, - login, - &store)) + if (ptr->GetProperties().nextTariff.Get() != nextTariff) + if (!ptr->GetProperties().nextTariff.Set(tariff, admin, login, store)) return true; }