DOH! Fix my muppetry of a segfault, and fix some warnings

[user/henk/code/inspircd.git] / src / modules / m_blockcaps.cpp

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index a3991177b161bbe9003b4019f6e0a45506b1e2c1..c229ef7529350a2000e79b06352489469e047f02 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,13 +11,9 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
-#include "mode.h"
 
-/* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */
+/* $ModDesc: Provides support to block all-CAPS channel messages and notices */
 
 
 /** Handles the +P channel mode
@@ -25,23 +21,23 @@
 class BlockCaps : public ModeHandler
 {
  public:
-       BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
-                       if (!channel->IsModeSet('P'))
+                       if (!channel->IsModeSet('B'))
                        {
-                               channel->SetMode('P',true);
+                               channel->SetMode('B',true);
                                return MODEACTION_ALLOW;
                        }
                }
                else
                {
-                       if (channel->IsModeSet('P'))
+                       if (channel->IsModeSet('B'))
                        {
-                               channel->SetMode('P',false);
+                               channel->SetMode('B',false);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -62,30 +58,36 @@ public:
        {
                OnRehash(NULL,"");
                bc = new BlockCaps(ServerInstance);
-               if (!ServerInstance->AddMode(bc, 'P'))
+               if (!ServerInstance->Modes->AddMode(bc))
+               {
+                       delete bc;
                        throw ModuleException("Could not add new modes!");
+               }
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
-       }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                ReadConf();
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        if ((!IS_LOCAL(user)) || (text.length() < minlen))
                                return 0;
 
-                       chanrec* c = (chanrec*)dest;
+                       Channel* c = (Channel*)dest;
+
+                       if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetStatus(user) == STATUS_OP)
+                       {
+                               return 0;
+                       }
 
-                       if (c->IsModeSet('P'))
+                       if (c->IsModeSet('B'))
                        {
                                int caps = 0;
                                for (std::string::iterator i = text.begin(); i != text.end(); i++)
@@ -100,7 +102,7 @@ public:
                return 0;
        }
 
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
@@ -109,58 +111,35 @@ public:
        {
                ConfigReader Conf(ServerInstance);
                percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
-               minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 0, true);
+               minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 0, true);
                std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0);
                if (hmap.empty())
                        hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
                memset(&capsmap, 0, 255);
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
                        capsmap[(unsigned char)*n] = 1;
-               if (percent < 0 || percent > 100)
+               if (percent < 1 || percent > 100)
                {
-                       ServerInstance->Log(DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
+                       ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
                        percent = 100;
                }
-               if (minlen < 0 || minlen > MAXBUF-1)
+               if (minlen < 1 || minlen > MAXBUF-1)
                {
-                       ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 0.");
-                       minlen = 0;
+                       ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+                       minlen = 1;
                }
        }
 
        virtual ~ModuleBlockCAPS()
        {
                ServerInstance->Modes->DelMode(bc);
-               DELETE(bc);
+               delete bc;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
-       }
-};
-
-
-class ModuleBlockCAPSFactory : public ModuleFactory
-{
- public:
-       ModuleBlockCAPSFactory()
-       {
-       }
-       
-       ~ModuleBlockCAPSFactory()
-       {
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBlockCAPS(Me);
-       }
-       
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBlockCAPSFactory;
-}
+MODULE_INIT(ModuleBlockCAPS)