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 58ee4da8b221ca9392d52b3f7acec022ab517668..ef26e746b45ce20070a9b3cdcc318a772379c543 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,8 +1,27 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+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 */
 
@@ -11,44 +30,96 @@ 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...
+               std::stringstream line(output);
+               std::string temp1, temp2;
+               while (!line.eof())
+               {
+                       line >> temp1;
+                       if (temp1.substr(0,10) == "CHANMODES=")
+                       {
+                               // append the chanmode to the end
+                               temp1 = temp1.substr(10,temp1.length());
+                               temp1 = "CHANMODES=" + temp1 + "c";
+                       }
+                       temp2 = temp2 + temp1 + " ";
+               }
+               if (temp2.length())
+                       output = temp2.substr(0,temp2.length()-1);
+        }
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        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++;
                                }
                        }
                }
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        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++;
                                }
                        }
                }
@@ -60,6 +131,7 @@ class ModuleBlockColor : public Module
                // check if this is our mode character...
                if ((modechar == 'c') && (type == MT_CHANNEL))
                {
+                       log(DEBUG,"Allowing c change");
                        return 1;
                }
                else
@@ -70,12 +142,11 @@ class ModuleBlockColor : public Module
 
        virtual ~ModuleBlockColor()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
 };
 
@@ -91,9 +162,9 @@ class ModuleBlockColorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleBlockColor;
+               return new ModuleBlockColor(Me);
        }
        
 };