X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a8689998a9b2cfc17dc260b423cce8ff2e407adb..1631088d558bc27b4f94869ddedec4580e7f30fa:/stglibs/srvconf.lib/include/stg/servconf.h

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index 9248fb0f..714a4e79 100644
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -32,6 +32,8 @@
 #include "stg/parser_auth_by.h"
 #include "stg/parser_server_info.h"
 #include "stg/parser_check_user.h"
+#include "stg/parser_get_user.h"
+#include "stg/parser_get_users.h"
 
 #include "stg/os_int.h"
 #include "stg/const.h"
@@ -71,25 +73,6 @@ private:
     bool error;
 };
 //-----------------------------------------------------------------------------
-class PARSER_GET_USERS: public PARSER
-{
-public:
-    PARSER_GET_USERS();
-    int  ParseStart(const char *el, const char **attr);
-    void ParseEnd(const char *el);
-    void ParseUsers(const char *el, const char **attr);
-    void ParseUser(const char *el, const char **attr);
-    void ParseUserParams(const char *el, const char **attr);
-    void ParseUserLoadStat(const char * el, const char ** attr);
-    void SetUserDataRecvCb(RecvUserDataCb_t, void * data);
-private:
-    RecvUserDataCb_t RecvUserDataCb;
-    void * userDataCb;
-    USERDATA user;
-    int depth;
-    bool error;
-};
-//-----------------------------------------------------------------------------
 class PARSER_SEND_MESSAGE: public PARSER
 {
 public:
@@ -115,7 +98,7 @@ public:
     void SetAdmLogin(const char * login);
     void SetAdmPassword(const char * password);
 
-    void SetUserDataRecvCb(RecvUserDataCb_t, void * data);
+    void SetGetUsers(PARSER_GET_USERS::CALLBACK f, void * data);
     void SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data);
     void SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data);
     void SetChgUserCb(RecvChgUserCb_t, void * data);
@@ -156,7 +139,7 @@ private:
     int error;
     XML_Parser parser;
 
-    RecvUserDataCb_t RecvUserDataCb;
+    PARSER_GET_USERS::CALLBACK getUsersCallback;
     PARSER_GET_USER::CALLBACK getUserCallback;
     PARSER_AUTH_BY::CALLBACK authByCallback;
     PARSER_SERVER_INFO::CALLBACK serverInfoCallback;
@@ -166,7 +149,7 @@ private:
 
     void * getUserData;
     void * authByData;
-    void * getUsersDataDataCb;
+    void * getUsersData;
     void * serverInfoData;
     void * chgUserDataCb;
     void * checkUserData;