No need to .c_str() the quitmsg, it takes const std::string&

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 50166ffd9bd7721d44f68040b3b4d6f9ab820482..5c5abf7ba44379c28cd2d1c9506c0edcfc75a1d8 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -2,137 +2,40 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_quit.h"
-
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-
-void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
-{
-       user_hash::iterator iter = clientlist.find(user->nick);
-       char* reason;
-
-       if (user->registered == 7)
-       {
-               /* theres more to do here, but for now just close the socket */
-               if (pcnt == 1)
-               {
-                       if (*parameters[0] == ':')
-                               parameters[0]++;
+#include "commands/cmd_quit.h"
 
-                       reason = parameters[0];
 
-                       if (strlen(reason) > MAXQUIT)
-                               reason[MAXQUIT-1] = 0;
 
-                       /* We should only prefix the quit for a local user. Remote users have
-                        * already been prefixed, where neccessary, by the upstream server.
-                        */
-                       if (user->fd > -1)
-                       {
-                               Write(user->fd,"ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,Config->PrefixQuit,parameters[0]);
-                               WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,Config->PrefixQuit,parameters[0]);
-                               WriteCommonExcept(user,"QUIT :%s%s",Config->PrefixQuit,parameters[0]);
-                       }
-                       else
-                       {
-                               WriteOpers("*** Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
-                               WriteCommonExcept(user,"QUIT :%s",parameters[0]);
-                       }
-                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(Config->PrefixQuit)+std::string(parameters[0])));
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_quit(Instance);
+}
 
-               }
-               else
-               {
-                       Write(user->fd,"ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
-                       WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
-                       WriteCommonExcept(user,"QUIT :Client exited");
-                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,"Client exited"));
+CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
+{
 
-               }
-               AddWhoWas(user);
-       }
+       std::string quitmsg;
 
-       FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
+       if (IS_LOCAL(user))
+               quitmsg = pcnt ? ServerInstance->Config->PrefixQuit + std::string(parameters[0]) : "Client exited";
+       else
+               quitmsg = pcnt ? parameters[0] : "Client exited";
 
-       /* push the socket on a stack of sockets due to be closed at the next opportunity */
-       if (user->fd > -1)
-       {
-               ServerInstance->SE->DelFd(user->fd);
-                if (find(local_users.begin(),local_users.end(),user) != local_users.end())
-                {
-                        log(DEBUG,"Delete local user");
-                        local_users.erase(find(local_users.begin(),local_users.end(),user));
-                }
-               user->CloseSocket();
-       }
-       
-       if (iter != clientlist.end())
-       {
-               clientlist.erase(iter);
-       }
+       userrec::QuitUser(ServerInstance, user, quitmsg);
 
-       if (user->registered == 7) {
-               purge_empty_chans(user);
-       }
-        if (user->fd > -1)
-                fd_ref_table[user->fd] = NULL;
-       delete user;
+       return CMD_SUCCESS;
 }
 
-