X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=48eafff7a8bad711935db7c242b3d943efcd7e0f;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=e811b8e67c1c5a9c8e1df8fd01482481448644b0;hpb=c4d6ce8c5e1802e5b834d5845e31c3adf7700585;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e811b8e67..48eafff7a 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -46,12 +46,14 @@ class NoNicks : public ModeHandler
 class ModuleNoNickChange : public Module
 {
 	NoNicks nn;
+	bool override;
  public:
 	ModuleNoNickChange() : nn(this)
 	{
+		OnRehash(NULL);
 		ServerInstance->Modes->AddMode(&nn);
-		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 	virtual ~ModuleNoNickChange()
@@ -60,7 +62,7 @@ class ModuleNoNickChange : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR);
 	}
 
 
@@ -78,14 +80,20 @@ class ModuleNoNickChange : public Module
 			return MOD_RES_PASSTHRU;
 
 		// Allow forced nick changes.
-		if (User::NICKForced.get(user))
+		if (ServerInstance->NICKForced.get(user))
 			return MOD_RES_PASSTHRU;
 
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
 			Channel* curr = *i;
 
-			if (CHANOPS_EXEMPT('N') && curr->GetPrefixValue(user) == OP_VALUE)
+			ModResult res;
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,curr,"nonick"));
+
+			if (res == MOD_RES_ALLOW)
+				continue;
+
+			if (override && IS_OPER(user))
 				continue;
 
 			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
@@ -98,6 +106,12 @@ class ModuleNoNickChange : public Module
 
 		return MOD_RES_PASSTHRU;
 	}
+
+	virtual void OnRehash(User* user)
+	{
+		ConfigReader Conf;
+		override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
+	}
 };
 
 MODULE_INIT(ModuleNoNickChange)