Stripcolor not finished yet.

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 0b7357417b29d0cc9b98c4e0ae6d01c96c6755a7..7c0b602e9464ea52c9d4004be7efba1ac0839a25 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -14,22 +14,11 @@
  * ---------------------------------------------------
  */
 
-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"
@@ -45,22 +34,18 @@ using namespace std;
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_quit.h"
+#include "commands/cmd_quit.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern ModuleList modules;
+extern FactoryList 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[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -72,16 +57,13 @@ void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
                /* theres more to do here, but for now just close the socket */
                if (pcnt == 1)
                {
-                       if (parameters[0][0] == ':')
-                       {
-                               *parameters[0]++;
-                       }
+                       if (*parameters[0] == ':')
+                               parameters[0]++;
+
                        reason = parameters[0];
 
-                       if (strlen(reason)>MAXQUIT)
-                       {
-                               reason[MAXQUIT-1] = '\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.
@@ -97,7 +79,7 @@ void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
                                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 OnUserQuit(user,std::string(Config->PrefixQuit)+std::string(parameters[0]));
+                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(Config->PrefixQuit)+std::string(parameters[0])));
 
                }
                else
@@ -105,23 +87,23 @@ void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
                        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 OnUserQuit(user,"Client exited");
+                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,"Client exited"));
 
                }
                AddWhoWas(user);
        }
 
-       FOREACH_MOD OnUserDisconnect(user);
+       FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
 
        /* 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));
-                }
+               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();
        }
        
@@ -133,9 +115,7 @@ void cmd_quit::Handle (char **parameters, int pcnt, userrec *user)
        if (user->registered == 7) {
                purge_empty_chans(user);
        }
-        if (user->fd > -1)
-                fd_ref_table[user->fd] = NULL;
-       delete user;
+       if (user->fd > -1)
+               fd_ref_table[user->fd] = NULL;
+       DELETE(user);
 }
-
-