This is better now.

[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 5f30b18b52b184cb1eb05760f037637e0da1299e..f62e546136485ee142ec6d4061ee90af01d0f28f 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.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>
@@ -14,123 +14,126 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <sstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
-class ModuleBlockColor : public Module
+/** Handles the +c channel mode
+ */
+class BlockColor : public ModeHandler
 {
-       Server *Srv;
  public:
- 
-       ModuleBlockColor()
-       {
-               Srv = new Server;
-               Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
-       }
+       BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-        virtual void On005Numeric(std::string &output)
-        {
-                // we don't really have a limit...
-               std::stringstream line(output);
-               std::string temp1, temp2;
-               while (!line.eof())
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               if (adding)
                {
-                       line >> temp1;
-                       if (temp1.substr(0,10) == "CHANMODES=")
+                       if (!channel->IsModeSet('c'))
                        {
-                               // append the chanmode to the end
-                               temp1 = temp1.substr(10,temp1.length());
-                               temp1 = "CHANMODES=" + temp1 + "c";
+                               channel->SetMode('c',true);
+                               return MODEACTION_ALLOW;
                        }
-                       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)
-       {
-               if (target_type == TYPE_CHANNEL)
+               else
                {
-                       chanrec* c = (chanrec*)dest;
-                       char ctext[MAXBUF];
-                       snprintf(ctext,MAXBUF,"%s",text.c_str());
-                       if (c->IsCustomModeSet('c'))
+                       if (channel->IsModeSet('c'))
                        {
-                               if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31)))
-                               {
-                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-                                       return 1;
-                               }
+                               channel->SetMode('c',false);
+                               return MODEACTION_ALLOW;
                        }
                }
-               return 0;
+
+               return MODEACTION_DENY;
        }
+};
+
+class ModuleBlockColour : public Module
+{
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       BlockColor *bc;
+ public:
+ 
+       ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
+       {
+               
+               bc = new BlockColor(ServerInstance);
+               ServerInstance->AddMode(bc, 'c');
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+       }
+
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* c = (chanrec*)dest;
-                       char ctext[MAXBUF];
-                       snprintf(ctext,MAXBUF,"%s",text.c_str());
-                       if (c->IsCustomModeSet('c'))
+                       
+                       if(c->IsModeSet('c'))
                        {
-                               if ((strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31)))
+                               /* Replace a strlcpy(), which ran even when +c wasn't set, with this (no copies at all) -- Om */
+                               for (std::string::iterator i = text.begin(); i != text.end(); i++)
                                {
-                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-                                       return 1;
+                                       switch (*i)
+                                       {
+                                               case 2:
+                                               case 3:
+                                               case 15:
+                                               case 21:
+                                               case 22:
+                                               case 31:
+                                                       user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
+                                                       return 1;
+                                               break;
+                                       }
                                }
                        }
                }
                return 0;
        }
        
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               // check if this is our mode character...
-               if ((modechar == 'c') && (type == MT_CHANNEL))
-               {
-                       log(DEBUG,"Allowing c change");
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
+               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
-       virtual ~ModuleBlockColor()
+       virtual ~ModuleBlockColour()
        {
-               delete Srv;
+               ServerInstance->Modes->DelMode(bc);
+               DELETE(bc);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };
 
 
-class ModuleBlockColorFactory : public ModuleFactory
+class ModuleBlockColourFactory : public ModuleFactory
 {
  public:
-       ModuleBlockColorFactory()
+       ModuleBlockColourFactory()
        {
        }
        
-       ~ModuleBlockColorFactory()
+       ~ModuleBlockColourFactory()
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleBlockColor;
+               return new ModuleBlockColour(Me);
        }
        
 };
@@ -138,6 +141,5 @@ class ModuleBlockColorFactory : public ModuleFactory
 
 extern "C" void * init_module( void )
 {
-       return new ModuleBlockColorFactory;
+       return new ModuleBlockColourFactory;
 }
-