X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=fe1e0a46d33690162dc7c2da61ab08379e52135b;hb=b5965b08c23e3e89404b481386f2e56ce7cb7ce2;hp=01c849e5596895dd1bd692933f34b1c7c9747cee;hpb=4257903481075d305b4039cc255bfb12cb94bba8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 01c849e55..fe1e0a46d 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,117 +2,78 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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 */
 
+class NoNotice : public SimpleChannelModeHandler
+{
+ public:
+	NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
+};
+
 class ModuleNoNotice : public Module
 {
-	Server *Srv;
+	NoNotice nt;
  public:
- 
-	ModuleNoNotice(Server* Me)
-		: Module::Module(Me)
+
+	ModuleNoNotice()
+		: nt(this)
 	{
-		Srv = Me;
-		Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+		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] = List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+		ServerInstance->AddExtBanChar('T');
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (target_type == TYPE_CHANNEL)
+		ModResult res;
+		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->IsUlined(user->server)) || (Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+				if (ServerInstance->ULine(user->server))
 				{
-					// ops and halfops can still /NOTICE the channel
-					return 0;
+					// ulines are exempt.
+					return MOD_RES_PASSTHRU;
 				}
+				FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"nonotice"));
+				if (res == MOD_RES_ALLOW)
+					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 void On005Numeric(std::string &output)
-        {
-		InsertMode(output,"T",4);
-        }
-
-	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()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
-};
-
 
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNoticeFactory()
-	{
-	}
-	
-	~ModuleNoNoticeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleNoNotice(Me);
+		return Version("Provides support for unreal-style channel mode +T", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)