X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/f8054f164b10a7b42a5250856ec83dca71ad3545..bcd21b6aaa556a95a9d0b84b5f8328aadb5c3d3d:/projects/stargazer/plugins/configuration/sgconfig/parser.cpp diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp index bfe2f7bc..dd654a1e 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -1,28 +1,176 @@ -#include -#include -#include -#include -#include -#include +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Boris Mikhailenko + */ -#include -#include -#include +#include "parser.h" -#include "stg/version.h" #include "stg/tariffs.h" +#include "stg/admin.h" +#include "stg/users.h" #include "stg/user_property.h" #include "stg/settings.h" #include "stg/logger.h" -#include "parser.h" +#include "stg/version.h" +#include "stg/store.h" + +#include +#include // sprintf + +#include #define UNAME_LEN (256) + +namespace +{ + +std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_t lastTime = 0) +{ +std::string answer; + +if (loginInStart) + answer += ""; +else + answer += ""; + +answer += ""; + +if (user.GetProperty().password.ModificationTime() > lastTime) + { + if (showPass) + answer += ""; + else + answer += ""; + } + +if (user.GetProperty().cash.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().freeMb.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().credit.ModificationTime() > lastTime) + answer += ""; + +if (user.GetProperty().nextTariff.Get() != "") + { + if (user.GetProperty().tariffName.ModificationTime() > lastTime || + user.GetProperty().nextTariff.ModificationTime() > lastTime) + answer += ""; + } +else + { + if (user.GetProperty().tariffName.ModificationTime() > lastTime) + answer += ""; + } + +if (user.GetProperty().note.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().phone.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().address.ModificationTime() > lastTime) + answer += "
"; +if (user.GetProperty().email.ModificationTime() > lastTime) + answer += ""; + +std::vector *> userdata; +userdata.push_back(user.GetProperty().userdata0.GetPointer()); +userdata.push_back(user.GetProperty().userdata1.GetPointer()); +userdata.push_back(user.GetProperty().userdata2.GetPointer()); +userdata.push_back(user.GetProperty().userdata3.GetPointer()); +userdata.push_back(user.GetProperty().userdata4.GetPointer()); +userdata.push_back(user.GetProperty().userdata5.GetPointer()); +userdata.push_back(user.GetProperty().userdata6.GetPointer()); +userdata.push_back(user.GetProperty().userdata7.GetPointer()); +userdata.push_back(user.GetProperty().userdata8.GetPointer()); +userdata.push_back(user.GetProperty().userdata9.GetPointer()); + +for (size_t i = 0; i < userdata.size(); i++) + if (userdata[i]->ModificationTime() > lastTime) + answer += "Get()) + "\" />"; + +if (user.GetProperty().realName.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().group.ModificationTime() > lastTime) + answer += ""; +if (user.GetConnectedModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().alwaysOnline.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetCurrIPModificationTime() > lastTime) + answer += ""; +if (user.GetPingTime() > lastTime) + answer += ""; +if (user.GetProperty().ips.ModificationTime() > lastTime) + answer += ""; + +answer += " lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " MU" + x2str(j) + "=\"" + x2str(upload[j]) + "\""; +if (user.GetProperty().down.ModificationTime() > lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " MD" + x2str(j) + "=\"" + x2str(download[j]) + "\""; +if (user.GetSessionUploadModificationTime() > lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " SU" + x2str(j) + "=\"" + x2str(user.GetSessionUpload()[j]) + "\""; +if (user.GetSessionDownloadModificationTime() > lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " SD" + x2str(j) + "=\"" + x2str(user.GetSessionDownload()[j]) + "\""; +answer += "/>"; + +if (user.GetProperty().disabled.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().disabledDetailStat.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().passive.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().lastCashAdd.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().lastCashAddTime.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().lastActivityTime.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().creditExpire.ModificationTime() > lastTime) + answer += ""; + +if (lastTime == 0) + { + answer += ""; + std::vector list(user.GetAuthorizers()); + for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) + answer += ""; + answer += ""; + } + +answer += ""; + +return answer; +} + +} // namespace anonymous + //----------------------------------------------------------------------------- // GET SERVER INFO //----------------------------------------------------------------------------- int PARSER_GET_SERVER_INFO::ParseStart(void *, const char *el, const char **) { -answerList->erase(answerList->begin(), answerList->end()); +answer.clear(); if (strcasecmp(el, "GetServerInfo") == 0) { return 0; @@ -42,7 +190,6 @@ return -1; //----------------------------------------------------------------------------- void PARSER_GET_SERVER_INFO::CreateAnswer() { -char s[UNAME_LEN + 128]; char un[UNAME_LEN]; struct utsname utsn; @@ -57,40 +204,20 @@ strcat(un, utsn.machine); strcat(un, " "); strcat(un, utsn.nodename); -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); -answerList->push_back(""); - -sprintf(s, "", SERVER_VERSION); -answerList->push_back(s); +answer.clear(); +answer += ""; +answer += std::string(""; +answer += "Count()) + "\"/>"; +answer += ""; +answer += "Count()) + "\"/>"; +answer += std::string(""; +answer += ""; +answer += "GetDayFee()) + "\"/>"; -sprintf(s, "", (unsigned long long)tariffs->Count()); -answerList->push_back(s); - -sprintf(s, "", 2); -answerList->push_back(s); - -sprintf(s, "", (unsigned long long)users->Count()); -answerList->push_back(s); - -sprintf(s, "", un); -answerList->push_back(s); - -sprintf(s, "", DIR_NUM); -answerList->push_back(s); - -sprintf(s, "", settings->GetDayFee()); -answerList->push_back(s); - -for (int i = 0; i< DIR_NUM; i++) - { - string dn2e; - Encode12str(dn2e, settings->GetDirName(i)); - sprintf(s, "", i, dn2e.c_str()); - answerList->push_back(s); - } +for (size_t i = 0; i< DIR_NUM; i++) + answer += "GetDirName(i)) + "\"/>"; -answerList->push_back(""); +answer += ""; } //----------------------------------------------------------------------------- // GET USER @@ -124,170 +251,17 @@ return -1; //----------------------------------------------------------------------------- void PARSER_GET_USER::CreateAnswer() { -string s; -string enc; - USER_PTR u; -answerList->erase(answerList->begin(), answerList->end()); +answer.clear(); if (users->FindByName(login, &u)) { - s = ""; - answerList->push_back(s); + answer = ""; return; } -s = ""; -answerList->push_back(s); - -s = "GetLogin() + "\"/>"; -answerList->push_back(s); - -if (currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd) - s = "GetProperty().password.Get() + "\" />"; -else - s = ""; -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().cash.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().freeMb.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().credit.Get()); -answerList->push_back(s); - -if (u->GetProperty().nextTariff.Get() != "") - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str(), - u->GetProperty().nextTariff.Get().c_str()); - } -else - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str()); - } - -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().note); -s = ""; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().phone); -s = ""; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().address); -s = "
"; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().email); -s = ""; -answerList->push_back(s); - - -vector *> userdata; -userdata.push_back(u->GetProperty().userdata0.GetPointer()); -userdata.push_back(u->GetProperty().userdata1.GetPointer()); -userdata.push_back(u->GetProperty().userdata2.GetPointer()); -userdata.push_back(u->GetProperty().userdata3.GetPointer()); -userdata.push_back(u->GetProperty().userdata4.GetPointer()); -userdata.push_back(u->GetProperty().userdata5.GetPointer()); -userdata.push_back(u->GetProperty().userdata6.GetPointer()); -userdata.push_back(u->GetProperty().userdata7.GetPointer()); -userdata.push_back(u->GetProperty().userdata8.GetPointer()); -userdata.push_back(u->GetProperty().userdata9.GetPointer()); - -string tmpI; -for (unsigned i = 0; i < userdata.size(); i++) - { - Encode12str(enc, userdata[i]->Get()); - s = ""; - answerList->push_back(s); - } - -Encode12str(enc, u->GetProperty().realName); -s = ""; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().group); -s = ""; -answerList->push_back(s); - -strprintf(&s, "", u->GetConnected()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().alwaysOnline.Get()); -answerList->push_back(s); - -strprintf(&s, "", inet_ntostring(u->GetCurrIP()).c_str()); -answerList->push_back(s); - -strprintf(&s, "", u->GetPingTime()); -answerList->push_back(s); - -stringstream sstr; -sstr << u->GetProperty().ips.Get(); -strprintf(&s, "", sstr.str().c_str()); -answerList->push_back(s); - -char * ss; -ss = new char[DIR_NUM*25*4 + 50]; -char st[50]; -sprintf(ss, "GetProperty().down.Get(); -upload = u->GetProperty().up.Get(); - -for (int j = 0; j < DIR_NUM; j++) - { - string s; - x2str(upload[j], s); - sprintf(st, " MU%d=\"%s\"", j, s.c_str()); - strcat(ss, st); - - x2str(download[j], s); - sprintf(st, " MD%d=\"%s\"", j, s.c_str()); - strcat(ss, st); - - sprintf(st, " SU%d=\"0\"", j); - strcat(ss, st); - - sprintf(st, " SD%d=\"0\"", j); - strcat(ss, st); - } -strcat(ss, " />"); -answerList->push_back(ss); -delete[] ss; - -strprintf(&s, "", u->GetProperty().disabled.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().disabledDetailStat.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().passive.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().lastCashAdd.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().lastCashAddTime.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().lastActivityTime.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().creditExpire.Get()); -answerList->push_back(s); - -strprintf(&s, ""); -answerList->push_back(s); +answer = UserToXML(*u, false, currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd); } //----------------------------------------------------------------------------- // GET USERS @@ -340,20 +314,7 @@ return -1; //----------------------------------------------------------------------------- void PARSER_GET_USERS::CreateAnswer() { -answerList->erase(answerList->begin(), answerList->end()); - -string s; -string userStart; -string traffStart; -string traffMiddle; -string traffFinish; -string middle; -string userFinish; - - -string enc; - -USER_PTR u; +answer.clear(); int h = users->OpenSearch(); if (!h) @@ -362,273 +323,20 @@ if (!h) users->CloseSearch(h); return; } -string updateTime; -x2str(time(NULL), updateTime); if (lastUpdateFound) - answerList->push_back(""); + answer += ""; else - answerList->push_back(""); + answer += ""; -while (1) - { - if (users->SearchNext(h, &u)) - { - break; - } - userStart = "GetLogin() + "\">"; - middle = ""; - - if (u->GetProperty().password.ModificationTime() > lastUserUpdateTime) - { - if (currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd) - s = "GetProperty().password.Get() + "\" />"; - else - s = ""; - middle += s; - } - - - if (u->GetProperty().cash.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().cash.Get()); - middle += s; - //printfd(__FILE__, "cash value=\"%f\"\n", u->GetProperty().cash.Get()); - } - - - if (u->GetProperty().freeMb.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().freeMb.Get()); - middle += s; - } - - if (u->GetProperty().credit.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().credit.Get()); - middle += s; - } - - if (u->GetProperty().nextTariff.Get() != "") - { - if (u->GetProperty().tariffName.ModificationTime() > lastUserUpdateTime - || u->GetProperty().nextTariff.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str(), - u->GetProperty().nextTariff.Get().c_str()); - middle += s; - } - } - else - { - if (u->GetProperty().tariffName.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str()); - middle += s; - } - } - - if (u->GetProperty().note.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().note); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().phone.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().phone); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().address.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().address); - strprintf(&s, "
", enc.c_str()); - middle += s; - } - - if (u->GetProperty().email.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().email); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - vector *> userdata; - userdata.push_back(u->GetProperty().userdata0.GetPointer()); - userdata.push_back(u->GetProperty().userdata1.GetPointer()); - userdata.push_back(u->GetProperty().userdata2.GetPointer()); - userdata.push_back(u->GetProperty().userdata3.GetPointer()); - userdata.push_back(u->GetProperty().userdata4.GetPointer()); - userdata.push_back(u->GetProperty().userdata5.GetPointer()); - userdata.push_back(u->GetProperty().userdata6.GetPointer()); - userdata.push_back(u->GetProperty().userdata7.GetPointer()); - userdata.push_back(u->GetProperty().userdata8.GetPointer()); - userdata.push_back(u->GetProperty().userdata9.GetPointer()); - - string tmpI; - for (unsigned i = 0; i < userdata.size(); i++) - { - if (userdata[i]->ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, userdata[i]->Get()); - s = ""; - middle += s; - } - } - - if (u->GetProperty().realName.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().realName); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().group.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().group); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().alwaysOnline.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().alwaysOnline.Get()); - middle += s; - } - - if (u->GetCurrIPModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", inet_ntostring(u->GetCurrIP()).c_str()); - middle += s; - } - - - if (u->GetConnectedModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetConnected()); - middle += s; - } - - if (u->GetPingTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetPingTime()); - middle += s; - } - - if (u->GetProperty().ips.ModificationTime() > lastUserUpdateTime) - { - stringstream sstr; - sstr << u->GetProperty().ips.Get(); - strprintf(&s, "", sstr.str().c_str()); - middle += s; - } - - char st[50]; - traffStart = "GetProperty().down.Get(); - upload = u->GetProperty().up.Get(); - traffMiddle = ""; - - if (u->GetProperty().up.ModificationTime() > lastUserUpdateTime) - { - for (int j = 0; j < DIR_NUM; j++) - { - string s; - x2str(upload[j], s); - sprintf(st, " MU%d=\"%s\" ", j, s.c_str()); - traffMiddle += st; - } - } - - if (u->GetProperty().down.ModificationTime() > lastUserUpdateTime) - { - for (int j = 0; j < DIR_NUM; j++) - { - x2str(download[j], s); - sprintf(st, " MD%d=\"%s\" ", j, s.c_str()); - traffMiddle += st; - } - } - - traffFinish = " />"; - if (traffMiddle.length() > 0) - { - middle += traffStart; - middle += traffMiddle; - middle += traffFinish; - } - - if (u->GetProperty().disabled.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().disabled.Get()); - middle += s; - } - - if (u->GetProperty().disabledDetailStat.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().disabledDetailStat.Get()); - middle += s; - } - - //printfd(__FILE__, ">>>>> %s\n", s.c_str()); - - if (u->GetProperty().passive.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().passive.Get()); - middle += s; - } - - if (u->GetProperty().lastCashAdd.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().lastCashAdd.Get()); - middle += s; - } - - if (u->GetProperty().lastCashAddTime.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().lastCashAddTime.Get()); - middle += s; - } - - - if (u->GetProperty().lastActivityTime.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().lastActivityTime.Get()); - middle += s; - } - - if (u->GetProperty().creditExpire.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().creditExpire.Get()); - middle += s; - } - - - userFinish = ""; - - if (middle.length() > 0) - { - /*printfd(__FILE__, "login: %s\n", u->GetLogin().c_str()); - printfd(__FILE__, "middle: %s\n", middle.c_str());*/ +USER_PTR u; - answerList->push_back(userStart); - answerList->push_back(middle); - answerList->push_back(userFinish); - } - } +while (users->SearchNext(h, &u) == 0) + answer += UserToXML(*u, true, currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd, lastUserUpdateTime); users->CloseSearch(h); -//answerList->push_back(""); - -answerList->push_back(""); +answer += ""; } //----------------------------------------------------------------------------- // ADD USER @@ -679,17 +387,10 @@ depth = 0; //----------------------------------------------------------------------------- void PARSER_ADD_USER::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - if (CheckUserData() == 0) - { - answerList->push_back(""); - } + answer = ""; else - { - answerList->push_back(""); - } + answer = ""; } //----------------------------------------------------------------------------- int PARSER_ADD_USER::CheckUserData() @@ -742,11 +443,11 @@ ucr = new USER_CONF_RES; upr = new RESETABLE[DIR_NUM]; downr = new RESETABLE[DIR_NUM]; -}; +} //----------------------------------------------------------------------------- -string PARSER_CHG_USER::EncChar2String(const char * strEnc) +std::string PARSER_CHG_USER::EncChar2String(const char * strEnc) { -string str; +std::string str; Decode21str(str, strEnc); return str; } @@ -914,13 +615,12 @@ else if (strcasecmp(el, "traff") == 0) { int j = 0; - int dir; DIR_TRAFF dtu; DIR_TRAFF dtd; - unsigned long long t = 0; + uint64_t t = 0; while (attr[j]) { - dir = attr[j][2] - '0'; + int dir = attr[j][2] - '0'; if (strncasecmp(attr[j], "md", 2) == 0) { @@ -936,8 +636,6 @@ else } j+=2; } - usr->down = dtd; - usr->up = dtu; return 0; } @@ -974,22 +672,19 @@ return -1; //----------------------------------------------------------------------------- void PARSER_CHG_USER::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - switch (res) { case 0: - answerList->push_back(""); + answer = ""; break; case -1: - answerList->push_back(""); + answer = ""; break; case -2: - answerList->push_back(""); + answer = ""; break; default: - answerList->push_back(""); + answer = ""; break; } @@ -1009,13 +704,13 @@ if (users->FindByName(login, &u)) bool check = false; bool alwaysOnline = u->GetProperty().alwaysOnline; -if (!ucr->alwaysOnline.res_empty()) +if (!ucr->alwaysOnline.empty()) { check = true; alwaysOnline = ucr->alwaysOnline.const_data(); } bool onlyOneIP = u->GetProperty().ips.ConstData().OnlyOneIP(); -if (!ucr->ips.res_empty()) +if (!ucr->ips.empty()) { check = true; onlyOneIP = ucr->ips.const_data().OnlyOneIP(); @@ -1025,56 +720,70 @@ if (check && alwaysOnline && !onlyOneIP) { printfd(__FILE__, "Requested change leads to a forbidden state: AlwaysOnline with multiple IP's\n"); GetStgLogger()("%s Requested change leads to a forbidden state: AlwaysOnline with multiple IP's", currAdmin->GetLogStr().c_str()); + res = -1; return -1; } -if (!ucr->ips.res_empty()) +for (size_t i = 0; i < ucr->ips.const_data().Count(); ++i) + { + CONST_USER_PTR user; + uint32_t ip = ucr->ips.const_data().operator[](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()); + GetStgLogger()("%s trying to assign an IP %s to '%s' that is currently in use by '%s'", currAdmin->GetLogStr().c_str(), inet_ntostring(ip).c_str(), login.c_str(), user->GetLogin().c_str()); + res = -1; + return -1; + } + } + +if (!ucr->ips.empty()) if (!u->GetProperty().ips.Set(ucr->ips.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->alwaysOnline.res_empty()) +if (!ucr->alwaysOnline.empty()) if (!u->GetProperty().alwaysOnline.Set(ucr->alwaysOnline.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->address.res_empty()) +if (!ucr->address.empty()) if (!u->GetProperty().address.Set(ucr->address.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->creditExpire.res_empty()) +if (!ucr->creditExpire.empty()) if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->credit.res_empty()) +if (!ucr->credit.empty()) if (!u->GetProperty().credit.Set(ucr->credit.const_data(), currAdmin, login, store)) res = -1; -if (!usr->freeMb.res_empty()) +if (!usr->freeMb.empty()) if (!u->GetProperty().freeMb.Set(usr->freeMb.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->disabled.res_empty()) +if (!ucr->disabled.empty()) if (!u->GetProperty().disabled.Set(ucr->disabled.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->disabledDetailStat.res_empty()) +if (!ucr->disabledDetailStat.empty()) if (!u->GetProperty().disabledDetailStat.Set(ucr->disabledDetailStat.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->email.res_empty()) +if (!ucr->email.empty()) if (!u->GetProperty().email.Set(ucr->email.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->group.res_empty()) +if (!ucr->group.empty()) if (!u->GetProperty().group.Set(ucr->group.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->note.res_empty()) +if (!ucr->note.empty()) if (!u->GetProperty().note.Set(ucr->note.const_data(), currAdmin, login, store)) res = -1; -vector *> userdata; +std::vector *> userdata; userdata.push_back(u->GetProperty().userdata0.GetPointer()); userdata.push_back(u->GetProperty().userdata1.GetPointer()); userdata.push_back(u->GetProperty().userdata2.GetPointer()); @@ -1088,31 +797,31 @@ userdata.push_back(u->GetProperty().userdata9.GetPointer()); for (int i = 0; i < (int)userdata.size(); i++) { - if (!ucr->userdata[i].res_empty()) + if (!ucr->userdata[i].empty()) { if(!userdata[i]->Set(ucr->userdata[i].const_data(), currAdmin, login, store)) res = -1; } } -if (!ucr->passive.res_empty()) +if (!ucr->passive.empty()) if (!u->GetProperty().passive.Set(ucr->passive.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->password.res_empty()) +if (!ucr->password.empty()) if (!u->GetProperty().password.Set(ucr->password.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->phone.res_empty()) +if (!ucr->phone.empty()) if (!u->GetProperty().phone.Set(ucr->phone.const_data(), currAdmin, login, store)) res = -1; -if (!ucr->realName.res_empty()) +if (!ucr->realName.empty()) if (!u->GetProperty().realName.Set(ucr->realName.const_data(), currAdmin, login, store)) res = -1; -if (!usr->cash.res_empty()) +if (!usr->cash.empty()) { //if (*currAdmin->GetPriv()->userCash) { @@ -1134,7 +843,7 @@ if (!usr->cash.res_empty()) } -if (!ucr->tariffName.res_empty()) +if (!ucr->tariffName.empty()) { if (tariffs->FindByName(ucr->tariffName.const_data())) { @@ -1149,7 +858,7 @@ if (!ucr->tariffName.res_empty()) } } -if (!ucr->nextTariff.res_empty()) +if (!ucr->nextTariff.empty()) { if (tariffs->FindByName(ucr->nextTariff.const_data())) { @@ -1169,14 +878,14 @@ int upCount = 0; int downCount = 0; for (int i = 0; i < DIR_NUM; i++) { - if (!upr[i].res_empty()) + if (!upr[i].empty()) { - up[i] = upr[i]; + up[i] = upr[i].data(); upCount++; } - if (!downr[i].res_empty()) + if (!downr[i].empty()) { - down[i] = downr[i]; + down[i] = downr[i].data(); downCount++; } } @@ -1189,15 +898,6 @@ if (downCount) if (!u->GetProperty().down.Set(down, currAdmin, login, store)) res = -1; -/*if (!usr->down.res_empty()) - { - u->GetProperty().down.Set(usr->down.const_data(), currAdmin, login, store); - } -if (!usr->up.res_empty()) - { - u->GetProperty().up.Set(usr->up.const_data(), currAdmin, login, store); - }*/ - u->WriteConf(); u->WriteStat(); @@ -1288,7 +988,7 @@ if (strcasecmp(el, "Message") == 0) printfd(__FILE__, "User not found. %s\n", logins[i].c_str()); continue; } - msg.header.creationTime = stgTime; + msg.header.creationTime = static_cast(stgTime); u->AddMessage(&msg); result = res_ok; } @@ -1331,22 +1031,18 @@ return 0; //----------------------------------------------------------------------------- void PARSER_SEND_MESSAGE::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); -//answerList->push_back(""); -// switch (result) { case res_ok: - answerList->push_back(""); + answer = ""; break; case res_params_error: printfd(__FILE__, "res_params_error\n"); - answerList->push_back(""); + answer = ""; break; case res_unknown: printfd(__FILE__, "res_unknown\n"); - answerList->push_back(""); + answer = ""; break; default: printfd(__FILE__, "res_default\n"); @@ -1395,9 +1091,9 @@ return -1; void PARSER_DEL_USER::CreateAnswer() { if (res) - answerList->push_back(""); + answer = ""; else - answerList->push_back(""); + answer = ""; } //----------------------------------------------------------------------------- /*void PARSERDELUSER::CreateAnswer(char * mes) @@ -1463,10 +1159,10 @@ return -1; //----------------------------------------------------------------------------- void PARSER_CHECK_USER::CreateAnswer() { -if (result) - answerList->push_back(""); +if (error) + answer = std::string(""; else - answerList->push_back(""); + answer = ""; } //----------------------------------------------------------------------------- //-----------------------------------------------------------------------------