X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=fe1e0a46d33690162dc7c2da61ab08379e52135b;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=c3523a7ef88ab138464c4af43ea2f1c3b90c5ba1;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index c3523a7ef..fe1e0a46d 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(Module* Creator) : SimpleChannelModeHandler(Creator, 'T') { }
+	NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
 };
 
 class ModuleNoNotice : public Module
@@ -42,6 +42,7 @@ class ModuleNoNotice : public Module
 
 	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;
@@ -52,11 +53,9 @@ class ModuleNoNotice : public Module
 					// ulines are exempt.
 					return MOD_RES_PASSTHRU;
 				}
-				else if (CHANOPS_EXEMPT('T') && c->GetPrefixValue(user) == OP_VALUE)
-				{
-					// channel ops are exempt if set in conf.
+				FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (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());
@@ -69,12 +68,11 @@ class ModuleNoNotice : public Module
 
 	virtual ~ModuleNoNotice()
 	{
-		ServerInstance->Modes->DelMode(&nt);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +T", VF_VENDOR);
 	}
 };