Fix DIRS param number in "OnDisconnect" scripts

[stg.git] / 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 b90cb2b6b8c15f6358ebd41fdd557a1763a83bdc..c63edfe0d16f4af11dbb31e3ebe0e6cd67e45ae6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -9,11 +9,11 @@
 #include <cerrno>
 #include <sstream>
 
 #include <cerrno>
 #include <sstream>
 

+#include "stg/version.h"
+#include "stg/tariffs.h"
+#include "stg/user_property.h"
+#include "stg/settings.h"

 #include "parser.h"
 #include "parser.h"

-#include "version.h"
-#include "tariffs.h"
-#include "../../../settings.h"
-#include "../../../user_property.h"

 
 #define  UNAME_LEN      (256)
 //-----------------------------------------------------------------------------
 
 #define  UNAME_LEN      (256)
 //-----------------------------------------------------------------------------


@@ -63,13 +63,13 @@ answerList->push_back("<ServerInfo>");
 sprintf(s, "<version value=\"%s\"/>", SERVER_VERSION);
 answerList->push_back(s);
 
 sprintf(s, "<version value=\"%s\"/>", SERVER_VERSION);
 answerList->push_back(s);
 

-sprintf(s, "<tariff_num value=\"%d\"/>", tariffs->GetTariffsNum());
+sprintf(s, "<tariff_num value=\"%llu\"/>", (unsigned long long)tariffs->Count());

 answerList->push_back(s);
 
 sprintf(s, "<tariff value=\"%d\"/>", 2);
 answerList->push_back(s);
 
 answerList->push_back(s);
 
 sprintf(s, "<tariff value=\"%d\"/>", 2);
 answerList->push_back(s);
 

-sprintf(s, "<users_num value=\"%d\"/>", users->GetUserNum());
+sprintf(s, "<users_num value=\"%llu\"/>", (unsigned long long)users->Count());

 answerList->push_back(s);
 
 sprintf(s, "<uname value=\"%s\"/>", un);
 answerList->push_back(s);
 
 sprintf(s, "<uname value=\"%s\"/>", un);


@@ -94,11 +94,6 @@ answerList->push_back("</ServerInfo>");
 //-----------------------------------------------------------------------------
 //  GET USER
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  GET USER
 //-----------------------------------------------------------------------------

-PARSER_GET_USER::PARSER_GET_USER()
-{
-
-}
-//-----------------------------------------------------------------------------

 int PARSER_GET_USER::ParseStart(void *, const char *el, const char **attr)
 {
 if (strcasecmp(el, "GetUser") == 0)
 int PARSER_GET_USER::ParseStart(void *, const char *el, const char **attr)
 {
 if (strcasecmp(el, "GetUser") == 0)


@@ -296,12 +291,6 @@ answerList->push_back(s);
 //-----------------------------------------------------------------------------
 //  GET USERS
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  GET USERS
 //-----------------------------------------------------------------------------

-PARSER_GET_USERS::PARSER_GET_USERS()
-    : lastUserUpdateTime(0),
-      lastUpdateFound(false)
-{
-}
-//-----------------------------------------------------------------------------

 int PARSER_GET_USERS::ParseStart(void *, const char *el, const char ** attr)
 {
 /*if (attr && *attr && *(attr+1))
 int PARSER_GET_USERS::ParseStart(void *, const char *el, const char ** attr)
 {
 /*if (attr && *attr && *(attr+1))


@@ -643,11 +632,6 @@ answerList->push_back("</Users>");
 //-----------------------------------------------------------------------------
 //  ADD USER
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  ADD USER
 //-----------------------------------------------------------------------------

-PARSER_ADD_USER::PARSER_ADD_USER()
-{
-depth = 0;
-}
-//-----------------------------------------------------------------------------

 int PARSER_ADD_USER::ParseStart(void *, const char *el, const char **attr)
 {
 depth++;
 int PARSER_ADD_USER::ParseStart(void *, const char *el, const char **attr)
 {
 depth++;


@@ -720,10 +704,13 @@ return -1;
 //  PARSER CHG USER
 //-----------------------------------------------------------------------------
 PARSER_CHG_USER::PARSER_CHG_USER()
 //  PARSER CHG USER
 //-----------------------------------------------------------------------------
 PARSER_CHG_USER::PARSER_CHG_USER()

-    : usr(NULL),
+    : BASE_PARSER(),
+      usr(NULL),

       ucr(NULL),
       upr(NULL),
       downr(NULL),
       ucr(NULL),
       upr(NULL),
       downr(NULL),

+      cashMsg(),
+      login(),

       cashMustBeAdded(false),
       res(0)
 {
       cashMustBeAdded(false),
       res(0)
 {