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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 769097ca0..48eafff7a 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -18,7 +18,7 @@
 class NoNicks : public ModeHandler
 {
  public:
-	NoNicks(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	NoNicks(Module* Creator) : ModeHandler(Creator, "nonick", 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
@@ -46,22 +46,23 @@ class NoNicks : public ModeHandler
 class ModuleNoNickChange : public Module
 {
 	NoNicks nn;
+	bool override;
  public:
-	ModuleNoNickChange(InspIRCd* Me) : Module(Me), nn(Me, this)
+	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()
 	{
-		ServerInstance->Modes->DelMode(&nn);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", 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);
 	}
 
 
@@ -79,14 +80,20 @@ class ModuleNoNickChange : public Module
 			return MOD_RES_PASSTHRU;
 
 		// Allow forced nick changes.
-		if (user->GetExt("NICKForced"))
+		if (ServerInstance->NICKForced.get(user))
 			return MOD_RES_PASSTHRU;
 
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
-			Channel* curr = i->first;
+			Channel* curr = *i;
 
-			if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+			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')))
@@ -99,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)