Fix m_chanlog crashing.

[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 c041feb31af565b0871467573b654f919ceeeb47..56f908dccf62fd31abe7f2b6480ff68dd8f01adf 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
@@ -13,7 +13,7 @@
 
 #include "inspircd.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
@@ -21,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(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                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;
                        }
                }
@@ -58,8 +58,11 @@ public:
        {
                OnRehash(NULL,"");
                bc = new BlockCaps(ServerInstance);
-               if (!ServerInstance->AddMode(bc))
+               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);
        }
@@ -79,7 +82,7 @@ public:
 
                        Channel* c = (Channel*)dest;
 
-                       if (c->IsModeSet('P'))
+                       if (c->IsModeSet('B'))
                        {
                                int caps = 0;
                                for (std::string::iterator i = text.begin(); i != text.end(); i++)