X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/46b0747592074017ff0ea4b33d4a7194235886e5..e5499c61083684b28bcbc6950aae66cbf0938703:/stargazer/plugins/authorization/ao/ao.cpp?ds=inline

diff --git a/stargazer/plugins/authorization/ao/ao.cpp b/stargazer/plugins/authorization/ao/ao.cpp
index 853df2a4..edfd1b2d 100644
--- a/stargazer/plugins/authorization/ao/ao.cpp
+++ b/stargazer/plugins/authorization/ao/ao.cpp
@@ -52,18 +52,6 @@ return aoc.GetPlugin();
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-template <typename varType>
-class IS_CONTAINS_USER: public std::binary_function<varType, USER_PTR, bool>
-{
-public:
-    bool operator()(const varType& notifier, USER_PTR user) const
-        {
-        return notifier.GetUser() == user;
-        }
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 std::string AUTH_AO::GetVersion() const
 {
 return "Always Online authorizator v.1.0";
@@ -86,7 +74,7 @@ GetUsers();
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
-std::for_each(usersList.begin(), usersList.end(), std::bind1st(std::mem_fun(&AUTH_AO::UpdateUserAuthorization), this));
+std::for_each(userList.begin(), userList.end(), [this](auto user){ UpdateUserAuthorization(user); });
 
 isRunning = true;
 
@@ -102,14 +90,13 @@ if (!isRunning)
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
-std::list<USER_PTR>::iterator users_iter;
-users_iter = usersList.begin();
-while (users_iter != usersList.end())
+auto it = userList.begin();
+while (it != userList.end())
     {
-    if ((*users_iter)->IsAuthorizedBy(this))
-        users->Unauthorize((*users_iter)->GetLogin(), this);
-    UnSetUserNotifiers(*users_iter);
-    ++users_iter;
+    if ((*it)->IsAuthorizedBy(this))
+        users->Unauthorize((*it)->GetLogin(), this);
+    UnSetUserNotifiers(*it);
+    ++it;
     }
 isRunning = false;
 return 0;
@@ -143,15 +130,9 @@ u->GetProperty().ips.AddAfterNotifier(&AfterChgIPNotifierList.front());
 void AUTH_AO::UnSetUserNotifiers(USER_PTR u)
 {
 // ---      AlwaysOnline        ---
-IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<int> > IsContainsUserAOB;
-IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<int> > IsContainsUserAOA;
-
-std::list<CHG_BEFORE_NOTIFIER<int> >::iterator aoBIter;
-std::list<CHG_AFTER_NOTIFIER<int> >::iterator  aoAIter;
-
-aoBIter = find_if(BeforeChgAONotifierList.begin(),
-                  BeforeChgAONotifierList.end(),
-                  bind2nd(IsContainsUserAOB, u));
+auto aoBIter = find_if(BeforeChgAONotifierList.begin(),
+                       BeforeChgAONotifierList.end(),
+                       [u](auto notifier){ return notifier.GetUser() == u; });
 
 if (aoBIter != BeforeChgAONotifierList.end())
     {
@@ -159,9 +140,9 @@ if (aoBIter != BeforeChgAONotifierList.end())
     BeforeChgAONotifierList.erase(aoBIter);
     }
 
-aoAIter = find_if(AfterChgAONotifierList.begin(),
-                  AfterChgAONotifierList.end(),
-                  bind2nd(IsContainsUserAOA, u));
+auto aoAIter = find_if(AfterChgAONotifierList.begin(),
+                       AfterChgAONotifierList.end(),
+                       [u](auto notifier){ return notifier.GetUser() == u; });
 
 if (aoAIter != AfterChgAONotifierList.end())
     {
@@ -171,15 +152,9 @@ if (aoAIter != AfterChgAONotifierList.end())
 // ---      AlwaysOnline end    ---
 
 // ---          IP              ---
-IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<USER_IPS> > IsContainsUserIPB;
-IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<USER_IPS> >  IsContainsUserIPA;
-
-std::list<CHG_BEFORE_NOTIFIER<USER_IPS> >::iterator ipBIter;
-std::list<CHG_AFTER_NOTIFIER<USER_IPS> >::iterator  ipAIter;
-
-ipBIter = std::find_if(BeforeChgIPNotifierList.begin(),
-                       BeforeChgIPNotifierList.end(),
-                       bind2nd(IsContainsUserIPB, u));
+auto ipBIter = std::find_if(BeforeChgIPNotifierList.begin(),
+                            BeforeChgIPNotifierList.end(),
+                            [u](auto notifier){ return notifier.GetUser() == u; });
 
 if (ipBIter != BeforeChgIPNotifierList.end())
     {
@@ -187,9 +162,9 @@ if (ipBIter != BeforeChgIPNotifierList.end())
     BeforeChgIPNotifierList.erase(ipBIter);
     }
 
-ipAIter = find_if(AfterChgIPNotifierList.begin(),
-                  AfterChgIPNotifierList.end(),
-                  bind2nd(IsContainsUserIPA, u));
+auto ipAIter = find_if(AfterChgIPNotifierList.begin(),
+                       AfterChgIPNotifierList.end(),
+                       [u](auto notifier){ return notifier.GetUser() == u; });
 
 if (ipAIter != AfterChgIPNotifierList.end())
     {
@@ -207,7 +182,7 @@ assert(h && "USERS::OpenSearch is always correct");
 
 while (!users->SearchNext(h, &u))
     {
-    usersList.push_back(u);
+    userList.push_back(u);
     SetUserNotifiers(u);
     }
 
@@ -229,7 +204,7 @@ if (u->GetProperty().alwaysOnline)
 void AUTH_AO::AddUser(USER_PTR u)
 {
 SetUserNotifiers(u);
-usersList.push_back(u);
+userList.push_back(u);
 UpdateUserAuthorization(u);
 }
 //-----------------------------------------------------------------------------
@@ -238,7 +213,7 @@ void AUTH_AO::DelUser(USER_PTR u)
 if (u->IsAuthorizedBy(this))
     users->Unauthorize(u->GetLogin(), this);
 UnSetUserNotifiers(u);
-usersList.remove(u);
+userList.erase(std::remove(userList.begin(), userList.end(), u), userList.end());
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const