X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=8713ffe96abc88ea333f84046aa5981af7edc3e6;hb=e071bd88391e00e4d3b0104ada985e08a9eb3210;hp=1a8e83795fcd9992ae657fc00f80037af0015f1f;hpb=24731c63b6320be22f7b3220236271fa7476b975;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 1a8e83795..8713ffe96 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.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,9 +18,9 @@
 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, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (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_VENDOR);
 	}
 
 
@@ -70,33 +71,43 @@ class ModuleNoNickChange : public Module
 		ServerInstance->AddExtBanChar('N');
 	}
 
-	virtual int OnUserPreNick(User* user, const std::string &newnick)
+	virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
 	{
 		if (!IS_LOCAL(user))
-			return 0;
-
-		if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		// Allow forced nick changes.
-		if (user->GetExt("NICKForced"))
-			return 0;
+		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;
+
+			ModResult res;
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,curr,"nonick"));
+
+			if (res == MOD_RES_ALLOW)
+				continue;
 
-			if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+			if (override && IS_OPER(user))
 				continue;
 
-			if (curr->IsModeSet('N') || curr->GetExtBanStatus(user, 'N') < 0)
+			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
 			{
-				user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)", user->nick.c_str(), curr->name.c_str());
-				return 1;
+				user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)",
+					user->nick.c_str(), curr->name.c_str());
+				return MOD_RES_DENY;
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
+	}
+
+	virtual void OnRehash(User* user)
+	{
+		ConfigReader Conf;
+		override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
 	}
 };