X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=56f908dccf62fd31abe7f2b6480ff68dd8f01adf;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=4b28f35d0ca4d26880e1041bf8e5ad7504e34476;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 4b28f35d0..56f908dcc 100644
--- 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,16 +58,15 @@ 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);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
-	}
 
 	virtual void OnRehash(User* user, const std::string &param)
 	{
@@ -83,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++)
@@ -129,7 +128,7 @@ public:
 	virtual ~ModuleBlockCAPS()
 	{
 		ServerInstance->Modes->DelMode(bc);
-		DELETE(bc);
+		delete bc;
 	}
 
 	virtual Version GetVersion()