X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=c3523a7ef88ab138464c4af43ea2f1c3b90c5ba1;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=c26299a774d20a5ab66a65b2b3062d671c525f36;hpb=103c58a8339c0cac95911ba83fd5adc98c17e17e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index c26299a77..c3523a7ef 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,78 +1,81 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
+class NoNotice : public SimpleChannelModeHandler
+{
+ public:
+	NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, 'T') { }
+};
+
 class ModuleNoNotice : public Module
 {
-	Server *Srv;
-	
+	NoNotice nt;
  public:
- 
+
 	ModuleNoNotice()
+		: nt(this)
+	{
+		if (!ServerInstance->Modes->AddMode(&nt))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+	}
+
+	virtual void On005Numeric(std::string &output)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+		ServerInstance->AddExtBanChar('T');
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+
+	virtual ModResult 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->IsCustomModeSet('T'))
+			Channel* c = (Channel*)dest;
+			if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
 			{
-				if ((Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+				if (ServerInstance->ULine(user->server))
+				{
+					// ulines are exempt.
+					return MOD_RES_PASSTHRU;
+				}
+				else if (CHANOPS_EXEMPT('T') && c->GetPrefixValue(user) == OP_VALUE)
 				{
-					// ops and halfops can still /NOTICE the channel
-					return 0;
+					// channel ops are exempt if set in conf.
+					return MOD_RES_PASSTHRU;
 				}
 				else
 				{
-					WriteServ(user->fd,"404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
-					return 1;
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
+					return MOD_RES_DENY;
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
-	
+
 	virtual ~ModuleNoNotice()
 	{
-		delete Srv;
+		ServerInstance->Modes->DelMode(&nt);
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-};
 
-
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNoticeFactory()
-	{
-	}
-	
-	~ModuleNoNoticeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
+	virtual Version GetVersion()
 	{
-		return new ModuleNoNotice;
+		return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)