X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a9c940996bac5c61168f06ef61bc20225fb7a65e..ccdebbb822ee49f89f3b2e5c0de0510258cddbc5:/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 5d17cbff..9ed7ffcf 100644 --- 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/logger.h" extern "C" PLUGIN * GetPlugin(); @@ -46,10 +47,11 @@ class USERS; template class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE { 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(), user(u), auth(a) {} CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER & rvalue) - : user(rvalue.user), auth(rvalue.auth) - {} + : PROPERTY_NOTIFIER_BASE(), + user(rvalue.user), auth(rvalue.auth) {} void Notify(const T & oldValue, const T & newValue); USER_PTR GetUser() const { return user; } @@ -63,10 +65,11 @@ private: template class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE { 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(), user(u), auth(a) {} CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue) - : user(rvalue.user), auth(rvalue.auth) - {} + : PROPERTY_NOTIFIER_BASE(), + user(rvalue.user), auth(rvalue.auth) {} void Notify(const T & oldValue, const T & newValue); USER_PTR GetUser() const { return user; } @@ -80,20 +83,20 @@ private: class AUTH_AO : public AUTH { public: AUTH_AO(); - virtual ~AUTH_AO(){}; + virtual ~AUTH_AO(){} void SetUsers(USERS * u) { users = u; } int Start(); int Stop(); - int Reload() { return 0; } + int Reload(const MODULE_SETTINGS & /*ms*/) { return 0; } bool IsRunning() { return isRunning; } 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); @@ -115,11 +118,11 @@ private: bool isRunning; MODULE_SETTINGS settings; - list > BeforeChgAONotifierList; - list > AfterChgAONotifierList; + std::list > BeforeChgAONotifierList; + std::list > AfterChgAONotifierList; - list > BeforeChgIPNotifierList; - list > AfterChgIPNotifierList; + std::list > BeforeChgIPNotifierList; + std::list > AfterChgIPNotifierList; class ADD_USER_NONIFIER: public NOTIFIER_BASE { public: @@ -146,6 +149,7 @@ private: AUTH_AO & auth; } onDelUserNotifier; + PLUGIN_LOGGER logger; friend class CHG_BEFORE_NOTIFIER; friend class CHG_AFTER_NOTIFIER;