X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=830b05ae96ace029d2982c81038e20eaad637706;hb=bcac49dca78631687975771c6d0a76b595171664;hp=4cad8ebc2bcd624721d3b41c78f38036293a9e95;hpb=33f3e5fc8e2d8c0d40366e6cd5bc6a20a0e9eee8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 4cad8ebc2..830b05ae9 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -18,14 +18,18 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
+#include "mode.h"
 
 /* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */
 
+
+/** Handles the +P channel mode
+ */
 class BlockCaps : public ModeHandler
 {
  public:
-	BlockCaps() : ModeHandler('P', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -33,7 +37,7 @@ class BlockCaps : public ModeHandler
 		{
 			if (!channel->IsModeSet('P'))
 			{
-				channel->SetCustomMode('P',true);
+				channel->SetMode('P',true);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -41,7 +45,7 @@ class BlockCaps : public ModeHandler
 		{
 			if (channel->IsModeSet('P'))
 			{
-				channel->SetCustomMode('P',false);
+				channel->SetMode('P',false);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -52,28 +56,23 @@ class BlockCaps : public ModeHandler
 
 class ModuleBlockCAPS : public Module
 {
-	Server *Srv;
+	
 	BlockCaps* bc;
 public:
 	
-	ModuleBlockCAPS(Server* Me) : Module::Module(Me)
+	ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		bc = new BlockCaps;
-		Srv->AddMode(bc, 'P');
+		
+		bc = new BlockCaps(ServerInstance);
+		ServerInstance->AddMode(bc, 'P');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-	}
-
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output, "P", 4);
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-	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)
 		{
@@ -90,25 +89,27 @@ public:
 					}
 				}
 				
-				WriteServ(user->fd, "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name);
+				user->WriteServ( "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name);
 				return 1;
 			}
 		}
 		return 0;
 	}
-	
-	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 ~ModuleBlockCAPS()
 	{
+		ServerInstance->Modes->DelMode(bc);
+		DELETE(bc);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
@@ -124,7 +125,7 @@ class ModuleBlockCAPSFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleBlockCAPS(Me);
 	}