X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=6286321b33102c8a4e9137924383f2c2ac2cd9b0;hb=124bc04e841f9ca527b99c37563f19a85dec63fc;hp=89a619590cf8495c9bc718320f1860c2a1b58a75;hpb=da8fe330c2b3445b370cb80ecae93c7fb34d441d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 89a619590..6286321b3 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -14,39 +14,77 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
+class NoNotice : public ModeHandler
+{
+ public:
+	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)
+	{
+		if (adding)
+		{
+			if (!channel->IsModeSet('T'))
+			{
+				channel->SetMode('T',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (channel->IsModeSet('T'))
+			{
+				channel->SetMode('T',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
+};
+
 class ModuleNoNotice : public Module
 {
-	Server *Srv;
+	
+	NoNotice* nt;
  public:
  
-	ModuleNoNotice()
+	ModuleNoNotice(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+		
+		nt = new NoNotice(ServerInstance);
+		ServerInstance->AddMode(nt, 'T');
+	}
+
+	void Implements(char* List)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+		List[I_OnUserPreNotice] = 1;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('T'))
+			if (c->IsModeSet('T'))
 			{
-				if ((Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+				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;
 				}
 				else
 				{
-					WriteServ(user->fd,"404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
+					user->WriteServ("404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
 					return 1;
 				}
 			}
@@ -54,27 +92,15 @@ class ModuleNoNotice : public Module
 		return 0;
 	}
 
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'T') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	
 	virtual ~ModuleNoNotice()
 	{
-		delete Srv;
+		ServerInstance->Modes->DelMode(nt);
+		DELETE(nt);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
@@ -90,9 +116,9 @@ class ModuleNoNoticeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleNoNotice;
+		return new ModuleNoNotice(Me);
 	}
 	
 };