X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=9c02408cf97cf73462e734c8d6bfc6b100ee7e8c;hb=563ad5acb0fb3d1aee5094989377d8b284d33d92;hp=71e7e570b4cec73d4e09cd1c808a72bb9c27a1d3;hpb=67878d628c15f2adec41b6d3b266830a636c2ed0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 71e7e570b..9c02408cf 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,76 +11,58 @@
  * ---------------------------------------------------
  */
 
-#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
+class NoNotice : public SimpleChannelModeHandler
 {
  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;
-	}
+	NoNotice(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'T') { }
 };
 
 class ModuleNoNotice : public Module
 {
-	
+
 	NoNotice* nt;
  public:
- 
+
 	ModuleNoNotice(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
+
 		nt = new NoNotice(ServerInstance);
-		if (!ServerInstance->AddMode(nt, 'T'))
+		if (!ServerInstance->Modes->AddMode(nt))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
+	virtual void On005Numeric(std::string &output)
 	{
-		List[I_OnUserPreNotice] = 1;
+		ServerInstance->AddExtBanChar('T');
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (target_type == TYPE_CHANNEL)
+		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsModeSet('T'))
+			Channel* c = (Channel*)dest;
+			if (c->IsModeSet('T') || c->IsExtBanned(user, 'T'))
 			{
-				if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
+				if (ServerInstance->ULine(user->server))
+				{
+					// ulines are exempt.
+					return 0;
+				}
+				else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
 				{
-					// ops and halfops can still /NOTICE the channel
+					// channel ops are exempt if set in conf.
 					return 0;
 				}
 				else
 				{
-					user->WriteServ("404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
 					return 1;
 				}
 			}
@@ -91,37 +73,13 @@ class ModuleNoNotice : public Module
 	virtual ~ModuleNoNotice()
 	{
 		ServerInstance->Modes->DelMode(nt);
-		DELETE(nt);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		delete nt;
 	}
-};
-
 
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNoticeFactory()
-	{
-	}
-	
-	~ModuleNoNoticeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleNoNotice(Me);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)