Move MODENOTICE command to a command module

[user/henk/code/inspircd.git] / src / usermanager.cpp

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 06d6ad1cdb46097ac099fb7687656843e4dbebd5..f78ebeb57cc87787ca4aa782edc1d4276542022e 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -24,7 +24,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
        LocalUser* New = NULL;
        try
        {
-               New = new LocalUser();
+               New = new LocalUser(socket, client, server);
        }
        catch (...)
        {
@@ -33,10 +33,6 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                return;
        }
 
-       New->SetFd(socket);
-       memcpy(&New->client_sa, client, sizeof(irc::sockets::sockaddrs));
-       memcpy(&New->server_sa, server, sizeof(irc::sockets::sockaddrs));
-
        /* Give each of the modules an attempt to hook the user for I/O */
        FOREACH_MOD(I_OnHookIO, OnHookIO(New, via));
 
@@ -56,10 +52,9 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 
        this->unregistered_count++;
 
-       (*(this->clientlist))[New->uuid] = New;
-
        /* The users default nick is their UUID */
        New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
+       (*(this->clientlist))[New->nick] = New;
 
        New->ident.assign("unknown");
 
@@ -195,13 +190,14 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
        if (IS_LOCAL(user))
        {
-               FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(IS_LOCAL(user)));
-               user->DoWrite();
-               if (user->GetIOHook())
+               LocalUser* lu = IS_LOCAL(user);
+               FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
+               lu->DoWrite();
+               if (lu->GetIOHook())
                {
                        try
                        {
-                               user->GetIOHook()->OnStreamSocketClose(user);
+                               lu->GetIOHook()->OnStreamSocketClose(lu);
                        }
                        catch (CoreException& modexcept)
                        {
@@ -209,10 +205,8 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                        }
                }
 
-               ServerInstance->SE->DelFd(user);
-               user->Close();
-               // user->Close() will set fd to -1; this breaks IS_LOCAL. Fix
-               user->SetFd(INT_MAX);
+               ServerInstance->SE->DelFd(lu);
+               lu->Close();
        }
 
        /*
@@ -272,13 +266,16 @@ void UserManager::AddGlobalClone(User *user)
 
 void UserManager::RemoveCloneCounts(User *user)
 {
-       clonemap::iterator x = local_clones.find(user->GetCIDRMask());
-       if (x != local_clones.end())
+       if (IS_LOCAL(user))
        {
-               x->second--;
-               if (!x->second)
+               clonemap::iterator x = local_clones.find(user->GetCIDRMask());
+               if (x != local_clones.end())
                {
-                       local_clones.erase(x);
+                       x->second--;
+                       if (!x->second)
+                       {
+                               local_clones.erase(x);
+                       }
                }
        }
 
@@ -389,67 +386,6 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
        }
 }
 
-void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       int modelen;
-       va_list argsPtr;
-
-       if (!text || !modes || !flags)
-       {
-               ServerInstance->Logs->Log("USERS", DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-       modelen = strlen(modes);
-
-       if (flags == WM_AND)
-       {
-               for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-               {
-                       User* t = *i;
-                       bool send_to_user = true;
-
-                       for (int n = 0; n < modelen; n++)
-                       {
-                               if (!t->IsModeSet(modes[n]))
-                               {
-                                       send_to_user = false;
-                                       break;
-                               }
-                       }
-                       if (send_to_user)
-                       {
-                               t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
-                       }
-               }
-       }
-       else if (flags == WM_OR)
-       {
-               for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-               {
-                       User* t = *i;
-                       bool send_to_user = false;
-
-                       for (int n = 0; n < modelen; n++)
-                       {
-                               if (t->IsModeSet(modes[n]))
-                               {
-                                       send_to_user = true;
-                                       break;
-                               }
-                       }
-
-                       if (send_to_user)
-                       {
-                               t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
-                       }
-               }
-       }
-}
 
 /* return how many users have a given mode e.g. 'a' */
 int UserManager::ModeCount(const char mode)