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_chanfilter.cpp

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 1cdee87a85fef3973523bb4371c37367a39068b0..19e1fe3d92bdf14526262b6eed988d86b0d7002f 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -2,31 +2,23 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+#define _CRT_SECURE_NO_DEPRECATE
+#define _SCL_SECURE_NO_DEPRECATE
 
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "u_listmode.h"
 #include "inspircd.h"
+#include "u_listmode.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
+/* $ModDep: ../../include/u_listmode.h */
 
 /** Handles channel mode +g
  */
@@ -71,10 +63,11 @@ class ModuleChanFilter : public Module
  public:
  
        ModuleChanFilter(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                cf = new ChanFilter(ServerInstance);
-               ServerInstance->AddMode(cf, 'g');
+               if (!ServerInstance->AddMode(cf, 'g'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List) 
@@ -88,13 +81,16 @@ class ModuleChanFilter : public Module
                cf->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                cf->DoRehash();
        }
 
        virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text)
        {
+               if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)
+                       return 0;
+
                // Create a copy of the string in irc::string
                irc::string line = text.c_str();
 
@@ -112,10 +108,11 @@ class ModuleChanFilter : public Module
                                }
                        }
                }
+
                return 0;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -129,9 +126,9 @@ class ModuleChanFilter : public Module
                cf->DoCleanup(target_type, item);
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreMessage(user,dest,target_type,text,status);
+               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
        
        virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
@@ -151,27 +148,4 @@ class ModuleChanFilter : public Module
        }
 };
 
-
-class ModuleChanFilterFactory : public ModuleFactory
-{
- public:
-       ModuleChanFilterFactory()
-       {
-       }
-       
-       ~ModuleChanFilterFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChanFilter(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleChanFilterFactory;
-}
+MODULE_INIT(ModuleChanFilter)