Types mismatch fixed

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

diff --git a/projects/stargazer/plugins/authorization/ao/ao.cpp b/projects/stargazer/plugins/authorization/ao/ao.cpp
index ccad36cf4eeab74e03789dd48d3d9a2d988dcfad..004210d2b5b030f18c13496e2906704f804af45c 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/projects/stargazer/plugins/authorization/ao/ao.cpp
@@ -30,37 +30,24 @@ $Author: faust $
 #include <algorithm> // for_each
 #include <functional> // mem_fun_ref
 
 #include <algorithm> // for_each
 #include <functional> // mem_fun_ref
 

+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/user_property.h"
+#include "stg/common.h"
+#include "stg/plugin_creator.h"

 #include "ao.h"
 #include "ao.h"

-#include "user.h"
-#include "users.h"
-#include "user_property.h"
-#include "common.h"
-//#include "../../../eventloop.h"

 
 

-class AO_CREATOR
-{
-private:
-    AUTH_AO * ao;
-
-public:
-    AO_CREATOR()
-        : ao(new AUTH_AO())
-        {
-        };
-    ~AO_CREATOR()
-        {
-        delete ao;
-        };
-
-    AUTH_AO * GetPlugin()
-        {
-        return ao;
-        };
-};

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-AO_CREATOR aoc;
+PLUGIN_CREATOR<AUTH_AO> aoc;
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+PLUGIN * GetPlugin()
+{
+return aoc.GetPlugin();
+}

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -76,13 +63,6 @@ public:
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-PLUGIN * GetPlugin()
-{
-return aoc.GetPlugin();
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------

 const string AUTH_AO::GetVersion() const
 {
 return "Always Online authorizator v.1.0";
 const string AUTH_AO::GetVersion() const
 {
 return "Always Online authorizator v.1.0";


@@ -237,13 +217,11 @@ users->CloseSearch(h);
 //-----------------------------------------------------------------------------
 void AUTH_AO::Unauthorize(USER_PTR u) const
 {
 //-----------------------------------------------------------------------------
 void AUTH_AO::Unauthorize(USER_PTR u) const
 {

-printfd(__FILE__, "AUTH_AO::Unauthorize - login: '%s'\n", u->GetLogin().c_str());

 u->Unauthorize(this);
 }
 //-----------------------------------------------------------------------------
 void AUTH_AO::UpdateUserAuthorization(USER_PTR u) const
 {
 u->Unauthorize(this);
 }
 //-----------------------------------------------------------------------------
 void AUTH_AO::UpdateUserAuthorization(USER_PTR u) const
 {

-printfd(__FILE__, "AUTH_AO::UpdateUserAuthorization - login: '%s'\n", u->GetLogin().c_str());

 if (u->GetProperty().alwaysOnline)
     {
     USER_IPS ips = u->GetProperty().ips;
 if (u->GetProperty().alwaysOnline)
     {
     USER_IPS ips = u->GetProperty().ips;


@@ -258,7 +236,6 @@ if (u->GetProperty().alwaysOnline)
 //-----------------------------------------------------------------------------
 void AUTH_AO::AddUser(USER_PTR u)
 {
 //-----------------------------------------------------------------------------
 void AUTH_AO::AddUser(USER_PTR u)
 {

-printfd(__FILE__, "AUTH_AO::AddUser - login: '%s'\n", u->GetLogin().c_str());

 SetUserNotifiers(u);
 usersList.push_back(u);
 UpdateUserAuthorization(u);
 SetUserNotifiers(u);
 usersList.push_back(u);
 UpdateUserAuthorization(u);


@@ -266,7 +243,6 @@ UpdateUserAuthorization(u);
 //-----------------------------------------------------------------------------
 void AUTH_AO::DelUser(USER_PTR u)
 {
 //-----------------------------------------------------------------------------
 void AUTH_AO::DelUser(USER_PTR u)
 {

-printfd(__FILE__, "AUTH_AO::DelUser - login: '%s'\n", u->GetLogin().c_str());

 Unauthorize(u);
 UnSetUserNotifiers(u);
 usersList.remove(u);
 Unauthorize(u);
 UnSetUserNotifiers(u);
 usersList.remove(u);


@@ -281,7 +257,6 @@ return -1;
 template <typename varParamType>
 void CHG_BEFORE_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {
 template <typename varParamType>
 void CHG_BEFORE_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {

-printfd(__FILE__, "CHG_BEFORE_NOTIFIER::Notify\n");

 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
 auth.Unauthorize(user);
 }
 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
 auth.Unauthorize(user);
 }


@@ -289,7 +264,6 @@ auth.Unauthorize(user);
 template <typename varParamType>
 void CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {
 template <typename varParamType>
 void CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {

-printfd(__FILE__, "CHG_AFTER_NOTIFIER::Notify\n");

 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
 auth.UpdateUserAuthorization(user);
 }
 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
 auth.UpdateUserAuthorization(user);
 }