Review and optimize

[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 9a6da0fae12574fc626e31ecb43fa82fdf658180..1e7f213535e8e0f6d475644e6cc0e22d59e1edac 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -14,11 +14,14 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <sstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
@@ -27,9 +30,10 @@ 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);
        }
 
@@ -59,13 +63,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++;
                                }
                        }
                }
@@ -78,13 +95,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++;
                                }
                        }
                }
@@ -107,12 +137,11 @@ class ModuleBlockColor : public Module
 
        virtual ~ModuleBlockColor()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
 };
 
@@ -128,9 +157,9 @@ class ModuleBlockColorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleBlockColor;
+               return new ModuleBlockColor(Me);
        }
        
 };