X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=3e8fdccc5e6726996d86b2ba50ef752366706ed7;hb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;hp=44ad7e8916bca76d8c87b365ec56b0fad17b7871;hpb=c708d7a3c0defba07171a70c68636d0b14abf590;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 44ad7e891..3e8fdccc5 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,37 +13,15 @@
 
 #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
  */
-class BlockCaps : public ModeHandler
+class BlockCaps : public SimpleChannelModeHandler
 {
  public:
-	BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 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'))
-			{
-				channel->SetMode('P',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('P'))
-			{
-				channel->SetMode('P',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	BlockCaps(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'B') { }
 };
 
 class ModuleBlockCAPS : public Module
@@ -58,7 +36,7 @@ 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!");
@@ -82,7 +60,12 @@ public:
 
 			Channel* c = (Channel*)dest;
 
-			if (c->IsModeSet('P'))
+			if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetStatus(user) == STATUS_OP)
+			{
+				return 0;
+			}
+
+			if (c->IsModeSet('B'))
 			{
 				int caps = 0;
 				for (std::string::iterator i = text.begin(); i != text.end(); i++)
@@ -115,12 +98,12 @@ public:
 			capsmap[(unsigned char)*n] = 1;
 		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 < 1 || minlen > MAXBUF-1)
 		{
-			ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+			ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
 			minlen = 1;
 		}
 	}
@@ -133,7 +116,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };