Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / users_methods.h

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
index 956a2f190feabe552bf3a11a33384c27bd1490d7..d1ec33a4ade340f07e1612e1b9641de38417db8d 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
@@ -4,13 +4,12 @@
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 

-

 class RPC_CONFIG;
 class ADMINS;
 class TARIFFS;
 class USERS;
 class RPC_CONFIG;
 class ADMINS;
 class TARIFFS;
 class USERS;

-class BASE_STORE;
-class IP_MASK;
+class STORE;
+struct IP_MASK;

 
 class METHOD_USER_GET : public xmlrpc_c::method {
 public:
 
 class METHOD_USER_GET : public xmlrpc_c::method {
 public:


@@ -23,7 +22,11 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USER_GET(const METHOD_USER_GET & rvalue);
+    METHOD_USER_GET & operator=(const METHOD_USER_GET & rvalue);
+

     RPC_CONFIG * config;
     USERS * users;
 };
     RPC_CONFIG * config;
     USERS * users;
 };


@@ -41,7 +44,11 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USER_ADD(const METHOD_USER_ADD & rvalue);
+    METHOD_USER_ADD & operator=(const METHOD_USER_ADD & rvalue);
+

     RPC_CONFIG * config;
     ADMINS * admins;
     USERS * users;
     RPC_CONFIG * config;
     ADMINS * admins;
     USERS * users;


@@ -60,7 +67,11 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USER_DEL(const METHOD_USER_DEL & rvalue);
+    METHOD_USER_DEL & operator=(const METHOD_USER_DEL & rvalue);
+

     RPC_CONFIG * config;
     ADMINS * admins;
     USERS * users;
     RPC_CONFIG * config;
     ADMINS * admins;
     USERS * users;


@@ -77,7 +88,11 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USERS_GET(const METHOD_USERS_GET & rvalue);
+    METHOD_USERS_GET & operator=(const METHOD_USERS_GET & rvalue);
+

     RPC_CONFIG * config;
     USERS * users;
 };
     RPC_CONFIG * config;
     USERS * users;
 };


@@ -87,7 +102,7 @@ public:
     METHOD_USER_CHG(RPC_CONFIG * c,
                     ADMINS * a,
                     TARIFFS * t,
     METHOD_USER_CHG(RPC_CONFIG * c,
                     ADMINS * a,
                     TARIFFS * t,

-                    BASE_STORE * s,
+                    STORE * s,

                     USERS * u)
         : config(c),
           admins(a),
                     USERS * u)
         : config(c),
           admins(a),


@@ -99,11 +114,15 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USER_CHG(const METHOD_USER_CHG & rvalue);
+    METHOD_USER_CHG & operator=(const METHOD_USER_CHG & rvalue);
+

     RPC_CONFIG * config;
     ADMINS * admins;
     TARIFFS * tariffs;
     RPC_CONFIG * config;
     ADMINS * admins;
     TARIFFS * tariffs;

-    BASE_STORE * store;
+    STORE * store;

     USERS * users;
 };
 
     USERS * users;
 };
 


@@ -111,7 +130,7 @@ class METHOD_USER_CASH_ADD : public xmlrpc_c::method {
 public:
     METHOD_USER_CASH_ADD(RPC_CONFIG * c,
                          ADMINS * a,
 public:
     METHOD_USER_CASH_ADD(RPC_CONFIG * c,
                          ADMINS * a,

-                         BASE_STORE * s,
+                         STORE * s,

                          USERS * u)
         : config(c),
           admins(a),
                          USERS * u)
         : config(c),
           admins(a),


@@ -122,10 +141,14 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USER_CASH_ADD(const METHOD_USER_CASH_ADD & rvalue);
+    METHOD_USER_CASH_ADD & operator=(const METHOD_USER_CASH_ADD & rvalue);
+

     RPC_CONFIG * config;
     ADMINS * admins;
     RPC_CONFIG * config;
     ADMINS * admins;

-    BASE_STORE * store;
+    STORE * store;

     USERS * users;
 };
 
     USERS * users;
 };
 


@@ -133,7 +156,7 @@ class METHOD_USER_CASH_SET : public xmlrpc_c::method {
 public:
     METHOD_USER_CASH_SET(RPC_CONFIG * c,
                          ADMINS * a,
 public:
     METHOD_USER_CASH_SET(RPC_CONFIG * c,
                          ADMINS * a,

-                         BASE_STORE * s,
+                         STORE * s,

                          USERS * u)
         : config(c),
           admins(a),
                          USERS * u)
         : config(c),
           admins(a),


@@ -144,10 +167,14 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USER_CASH_SET(const METHOD_USER_CASH_SET & rvalue);
+    METHOD_USER_CASH_SET & operator=(const METHOD_USER_CASH_SET & rvalue);
+

     RPC_CONFIG * config;
     ADMINS * admins;
     RPC_CONFIG * config;
     ADMINS * admins;

-    BASE_STORE * store;
+    STORE * store;

     USERS * users;
 };
 
     USERS * users;
 };
 


@@ -156,7 +183,7 @@ public:
     METHOD_USER_TARIFF_CHANGE(RPC_CONFIG * c,
                               ADMINS * a,
                               TARIFFS * t,
     METHOD_USER_TARIFF_CHANGE(RPC_CONFIG * c,
                               ADMINS * a,
                               TARIFFS * t,

-                              BASE_STORE * s,
+                              STORE * s,

                               USERS * u)
         : config(c),
           admins(a),
                               USERS * u)
         : config(c),
           admins(a),


@@ -168,11 +195,15 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_USER_TARIFF_CHANGE(const METHOD_USER_TARIFF_CHANGE & rvalue);
+    METHOD_USER_TARIFF_CHANGE & operator=(const METHOD_USER_TARIFF_CHANGE & rvalue);
+

     RPC_CONFIG * config;
     ADMINS * admins;
     TARIFFS * tariffs;
     RPC_CONFIG * config;
     ADMINS * admins;
     TARIFFS * tariffs;

-    BASE_STORE * store;
+    STORE * store;

     USERS * users;
 };
 
     USERS * users;
 };
 


@@ -187,11 +218,35 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_GET_ONLINE_IPS(const METHOD_GET_ONLINE_IPS & rvalue);
+    METHOD_GET_ONLINE_IPS & operator=(const METHOD_GET_ONLINE_IPS & rvalue);
+

     RPC_CONFIG * config;
     USERS * users;
 
     bool ParseNet(const std::string & net, IP_MASK & ipm) const;
 };
 
     RPC_CONFIG * config;
     USERS * users;
 
     bool ParseNet(const std::string & net, IP_MASK & ipm) const;
 };
 

+class METHOD_GET_USER_AUTH_BY : public xmlrpc_c::method {
+public:
+    METHOD_GET_USER_AUTH_BY(RPC_CONFIG * c,
+                            USERS * u)
+        : config(c),
+          users(u)
+    {
+    }
+
+    void execute(xmlrpc_c::paramList const & paramList,
+                 xmlrpc_c::value *   const   retvalP);
+
+private:
+    METHOD_GET_USER_AUTH_BY(const METHOD_GET_ONLINE_IPS & rvalue);
+    METHOD_GET_USER_AUTH_BY & operator=(const METHOD_GET_ONLINE_IPS & rvalue);
+
+    RPC_CONFIG * config;
+    USERS * users;
+};
+

 #endif
 #endif