Adjusted Makefile due to new source files.

[stg.git] / projects / stargazer / plugins / authorization / ao / ao.h

diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h
index 5d17cbffff44c650a38f001d14739107bf6b25f7..d8b6dc88bf48719a7504a9f08328bdfb08c25973 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -37,6 +37,7 @@
 #include "stg/notifer.h"
 #include "stg/user_ips.h"
 #include "stg/user.h"
 #include "stg/notifer.h"
 #include "stg/user_ips.h"
 #include "stg/user.h"

+#include "stg/logger.h"

 
 extern "C" PLUGIN * GetPlugin();
 
 
 extern "C" PLUGIN * GetPlugin();
 


@@ -46,10 +47,11 @@ class USERS;
 template <typename T>
 class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:
 template <typename T>
 class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:

-                CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
+                CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u)
+                    : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}

                 CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER<T> & rvalue)
                 CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER<T> & rvalue)

-                    : user(rvalue.user), auth(rvalue.auth)
-                {}
+                    : PROPERTY_NOTIFIER_BASE<T>(),
+                      user(rvalue.user), auth(rvalue.auth) {}

     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 
     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 


@@ -63,10 +65,11 @@ private:
 template <typename T>
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:
 template <typename T>
 class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:

-                CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
+                CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u)
+                    : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}

                 CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER<T> & rvalue)
                 CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER<T> & rvalue)

-                    : user(rvalue.user), auth(rvalue.auth)
-                {}
+                    : PROPERTY_NOTIFIER_BASE<T>(),
+                      user(rvalue.user), auth(rvalue.auth) {}

     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 
     void        Notify(const T & oldValue, const T & newValue);
     USER_PTR    GetUser() const { return user; }
 


@@ -80,7 +83,7 @@ private:
 class AUTH_AO : public AUTH {
 public:
     AUTH_AO();
 class AUTH_AO : public AUTH {
 public:
     AUTH_AO();

-    virtual ~AUTH_AO(){};
+    virtual ~AUTH_AO(){}

 
     void                SetUsers(USERS * u) { users = u; }
 
 
     void                SetUsers(USERS * u) { users = u; }
 


@@ -91,9 +94,9 @@ public:
     void                SetSettings(const MODULE_SETTINGS &) {}
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     void                SetSettings(const MODULE_SETTINGS &) {}
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }

-    const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 70; }
-    uint16_t            GetStopPosition() const { return 70; }
+    std::string         GetVersion() const;
+    uint16_t            GetStartPosition() const { return 30; }
+    uint16_t            GetStopPosition() const { return 30; }

 
     void                AddUser(USER_PTR u);
     void                DelUser(USER_PTR u);
 
     void                AddUser(USER_PTR u);
     void                DelUser(USER_PTR u);


@@ -115,11 +118,11 @@ private:
     bool                isRunning;
     MODULE_SETTINGS     settings;
 
     bool                isRunning;
     MODULE_SETTINGS     settings;
 

-    list<CHG_BEFORE_NOTIFIER<int> >      BeforeChgAONotifierList;
-    list<CHG_AFTER_NOTIFIER<int> >       AfterChgAONotifierList;
+    std::list<CHG_BEFORE_NOTIFIER<int> >      BeforeChgAONotifierList;
+    std::list<CHG_AFTER_NOTIFIER<int> >       AfterChgAONotifierList;

 
 

-    list<CHG_BEFORE_NOTIFIER<USER_IPS> > BeforeChgIPNotifierList;
-    list<CHG_AFTER_NOTIFIER<USER_IPS> >  AfterChgIPNotifierList;
+    std::list<CHG_BEFORE_NOTIFIER<USER_IPS> > BeforeChgIPNotifierList;
+    std::list<CHG_AFTER_NOTIFIER<USER_IPS> >  AfterChgIPNotifierList;

 
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:
 
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:


@@ -146,6 +149,7 @@ private:
 
         AUTH_AO & auth;
     } onDelUserNotifier;
 
         AUTH_AO & auth;
     } onDelUserNotifier;

+    PLUGIN_LOGGER logger;

 
     friend class CHG_BEFORE_NOTIFIER<int>;
     friend class CHG_AFTER_NOTIFIER<int>;
 
     friend class CHG_BEFORE_NOTIFIER<int>;
     friend class CHG_AFTER_NOTIFIER<int>;