X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=c5b9f3a1c784f6dd894a4ec6b6d5237705826f73;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=5fe8a8c93cef9d031080d0b47d7b653248d82c09;hpb=7074dc3b2788da8f2e2e8e3a74f3518343aa65db;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 5fe8a8c93..c5b9f3a1c 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,136 +1,85 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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 */
+/* $ModDesc: Provides channel mode +T to block notices to the channel */
 
-class NoNotice : public ModeHandler
+class NoNotice : public SimpleChannelModeHandler
 {
  public:
-	NoNotice() : ModeHandler('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(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
 };
 
 class ModuleNoNotice : public Module
 {
-	Server *Srv;
-	NoNotice* nt;
+	NoNotice nt;
  public:
- 
-	ModuleNoNotice(Server* Me)
-		: Module::Module(Me)
+
+	ModuleNoNotice()
+		: nt(this)
+	{
+	}
+
+	void init()
 	{
-		Srv = Me;
-		nt = new NoNotice();
-		Srv->AddMode(nt, 'T');
+		ServerInstance->Modules->AddService(nt);
+		Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	void Implements(char* List)
+	virtual void On005Numeric(std::string &output)
 	{
-		List[I_OnUserPreNotice] = List[I_On005Numeric] = 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->IsModeSet('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) == "%"))
-				{
-					// ops and halfops can still /NOTICE the channel
-					return 0;
-				}
+				res = ServerInstance->OnCheckExemption(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;
-	}
-
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output,"T",4);
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual ~ModuleNoNotice()
 	{
-		DELETE(nt);
 	}
-	
-	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 channel mode +T to block notices to the channel", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)