X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/198f8204d13f3f0661233d910f474775a68a7337..dd1e2e08e0cf4010c4e2d12c229f1698322102d2:/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 431d17f3..a7c79c00 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -133,8 +133,7 @@ answerList->erase(answerList->begin(), answerList->end()); if (users->FindByName(login, &u)) { - s = ""; - answerList->push_back(s); + answerList->push_back(""); return; } @@ -943,8 +942,6 @@ else } j+=2; } - usr->down = dtd; - usr->up = dtu; return 0; } @@ -1016,13 +1013,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(); @@ -1049,49 +1046,49 @@ for (size_t i = 0; i < ucr->ips.const_data().Count(); ++i) } } -if (!ucr->ips.res_empty()) +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; @@ -1109,31 +1106,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) { @@ -1155,7 +1152,7 @@ if (!usr->cash.res_empty()) } -if (!ucr->tariffName.res_empty()) +if (!ucr->tariffName.empty()) { if (tariffs->FindByName(ucr->tariffName.const_data())) { @@ -1170,7 +1167,7 @@ if (!ucr->tariffName.res_empty()) } } -if (!ucr->nextTariff.res_empty()) +if (!ucr->nextTariff.empty()) { if (tariffs->FindByName(ucr->nextTariff.const_data())) { @@ -1190,14 +1187,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++; } } @@ -1210,15 +1207,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(); @@ -1363,11 +1351,11 @@ switch (result) break; case res_params_error: printfd(__FILE__, "res_params_error\n"); - answerList->push_back(""); + answerList->push_back(""); break; case res_unknown: printfd(__FILE__, "res_unknown\n"); - answerList->push_back(""); + answerList->push_back(""); break; default: printfd(__FILE__, "res_default\n"); @@ -1421,30 +1409,17 @@ else answerList->push_back(""); } //----------------------------------------------------------------------------- -/*void PARSERDELUSER::CreateAnswer(char * mes) -{ -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - -char str[255]; -sprintf(str, "", mes); -answerList->push_back(str); -}*/ -//----------------------------------------------------------------------------- // CHECK USER // //----------------------------------------------------------------------------- int PARSER_CHECK_USER::ParseStart(void *, const char *el, const char **attr) { -result = false; - if (strcasecmp(el, "CheckUser") == 0) { if (attr[0] == NULL || attr[1] == NULL || attr[2] == NULL || attr[3] == NULL) { - result = false; - CreateAnswer(); + CreateAnswer("Invalid parameters."); printfd(__FILE__, "PARSER_CHECK_USER - attr err\n"); return 0; } @@ -1452,22 +1427,19 @@ if (strcasecmp(el, "CheckUser") == 0) USER_PTR user; if (users->FindByName(attr[1], &user)) { - result = false; - CreateAnswer(); + CreateAnswer("User not found."); printfd(__FILE__, "PARSER_CHECK_USER - login err\n"); return 0; } if (strcmp(user->GetProperty().password.Get().c_str(), attr[3])) { - result = false; - CreateAnswer(); + CreateAnswer("Wrong password."); printfd(__FILE__, "PARSER_CHECK_USER - passwd err\n"); return 0; } - result = true; - CreateAnswer(); + CreateAnswer(NULL); return 0; } return -1; @@ -1482,12 +1454,12 @@ if (strcasecmp(el, "CheckUser") == 0) return -1; } //----------------------------------------------------------------------------- -void PARSER_CHECK_USER::CreateAnswer() +void PARSER_CHECK_USER::CreateAnswer(const char * error) { -if (result) - answerList->push_back(""); +if (error) + answerList->push_back(std::string(""); else - answerList->push_back(""); + answerList->push_back(""); } //----------------------------------------------------------------------------- //-----------------------------------------------------------------------------