X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4662fe21cd850eb2fecff20c9d93888b50f40245..ccdebbb822ee49f89f3b2e5c0de0510258cddbc5:/projects/stargazer/plugins/configuration/sgconfig/parser.cpp?ds=inline

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index dd654a1e..03717981 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -20,1150 +20,28 @@
 
 #include "parser.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 "stg/version.h"
-#include "stg/store.h"
-
 #include <cstring>
-#include <cstdio> // sprintf
-
-#include <sys/utsname.h>
-
-#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 += "<User result=\"ok\">";
-else
-    answer += "<User result=\"ok\" login=\"" + user.GetLogin() + "\">";
-
-answer += "<Login value=\"" + user.GetLogin() + "\"/>";
-
-if (user.GetProperty().password.ModificationTime() > lastTime)
-    {
-    if (showPass)
-        answer += "<Password value=\"" + user.GetProperty().password.Get() + "\" />";
-    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.GetProperty().nextTariff.Get() != "")
-    {
-    if (user.GetProperty().tariffName.ModificationTime() > lastTime ||
-        user.GetProperty().nextTariff.ModificationTime() > lastTime)
-        answer += "<Tariff value=\"" + user.GetProperty().tariffName.Get() + "/" + user.GetProperty().nextTariff.Get() + "\"/>";
-    }
-else
-    {
-    if (user.GetProperty().tariffName.ModificationTime() > lastTime)
-        answer += "<Tariff value=\"" + user.GetProperty().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());
-
-for (size_t i = 0; i < userdata.size(); i++)
-    if (userdata[i]->ModificationTime() > lastTime)
-        answer += "<UserData" + x2str(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.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.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 += "<Traff";
-const DIR_TRAFF & upload(user.GetProperty().down.Get());
-const DIR_TRAFF & download(user.GetProperty().up.Get());
-if (user.GetProperty().up.ModificationTime() > 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("<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 (lastTime == 0)
-    {
-    answer += "<AuthorizedBy>";
-    std::vector<std::string> list(user.GetAuthorizers());
-    for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
-        answer += "<Auth name=\"" + *it + "\"/>";
-    answer += "</AuthorizedBy>";
-    }
-
-answer += "</User>";
-
-return answer;
-}
-
-} // namespace anonymous
-
-//-----------------------------------------------------------------------------
-//  GET SERVER INFO
-//-----------------------------------------------------------------------------
-int PARSER_GET_SERVER_INFO::ParseStart(void *, const char *el, const char **)
-{
-answer.clear();
-if (strcasecmp(el, "GetServerInfo") == 0)
-    {
-    return 0;
-    }
-return -1;
-}
 //-----------------------------------------------------------------------------
-int PARSER_GET_SERVER_INFO::ParseEnd(void *, const char *el)
-{
-if (strcasecmp(el, "GetServerInfo") == 0)
-    {
-    CreateAnswer();
-    return 0;
-    }
-return -1;
-}
+//  BASE PARSER
 //-----------------------------------------------------------------------------
-void PARSER_GET_SERVER_INFO::CreateAnswer()
+int BASE_PARSER::Start(void *, const char * el, const char **)
 {
-char un[UNAME_LEN];
-struct utsname utsn;
-
-uname(&utsn);
-un[0] = 0;
-
-strcat(un, utsn.sysname);
-strcat(un, " ");
-strcat(un, utsn.release);
-strcat(un, " ");
-strcat(un, utsn.machine);
-strcat(un, " ");
-strcat(un, utsn.nodename);
-
-answer.clear();
-answer += "<ServerInfo>";
-answer += std::string("<version value=\"") + SERVER_VERSION + "\"/>";
-answer += "<tariff_num value=\"" + x2str(tariffs->Count()) + "\"/>";
-answer += "<tariff value=\"2\"/>";
-answer += "<user_num value=\"" + x2str(users->Count()) + "\"/>";
-answer += std::string("<uname value=\"") + un + "\"/>";
-answer += "<dir_num value=\"" + x2str(DIR_NUM) + "\"/>";
-answer += "<day_fee value=\"" + x2str(settings->GetDayFee()) + "\"/>";
-
-for (size_t i = 0; i< DIR_NUM; i++)
-    answer += "<dir_name_" + x2str(i) + " value=\"" + Encode12str(settings->GetDirName(i)) + "\"/>";
-
-answer += "</ServerInfo>";
-}
-//-----------------------------------------------------------------------------
-//  GET USER
-//-----------------------------------------------------------------------------
-int PARSER_GET_USER::ParseStart(void *, const char *el, const char **attr)
-{
-if (strcasecmp(el, "GetUser") == 0)
-    {
-    if (attr[0] && attr[1])
-        login = attr[1];
-    else
-        {
-        //login.clear();
-        login.erase(login.begin(), login.end());
-        return -1;
-        }
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-int PARSER_GET_USER::ParseEnd(void *, const char *el)
-{
-if (strcasecmp(el, "GetUser") == 0)
-    {
-    CreateAnswer();
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-void PARSER_GET_USER::CreateAnswer()
-{
-USER_PTR u;
-
-answer.clear();
-
-if (users->FindByName(login, &u))
-    {
-    answer = "<User result=\"error\" reason=\"User not found.\"/>";
-    return;
-    }
-
-answer = UserToXML(*u, false, currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd);
-}
-//-----------------------------------------------------------------------------
-//  GET USERS
-//-----------------------------------------------------------------------------
-int PARSER_GET_USERS::ParseStart(void *, const char *el, const char ** attr)
-{
-/*if (attr && *attr && *(attr+1))
-    {
-    printfd(__FILE__, "attr=%s %s\n", *attr, *(attr+1));
-    }
-else
-    {
-    printfd(__FILE__, "attr = NULL\n");
-    }*/
-
-lastUpdateFound = false;
-if (strcasecmp(el, "GetUsers") == 0)
-    {
-    while (attr && *attr && *(attr+1))
-        {
-        if (strcasecmp(*attr, "LastUpdate") == 0)
-            {
-            if (str2x(*(attr+1), lastUserUpdateTime) == 0)
-                {
-                //printfd(__FILE__, "lastUserUpdateTime=%d\n", lastUserUpdateTime);
-                lastUpdateFound = true;
-                }
-            else
-                {
-                //printfd(__FILE__, "NO lastUserUpdateTime\n");
-                }
-            }
-        ++attr;
-        }
-
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-int PARSER_GET_USERS::ParseEnd(void *, const char *el)
-{
-if (strcasecmp(el, "GetUsers") == 0)
-    {
-    CreateAnswer();
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-void PARSER_GET_USERS::CreateAnswer()
-{
-answer.clear();
-
-int h = users->OpenSearch();
-if (!h)
-    {
-    printfd(__FILE__, "users->OpenSearch() error\n");
-    users->CloseSearch(h);
-    return;
-    }
-
-if (lastUpdateFound)
-    answer += "<Users LastUpdate=\"" + x2str(time(NULL)) + "\">";
-else
-    answer += "<Users>";
-
-USER_PTR u;
-
-while (users->SearchNext(h, &u) == 0)
-    answer += UserToXML(*u, true, currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd, lastUserUpdateTime);
-
-users->CloseSearch(h);
-
-answer += "</Users>";
-}
-//-----------------------------------------------------------------------------
-//  ADD USER
-//-----------------------------------------------------------------------------
-int PARSER_ADD_USER::ParseStart(void *, const char *el, const char **attr)
-{
-depth++;
-
-if (depth == 1)
-    {
-    if (strcasecmp(el, "AddUser") == 0)
-        {
-        return 0;
-        }
-    }
-else
-    {
-    if (strcasecmp(el, "login") == 0)
-        {
-        login = attr[1];
-        return 0;
-        }
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-int PARSER_ADD_USER::ParseEnd(void *, const char *el)
-{
-if (depth == 1)
-    {
-    if (strcasecmp(el, "AddUser") == 0)
-        {
-        CreateAnswer();
-        depth--;
-        return 0;
-        }
-    }
-
-depth--;
-return -1;
-}
-//-----------------------------------------------------------------------------
-void PARSER_ADD_USER::Reset()
-{
-BASE_PARSER::Reset();
-depth = 0;
-}
-//-----------------------------------------------------------------------------
-void PARSER_ADD_USER::CreateAnswer()
-{
-if (CheckUserData() == 0)
-    answer = "<AddUser result=\"ok\"/>";
-else
-    answer = "<AddUser result=\"error\" reason=\"Access denied\"/>";
-}
-//-----------------------------------------------------------------------------
-int PARSER_ADD_USER::CheckUserData()
-{
-USER_PTR u;
-if (users->FindByName(login, &u))
-    {
-    return users->Add(login, currAdmin);
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-//  PARSER CHG USER
-//-----------------------------------------------------------------------------
-PARSER_CHG_USER::PARSER_CHG_USER()
-    : BASE_PARSER(),
-      usr(NULL),
-      ucr(NULL),
-      upr(NULL),
-      downr(NULL),
-      cashMsg(),
-      login(),
-      cashMustBeAdded(false),
-      res(0)
-{
-Reset();
-}
-//-----------------------------------------------------------------------------
-PARSER_CHG_USER::~PARSER_CHG_USER()
-{
-delete usr;
-delete ucr;
-delete[] upr;
-delete[] downr;
-}
-//-----------------------------------------------------------------------------
-void PARSER_CHG_USER::Reset()
-{
-depth = 0;
-delete usr;
-
-delete ucr;
-
-delete[] upr;
-
-delete[] downr;
-
-usr = new USER_STAT_RES;
-ucr = new USER_CONF_RES;
-
-upr = new RESETABLE<uint64_t>[DIR_NUM];
-downr = new RESETABLE<uint64_t>[DIR_NUM];
-}
-//-----------------------------------------------------------------------------
-std::string PARSER_CHG_USER::EncChar2String(const char * strEnc)
-{
-std::string str;
-Decode21str(str, strEnc);
-return str;
-}
-//-----------------------------------------------------------------------------
-int PARSER_CHG_USER::ParseStart(void *, const char *el, const char **attr)
-{
-depth++;
-
-if (depth == 1)
-    {
-    if (strcasecmp(el, "SetUser") == 0)
-        {
+    if (strcasecmp(el, m_tag.c_str()) == 0)
         return 0;
-        }
-    }
-else
-    {
-    //printfd(__FILE__, "el=%s\n", el);
-    if (strcasecmp(el, "login") == 0)
-        {
-        login = attr[1];
-        return 0;
-        }
-
-    if (strcasecmp(el, "ip") == 0)
-        {
-        try
-            {
-            ucr->ips = StrToIPS(attr[1]);
-            }
-        catch (...)
-            {
-            printfd(__FILE__, "StrToIPS Error!\n");
-            }
-        }
-
-    if (strcasecmp(el, "password") == 0)
-        {
-        ucr->password = attr[1];
-        return 0;
-        }
-
-    if (strcasecmp(el, "address") == 0)
-        {
-        ucr->address = EncChar2String(attr[1]);
-        return 0;
-        }
-
-    if (strcasecmp(el, "aonline") == 0)
-        {
-        ucr->alwaysOnline = (*(attr[1]) != '0');
-        return 0;
-        }
-
-    if (strcasecmp(el, "cash") == 0)
-        {
-        if (attr[2] && (strcasecmp(attr[2], "msg") == 0))
-            {
-            cashMsg = EncChar2String(attr[3]);
-            }
-
-        double cash;
-        if (strtodouble2(attr[1], cash) == 0)
-            usr->cash = cash;
 
-        if (strcasecmp(attr[0], "set") == 0)
-            cashMustBeAdded = false;
-
-        if (strcasecmp(attr[0], "add") == 0)
-            cashMustBeAdded = true;
-
-        return 0;
-        }
-
-    if (strcasecmp(el, "CreditExpire") == 0)
-        {
-        long int creditExpire = 0;
-        if (str2x(attr[1], creditExpire) == 0)
-            ucr->creditExpire = (time_t)creditExpire;
-
-        return 0;
-        }
-
-    if (strcasecmp(el, "credit") == 0)
-        {
-        double credit;
-        if (strtodouble2(attr[1], credit) == 0)
-            ucr->credit = credit;
-        return 0;
-        }
-
-    if (strcasecmp(el, "freemb") == 0)
-        {
-        double freeMb;
-        if (strtodouble2(attr[1], freeMb) == 0)
-            usr->freeMb = freeMb;
-        return 0;
-        }
-
-    if (strcasecmp(el, "down") == 0)
-        {
-        int down = 0;
-        if (str2x(attr[1], down) == 0)
-            ucr->disabled = down;
-        return 0;
-        }
-
-    if (strcasecmp(el, "DisableDetailStat") == 0)
-        {
-        int disabledDetailStat = 0;
-        if (str2x(attr[1], disabledDetailStat) == 0)
-            ucr->disabledDetailStat = disabledDetailStat;
-        return 0;
-        }
-
-    if (strcasecmp(el, "email") == 0)
-        {
-        ucr->email = EncChar2String(attr[1]);
-        return 0;
-        }
-
-    for (int i = 0; i < USERDATA_NUM; i++)
-        {
-        char name[15];
-        sprintf(name, "userdata%d", i);
-        if (strcasecmp(el, name) == 0)
-            {
-            ucr->userdata[i] = EncChar2String(attr[1]);
-            return 0;
-            }
-        }
-
-    if (strcasecmp(el, "group") == 0)
-        {
-        ucr->group = EncChar2String(attr[1]);
-        return 0;
-        }
-
-    if (strcasecmp(el, "note") == 0)
-        {
-        ucr->note = EncChar2String(attr[1]);
-        return 0;
-        }
-
-    if (strcasecmp(el, "passive") == 0)
-        {
-        int passive = 0;
-        if (str2x(attr[1], passive) == 0)
-            ucr->passive = passive;
-        return 0;
-        }
-
-    if (strcasecmp(el, "phone") == 0)
-        {
-        ucr->phone = EncChar2String(attr[1]);
-        return 0;
-        }
-
-    if (strcasecmp(el, "Name") == 0)
-        {
-        ucr->realName = EncChar2String(attr[1]);
-        return 0;
-        }
-
-    if (strcasecmp(el, "traff") == 0)
-        {
-        int j = 0;
-        DIR_TRAFF dtu;
-        DIR_TRAFF dtd;
-        uint64_t t = 0;
-        while (attr[j])
-            {
-            int dir = attr[j][2] - '0';
-
-            if (strncasecmp(attr[j], "md", 2) == 0)
-                {
-                str2x(attr[j+1], t);
-                dtd[dir] = t;
-                downr[dir] = t;
-                }
-            if (strncasecmp(attr[j], "mu", 2) == 0)
-                {
-                str2x(attr[j+1], t);
-                dtu[dir] = t;
-                upr[dir] = t;
-                }
-            j+=2;
-            }
-        return 0;
-        }
-
-    if (strcasecmp(el, "tariff") == 0)
-        {
-        if (strcasecmp(attr[0], "now") == 0)
-            ucr->tariffName = attr[1];
-
-        if (strcasecmp(attr[0], "delayed") == 0)
-            ucr->nextTariff = attr[1];
-
-        return 0;
-        }
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-int PARSER_CHG_USER::ParseEnd(void *, const char *el)
-{
-if (depth == 1)
-    {
-    if (strcasecmp(el, "SetUser") == 0)
-        {
-        AplayChanges();
-        CreateAnswer();
-        depth--;
-        return 0;
-        }
-    }
-
-depth--;
-return -1;
-}
-//-----------------------------------------------------------------------------
-void PARSER_CHG_USER::CreateAnswer()
-{
-switch (res)
-    {
-    case 0:
-        answer = "<SetUser result=\"ok\"/>";
-        break;
-    case -1:
-        answer = "<SetUser result=\"error\"/>";
-        break;
-    case -2:
-        answer = "<SetUser result=\"error\"/>";
-        break;
-    default:
-        answer = "<SetUser result=\"error\"/>";
-        break;
-    }
-
-}
-//-----------------------------------------------------------------------------
-int PARSER_CHG_USER::AplayChanges()
-{
-printfd(__FILE__, "PARSER_CHG_USER::AplayChanges()\n");
-USER_PTR u;
-
-res = 0;
-if (users->FindByName(login, &u))
-    {
-    res = -1;
     return -1;
-    }
-
-bool check = false;
-bool alwaysOnline = u->GetProperty().alwaysOnline;
-if (!ucr->alwaysOnline.empty())
-    {
-    check = true;
-    alwaysOnline = ucr->alwaysOnline.const_data();
-    }
-bool onlyOneIP = u->GetProperty().ips.ConstData().OnlyOneIP();
-if (!ucr->ips.empty())
-    {
-    check = true;
-    onlyOneIP = ucr->ips.const_data().OnlyOneIP();
-    }
-
-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;
-    }
-
-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.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());
-
-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 (!ucr->passive.empty())
-    if (!u->GetProperty().passive.Set(ucr->passive.const_data(), currAdmin, login, store))
-        res = -1;
-
-if (!ucr->password.empty())
-    if (!u->GetProperty().password.Set(ucr->password.const_data(), currAdmin, login, store))
-        res = -1;
-
-if (!ucr->phone.empty())
-    if (!u->GetProperty().phone.Set(ucr->phone.const_data(), currAdmin, login, store))
-        res = -1;
-
-if (!ucr->realName.empty())
-    if (!u->GetProperty().realName.Set(ucr->realName.const_data(), currAdmin, login, store))
-        res = -1;
-
-
-if (!usr->cash.empty())
-    {
-    //if (*currAdmin->GetPriv()->userCash)
-        {
-        if (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 (!ucr->tariffName.empty())
-    {
-    if (tariffs->FindByName(ucr->tariffName.const_data()))
-        {
-        if (!u->GetProperty().tariffName.Set(ucr->tariffName.const_data(), currAdmin, login, store))
-            res = -1;
-        u->ResetNextTariff();
-        }
-    else
-        {
-        //WriteServLog("SetUser: Tariff %s not found", ud.conf.tariffName.c_str());
-        res = -1;
-        }
-    }
-
-if (!ucr->nextTariff.empty())
-    {
-    if (tariffs->FindByName(ucr->nextTariff.const_data()))
-        {
-        if (!u->GetProperty().nextTariff.Set(ucr->nextTariff.const_data(), currAdmin, login, store))
-            res = -1;
-        }
-    else
-        {
-        //WriteServLog("SetUser: Tariff %s not found", ud.conf.tariffName.c_str());
-        res = -1;
-        }
-    }
-
-DIR_TRAFF up = u->GetProperty().up;
-DIR_TRAFF down = u->GetProperty().down;
-int upCount = 0;
-int downCount = 0;
-for (int i = 0; i < DIR_NUM; i++)
-    {
-    if (!upr[i].empty())
-        {
-        up[i] = upr[i].data();
-        upCount++;
-        }
-    if (!downr[i].empty())
-        {
-        down[i] = downr[i].data();
-        downCount++;
-        }
-    }
-
-if (upCount)
-    if (!u->GetProperty().up.Set(up, currAdmin, login, store))
-        res = -1;
-
-if (downCount)
-    if (!u->GetProperty().down.Set(down, currAdmin, login, store))
-        res = -1;
-
-u->WriteConf();
-u->WriteStat();
-
-return 0;
-}
-//-----------------------------------------------------------------------------
-//      SEND MESSAGE
-//-----------------------------------------------------------------------------
-int PARSER_SEND_MESSAGE::ParseStart(void *, const char *el, const char **attr)
-{
-if (strcasecmp(el, "Message") == 0)
-    {
-    for (int i = 0; i < 14; i++)
-        {
-        if (attr[i] == NULL)
-            {
-            result = res_params_error;
-            CreateAnswer();
-            printfd(__FILE__, "To few parameters\n");
-            return 0;
-            }
-        }
-
-    for (int i = 0; i < 14; i+=2)
-        {
-        if (strcasecmp(attr[i], "login") == 0)
-            {
-            ParseLogins(attr[i+1]);
-            /*if (users->FindByName(login, &u))
-                {
-                result = res_unknown;
-                break;
-                }*/
-            }
-
-        if (strcasecmp(attr[i], "MsgVer") == 0)
-            {
-            str2x(attr[i+1], msg.header.ver);
-            if (msg.header.ver != 1)
-                result = res_params_error;
-            }
-
-        if (strcasecmp(attr[i], "MsgType") == 0)
-            {
-            str2x(attr[i+1], msg.header.type);
-            if (msg.header.type != 1)
-                result = res_params_error;
-            }
-
-        if (strcasecmp(attr[i], "Repeat") == 0)
-            {
-            str2x(attr[i+1], msg.header.repeat);
-            if (msg.header.repeat < 0)
-                result = res_params_error;
-            }
-
-        if (strcasecmp(attr[i], "RepeatPeriod") == 0)
-            {
-            str2x(attr[i+1], msg.header.repeatPeriod);
-            }
-
-        if (strcasecmp(attr[i], "ShowTime") == 0)
-            {
-            str2x(attr[i+1], msg.header.showTime);
-            }
-
-        if (strcasecmp(attr[i], "Text") == 0)
-            {
-            Decode21str(msg.text, attr[i+1]);
-            result = res_ok;
-            }
-        }
-    return 0;
-    }
-return -1;
 }
 //-----------------------------------------------------------------------------
-int PARSER_SEND_MESSAGE::ParseEnd(void *, const char *el)
+int BASE_PARSER::End(void *, const char * el)
 {
-//MSG msg;
-if (strcasecmp(el, "Message") == 0)
+    if (m_depth < 2)
     {
-    result = res_unknown;
-    for (unsigned i = 0; i < logins.size(); i++)
-        {
-        if (users->FindByName(logins[i], &u))
-            {
-            printfd(__FILE__, "User not found. %s\n", logins[i].c_str());
-            continue;
-            }
-        msg.header.creationTime = static_cast<unsigned int>(stgTime);
-        u->AddMessage(&msg);
-        result = res_ok;
-        }
-    /*if (result == res_ok)
-        {
-        if (strcmp(login, "*") == 0)
-            {
-            msg.text = text;
-            msg.prio = pri;
-            printfd(__FILE__, "SendMsg text: %s\n", text);
-            users->GetAllUsers(SendMessageAllUsers, &msg);
-            }
-        else
-            {
-            u->AddMessage(pri, text);
-            }
-        }*/
-    CreateAnswer();
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-int PARSER_SEND_MESSAGE::ParseLogins(const char * login)
-{
-char * p;
-char * l = new char[strlen(login) + 1];
-strcpy(l, login);
-p = strtok(l, ":");
-logins.clear();
-while(p)
-    {
-    logins.push_back(p);
-    p = strtok(NULL, ":");
-    }
-
-delete[] l;
-return 0;
-}
-//-----------------------------------------------------------------------------
-void PARSER_SEND_MESSAGE::CreateAnswer()
-{
-switch (result)
-    {
-    case res_ok:
-        answer = "<SendMessageResult value=\"ok\"/>";
-        break;
-    case res_params_error:
-        printfd(__FILE__, "res_params_error\n");
-        answer = "<SendMessageResult value=\"Parameters error.\"/>";
-        break;
-    case res_unknown:
-        printfd(__FILE__, "res_unknown\n");
-        answer = "<SendMessageResult value=\"Unknown user.\"/>";
-        break;
-    default:
-        printfd(__FILE__, "res_default\n");
-    }
-
-}
-//-----------------------------------------------------------------------------
-//      DEL USER
-//-----------------------------------------------------------------------------
-int PARSER_DEL_USER::ParseStart(void *, const char *el, const char **attr)
-{
-res = 0;
-if (strcasecmp(el, "DelUser") == 0)
-    {
-    if (attr[0] == NULL || attr[1] == NULL)
-        {
-        //CreateAnswer("Parameters error!");
-        CreateAnswer();
-        return 0;
-        }
-
-    if (users->FindByName(attr[1], &u))
-        {
-        res = 1;
+        if (strcasecmp(el, m_tag.c_str()) != 0)
+            return -1;
         CreateAnswer();
-        return 0;
-        }
-    CreateAnswer();
-    return 0;
     }
-return -1;
-}
-//-----------------------------------------------------------------------------
-int PARSER_DEL_USER::ParseEnd(void *, const char *el)
-{
-if (strcasecmp(el, "DelUser") == 0)
-    {
-    if (!res)
-        users->Del(u->GetLogin(), currAdmin);
 
+    --m_depth;
     return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-void PARSER_DEL_USER::CreateAnswer()
-{
-if (res)
-    answer = "<DelUser value=\"error\" reason=\"User not found\"/>";
-else
-    answer = "<DelUser value=\"ok\"/>";
 }
-//-----------------------------------------------------------------------------
-/*void PARSERDELUSER::CreateAnswer(char * mes)
-{
-//answerList->clear();
-answerList->erase(answerList->begin(), answerList->end());
-
-char str[255];
-sprintf(str, "<DelUser value=\"%s\"/>", mes);
-answerList->push_back(str);
-}*/
-//-----------------------------------------------------------------------------
-//  CHECK USER
-// <checkuser login="vasya" password=\"123456\"/>
-//-----------------------------------------------------------------------------
-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();
-        printfd(__FILE__, "PARSER_CHECK_USER - attr err\n");
-        return 0;
-        }
-
-    USER_PTR user;
-    if (users->FindByName(attr[1], &user))
-        {
-        result = false;
-        CreateAnswer();
-        printfd(__FILE__, "PARSER_CHECK_USER - login err\n");
-        return 0;
-        }
-
-    if (strcmp(user->GetProperty().password.Get().c_str(), attr[3]))
-        {
-        result = false;
-        CreateAnswer();
-        printfd(__FILE__, "PARSER_CHECK_USER - passwd err\n");
-        return 0;
-        }
-
-    result = true;
-    CreateAnswer();
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-int PARSER_CHECK_USER::ParseEnd(void *, const char *el)
-{
-if (strcasecmp(el, "CheckUser") == 0)
-    {
-    return 0;
-    }
-return -1;
-}
-//-----------------------------------------------------------------------------
-void PARSER_CHECK_USER::CreateAnswer()
-{
-if (error)
-    answer = std::string("<CheckUser value=\"Err\" reason=\"") + error + "\"/>";
-else
-    answer = "<CheckUser value=\"Ok\"/>";
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------