Add sanity checks to the ssl modules so that theres no possibility of an out of range...

[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 38da18cbe48aa16bf73c686653e22c1938bdca03..d46e5a9d6f36e4044cdd0a97226ab4e7424a3789 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#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 */
@@ -52,15 +47,15 @@ class BlockColor : public ModeHandler
 
 class ModuleBlockColour : public Module
 {
-       
+       bool AllowChanOps;      
        BlockColor *bc;
  public:
  
-       ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
+       ModuleBlockColour(InspIRCd* Me) : Module(Me)
        {
-               
                bc = new BlockColor(ServerInstance);
-               ServerInstance->AddMode(bc, 'c');
+               if (!ServerInstance->AddMode(bc, 'c'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
@@ -68,28 +63,31 @@ class ModuleBlockColour : public Module
                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)
+               if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        chanrec* c = (chanrec*)dest;
                        
                        if(c->IsModeSet('c'))
                        {
-                               /* 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++)
+                               if (!CHANOPS_EXEMPT(ServerInstance, 'c') || CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) != STATUS_OP)
                                {
-                                       switch (*i)
+                                       for (std::string::iterator i = text.begin(); i != text.end(); 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;
+                                               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;
+                                               }
                                        }
                                }
                        }
@@ -114,27 +112,4 @@ class ModuleBlockColour : public Module
        }
 };
 
-
-class ModuleBlockColourFactory : public ModuleFactory
-{
- public:
-       ModuleBlockColourFactory()
-       {
-       }
-       
-       ~ModuleBlockColourFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBlockColour(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleBlockColourFactory;
-}
+MODULE_INIT(ModuleBlockColour)