kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

[user/henk/code/inspircd.git] / src / modules / m_antibottler.cpp

diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 8b11c80c5dcb6c73faf0e7ca442c48b48d877bb0..58ee0b5d6c562f49d18c3bf0d92dd7b6fff2649b 100644 (file)
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -32,6 +32,12 @@ class ModuleAntiBottler : public Module
        {
                Srv = Me;
        }
+
+       void Implements(char* List)
+       {
+               List[I_OnServerRaw] = 1;
+       }
+
        
        virtual ~ModuleAntiBottler()
        {
@@ -42,40 +48,42 @@ class ModuleAntiBottler : public Module
                return Version(1,0,0,1,VF_VENDOR);
        }
 
-
        virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user)
        {
                if (inbound)
                {
                        char data[MAXBUF];
-                       strncpy(data,raw.c_str(),MAXBUF);
+                       strlcpy(data,raw.c_str(),MAXBUF);
                        bool not_bottler = false;
                        if (!strncmp(data,"user ",5))
                        {
-                               for (unsigned int j = 0; j < strlen(data); j++)
+                               for (char* j = data; *j; j++)
                                {
-                                       if (data[j] == ':')
+                                       if (*j == ':')
                                                break;
                                                
-                                       if (data[j] == '"')
+                                       if (*j == '"')
                                        {
                                                not_bottler = true;
                                        }
                                }
                                // Bug Fix (#14) -- FCS
-                               if (!strlen(data)) return;                              
+
+                               if (!(data) || !(*data))
+                                       return;
+
                                strtok(data," ");
-                               if (!strlen(data)) return;
                                char *ident = strtok(NULL," ");
-                               if (!strlen(data)) return;
                                char *local = strtok(NULL," ");
-                               if (!strlen(data)) return;
                                char *remote = strtok(NULL," :");
-                               if (!strlen(data)) return;
                                char *gecos = strtok(NULL,"\r\n");
-                               for (unsigned int j = 0; j < strlen(remote); j++)
+
+                               if (!ident || !local || !remote || !gecos)
+                                       return;
+
+                               for (char* j = remote; *j; j++)
                                {
-                                       if (((remote[j] < '0') || (remote[j] > '9')) && (remote[j] != '.'))
+                                       if (((*j < '0') || (*j > '9')) && (*j != '.'))
                                        {
                                                not_bottler = true;
                                        }