USER_STAT refactoring.

[stg.git] / 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 e55cff2ce8f2adba3793bab9c30ab32ff09ad7c8..63987fd81464297727e5ff0b1bdc62bce75fc1e0 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -27,15 +27,9 @@
 #ifndef __STG_STGLIBS_SERVCONF_H__
 #define __STG_STGLIBS_SERVCONF_H__
 
 #ifndef __STG_STGLIBS_SERVCONF_H__
 #define __STG_STGLIBS_SERVCONF_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/parser_chg_user.h"
-#include "stg/parser_send_message.h"
-

 #include "stg/servconf_types.h"
 
 #include "stg/servconf_types.h"
 

+#include "stg/admin_conf.h"

 #include "stg/os_int.h"
 
 #include <string>
 #include "stg/os_int.h"
 
 #include <string>


@@ -50,13 +44,22 @@ public:
              const std::string & login, const std::string & password);
     ~SERVCONF();
 
              const std::string & login, const std::string & password);
     ~SERVCONF();
 

-    int GetUsers(PARSER_GET_USERS::CALLBACK f, void * data);
-    int GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data);
-    int ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data);
+    int ServerInfo(SERVER_INFO::CALLBACK f, void * data);
+
+    int GetAdmins(GET_ADMINS::CALLBACK f, void * data);
+    int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
+    int ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
+    int AddAdmin(const std::string & login, const ADMIN_CONF & conf, SIMPLE::CALLBACK f, void * data);
+    int DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data);
+
+    int GetUsers(GET_USERS::CALLBACK f, void * data);
+    int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
+    int ChgUser(const std::string & request, SIMPLE::CALLBACK f, void * data);
+    int DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data);
+    int AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data);

     int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);
     int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);

-    int SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data);
-    int ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data);
-    int CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data);
+    int SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data);
+    int CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data);

 
     const std::string & GetStrError() const;
 
 
     const std::string & GetStrError() const;