X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/899b65fa18e88f77d584d79f71592a2b51a632c2..418ecfb85b58d140aa9c786d837b27d79d3187ce:/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp?ds=inline diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp index f596bfbf..c54ae8eb 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp @@ -26,7 +26,6 @@ #include "stg/user_property.h" #include "stg/user_conf.h" #include "stg/user_stat.h" -#include "stg/common.h" #include #include @@ -127,8 +126,8 @@ std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_ answer += ""; answer += " lastTime) for (size_t j = 0; j < DIR_NUM; j++) answer += " MU" + x2str(j) + "=\"" + x2str(upload[j]) + "\""; @@ -575,8 +574,8 @@ int CHG_USER::ApplyChanges() if (!u->GetProperty().realName.Set(m_ucr.realName.const_data(), &m_currAdmin, m_login, &m_store)) return -1; - if (!m_usr.cash.empty()) + { if (m_cashMustBeAdded) { if (!u->GetProperty().cash.Set(m_usr.cash.const_data() + u->GetProperty().cash, @@ -585,11 +584,13 @@ int CHG_USER::ApplyChanges() &m_store, m_cashMsg)) return -1; - else - if (!u->GetProperty().cash.Set(m_usr.cash.const_data(), &m_currAdmin, m_login, &m_store, m_cashMsg)) - return -1; } - + else + { + if (!u->GetProperty().cash.Set(m_usr.cash.const_data(), &m_currAdmin, m_login, &m_store, m_cashMsg)) + return -1; + } + } if (!m_ucr.tariffName.empty()) {