X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=c3523a7ef88ab138464c4af43ea2f1c3b90c5ba1;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=1e88a4cc0ec98b6ad320a1c09bb7f620a3bca763;hpb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 1e88a4cc0..c3523a7ef 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -18,63 +18,63 @@
 class NoNotice : public SimpleChannelModeHandler
 {
  public:
-	NoNotice(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'T') { }
+	NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, 'T') { }
 };
 
 class ModuleNoNotice : public Module
 {
-	
-	NoNotice* nt;
+	NoNotice nt;
  public:
- 
-	ModuleNoNotice(InspIRCd* Me)
-		: Module(Me)
+
+	ModuleNoNotice()
+		: nt(this)
 	{
-		
-		nt = new NoNotice(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(nt))
+		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 int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual void On005Numeric(std::string &output)
+	{
+		ServerInstance->AddExtBanChar('T');
+	}
+
+	virtual ModResult 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->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
 			{
 				if (ServerInstance->ULine(user->server))
 				{
 					// ulines are exempt.
-					return 0;
+					return MOD_RES_PASSTHRU;
 				}
-				else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
+				else if (CHANOPS_EXEMPT('T') && c->GetPrefixValue(user) == OP_VALUE)
 				{
 					// channel ops are exempt if set in conf.
-					return 0;
+					return MOD_RES_PASSTHRU;
 				}
 				else
 				{
-					user->WriteNumeric(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()
 	{
-		ServerInstance->Modes->DelMode(nt);
-		delete nt;
+		ServerInstance->Modes->DelMode(&nt);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };