X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..b9bafe1042839cd7295adf84448b4d08de9f5f46:/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp diff --git a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp index 62dcd1af..38e9a260 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp @@ -1,78 +1,86 @@ #include "user_helper.h" -#include "user_ips.h" -#include "utils.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/user_property.h" +#include "stg/common.h" +#include "stg/const.h" + +#include //------------------------------------------------------------------------------ void USER_HELPER::GetUserInfo(xmlrpc_c::value * info, bool hidePassword) { -std::string enc; - std::map structVal; structVal["result"] = xmlrpc_c::value_boolean(true); -structVal["login"] = xmlrpc_c::value_string(iter->GetLogin()); +structVal["login"] = xmlrpc_c::value_string(ptr->GetLogin()); if (!hidePassword) { - structVal["password"] = xmlrpc_c::value_string(iter->property.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(iter->property.cash.Get()); -structVal["freemb"] = xmlrpc_c::value_double(iter->property.freeMb.Get()); -structVal["credit"] = xmlrpc_c::value_double(iter->property.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 (iter->property.nextTariff.Get() != "") +if (ptr->GetProperties().nextTariff.Get() != "") { structVal["tariff"] = xmlrpc_c::value_string( - iter->property.tariffName.Get() + + ptr->GetProperties().tariffName.Get() + "/" + - iter->property.nextTariff.Get() + ptr->GetProperties().nextTariff.Get() ); } else { - structVal["tariff"] = xmlrpc_c::value_string(iter->property.tariffName.Get()); + structVal["tariff"] = xmlrpc_c::value_string(ptr->GetProperties().tariffName.Get()); } -structVal["note"] = xmlrpc_c::value_string(IconvString(iter->property.note, "KOI8-R", "UTF-8")); +structVal["note"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().note, "KOI8-RU", "UTF-8")); -structVal["phone"] = xmlrpc_c::value_string(IconvString(iter->property.phone, "KOI8-R", "UTF-8")); +structVal["phone"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().phone, "KOI8-RU", "UTF-8")); -structVal["address"] = xmlrpc_c::value_string(IconvString(iter->property.address, "KOI8-R", "UTF-8")); +structVal["address"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().address, "KOI8-RU", "UTF-8")); -structVal["email"] = xmlrpc_c::value_string(IconvString(iter->property.email, "KOI8-R", "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(iter->property.userdata0.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata1.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata2.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata3.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata4.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata5.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata6.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata7.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata8.Get(), "KOI8-R", "UTF-8"))); -userdata.push_back(xmlrpc_c::value_string(IconvString(iter->property.userdata9.Get(), "KOI8-R", "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(iter->property.realName, "KOI8-R", "UTF-8")); +structVal["name"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().realName, "KOI8-RU", "UTF-8")); -structVal["group"] = xmlrpc_c::value_string(IconvString(iter->property.group, "KOI8-R", "UTF-8")); +structVal["group"] = xmlrpc_c::value_string(IconvString(ptr->GetProperties().group, "KOI8-RU", "UTF-8")); -structVal["status"] = xmlrpc_c::value_boolean(iter->GetConnected()); -structVal["aonline"] = xmlrpc_c::value_boolean(iter->property.alwaysOnline.Get()); -structVal["currip"] = xmlrpc_c::value_string(inet_ntostring(iter->GetCurrIP())); -structVal["pingtime"] = xmlrpc_c::value_int(iter->GetPingTime()); -structVal["ips"] = xmlrpc_c::value_string(iter->property.ips.Get().GetIpStr()); +structVal["status"] = xmlrpc_c::value_boolean(ptr->GetConnected()); +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->GetProperties().ips.Get().toString()); std::map traffInfo; std::vector mu(DIR_NUM); @@ -80,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 = iter->property.down.Get(); -upload = iter->property.up.Get(); -sdownload = iter->GetSessionUpload(); -supload = iter->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); @@ -109,13 +108,13 @@ traffInfo["sd"] = xmlrpc_c::value_array(sd); structVal["traff"] = xmlrpc_c::value_struct(traffInfo); -structVal["down"] = xmlrpc_c::value_boolean(iter->property.disabled.Get()); -structVal["disableddetailstat"] = xmlrpc_c::value_boolean(iter->property.disabledDetailStat.Get()); -structVal["passive"] = xmlrpc_c::value_boolean(iter->property.passive.Get()); -structVal["lastcash"] = xmlrpc_c::value_double(iter->property.lastCashAdd.Get()); -structVal["lasttimecash"] = xmlrpc_c::value_int(iter->property.lastCashAddTime.Get()); -structVal["lastactivitytime"] = xmlrpc_c::value_int(iter->property.lastActivityTime.Get()); -structVal["creditexpire"] = xmlrpc_c::value_int(iter->property.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); } @@ -123,9 +122,10 @@ structVal["creditexpire"] = xmlrpc_c::value_int(iter->property.creditExpire.Get( //------------------------------------------------------------------------------ bool USER_HELPER::SetUserInfo(const xmlrpc_c::value & info, - const ADMIN & admin, + const STG::Admin& admin, const std::string & login, - const BASE_STORE & store) + const STG::Store & store, + STG::Tariffs * tariffs) { std::map structVal( static_cast >(xmlrpc_c::value_struct(info)) @@ -133,201 +133,179 @@ std::map structVal( std::map::iterator it; -if ((it = structVal.find("password")) != structVal.end()) +bool check = false; +bool alwaysOnline = ptr->GetProperties().alwaysOnline; +if ((it = structVal.find("aonline")) != structVal.end()) { - bool res = iter->property.password.Set(xmlrpc_c::value_string(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + check = true; + alwaysOnline = xmlrpc_c::value_boolean(it->second); + } +bool onlyOneIP = ptr->GetProperties().ips.ConstData().onlyOneIP(); +if ((it = structVal.find("ips")) != structVal.end()) + { + check = true; + onlyOneIP = STG::UserIPs::parse(xmlrpc_c::value_string(it->second)).onlyOneIP(); + } + +if (check && alwaysOnline && !onlyOneIP) + { + printfd(__FILE__, "Requested change leads to a forbidden state: AlwaysOnline with multiple IP's\n"); + return true; } if ((it = structVal.find("ips")) != structVal.end()) { - USER_IPS ips; - ips = StrToIPS(xmlrpc_c::value_string(it->second)); - bool res = iter->property.ips.Set(ips, - admin, - login, - &store); - if (!res) + auto ips = STG::UserIPs::parse(xmlrpc_c::value_string(it->second)); + + for (size_t i = 0; i < ips.count(); ++i) { - return true; + using ConstUserPtr = const STG::User*; + ConstUserPtr user; + uint32_t ip = ips[i].ip; + if (users.IsIPInUse(ip, login, &user)) + { + printfd(__FILE__, "Trying to assign an IP %s to '%s' that is already in use by '%s'\n", inet_ntostring(ip).c_str(), login.c_str(), user->GetLogin().c_str()); + return true; + } } + + 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->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->GetProperties().password.Get() != value) + if (!ptr->GetProperties().password.Set(value, admin, login, store)) + return true; } if ((it = structVal.find("address")) != structVal.end()) { - bool res = iter->property.address.Set(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-R"), - admin, - login, - &store); - if (!res) - { - return true; - } + std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); + if (ptr->GetProperties().address.Get() != value) + if (!ptr->GetProperties().address.Set(value, admin, login, store)) + return true; } if ((it = structVal.find("phone")) != structVal.end()) { - bool res = iter->property.phone.Set(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-R"), - admin, - login, - &store); - if (!res) - { - return true; - } + std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); + if (ptr->GetProperties().phone.Get() != value) + if (!ptr->GetProperties().phone.Set(value, admin, login, store)) + return true; } if ((it = structVal.find("email")) != structVal.end()) { - bool res = iter->property.email.Set(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-R"), - admin, - login, - &store); - if (!res) - { - return true; - } + std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); + 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->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()) { - bool res = iter->property.creditExpire.Set(xmlrpc_c::value_int(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + time_t value(xmlrpc_c::value_int(it->second)); + if (ptr->GetProperties().creditExpire.Get() != value) + if (!ptr->GetProperties().creditExpire.Set(value, admin, login, store)) + return true; } if ((it = structVal.find("credit")) != structVal.end()) { - bool res = iter->property.credit.Set(xmlrpc_c::value_double(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + double value(xmlrpc_c::value_double(it->second)); + 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()) { - bool res = iter->property.freeMb.Set(xmlrpc_c::value_double(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + double value(xmlrpc_c::value_double(it->second)); + 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("disabled")) != structVal.end()) +if ((it = structVal.find("down")) != structVal.end()) { - bool res = iter->property.disabled.Set(xmlrpc_c::value_boolean(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + bool value(xmlrpc_c::value_boolean(it->second)); + 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 res = iter->property.passive.Set(xmlrpc_c::value_boolean(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } - } - -if ((it = structVal.find("aonline")) != structVal.end()) - { - bool res = iter->property.alwaysOnline.Set(xmlrpc_c::value_boolean(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + bool value(xmlrpc_c::value_boolean(it->second)); + 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 res = iter->property.disabledDetailStat.Set(xmlrpc_c::value_boolean(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + bool value(xmlrpc_c::value_boolean(it->second)); + if (ptr->GetProperties().disabledDetailStat.Get() != value) + if (!ptr->GetProperties().disabledDetailStat.Set(value, admin, login, store)) + return true; } if ((it = structVal.find("name")) != structVal.end()) { - bool res = iter->property.realName.Set(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-R"), - admin, - login, - &store); - if (!res) - { - return true; - } + std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); + if (ptr->GetProperties().realName.Get() != value) + if (!ptr->GetProperties().realName.Set(value, admin, login, store)) + return true; } if ((it = structVal.find("group")) != structVal.end()) { - bool res = iter->property.group.Set(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-R"), - admin, - login, - &store); - if (!res) - { - return true; - } + std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); + if (ptr->GetProperties().group.Get() != value) + if (!ptr->GetProperties().group.Set(value, admin, login, store)) + return true; } if ((it = structVal.find("note")) != structVal.end()) { - bool res = iter->property.note.Set(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-R"), - admin, - login, - &store); - if (!res) - { - return true; - } + std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); + 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(iter->property.userdata0.GetPointer()); - userdata.push_back(iter->property.userdata1.GetPointer()); - userdata.push_back(iter->property.userdata2.GetPointer()); - userdata.push_back(iter->property.userdata3.GetPointer()); - userdata.push_back(iter->property.userdata4.GetPointer()); - userdata.push_back(iter->property.userdata5.GetPointer()); - userdata.push_back(iter->property.userdata6.GetPointer()); - userdata.push_back(iter->property.userdata7.GetPointer()); - userdata.push_back(iter->property.userdata8.GetPointer()); - userdata.push_back(iter->property.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() @@ -335,14 +313,10 @@ if ((it = structVal.find("userdata")) != structVal.end()) for (unsigned i = 0; i < userdata.size(); ++i) { - bool res = userdata[i]->Set(IconvString(xmlrpc_c::value_string(udata[i]), "UTF-8", "KOI8-R"), - admin, - login, - &store); - if (!res) - { - return true; - } + 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)) + return true; } } @@ -352,60 +326,75 @@ if ((it = structVal.find("traff")) != structVal.end()) static_cast >(xmlrpc_c::value_struct(it->second)) ); - std::vector data; - DIR_TRAFF dtData; - dtData = iter->property.up.Get(); + auto dtData = ptr->GetProperties().up.Get(); if ((it = traff.find("mu")) != traff.end()) { - data = xmlrpc_c::value_array(it->second).vectorValueValue(); + std::vector data(xmlrpc_c::value_array(it->second).vectorValueValue()); for (int i = 0; i < std::min(DIR_NUM, static_cast(data.size())); ++i) { int64_t value; if (str2x(xmlrpc_c::value_string(data[i]), value)) - { printfd(__FILE__, "USER_HELPER::SetUserInfo(): 'Invalid month upload value'\n"); - } else - { dtData[i] = value; - } } - bool res = iter->property.up.Set(dtData, - admin, - login, - &store); - if (!res) - { + if (!ptr->GetProperties().up.Set(dtData, admin, login, store)) return true; - } } - dtData = iter->property.down.Get(); + dtData = ptr->GetProperties().down.Get(); if ((it = traff.find("md")) != traff.end()) { - data = xmlrpc_c::value_array(it->second).vectorValueValue(); + std::vector data(xmlrpc_c::value_array(it->second).vectorValueValue()); for (int i = 0; i < std::min(DIR_NUM, static_cast(data.size())); ++i) { int64_t value; if (str2x(xmlrpc_c::value_string(data[i]), value)) - { printfd(__FILE__, "USER_HELPER::SetUserInfo(): 'Invalid month download value'\n"); - } else - { dtData[i] = value; + } + if (!ptr->GetProperties().down.Set(dtData, admin, login, store)) + return true; + } + } + +if ((it = structVal.find("tariff")) != structVal.end()) + { + std::string tariff(xmlrpc_c::value_string(it->second)); + size_t pos = tariff.find('/'); + std::string nextTariff; + if (pos != std::string::npos) + { + nextTariff = tariff.substr(pos + 1); + tariff = tariff.substr(0, pos); + } + + const auto newTariff = tariffs->FindByName(tariff); + if (newTariff) + { + const auto currentTariff = ptr->GetTariff(); + std::string message = currentTariff->TariffChangeIsAllowed(*newTariff, time(NULL)); + if (message.empty()) + { + if (ptr->GetProperties().tariffName.Get() != tariff) + { + if (!ptr->GetProperties().tariffName.Set(tariff, admin, login, store)) + return true; } } - bool res = iter->property.down.Set(dtData, - admin, - login, - &store); - if (!res) + else { - return true; + 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->GetProperties().nextTariff.Get() != nextTariff) + if (!ptr->GetProperties().nextTariff.Set(tariff, admin, login, store)) + return true; } return false;