X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=8e03f2bca6e4499350e639ad29ec9a66780f7a24;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=7a2229ccd33c2359b1031dda056d1a6521c5f384;hpb=e51a4b5c29deac855496d6658a3c4612a61ffbb7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 7a2229ccd..8e03f2bca 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -16,21 +16,17 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
-extern InspIRCd* ServerInstance;
-
 class NoNotice : public ModeHandler
 {
  public:
-	NoNotice() : ModeHandler('T', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -57,21 +53,21 @@ class NoNotice : public ModeHandler
 
 class ModuleNoNotice : public Module
 {
-	Server *Srv;
+	
 	NoNotice* nt;
  public:
  
-	ModuleNoNotice(Server* Me)
+	ModuleNoNotice(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		nt = new NoNotice();
-		Srv->AddMode(nt, 'T');
+		
+		nt = new NoNotice(ServerInstance);
+		ServerInstance->AddMode(nt, 'T');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnUserPreNotice] = List[I_On005Numeric] = 1;
+		List[I_OnUserPreNotice] = 1;
 	}
 	
 	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
@@ -81,7 +77,7 @@ class ModuleNoNotice : public Module
 			chanrec* c = (chanrec*)dest;
 			if (c->IsModeSet('T'))
 			{
-				if ((Srv->IsUlined(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
+				if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
 				{
 					// ops and halfops can still /NOTICE the channel
 					return 0;
@@ -96,19 +92,15 @@ class ModuleNoNotice : public Module
 		return 0;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->ModeGrok->InsertMode(output,"T",4);
-	}
-
 	virtual ~ModuleNoNotice()
 	{
+		ServerInstance->Modes->DelMode(nt);
 		DELETE(nt);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
 	}
 };
 
@@ -124,7 +116,7 @@ class ModuleNoNoticeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleNoNotice(Me);
 	}