Just to mess with om's head, remove helperfuncs.h from everywhere

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index dd36de9b386c87e5c2bfe2488064adf3423ef5d6..7430e0fd27599334ee9ea12eeb69349e76af8ca1 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -14,59 +14,32 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
+#include "configreader.h"
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
 #include <vector>
-#include <deque>
 #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 std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+#include "commands/cmd_quit.h"
 
-void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       user_hash::iterator iter = clientlist.find(user->nick);
-       char* reason;
+       user_hash::iterator iter = ServerInstance->clientlist.find(user->nick);
+       char reason[MAXBUF];
 
-       if (user->registered == 7)
+       if (user->registered == REG_ALL)
        {
                /* theres more to do here, but for now just close the socket */
                if (pcnt == 1)
@@ -74,37 +47,34 @@ void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
                        if (*parameters[0] == ':')
                                parameters[0]++;
 
-                       reason = parameters[0];
-
-                       if (strlen(reason) > MAXQUIT)
-                               reason[MAXQUIT-1] = 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 (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]);
+                               user->Write("ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,ServerInstance->Config->PrefixQuit,parameters[0]);
+                               ServerInstance->WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,ServerInstance->Config->PrefixQuit,parameters[0]);
+                               user->WriteCommonExcept("QUIT :%s%s",ServerInstance->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]);
+                               ServerInstance->WriteOpers("*** Client exiting at %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(Config->PrefixQuit)+std::string(parameters[0])));
+                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(ServerInstance->Config->PrefixQuit)+std::string(parameters[0])));
 
                }
                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");
+                       user->Write("ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
+                       ServerInstance->WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
+                       user->WriteCommonExcept("QUIT :Client exited");
                        FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,"Client exited"));
 
                }
-               AddWhoWas(user);
+               user->AddToWhoWas();
        }
 
        FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
@@ -113,25 +83,23 @@ void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
        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));
-                }
+               if (find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user) != ServerInstance->local_users.end())
+               {
+                       ServerInstance->Log(DEBUG,"Delete local user");
+                       ServerInstance->local_users.erase(find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user));
+               }
                user->CloseSocket();
        }
        
-       if (iter != clientlist.end())
+       if (iter != ServerInstance->clientlist.end())
        {
-               clientlist.erase(iter);
+               ServerInstance->clientlist.erase(iter);
        }
 
-       if (user->registered == 7) {
-               purge_empty_chans(user);
+       if (user->registered == REG_ALL) {
+               user->PurgeEmptyChannels();
        }
-        if (user->fd > -1)
-                fd_ref_table[user->fd] = NULL;
-       delete user;
+       if (user->fd > -1)
+               ServerInstance->fd_ref_table[user->fd] = NULL;
+       DELETE(user);
 }
-
-