Move InspIRCd::IsValidMask() to helperfuncs.cpp

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 0c5db928d5908f7cd59f0aa3096572b137c44cf6..c74f868ba3276c82a6ba9b30fb7eb6295918e5d2 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -12,102 +12,34 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_quit.h"
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-       return new cmd_quit(Instance);
+       return new CommandQuit(Instance);
 }
 
-CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandQuit::Handle (const char** parameters, int pcnt, User *user)
 {
-       user_hash::iterator iter = ServerInstance->clientlist->find(user->nick);
-       char reason[MAXBUF];
-       std::string quitmsg = "Client exited";
 
-       if (user->registered == REG_ALL)
-       {
-               /* theres more to do here, but for now just close the socket */
-               if (pcnt == 1)
-               {
-                       if (*parameters[0] == ':')
-                               parameters[0]++;
-
-                       strlcpy(reason, parameters[0],MAXQUIT-1);
-
-                       /* We should only prefix the quit for a local user. Remote users have
-                        * already been prefixed, where neccessary, by the upstream server.
-                        */
-                       if (IS_LOCAL(user))
-                       {
-                               quitmsg = ServerInstance->Config->PrefixQuit;
-                               quitmsg.append(parameters[0]);
-                               user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,quitmsg.c_str());
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,quitmsg.c_str());
-                               user->WriteCommonExcept("QUIT :%s", quitmsg.c_str());
-                       }
-                       else
-                       {
-                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
-                               user->WriteCommonExcept("QUIT :%s",parameters[0]);
-                       }
-                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(ServerInstance->Config->PrefixQuit)+std::string(parameters[0])));
-
-               }
-               else
-               {
-                       if (IS_LOCAL(user))
-                       {
-                               user->Write("ERROR :Closing link (%s@%s) []",user->ident,user->host);
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
-                       }
-                       else
-                       {
-                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [Client exited]",user->server,user->nick,user->ident,user->host);
-                       }
-                       user->WriteCommonExcept("QUIT :Client exited");
-                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,"Client exited"));
-
-               }
-               user->AddToWhoWas();
-       }
-
-       FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
+       std::string quitmsg;
 
        if (IS_LOCAL(user))
        {
-               ServerInstance->SE->DelFd(user);
-               std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user);
-               if (x != ServerInstance->local_users.end())
-                       ServerInstance->local_users.erase(x);
-               user->CloseSocket();
-       }
-       
-       if (iter != ServerInstance->clientlist->end())
-       {
-               ServerInstance->clientlist->erase(iter);
-       }
-
-       if (user->registered == REG_ALL) {
-               user->PurgeEmptyChannels();
-       }
-
-       if (IS_LOCAL(user))
-       {
-               std::string original_command = "QUIT :" + quitmsg;
-               FOREACH_MOD(I_OnPostCommand,OnPostCommand("QUIT", parameters, pcnt, user, CMD_SUCCESS, original_command));
+               if (*ServerInstance->Config->FixedQuit)
+                       quitmsg = ServerInstance->Config->FixedQuit;
+               else
+                       quitmsg = pcnt ?
+                               ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit
+                               : "Client exited";
        }
+       else
+               quitmsg = pcnt ? parameters[0] : "Client exited";
 
-       if (user->registered != REG_ALL)
-               if (ServerInstance->unregistered_count)
-                       ServerInstance->unregistered_count--;
+       User::QuitUser(ServerInstance, user, quitmsg);
 
-       DELETE(user);
-       return CMD_USER_DELETED;
+       return CMD_SUCCESS;
 }