New 'Implements' system

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 13663cc4007b2046fe2989275bca4b8feca532c5..ef26e746b45ce20070a9b3cdcc318a772379c543 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -30,12 +30,18 @@ class ModuleBlockColor : public Module
        Server *Srv;
  public:
  
-       ModuleBlockColor()
+       ModuleBlockColor(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
        }
 
+       void Implements(char* List)
+        {
+                List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
+        }
+
         virtual void On005Numeric(std::string &output)
         {
                 // we don't really have a limit...
@@ -62,13 +68,26 @@ class ModuleBlockColor : public Module
                {
                        chanrec* c = (chanrec*)dest;
                        char ctext[MAXBUF];
+                       char *ctptr = ctext;
                        snprintf(ctext,MAXBUF,"%s",text.c_str());
+
+
                        if (c->IsCustomModeSet('c'))
                        {
-                               if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31)))
+                               /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
+                               while (ctptr && *ctptr)
                                {
-                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-                                       return 1;
+                                       switch (*ctptr)
+                                       {
+                                               case 2:
+                                               case 3:
+                                               case 31:
+                                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
+                                                       return 1;
+                                                       break;
+                                       }
+
+                                       *ctptr++;
                                }
                        }
                }
@@ -81,13 +100,26 @@ class ModuleBlockColor : public Module
                {
                        chanrec* c = (chanrec*)dest;
                        char ctext[MAXBUF];
+                       char *ctptr = ctext;
                        snprintf(ctext,MAXBUF,"%s",text.c_str());
+
+
                        if (c->IsCustomModeSet('c'))
                        {
-                               if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31)))
+                               /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
+                               while (ctptr && *ctptr)
                                {
-                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-                                       return 1;
+                                       switch (*ctptr)
+                                       {
+                                               case 2:
+                                               case 3:
+                                               case 31:
+                                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
+                                                       return 1;
+                                                       break;
+                                       }
+
+                                       ctptr++;
                                }
                        }
                }
@@ -110,7 +142,6 @@ class ModuleBlockColor : public Module
 
        virtual ~ModuleBlockColor()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -131,9 +162,9 @@ class ModuleBlockColorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleBlockColor;
+               return new ModuleBlockColor(Me);
        }
        
 };