X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/77ba2f5a96084fa2eb6f52c7122b5ef32d326ef6..daded9039931526b36f5794ae7ea4f8536ccbec6:/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 7f10eae4..00711e3d 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp @@ -1,6 +1,10 @@ +#include "stg/tariffs.h" +#include "stg/admin.h" +#include "stg/store.h" +#include "stg/user_ips.h" +#include "stg/common.h" +#include "stg/user_property.h" #include "user_helper.h" - -#include "user_ips.h" #include "utils.h" //------------------------------------------------------------------------------ @@ -13,66 +17,66 @@ 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->GetProperty().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->GetProperty().cash.Get()); +structVal["freemb"] = xmlrpc_c::value_double(ptr->GetProperty().freeMb.Get()); +structVal["credit"] = xmlrpc_c::value_double(ptr->GetProperty().credit.Get()); -if (iter->property.nextTariff.Get() != "") +if (ptr->GetProperty().nextTariff.Get() != "") { structVal["tariff"] = xmlrpc_c::value_string( - iter->property.tariffName.Get() + + ptr->GetProperty().tariffName.Get() + "/" + - iter->property.nextTariff.Get() + ptr->GetProperty().nextTariff.Get() ); } else { - structVal["tariff"] = xmlrpc_c::value_string(iter->property.tariffName.Get()); + structVal["tariff"] = xmlrpc_c::value_string(ptr->GetProperty().tariffName.Get()); } -structVal["note"] = xmlrpc_c::value_string(IconvString(iter->property.note, "KOI8-R", "UTF-8")); +structVal["note"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().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->GetProperty().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->GetProperty().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->GetProperty().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->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"))); 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->GetProperty().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->GetProperty().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->GetProperty().alwaysOnline.Get()); +structVal["currip"] = xmlrpc_c::value_string(inet_ntostring(ptr->GetCurrIP())); +structVal["pingtime"] = xmlrpc_c::value_int(ptr->GetPingTime()); +structVal["ips"] = xmlrpc_c::value_string(ptr->GetProperty().ips.Get().GetIpStr()); std::map traffInfo; std::vector mu(DIR_NUM); @@ -84,10 +88,10 @@ 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(); +download = ptr->GetProperty().down.Get(); +upload = ptr->GetProperty().up.Get(); +sdownload = ptr->GetSessionUpload(); +supload = ptr->GetSessionDownload(); for (int j = 0; j < DIR_NUM; j++) { @@ -109,13 +113,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->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(ptr->GetProperty().lastCashAddTime.Get()); +structVal["lastactivitytime"] = xmlrpc_c::value_int(ptr->GetProperty().lastActivityTime.Get()); +structVal["creditexpire"] = xmlrpc_c::value_int(ptr->GetProperty().creditExpire.Get()); *info = xmlrpc_c::value_struct(structVal); } @@ -123,9 +127,10 @@ structVal["creditexpire"] = xmlrpc_c::value_int(iter->property.creditExpire.Get( //------------------------------------------------------------------------------ bool USER_HELPER::SetUserInfo(const xmlrpc_c::value & info, - const ADMIN & admin, + const ADMIN * admin, const std::string & login, - const BASE_STORE & store) + const STORE & store, + TARIFFS * tariffs) { std::map structVal( static_cast >(xmlrpc_c::value_struct(info)) @@ -135,211 +140,193 @@ std::map::iterator it; if ((it = structVal.find("password")) != structVal.end()) { - bool res = iter->property.password.Set(xmlrpc_c::value_string(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + std::string value(xmlrpc_c::value_string(it->second)); + if (ptr->GetProperty().password.Get() != value) + if (!ptr->GetProperty().password.Set(value, + admin, + login, + &store)) + 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) - { + if (!ptr->GetProperty().ips.Set(ips, + 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->GetProperty().address.Get() != value) + if (!ptr->GetProperty().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->GetProperty().phone.Get() != value) + if (!ptr->GetProperty().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->GetProperty().email.Get() != value) + if (!ptr->GetProperty().email.Set(value, + admin, + login, + &store)) + return true; } if ((it = structVal.find("cash")) != structVal.end()) { - bool res = iter->property.cash.Set(xmlrpc_c::value_double(it->second), - admin, - login, - &store); - if (!res) - { - return true; - } + double value(xmlrpc_c::value_double(it->second)); + if (ptr->GetProperty().cash.Get() != value) + if (!ptr->GetProperty().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->GetProperty().creditExpire.Get() != value) + if (!ptr->GetProperty().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 (ptr->GetProperty().credit.Get() != value) + if (!ptr->GetProperty().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 (ptr->GetProperty().freeMb.Get() != value) + if (!ptr->GetProperty().freeMb.Set(value, + admin, + login, + &store)) + return true; } 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->GetProperty().disabled.Get() != value) + if (!ptr->GetProperty().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; - } + bool value(xmlrpc_c::value_boolean(it->second)); + if (ptr->GetProperty().passive.Get() != value) + if (!ptr->GetProperty().passive.Set(value, + admin, + login, + &store)) + 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->GetProperty().alwaysOnline.Get() != value) + if (!ptr->GetProperty().alwaysOnline.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->GetProperty().disabledDetailStat.Get() != value) + if (!ptr->GetProperty().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->GetProperty().realName.Get() != value) + if (!ptr->GetProperty().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->GetProperty().group.Get() != value) + if (!ptr->GetProperty().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->GetProperty().note.Get() != value) + if (!ptr->GetProperty().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()); + 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 udata( xmlrpc_c::value_array(it->second).vectorValueValue() @@ -347,14 +334,13 @@ 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; } } @@ -365,7 +351,7 @@ if ((it = structVal.find("traff")) != structVal.end()) ); DIR_TRAFF dtData; - dtData = iter->property.up.Get(); + dtData = ptr->GetProperty().up.Get(); if ((it = traff.find("mu")) != traff.end()) { std::vector data(xmlrpc_c::value_array(it->second).vectorValueValue()); @@ -374,24 +360,17 @@ if ((it = structVal.find("traff")) != structVal.end()) { 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->GetProperty().up.Set(dtData, + admin, + login, + &store)) return true; - } } - dtData = iter->property.down.Get(); + dtData = ptr->GetProperty().down.Get(); if ((it = traff.find("md")) != traff.end()) { std::vector data(xmlrpc_c::value_array(it->second).vectorValueValue()); @@ -400,24 +379,46 @@ if ((it = structVal.find("traff")) != structVal.end()) { 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; - } } - bool res = iter->property.down.Set(dtData, - admin, - login, - &store); - if (!res) - { + if (!ptr->GetProperty().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); + } + + if (tariffs->FindByName(tariff)) + if (ptr->GetProperty().tariffName.Get() != tariff) + if (!ptr->GetProperty().tariffName.Set(tariff, + admin, + login, + &store)) + return true; + + if (nextTariff != "" && + tariffs->FindByName(nextTariff)) + if (ptr->GetProperty().nextTariff.Get() != nextTariff) + if (!ptr->GetProperty().nextTariff.Set(tariff, + admin, + login, + &store)) + return true; + } + return false; }