X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_nonotice.cpp;h=11b57e09be9d2530f320750f0231dfb3c4b89b61;hb=ece985ccb3210a132d67381511642edfb359f5c4;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..11b57e09b 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,78 +1,98 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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 ModeHandler
+{
+ public:
+	NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* 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(Me)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+		
+		nt = new NoNotice(ServerInstance);
+		if (!ServerInstance->Modes->AddMode(nt))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreNotice };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
+
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+	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->IsCustomModeSet('T'))
+			Channel* c = (Channel*)dest;
+			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;
 				}
 			}
 		}
 		return 0;
 	}
-	
+
 	virtual ~ModuleNoNotice()
 	{
-		delete Srv;
+		ServerInstance->Modes->DelMode(nt);
+		delete nt;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
-	}
-};
-
-
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNoticeFactory()
-	{
-	}
-	
-	~ModuleNoNoticeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleNoNotice;
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)