Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser_users.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
index 16054a9cb74211301eb91f28e9843208abb4f63a..e371e45a61964d198d55d75d73a38172cd6a3b03 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -22,13 +22,15 @@
 #include "parser_users.h"
 
 #include "stg/users.h"
 #include "parser_users.h"
 
 #include "stg/users.h"

-#include "stg/tariffs.h"
-#include "stg/user_property.h"
+#include "stg/user.h"

 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"

-#include "stg/common.h"
+#include "stg/tariffs.h"
+#include "stg/tariff.h"
+#include "stg/user_property.h"

 
 #include <cstdio>
 
 #include <cstdio>

+#include <cassert>

 
 using STG::PARSER::GET_USERS;
 using STG::PARSER::GET_USER;
 
 using STG::PARSER::GET_USERS;
 using STG::PARSER::GET_USER;


@@ -37,118 +39,128 @@ using STG::PARSER::DEL_USER;
 using STG::PARSER::CHG_USER;
 using STG::PARSER::CHECK_USER;
 
 using STG::PARSER::CHG_USER;
 using STG::PARSER::CHECK_USER;
 

+const char * GET_USERS::tag  = "GetUsers";
+const char * GET_USER::tag   = "GetUser";
+const char * ADD_USER::tag   = "AddUser";
+const char * CHG_USER::tag   = "SetUser";
+const char * DEL_USER::tag   = "DelUser";
+const char * CHECK_USER::tag = "CheckUser";
+
+using UserPtr = STG::User*;
+using ConstUserPtr = const STG::User*;
+

 namespace
 {
 
 namespace
 {
 

-std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_t lastTime = 0)
+std::string UserToXML(const STG::User & user, bool loginInStart, bool showPass, time_t lastTime = 0)

 {
     std::string answer;
 
     if (loginInStart)
 {
     std::string answer;
 
     if (loginInStart)

-        answer += "<User result=\"ok\">";
+        answer += "<User login=\"" + user.GetLogin() + "\" result=\"ok\">";

     else
     else

-        answer += "<User result=\"ok\" login=\"" + user.GetLogin() + "\">";
+        answer += "<User result=\"ok\">";

 
     answer += "<Login value=\"" + user.GetLogin() + "\"/>";
 
 
     answer += "<Login value=\"" + user.GetLogin() + "\"/>";
 

-    if (user.GetProperty().password.ModificationTime() > lastTime)
+    if (user.GetProperties().password.ModificationTime() > lastTime)

     {
         if (showPass)
     {
         if (showPass)

-            answer += "<Password value=\"" + user.GetProperty().password.Get() + "\" />";
+            answer += "<Password value=\"" + user.GetProperties().password.Get() + "\" />";

         else
             answer += "<Password value=\"++++++\"/>";
     }
 
         else
             answer += "<Password value=\"++++++\"/>";
     }
 

-    if (user.GetProperty().cash.ModificationTime() > lastTime)
-        answer += "<Cash value=\"" + x2str(user.GetProperty().cash.Get()) + "\"/>";
-    if (user.GetProperty().freeMb.ModificationTime() > lastTime)
-        answer += "<FreeMb value=\"" + x2str(user.GetProperty().freeMb.Get()) + "\"/>";
-    if (user.GetProperty().credit.ModificationTime() > lastTime)
-        answer += "<Credit value=\"" + x2str(user.GetProperty().credit.Get()) + "\"/>";
+    if (user.GetProperties().cash.ModificationTime() > lastTime)
+        answer += "<Cash value=\"" + std::to_string(user.GetProperties().cash.Get()) + "\"/>";
+    if (user.GetProperties().freeMb.ModificationTime() > lastTime)
+        answer += "<FreeMb value=\"" + std::to_string(user.GetProperties().freeMb.Get()) + "\"/>";
+    if (user.GetProperties().credit.ModificationTime() > lastTime)
+        answer += "<Credit value=\"" + std::to_string(user.GetProperties().credit.Get()) + "\"/>";

 
 

-    if (user.GetProperty().nextTariff.Get() != "")
+    if (user.GetProperties().nextTariff.Get() != "")

     {
     {

-        if (user.GetProperty().tariffName.ModificationTime() > lastTime ||
-            user.GetProperty().nextTariff.ModificationTime() > lastTime)
-            answer += "<Tariff value=\"" + user.GetProperty().tariffName.Get() + "/" + user.GetProperty().nextTariff.Get() + "\"/>";
+        if (user.GetProperties().tariffName.ModificationTime() > lastTime ||
+            user.GetProperties().nextTariff.ModificationTime() > lastTime)
+            answer += "<Tariff value=\"" + user.GetProperties().tariffName.Get() + "/" + user.GetProperties().nextTariff.Get() + "\"/>";

     }
     else
     {
     }
     else
     {

-        if (user.GetProperty().tariffName.ModificationTime() > lastTime)
-            answer += "<Tariff value=\"" + user.GetProperty().tariffName.Get() + "\"/>";
+        if (user.GetProperties().tariffName.ModificationTime() > lastTime)
+            answer += "<Tariff value=\"" + user.GetProperties().tariffName.Get() + "\"/>";

     }
 
     }
 

-    if (user.GetProperty().note.ModificationTime() > lastTime)
-        answer += "<Note value=\"" + Encode12str(user.GetProperty().note) + "\"/>";
-    if (user.GetProperty().phone.ModificationTime() > lastTime)
-        answer += "<Phone value=\"" + Encode12str(user.GetProperty().phone) + "\"/>";
-    if (user.GetProperty().address.ModificationTime() > lastTime)
-        answer += "<Address value=\"" + Encode12str(user.GetProperty().address) + "\"/>";
-    if (user.GetProperty().email.ModificationTime() > lastTime)
-        answer += "<Email value=\"" + Encode12str(user.GetProperty().email) + "\"/>";
-
-    std::vector<const USER_PROPERTY_LOGGED<std::string> *> 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());
+    if (user.GetProperties().note.ModificationTime() > lastTime)
+        answer += "<Note value=\"" + Encode12str(user.GetProperties().note) + "\"/>";
+    if (user.GetProperties().phone.ModificationTime() > lastTime)
+        answer += "<Phone value=\"" + Encode12str(user.GetProperties().phone) + "\"/>";
+    if (user.GetProperties().address.ModificationTime() > lastTime)
+        answer += "<Address value=\"" + Encode12str(user.GetProperties().address) + "\"/>";
+    if (user.GetProperties().email.ModificationTime() > lastTime)
+        answer += "<Email value=\"" + Encode12str(user.GetProperties().email) + "\"/>";
+
+    std::vector<const STG::UserPropertyLogged<std::string> *> userdata;
+    userdata.push_back(user.GetProperties().userdata0.GetPointer());
+    userdata.push_back(user.GetProperties().userdata1.GetPointer());
+    userdata.push_back(user.GetProperties().userdata2.GetPointer());
+    userdata.push_back(user.GetProperties().userdata3.GetPointer());
+    userdata.push_back(user.GetProperties().userdata4.GetPointer());
+    userdata.push_back(user.GetProperties().userdata5.GetPointer());
+    userdata.push_back(user.GetProperties().userdata6.GetPointer());
+    userdata.push_back(user.GetProperties().userdata7.GetPointer());
+    userdata.push_back(user.GetProperties().userdata8.GetPointer());
+    userdata.push_back(user.GetProperties().userdata9.GetPointer());

 
     for (size_t i = 0; i < userdata.size(); i++)
         if (userdata[i]->ModificationTime() > lastTime)
 
     for (size_t i = 0; i < userdata.size(); i++)
         if (userdata[i]->ModificationTime() > lastTime)

-            answer += "<UserData" + x2str(i) + " value=\"" + Encode12str(userdata[i]->Get()) + "\" />";
+            answer += "<UserData" + std::to_string(i) + " value=\"" + Encode12str(userdata[i]->Get()) + "\" />";

 
 

-    if (user.GetProperty().realName.ModificationTime() > lastTime)
-        answer += "<Name value=\"" + Encode12str(user.GetProperty().realName) + "\"/>";
-    if (user.GetProperty().group.ModificationTime() > lastTime)
-        answer += "<Group value=\"" + Encode12str(user.GetProperty().group) + "\"/>";
+    if (user.GetProperties().realName.ModificationTime() > lastTime)
+        answer += "<Name value=\"" + Encode12str(user.GetProperties().realName) + "\"/>";
+    if (user.GetProperties().group.ModificationTime() > lastTime)
+        answer += "<Group value=\"" + Encode12str(user.GetProperties().group) + "\"/>";

     if (user.GetConnectedModificationTime() > lastTime)
         answer += std::string("<Status value=\"") + (user.GetConnected() ? "1" : "0") + "\"/>";
     if (user.GetConnectedModificationTime() > lastTime)
         answer += std::string("<Status value=\"") + (user.GetConnected() ? "1" : "0") + "\"/>";

-    if (user.GetProperty().alwaysOnline.ModificationTime() > lastTime)
-        answer += std::string("<AOnline value=\"") + (user.GetProperty().alwaysOnline.Get() ? "1" : "0") + "\"/>";
+    if (user.GetProperties().alwaysOnline.ModificationTime() > lastTime)
+        answer += std::string("<AOnline value=\"") + (user.GetProperties().alwaysOnline.Get() ? "1" : "0") + "\"/>";

     if (user.GetCurrIPModificationTime() > lastTime)
         answer += "<CurrIP value=\"" + inet_ntostring(user.GetCurrIP()) + "\"/>";
     if (user.GetPingTime() > lastTime)
     if (user.GetCurrIPModificationTime() > lastTime)
         answer += "<CurrIP value=\"" + inet_ntostring(user.GetCurrIP()) + "\"/>";
     if (user.GetPingTime() > lastTime)

-        answer += "<PingTime value=\"" + x2str(user.GetPingTime()) + "\"/>";
-    if (user.GetProperty().ips.ModificationTime() > lastTime)
-        answer += "<IP value=\"" + user.GetProperty().ips.Get().GetIpStr() + "\"/>";
+        answer += "<PingTime value=\"" + std::to_string(user.GetPingTime()) + "\"/>";
+    if (user.GetProperties().ips.ModificationTime() > lastTime)
+        answer += "<IP value=\"" + user.GetProperties().ips.Get().toString() + "\"/>";

 
     answer += "<Traff";
 
     answer += "<Traff";

-    const DIR_TRAFF & upload(user.GetProperty().down.Get());
-    const DIR_TRAFF & download(user.GetProperty().up.Get());
-    if (user.GetProperty().up.ModificationTime() > lastTime)
+    const auto & upload(user.GetProperties().up.Get());
+    const auto & download(user.GetProperties().down.Get());
+    if (user.GetProperties().up.ModificationTime() > lastTime)

         for (size_t j = 0; j < DIR_NUM; j++)
         for (size_t j = 0; j < DIR_NUM; j++)

-            answer += " MU" + x2str(j) + "=\"" + x2str(upload[j]) + "\"";
-    if (user.GetProperty().down.ModificationTime() > lastTime)
+            answer += " MU" + std::to_string(j) + "=\"" + std::to_string(upload[j]) + "\"";
+    if (user.GetProperties().down.ModificationTime() > lastTime)

         for (size_t j = 0; j < DIR_NUM; j++)
         for (size_t j = 0; j < DIR_NUM; j++)

-            answer += " MD" + x2str(j) + "=\"" + x2str(download[j]) + "\"";
+            answer += " MD" + std::to_string(j) + "=\"" + std::to_string(download[j]) + "\"";

     if (user.GetSessionUploadModificationTime() > lastTime)
         for (size_t j = 0; j < DIR_NUM; j++)
     if (user.GetSessionUploadModificationTime() > lastTime)
         for (size_t j = 0; j < DIR_NUM; j++)

-            answer += " SU" + x2str(j) + "=\"" + x2str(user.GetSessionUpload()[j]) + "\"";
+            answer += " SU" + std::to_string(j) + "=\"" + std::to_string(user.GetSessionUpload()[j]) + "\"";

     if (user.GetSessionDownloadModificationTime() > lastTime)
         for (size_t j = 0; j < DIR_NUM; j++)
     if (user.GetSessionDownloadModificationTime() > lastTime)
         for (size_t j = 0; j < DIR_NUM; j++)

-            answer += " SD" + x2str(j) + "=\"" + x2str(user.GetSessionDownload()[j]) + "\"";
+            answer += " SD" + std::to_string(j) + "=\"" + std::to_string(user.GetSessionDownload()[j]) + "\"";

     answer += "/>";
 
     answer += "/>";
 

-    if (user.GetProperty().disabled.ModificationTime() > lastTime)
-        answer += std::string("<Down value=\"") + (user.GetProperty().disabled.Get() ? "1" : "0") + "\"/>";
-    if (user.GetProperty().disabledDetailStat.ModificationTime() > lastTime)
-        answer += std::string("<DisableDetailStat value=\"") + (user.GetProperty().disabledDetailStat.Get() ? "1" : "0") + "\"/>";
-    if (user.GetProperty().passive.ModificationTime() > lastTime)
-        answer += std::string("<Passive value=\"") + (user.GetProperty().passive.Get() ? "1" : "0") + "\"/>";
-    if (user.GetProperty().lastCashAdd.ModificationTime() > lastTime)
-        answer += "<LastCash value=\"" + x2str(user.GetProperty().lastCashAdd.Get()) + "\"/>";
-    if (user.GetProperty().lastCashAddTime.ModificationTime() > lastTime)
-        answer += "<LastTimeCash value=\"" + x2str(user.GetProperty().lastCashAddTime.Get()) + "\"/>";
-    if (user.GetProperty().lastActivityTime.ModificationTime() > lastTime)
-        answer += "<LastActivityTime value=\"" + x2str(user.GetProperty().lastActivityTime.Get()) + "\"/>";
-    if (user.GetProperty().creditExpire.ModificationTime() > lastTime)
-        answer += "<CreditExpire value=\"" + x2str(user.GetProperty().creditExpire.Get()) + "\"/>";
+    if (user.GetProperties().disabled.ModificationTime() > lastTime)
+        answer += std::string("<Down value=\"") + (user.GetProperties().disabled.Get() ? "1" : "0") + "\"/>";
+    if (user.GetProperties().disabledDetailStat.ModificationTime() > lastTime)
+        answer += std::string("<DisableDetailStat value=\"") + (user.GetProperties().disabledDetailStat.Get() ? "1" : "0") + "\"/>";
+    if (user.GetProperties().passive.ModificationTime() > lastTime)
+        answer += std::string("<Passive value=\"") + (user.GetProperties().passive.Get() ? "1" : "0") + "\"/>";
+    if (user.GetProperties().lastCashAdd.ModificationTime() > lastTime)
+        answer += "<LastCash value=\"" + std::to_string(user.GetProperties().lastCashAdd.Get()) + "\"/>";
+    if (user.GetProperties().lastCashAddTime.ModificationTime() > lastTime)
+        answer += "<LastTimeCash value=\"" + std::to_string(user.GetProperties().lastCashAddTime.Get()) + "\"/>";
+    if (user.GetProperties().lastActivityTime.ModificationTime() > lastTime)
+        answer += "<LastActivityTime value=\"" + std::to_string(user.GetProperties().lastActivityTime.Get()) + "\"/>";
+    if (user.GetProperties().creditExpire.ModificationTime() > lastTime)
+        answer += "<CreditExpire value=\"" + std::to_string(user.GetProperties().creditExpire.Get()) + "\"/>";

 
     if (lastTime == 0)
     {
 
     if (lastTime == 0)
     {


@@ -166,41 +178,18 @@ std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_
 
 } // namespace anonymous
 
 
 } // namespace anonymous
 

-int GET_USER::Start(void *, const char * el, const char ** attr)
-{
-    if (strcasecmp(el, tag.c_str()) != 0)
-        return -1;
-
-    if (attr[1] == NULL)
-        return -1;
-
-    login = attr[1];
-    return 0;
-}
-
-void GET_USER::CreateAnswer()
-{
-    CONST_USER_PTR u;
-
-    if (m_users.FindByName(login, &u))
-        answer = "<" + tag + " result=\"error\" reason=\"User not found.\"/>";
-    else
-        answer = UserToXML(*u, false, currAdmin.GetPriv()->userConf || currAdmin.GetPriv()->userPasswd);
-}
-

 int GET_USERS::Start(void *, const char * el, const char ** attr)
 {
 int GET_USERS::Start(void *, const char * el, const char ** attr)
 {

-    lastUpdateFound = false;
-    if (strcasecmp(el, tag.c_str()) != 0)
+    if (strcasecmp(el, m_tag.c_str()) != 0)
+    {
+        printfd(__FILE__, "Got wrong tag: '%s' instead of '%s'\n", el, m_tag.c_str());

         return -1;
         return -1;

+    }

 
     while (attr && *attr && *(attr + 1))
     {
         if (strcasecmp(*attr, "LastUpdate") == 0)
 
     while (attr && *attr && *(attr + 1))
     {
         if (strcasecmp(*attr, "LastUpdate") == 0)

-        {
-            if (str2x(*(attr + 1), lastUserUpdateTime) == 0)
-                lastUpdateFound = true;
-        }
+            str2x(*(attr + 1), m_lastUserUpdateTime);

         ++attr;
     }
 
         ++attr;
     }
 


@@ -210,159 +199,126 @@ int GET_USERS::Start(void *, const char * el, const char ** attr)
 void GET_USERS::CreateAnswer()
 {
     int h = m_users.OpenSearch();
 void GET_USERS::CreateAnswer()
 {
     int h = m_users.OpenSearch();

-    if (!h)
-    {
-        printfd(__FILE__, "m_users.OpenSearch() error\n");
-        return;
-    }
+    assert(h);

 
 

-    if (lastUpdateFound)
-        answer = "<" + tag + " LastUpdate=\"" + x2str(time(NULL)) + "\">";
+    if (m_lastUserUpdateTime > 0)
+        m_answer = "<Users LastUpdate=\"" + std::to_string(time(NULL)) + "\">";

     else
     else

-        answer = GetOpenTag();
+        m_answer = "<Users>";

 
 

-    USER_PTR u;
+    UserPtr u;

 
     while (m_users.SearchNext(h, &u) == 0)
 
     while (m_users.SearchNext(h, &u) == 0)

-        answer += UserToXML(*u, true, currAdmin.GetPriv()->userConf || currAdmin.GetPriv()->userPasswd, lastUserUpdateTime);
+        m_answer += UserToXML(*u, true, m_currAdmin.priv().userConf || m_currAdmin.priv().userPasswd, m_lastUserUpdateTime);

 
     m_users.CloseSearch(h);
 
 
     m_users.CloseSearch(h);
 

-    answer += GetCloseTag();
+    m_answer += "</Users>";
+}
+
+int GET_USER::Start(void *, const char * el, const char ** attr)
+{
+    if (strcasecmp(el, m_tag.c_str()) != 0)
+        return -1;
+
+    if (attr[1] == NULL)
+        return -1;
+
+    m_login = attr[1];
+    return 0;
+}
+
+void GET_USER::CreateAnswer()
+{
+    ConstUserPtr u;
+
+    if (m_users.FindByName(m_login, &u))
+        m_answer = "<User result=\"error\" reason=\"User not found.\"/>";
+    else
+        m_answer = UserToXML(*u, false, m_currAdmin.priv().userConf || m_currAdmin.priv().userPasswd);

 }
 
 int ADD_USER::Start(void *, const char * el, const char ** attr)
 {
 }
 
 int ADD_USER::Start(void *, const char * el, const char ** attr)
 {

-    depth++;
+    m_depth++;

 
 

-    if (depth == 1)
+    if (m_depth == 1)

     {
     {

-        if (strcasecmp(el, tag.c_str()) == 0)
+        if (strcasecmp(el, m_tag.c_str()) == 0)

             return 0;
     }
     else
     {
         if (strcasecmp(el, "login") == 0)
         {
             return 0;
     }
     else
     {
         if (strcasecmp(el, "login") == 0)
         {

-            login = attr[1];
+            m_login = attr[1];

             return 0;
         }
     }
     return -1;
 }
 
             return 0;
         }
     }
     return -1;
 }
 

-int ADD_USER::End(void *, const char *el)
-{
-    if (depth == 1)
-    {
-        if (strcasecmp(el, tag.c_str()) == 0)
-            return -1;
-        CreateAnswer();
-    }
-
-    --depth;
-    return 0;
-}
-

 void ADD_USER::CreateAnswer()
 {
 void ADD_USER::CreateAnswer()
 {

-    if (CheckUserData() == 0)
-        answer = "<" + tag + " result=\"ok\"/>";
+    if (m_users.Exists(m_login))
+        m_answer = "<" + m_tag + " result=\"error\" reason=\"User '" + m_login + "' exists.\"/>";
+    else if (m_users.Add(m_login, &m_currAdmin) == 0)
+        m_answer = "<" + m_tag + " result=\"ok\"/>";

     else
     else

-        answer = "<" + tag + " result=\"error\" reason=\"Access denied\"/>";
-}
-
-int ADD_USER::CheckUserData()
-{
-    USER_PTR u;
-    if (m_users.FindByName(login, &u))
-        return m_users.Add(login, &currAdmin);
-
-    return -1;
-}
-
-CHG_USER::CHG_USER(const ADMIN & admin, USERS & users, const TARIFFS & tariffs)
-    : BASE_PARSER(admin, "SetUser"),
-      m_users(users),
-      m_tariffs(tariffs),
-      usr(new USER_STAT_RES),
-      ucr(new USER_CONF_RES),
-      upr(new RESETABLE<uint64_t>[DIR_NUM]),
-      downr(new RESETABLE<uint64_t>[DIR_NUM]),
-      cashMustBeAdded(false),
-      res(0)
-{
-}
-
-CHG_USER::~CHG_USER()
-{
-    delete usr;
-    delete ucr;
-    delete[] upr;
-    delete[] downr;
+        m_answer = "<" + m_tag + " result=\"error\" reason=\"Access denied\"/>";

 }
 
 int CHG_USER::Start(void *, const char * el, const char ** attr)
 {
 }
 
 int CHG_USER::Start(void *, const char * el, const char ** attr)
 {

-    depth++;
+    m_depth++;

 
 

-    if (depth == 1)
+    if (m_depth == 1)

     {
     {

-        if (strcasecmp(el, tag.c_str()) == 0)
+        if (strcasecmp(el, m_tag.c_str()) == 0)

             return 0;
     }
     else
     {
         if (strcasecmp(el, "login") == 0)
         {
             return 0;
     }
     else
     {
         if (strcasecmp(el, "login") == 0)
         {

-            login = attr[1];
+            m_login = attr[1];

             return 0;
         }
 
         if (strcasecmp(el, "ip") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "ip") == 0)
         {

-            try
-            {
-                ucr->ips = StrToIPS(attr[1]);
-            }
-            catch (...)
-            {
-                printfd(__FILE__, "StrToIPS Error!\n");
-            }
+            m_ucr.ips = UserIPs::parse(attr[1]);
+            return 0;

         }
 
         if (strcasecmp(el, "password") == 0)
         {
         }
 
         if (strcasecmp(el, "password") == 0)
         {

-            ucr->password = attr[1];
+            m_ucr.password = attr[1];

             return 0;
         }
 
         if (strcasecmp(el, "address") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "address") == 0)
         {

-            ucr->address = Decode21str(attr[1]);
+            m_ucr.address = Decode21str(attr[1]);

             return 0;
         }
 
         if (strcasecmp(el, "aonline") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "aonline") == 0)
         {

-            ucr->alwaysOnline = (*(attr[1]) != '0');
+            m_ucr.alwaysOnline = (*(attr[1]) != '0');

             return 0;
         }
 
         if (strcasecmp(el, "cash") == 0)
         {
             if (attr[2] && (strcasecmp(attr[2], "msg") == 0))
             return 0;
         }
 
         if (strcasecmp(el, "cash") == 0)
         {
             if (attr[2] && (strcasecmp(attr[2], "msg") == 0))

-                cashMsg = Decode21str(attr[3]);
+                m_cashMsg = Decode21str(attr[3]);

 
 

-            double cash;
+            double cash = 0;

             if (strtodouble2(attr[1], cash) == 0)
             if (strtodouble2(attr[1], cash) == 0)

-                usr->cash = cash;
-
-            if (strcasecmp(attr[0], "set") == 0)
-                cashMustBeAdded = false;
+                m_usr.cash = cash;

 
 

-            if (strcasecmp(attr[0], "add") == 0)
-                cashMustBeAdded = true;
+            m_cashMustBeAdded = (strcasecmp(attr[0], "add") == 0);

 
             return 0;
         }
 
             return 0;
         }


@@ -371,24 +327,24 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
         {
             long int creditExpire = 0;
             if (str2x(attr[1], creditExpire) == 0)
         {
             long int creditExpire = 0;
             if (str2x(attr[1], creditExpire) == 0)

-                ucr->creditExpire = (time_t)creditExpire;
+                m_ucr.creditExpire = (time_t)creditExpire;

 
             return 0;
         }
 
         if (strcasecmp(el, "credit") == 0)
         {
 
             return 0;
         }
 
         if (strcasecmp(el, "credit") == 0)
         {

-            double credit;
+            double credit = 0;

             if (strtodouble2(attr[1], credit) == 0)
             if (strtodouble2(attr[1], credit) == 0)

-                ucr->credit = credit;
+                m_ucr.credit = credit;

             return 0;
         }
 
         if (strcasecmp(el, "freemb") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "freemb") == 0)
         {

-            double freeMb;
+            double freeMb = 0;

             if (strtodouble2(attr[1], freeMb) == 0)
             if (strtodouble2(attr[1], freeMb) == 0)

-                usr->freeMb = freeMb;
+                m_usr.freeMb = freeMb;

             return 0;
         }
 
             return 0;
         }
 


@@ -396,7 +352,7 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
         {
             int down = 0;
             if (str2x(attr[1], down) == 0)
         {
             int down = 0;
             if (str2x(attr[1], down) == 0)

-                ucr->disabled = down;
+                m_ucr.disabled = down;

             return 0;
         }
 
             return 0;
         }
 


@@ -404,13 +360,13 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
         {
             int disabledDetailStat = 0;
             if (str2x(attr[1], disabledDetailStat) == 0)
         {
             int disabledDetailStat = 0;
             if (str2x(attr[1], disabledDetailStat) == 0)

-                ucr->disabledDetailStat = disabledDetailStat;
+                m_ucr.disabledDetailStat = disabledDetailStat;

             return 0;
         }
 
         if (strcasecmp(el, "email") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "email") == 0)
         {

-            ucr->email = Decode21str(attr[1]);
+            m_ucr.email = Decode21str(attr[1]);

             return 0;
         }
 
             return 0;
         }
 


@@ -420,20 +376,20 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
             sprintf(name, "userdata%d", i);
             if (strcasecmp(el, name) == 0)
             {
             sprintf(name, "userdata%d", i);
             if (strcasecmp(el, name) == 0)
             {

-                ucr->userdata[i] = Decode21str(attr[1]);
+                m_ucr.userdata[i] = Decode21str(attr[1]);

                 return 0;
             }
         }
 
         if (strcasecmp(el, "group") == 0)
         {
                 return 0;
             }
         }
 
         if (strcasecmp(el, "group") == 0)
         {

-            ucr->group = Decode21str(attr[1]);
+            m_ucr.group = Decode21str(attr[1]);

             return 0;
         }
 
         if (strcasecmp(el, "note") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "note") == 0)
         {

-            ucr->note = Decode21str(attr[1]);
+            m_ucr.note = Decode21str(attr[1]);

             return 0;
         }
 
             return 0;
         }
 


@@ -441,19 +397,19 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
         {
             int passive = 0;
             if (str2x(attr[1], passive) == 0)
         {
             int passive = 0;
             if (str2x(attr[1], passive) == 0)

-                ucr->passive = passive;
+                m_ucr.passive = passive;

             return 0;
         }
 
         if (strcasecmp(el, "phone") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "phone") == 0)
         {

-            ucr->phone = Decode21str(attr[1]);
+            m_ucr.phone = Decode21str(attr[1]);

             return 0;
         }
 
         if (strcasecmp(el, "Name") == 0)
         {
             return 0;
         }
 
         if (strcasecmp(el, "Name") == 0)
         {

-            ucr->realName = Decode21str(attr[1]);
+            m_ucr.realName = Decode21str(attr[1]);

             return 0;
         }
 
             return 0;
         }
 


@@ -468,13 +424,13 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
                 {
                     uint64_t t = 0;
                     str2x(attr[j + 1], t);
                 {
                     uint64_t t = 0;
                     str2x(attr[j + 1], t);

-                    downr[dir] = t;
+                    m_downr[dir] = t;

                 }
                 if (strncasecmp(attr[j], "mu", 2) == 0)
                 {
                     uint64_t t = 0;
                     str2x(attr[j + 1], t);
                 }
                 if (strncasecmp(attr[j], "mu", 2) == 0)
                 {
                     uint64_t t = 0;
                     str2x(attr[j + 1], t);

-                    upr[dir] = t;
+                    m_upr[dir] = t;

                 }
                 j += 2;
             }
                 }
                 j += 2;
             }


@@ -484,10 +440,10 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
         if (strcasecmp(el, "tariff") == 0)
         {
             if (strcasecmp(attr[0], "now") == 0)
         if (strcasecmp(el, "tariff") == 0)
         {
             if (strcasecmp(attr[0], "now") == 0)

-                ucr->tariffName = attr[1];
+                m_ucr.tariffName = attr[1];

 
             if (strcasecmp(attr[0], "delayed") == 0)
 
             if (strcasecmp(attr[0], "delayed") == 0)

-                ucr->nextTariff = attr[1];
+                m_ucr.nextTariff = attr[1];

 
             return 0;
         }
 
             return 0;
         }


@@ -495,225 +451,216 @@ int CHG_USER::Start(void *, const char * el, const char ** attr)
     return -1;
 }
 
     return -1;
 }
 

-int CHG_USER::End(void *, const char *el)
-{
-    if (depth == 1)
-    {
-        if (strcasecmp(el, tag.c_str()) != 0)
-            return -1;
-
-        ApplyChanges();
-        CreateAnswer();
-    }
-
-    depth--;
-    return 0;
-}
-

 void CHG_USER::CreateAnswer()
 {
 void CHG_USER::CreateAnswer()
 {

-    if (res == 0)
-        answer = "<" + tag + " result=\"ok\"/>";
+    if (ApplyChanges() == 0)
+        m_answer = "<" + m_tag + " result=\"ok\"/>";

     else
     else

-        answer = "<" + tag + " result=\"error\"/>";
+        m_answer = "<" + m_tag + " result=\"error\"/>";

 }
 
 int CHG_USER::ApplyChanges()
 {
     printfd(__FILE__, "PARSER_CHG_USER::ApplyChanges()\n");
 }
 
 int CHG_USER::ApplyChanges()
 {
     printfd(__FILE__, "PARSER_CHG_USER::ApplyChanges()\n");

-    USER_PTR u;
+    UserPtr u;

 
 

-    res = 0;
-    if (m_users.FindByName(login, &u))
-    {
-        res = -1;
+    if (m_users.FindByName(m_login, &u))

         return -1;
         return -1;

-    }

 
     bool check = false;
 
     bool check = false;

-    bool alwaysOnline = u->GetProperty().alwaysOnline;
-    if (!ucr->alwaysOnline.empty())
+    bool alwaysOnline = u->GetProperties().alwaysOnline;
+    if (!m_ucr.alwaysOnline.empty())

     {
         check = true;
     {
         check = true;

-        alwaysOnline = ucr->alwaysOnline.const_data();
+        alwaysOnline = m_ucr.alwaysOnline.const_data();

     }
     }

-    bool onlyOneIP = u->GetProperty().ips.ConstData().OnlyOneIP();
-    if (!ucr->ips.empty())
+    bool onlyOneIP = u->GetProperties().ips.ConstData().onlyOneIP();
+    if (!m_ucr.ips.empty())

     {
         check = true;
     {
         check = true;

-        onlyOneIP = ucr->ips.const_data().OnlyOneIP();
+        onlyOneIP = m_ucr.ips.const_data().onlyOneIP();

     }
 
     if (check && alwaysOnline && !onlyOneIP)
     {
         printfd(__FILE__, "Requested change leads to a forbidden state: AlwaysOnline with multiple IP's\n");
     }
 
     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;
+        PluginLogger::get("conf_sg")("%s Requested change leads to a forbidden state: AlwaysOnline with multiple IP's", m_currAdmin.logStr().c_str());

         return -1;
     }
 
         return -1;
     }
 

-    for (size_t i = 0; i < ucr->ips.const_data().Count(); ++i)
+    for (size_t i = 0; i < m_ucr.ips.const_data().count(); ++i)

     {
     {

-        CONST_USER_PTR user;
-        uint32_t ip = ucr->ips.const_data().operator[](i).ip;
-        if (m_users.IsIPInUse(ip, login, &user))
+        ConstUserPtr user;
+        uint32_t ip = m_ucr.ips.const_data().operator[](i).ip;
+        if (m_users.IsIPInUse(ip, m_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;
+            printfd(__FILE__, "Trying to assign an IP %s to '%s' that is already in use by '%s'\n", inet_ntostring(ip).c_str(), m_login.c_str(), user->GetLogin().c_str());
+            PluginLogger::get("conf_sg")("%s trying to assign an IP %s to '%s' that is currently in use by '%s'", m_currAdmin.logStr().c_str(), inet_ntostring(ip).c_str(), m_login.c_str(), user->GetLogin().c_str());

             return -1;
         }
     }
 
             return -1;
         }
     }
 

-    if (!ucr->ips.empty())
-        if (!u->GetProperty().ips.Set(ucr->ips.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->alwaysOnline.empty())
-        if (!u->GetProperty().alwaysOnline.Set(ucr->alwaysOnline.const_data(),
-                                          &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->address.empty())
-        if (!u->GetProperty().address.Set(ucr->address.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->creditExpire.empty())
-        if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(),
-                                          &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->credit.empty())
-        if (!u->GetProperty().credit.Set(ucr->credit.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!usr->freeMb.empty())
-        if (!u->GetProperty().freeMb.Set(usr->freeMb.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->disabled.empty())
-        if (!u->GetProperty().disabled.Set(ucr->disabled.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->disabledDetailStat.empty())
-        if (!u->GetProperty().disabledDetailStat.Set(ucr->disabledDetailStat.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->email.empty())
-        if (!u->GetProperty().email.Set(ucr->email.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->group.empty())
-        if (!u->GetProperty().group.Set(ucr->group.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    if (!ucr->note.empty())
-        if (!u->GetProperty().note.Set(ucr->note.const_data(), &currAdmin, login, store))
-            res = -1;
-
-    std::vector<USER_PROPERTY_LOGGED<std::string> *> 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());
+    if (!m_ucr.ips.empty())
+        if (!u->GetProperties().ips.Set(m_ucr.ips.const_data(), m_currAdmin, m_login, m_store))
+            return -1;

 
 

-    for (int i = 0; i < (int)userdata.size(); i++)
-        if (!ucr->userdata[i].empty())
-            if(!userdata[i]->Set(ucr->userdata[i].const_data(), &currAdmin, login, store))
-                res = -1;
+    if (!m_ucr.alwaysOnline.empty())
+        if (!u->GetProperties().alwaysOnline.Set(m_ucr.alwaysOnline.const_data(),
+                                                 m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_ucr.address.empty())
+        if (!u->GetProperties().address.Set(m_ucr.address.const_data(), m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_ucr.creditExpire.empty())
+        if (!u->GetProperties().creditExpire.Set(m_ucr.creditExpire.const_data(),
+                                                 m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_ucr.credit.empty())
+        if (!u->GetProperties().credit.Set(m_ucr.credit.const_data(), m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_usr.freeMb.empty())
+        if (!u->GetProperties().freeMb.Set(m_usr.freeMb.const_data(), m_currAdmin, m_login, m_store))
+            return -1;

 
 

-    if (!ucr->passive.empty())
-        if (!u->GetProperty().passive.Set(ucr->passive.const_data(), &currAdmin, login, store))
-            res = -1;
+    if (!m_ucr.disabled.empty())
+        if (!u->GetProperties().disabled.Set(m_ucr.disabled.const_data(), m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_ucr.disabledDetailStat.empty())
+        if (!u->GetProperties().disabledDetailStat.Set(m_ucr.disabledDetailStat.const_data(), m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_ucr.email.empty())
+        if (!u->GetProperties().email.Set(m_ucr.email.const_data(), m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_ucr.group.empty())
+        if (!u->GetProperties().group.Set(m_ucr.group.const_data(), m_currAdmin, m_login, m_store))
+            return -1;
+
+    if (!m_ucr.note.empty())
+        if (!u->GetProperties().note.Set(m_ucr.note.const_data(), m_currAdmin, m_login, m_store))
+            return -1;
+
+    std::vector<STG::UserPropertyLogged<std::string> *> userdata;
+    userdata.push_back(u->GetProperties().userdata0.GetPointer());
+    userdata.push_back(u->GetProperties().userdata1.GetPointer());
+    userdata.push_back(u->GetProperties().userdata2.GetPointer());
+    userdata.push_back(u->GetProperties().userdata3.GetPointer());
+    userdata.push_back(u->GetProperties().userdata4.GetPointer());
+    userdata.push_back(u->GetProperties().userdata5.GetPointer());
+    userdata.push_back(u->GetProperties().userdata6.GetPointer());
+    userdata.push_back(u->GetProperties().userdata7.GetPointer());
+    userdata.push_back(u->GetProperties().userdata8.GetPointer());
+    userdata.push_back(u->GetProperties().userdata9.GetPointer());
+
+    for (int i = 0; i < (int)userdata.size(); i++)
+        if (!m_ucr.userdata[i].empty())
+            if(!userdata[i]->Set(m_ucr.userdata[i].const_data(), m_currAdmin, m_login, m_store))
+                return -1;

 
 

-    if (!ucr->password.empty())
-        if (!u->GetProperty().password.Set(ucr->password.const_data(), &currAdmin, login, store))
-            res = -1;
+    if (!m_ucr.passive.empty())
+        if (!u->GetProperties().passive.Set(m_ucr.passive.const_data(), m_currAdmin, m_login, m_store))
+            return -1;

 
 

-    if (!ucr->phone.empty())
-        if (!u->GetProperty().phone.Set(ucr->phone.const_data(), &currAdmin, login, store))
-            res = -1;
+    if (!m_ucr.password.empty())
+        if (!u->GetProperties().password.Set(m_ucr.password.const_data(), m_currAdmin, m_login, m_store))
+            return -1;

 
 

-    if (!ucr->realName.empty())
-        if (!u->GetProperty().realName.Set(ucr->realName.const_data(), &currAdmin, login, store))
-            res = -1;
+    if (!m_ucr.phone.empty())
+        if (!u->GetProperties().phone.Set(m_ucr.phone.const_data(), m_currAdmin, m_login, m_store))
+            return -1;

 
 

+    if (!m_ucr.realName.empty())
+        if (!u->GetProperties().realName.Set(m_ucr.realName.const_data(), m_currAdmin, m_login, m_store))
+            return -1;

 
 

-    if (!usr->cash.empty())
-        if (cashMustBeAdded)
+    if (!m_usr.cash.empty())
+    {
+        if (m_cashMustBeAdded)

         {
         {

-            if (!u->GetProperty().cash.Set(usr->cash.const_data() + u->GetProperty().cash,
-                                           &currAdmin,
-                                           login,
-                                           store,
-                                           cashMsg))
-                res = -1;
-            else
-                if (!u->GetProperty().cash.Set(usr->cash.const_data(), &currAdmin, login, store, cashMsg))
-                    res = -1;
+            if (!u->GetProperties().cash.Set(m_usr.cash.const_data() + u->GetProperties().cash,
+                                             m_currAdmin,
+                                             m_login,
+                                             m_store,
+                                             m_cashMsg))
+                return -1;

         }
         }

+        else
+        {
+            if (!u->GetProperties().cash.Set(m_usr.cash.const_data(), m_currAdmin, m_login, m_store, m_cashMsg))
+                return -1;
+        }
+    }

 
 

-
-    if (!ucr->tariffName.empty())
+    if (!m_ucr.tariffName.empty())

     {
     {

-        if (m_tariffs.FindByName(ucr->tariffName.const_data()))
+        const auto newTariff = m_tariffs.FindByName(m_ucr.tariffName.const_data());
+        if (newTariff)

         {
         {

-            if (!u->GetProperty().tariffName.Set(ucr->tariffName.const_data(), &currAdmin, login, store))
-                res = -1;
-            u->ResetNextTariff();
+            const auto tariff = u->GetTariff();
+            std::string message = tariff->TariffChangeIsAllowed(*newTariff, time(NULL));
+            if (message.empty())
+            {
+                if (!u->GetProperties().tariffName.Set(m_ucr.tariffName.const_data(), m_currAdmin, m_login, m_store))
+                    return -1;
+                u->ResetNextTariff();
+            }
+            else
+            {
+                PluginLogger::get("conf_sg")("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
+            }

         }
         else
         {
             //WriteServLog("SetUser: Tariff %s not found", ud.conf.tariffName.c_str());
         }
         else
         {
             //WriteServLog("SetUser: Tariff %s not found", ud.conf.tariffName.c_str());

-            res = -1;
+            return -1;

         }
     }
 
         }
     }
 

-    if (!ucr->nextTariff.empty())
+    if (!m_ucr.nextTariff.empty())

     {
     {

-        if (m_tariffs.FindByName(ucr->nextTariff.const_data()))
+        if (m_tariffs.FindByName(m_ucr.nextTariff.const_data()))

         {
         {

-            if (!u->GetProperty().nextTariff.Set(ucr->nextTariff.const_data(), &currAdmin, login, store))
-                res = -1;
+            if (!u->GetProperties().nextTariff.Set(m_ucr.nextTariff.const_data(), m_currAdmin, m_login, m_store))
+                return -1;

         }
         else
         {
             //WriteServLog("SetUser: Tariff %s not found", ud.conf.tariffName.c_str());
         }
         else
         {
             //WriteServLog("SetUser: Tariff %s not found", ud.conf.tariffName.c_str());

-            res = -1;
+            return -1;

         }
     }
 
         }
     }
 

-    DIR_TRAFF up = u->GetProperty().up;
-    DIR_TRAFF down = u->GetProperty().down;
+    auto up = u->GetProperties().up.get();
+    auto down = u->GetProperties().down.get();

     int upCount = 0;
     int downCount = 0;
     for (int i = 0; i < DIR_NUM; i++)
     {
     int upCount = 0;
     int downCount = 0;
     for (int i = 0; i < DIR_NUM; i++)
     {

-        if (!upr[i].empty())
+        if (!m_upr[i].empty())

         {
         {

-            up[i] = upr[i].data();
+            up[i] = m_upr[i].data();

             upCount++;
         }
             upCount++;
         }

-        if (!downr[i].empty())
+        if (!m_downr[i].empty())

         {
         {

-            down[i] = downr[i].data();
+            down[i] = m_downr[i].data();

             downCount++;
         }
     }
 
     if (upCount)
             downCount++;
         }
     }
 
     if (upCount)

-        if (!u->GetProperty().up.Set(up, &currAdmin, login, store))
-            res = -1;
+        if (!u->GetProperties().up.Set(up, m_currAdmin, m_login, m_store))
+            return -1;

 
     if (downCount)
 
     if (downCount)

-        if (!u->GetProperty().down.Set(down, &currAdmin, login, store))
-            res = -1;
+        if (!u->GetProperties().down.Set(down, m_currAdmin, m_login, m_store))
+            return -1;

 
     u->WriteConf();
     u->WriteStat();
 
     u->WriteConf();
     u->WriteStat();


@@ -724,7 +671,7 @@ int CHG_USER::ApplyChanges()
 int DEL_USER::Start(void *, const char *el, const char **attr)
 {
     res = 0;
 int DEL_USER::Start(void *, const char *el, const char **attr)
 {
     res = 0;

-    if (strcasecmp(el, tag.c_str()) == 0)
+    if (strcasecmp(el, m_tag.c_str()) == 0)

     {
         if (attr[0] == NULL || attr[1] == NULL)
         {
     {
         if (attr[0] == NULL || attr[1] == NULL)
         {


@@ -747,10 +694,10 @@ int DEL_USER::Start(void *, const char *el, const char **attr)
 
 int DEL_USER::End(void *, const char *el)
 {
 
 int DEL_USER::End(void *, const char *el)
 {

-    if (strcasecmp(el, tag.c_str()) == 0)
+    if (strcasecmp(el, m_tag.c_str()) == 0)

     {
         if (!res)
     {
         if (!res)

-            m_users.Del(u->GetLogin(), &currAdmin);
+            m_users.Del(u->GetLogin(), &m_currAdmin);

 
         return 0;
     }
 
         return 0;
     }


@@ -760,14 +707,14 @@ int DEL_USER::End(void *, const char *el)
 void DEL_USER::CreateAnswer()
 {
     if (res)
 void DEL_USER::CreateAnswer()
 {
     if (res)

-        answer = "<" + tag + " value=\"error\" reason=\"User not found\"/>";
+        m_answer = "<" + m_tag + " value=\"error\" reason=\"User not found\"/>";

     else
     else

-        answer = "<" + tag + " value=\"ok\"/>";
+        m_answer = "<" + m_tag + " value=\"ok\"/>";

 }
 
 int CHECK_USER::Start(void *, const char *el, const char **attr)
 {
 }
 
 int CHECK_USER::Start(void *, const char *el, const char **attr)
 {

-    if (strcasecmp(el, tag.c_str()) == 0)
+    if (strcasecmp(el, m_tag.c_str()) == 0)

     {
         if (attr[0] == NULL || attr[1] == NULL ||
             attr[2] == NULL || attr[3] == NULL)
     {
         if (attr[0] == NULL || attr[1] == NULL ||
             attr[2] == NULL || attr[3] == NULL)


@@ -777,7 +724,7 @@ int CHECK_USER::Start(void *, const char *el, const char **attr)
             return 0;
         }
 
             return 0;
         }
 

-        CONST_USER_PTR user;
+        ConstUserPtr user;

         if (m_users.FindByName(attr[1], &user))
         {
             CreateAnswer("User not found.");
         if (m_users.FindByName(attr[1], &user))
         {
             CreateAnswer("User not found.");


@@ -785,7 +732,7 @@ int CHECK_USER::Start(void *, const char *el, const char **attr)
             return 0;
         }
 
             return 0;
         }
 

-        if (strcmp(user->GetProperty().password.Get().c_str(), attr[3]))
+        if (strcmp(user->GetProperties().password.Get().c_str(), attr[3]))

         {
             CreateAnswer("Wrong password.");
             printfd(__FILE__, "PARSER_CHECK_USER - passwd err\n");
         {
             CreateAnswer("Wrong password.");
             printfd(__FILE__, "PARSER_CHECK_USER - passwd err\n");


@@ -800,7 +747,7 @@ int CHECK_USER::Start(void *, const char *el, const char **attr)
 
 int CHECK_USER::End(void *, const char *el)
 {
 
 int CHECK_USER::End(void *, const char *el)
 {

-    if (strcasecmp(el, tag.c_str()) == 0)
+    if (strcasecmp(el, m_tag.c_str()) == 0)

         return 0;
     return -1;
 }
         return 0;
     return -1;
 }


@@ -808,7 +755,7 @@ int CHECK_USER::End(void *, const char *el)
 void CHECK_USER::CreateAnswer(const char * error)
 {
     if (error)
 void CHECK_USER::CreateAnswer(const char * error)
 {
     if (error)

-        answer = "<" + tag + " value=\"Err\" reason=\"" + error + "\"/>";
+        m_answer = "<" + m_tag + " value=\"Err\" reason=\"" + error + "\"/>";

     else
     else

-        answer = "<" + tag + " value=\"Ok\"/>";
+        m_answer = "<" + m_tag + " value=\"Ok\"/>";

 }
 }