X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ede91934442fd804d7b818971a44e3ad795cb01f..8e8c6cdddc6af0a1e7ebcd7fa947395b66bf1103:/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 05c16b10..c63edfe0 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -9,11 +9,11 @@ #include #include +#include "stg/version.h" +#include "stg/tariffs.h" +#include "stg/user_property.h" +#include "stg/settings.h" #include "parser.h" -#include "version.h" -#include "tariffs.h" -#include "../../../settings.h" -#include "../../../user_property.h" #define UNAME_LEN (256) //----------------------------------------------------------------------------- @@ -63,13 +63,13 @@ answerList->push_back(""); sprintf(s, "", SERVER_VERSION); answerList->push_back(s); -sprintf(s, "", tariffs->GetTariffsNum()); +sprintf(s, "", (unsigned long long)tariffs->Count()); answerList->push_back(s); sprintf(s, "", 2); answerList->push_back(s); -sprintf(s, "", users->GetUserNum()); +sprintf(s, "", (unsigned long long)users->Count()); answerList->push_back(s); sprintf(s, "", un); @@ -94,11 +94,6 @@ answerList->push_back(""); //----------------------------------------------------------------------------- // GET USER //----------------------------------------------------------------------------- -PARSER_GET_USER::PARSER_GET_USER() -{ - -} -//----------------------------------------------------------------------------- int PARSER_GET_USER::ParseStart(void *, const char *el, const char **attr) { if (strcasecmp(el, "GetUser") == 0) @@ -296,12 +291,6 @@ answerList->push_back(s); //----------------------------------------------------------------------------- // GET USERS //----------------------------------------------------------------------------- -PARSER_GET_USERS::PARSER_GET_USERS() - : lastUserUpdateTime(0), - lastUpdateFound(false) -{ -} -//----------------------------------------------------------------------------- int PARSER_GET_USERS::ParseStart(void *, const char *el, const char ** attr) { /*if (attr && *attr && *(attr+1)) @@ -643,11 +632,6 @@ answerList->push_back(""); //----------------------------------------------------------------------------- // ADD USER //----------------------------------------------------------------------------- -PARSER_ADD_USER::PARSER_ADD_USER() -{ -depth = 0; -} -//----------------------------------------------------------------------------- int PARSER_ADD_USER::ParseStart(void *, const char *el, const char **attr) { depth++; @@ -712,7 +696,7 @@ int PARSER_ADD_USER::CheckUserData() USER_PTR u; if (users->FindByName(login, &u)) { - return users->Add(login, *currAdmin); + return users->Add(login, currAdmin); } return -1; } @@ -720,10 +704,13 @@ return -1; // PARSER CHG USER //----------------------------------------------------------------------------- PARSER_CHG_USER::PARSER_CHG_USER() - : usr(NULL), + : BASE_PARSER(), + usr(NULL), ucr(NULL), upr(NULL), downr(NULL), + cashMsg(), + login(), cashMustBeAdded(false), res(0) { @@ -1019,49 +1006,49 @@ if (users->FindByName(login, &u)) } if (!ucr->ips.res_empty()) - if (!u->GetProperty().ips.Set(ucr->ips.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().ips.Set(ucr->ips.const_data(), currAdmin, login, store)) res = -1; if (!ucr->address.res_empty()) - if (!u->GetProperty().address.Set(ucr->address.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().address.Set(ucr->address.const_data(), currAdmin, login, store)) res = -1; if (!ucr->alwaysOnline.res_empty()) if (!u->GetProperty().alwaysOnline.Set(ucr->alwaysOnline.const_data(), - *currAdmin, login, store)) + currAdmin, login, store)) res = -1; if (!ucr->creditExpire.res_empty()) if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(), - *currAdmin, login, store)) + currAdmin, login, store)) res = -1; if (!ucr->credit.res_empty()) - if (!u->GetProperty().credit.Set(ucr->credit.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().credit.Set(ucr->credit.const_data(), currAdmin, login, store)) res = -1; if (!usr->freeMb.res_empty()) - if (!u->GetProperty().freeMb.Set(usr->freeMb.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().freeMb.Set(usr->freeMb.const_data(), currAdmin, login, store)) res = -1; if (!ucr->disabled.res_empty()) - if (!u->GetProperty().disabled.Set(ucr->disabled.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().disabled.Set(ucr->disabled.const_data(), currAdmin, login, store)) res = -1; if (!ucr->disabledDetailStat.res_empty()) - if (!u->GetProperty().disabledDetailStat.Set(ucr->disabledDetailStat.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().disabledDetailStat.Set(ucr->disabledDetailStat.const_data(), currAdmin, login, store)) res = -1; if (!ucr->email.res_empty()) - if (!u->GetProperty().email.Set(ucr->email.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().email.Set(ucr->email.const_data(), currAdmin, login, store)) res = -1; if (!ucr->group.res_empty()) - if (!u->GetProperty().group.Set(ucr->group.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().group.Set(ucr->group.const_data(), currAdmin, login, store)) res = -1; if (!ucr->note.res_empty()) - if (!u->GetProperty().note.Set(ucr->note.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().note.Set(ucr->note.const_data(), currAdmin, login, store)) res = -1; vector *> userdata; @@ -1080,25 +1067,25 @@ for (int i = 0; i < (int)userdata.size(); i++) { if (!ucr->userdata[i].res_empty()) { - if(!userdata[i]->Set(ucr->userdata[i].const_data(), *currAdmin, login, store)) + if(!userdata[i]->Set(ucr->userdata[i].const_data(), currAdmin, login, store)) res = -1; } } if (!ucr->passive.res_empty()) - if (!u->GetProperty().passive.Set(ucr->passive.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().passive.Set(ucr->passive.const_data(), currAdmin, login, store)) res = -1; if (!ucr->password.res_empty()) - if (!u->GetProperty().password.Set(ucr->password.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().password.Set(ucr->password.const_data(), currAdmin, login, store)) res = -1; if (!ucr->phone.res_empty()) - if (!u->GetProperty().phone.Set(ucr->phone.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().phone.Set(ucr->phone.const_data(), currAdmin, login, store)) res = -1; if (!ucr->realName.res_empty()) - if (!u->GetProperty().realName.Set(ucr->realName.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().realName.Set(ucr->realName.const_data(), currAdmin, login, store)) res = -1; @@ -1109,15 +1096,15 @@ if (!usr->cash.res_empty()) if (cashMustBeAdded) { if (!u->GetProperty().cash.Set(usr->cash.const_data() + u->GetProperty().cash, - *currAdmin, - login, - store, - cashMsg)) + currAdmin, + login, + store, + cashMsg)) res = -1; } else { - if (!u->GetProperty().cash.Set(usr->cash.const_data(), *currAdmin, login, store, cashMsg)) + if (!u->GetProperty().cash.Set(usr->cash.const_data(), currAdmin, login, store, cashMsg)) res = -1; } } @@ -1128,7 +1115,7 @@ if (!ucr->tariffName.res_empty()) { if (tariffs->FindByName(ucr->tariffName.const_data())) { - if (!u->GetProperty().tariffName.Set(ucr->tariffName.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().tariffName.Set(ucr->tariffName.const_data(), currAdmin, login, store)) res = -1; u->ResetNextTariff(); } @@ -1143,7 +1130,7 @@ if (!ucr->nextTariff.res_empty()) { if (tariffs->FindByName(ucr->nextTariff.const_data())) { - if (!u->GetProperty().nextTariff.Set(ucr->nextTariff.const_data(), *currAdmin, login, store)) + if (!u->GetProperty().nextTariff.Set(ucr->nextTariff.const_data(), currAdmin, login, store)) res = -1; } else @@ -1172,20 +1159,20 @@ for (int i = 0; i < DIR_NUM; i++) } if (upCount) - if (!u->GetProperty().up.Set(up, *currAdmin, login, store)) + if (!u->GetProperty().up.Set(up, currAdmin, login, store)) res = -1; if (downCount) - if (!u->GetProperty().down.Set(down, *currAdmin, login, store)) + 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); + 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->GetProperty().up.Set(usr->up.const_data(), currAdmin, login, store); }*/ u->WriteConf(); @@ -1375,7 +1362,7 @@ int PARSER_DEL_USER::ParseEnd(void *, const char *el) if (strcasecmp(el, "DelUser") == 0) { if (!res) - users->Del(u->GetLogin(), *currAdmin); + users->Del(u->GetLogin(), currAdmin); return 0; }