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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 920a0d134..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-2008 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
@@ -23,28 +23,32 @@ class NoNotice : public SimpleChannelModeHandler
 
 class ModuleNoNotice : public Module
 {
-	
+
 	NoNotice* nt;
  public:
- 
+
 	ModuleNoNotice(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		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);
+		Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+	}
+
+	virtual void On005Numeric(std::string &output)
+	{
+		ServerInstance->AddExtBanChar('T');
 	}
 
-	
 	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
 			Channel* c = (Channel*)dest;
-			if (c->IsModeSet('T'))
+			if (c->IsModeSet('T') || c->IsExtBanned(user, 'T'))
 			{
 				if (ServerInstance->ULine(user->server))
 				{
@@ -58,7 +62,7 @@ class ModuleNoNotice : public Module
 				}
 				else
 				{
-					user->WriteNumeric(404, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), 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;
 				}
 			}
@@ -71,10 +75,10 @@ class ModuleNoNotice : public Module
 		ServerInstance->Modes->DelMode(nt);
 		delete nt;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };