X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=b3f3d8da6e7f24215c480a30c5bb6e620048e3d7;hb=8f915e5ddbab4e36bb08f9f9d726e953db1f601f;hp=6d17bc85df04a453b4117d9f017dfb218082f9b4;hpb=24731c63b6320be22f7b3220236271fa7476b975;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 6d17bc85d..b3f3d8da6 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,7 +18,7 @@
 class NoNotice : public SimpleChannelModeHandler
 {
  public:
-	NoNotice(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'T') { }
+	NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
 };
 
 class ModuleNoNotice : public Module
@@ -26,8 +26,8 @@ class ModuleNoNotice : public Module
 	NoNotice nt;
  public:
 
-	ModuleNoNotice(InspIRCd* Me)
-		: Module(Me), nt(Me, this)
+	ModuleNoNotice()
+		: nt(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&nt))
 			throw ModuleException("Could not add new modes!");
@@ -40,41 +40,39 @@ class ModuleNoNotice : public Module
 		ServerInstance->AddExtBanChar('T');
 	}
 
-	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
+		ModResult res;
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
 			Channel* c = (Channel*)dest;
-			if (c->IsModeSet('T') || c->GetExtBanStatus(user, 'T') < 0)
+			if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
 			{
 				if (ServerInstance->ULine(user->server))
 				{
 					// ulines are exempt.
-					return 0;
-				}
-				else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
-				{
-					// channel ops are exempt if set in conf.
-					return 0;
+					return MOD_RES_PASSTHRU;
 				}
+				res = ServerInstance->OnCheckExemption(user,c,"nonotice");
+				if (res == MOD_RES_ALLOW)
+					return MOD_RES_PASSTHRU;
 				else
 				{
 					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
-					return 1;
+					return MOD_RES_DENY;
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual ~ModuleNoNotice()
 	{
-		ServerInstance->Modes->DelMode(&nt);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +T", VF_VENDOR);
 	}
 };