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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 05b07c44f..8713ffe96 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,12 +13,12 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for channel mode +N which prevents nick changes on channel */
+/* $ModDesc: Provides support for channel mode +N & extban +b N: which prevents nick changes on channel */
 
 class NoNicks : public ModeHandler
 {
  public:
-	NoNicks(InspIRCd* Instance) : ModeHandler(Instance, '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)
 	{
@@ -45,57 +45,69 @@ class NoNicks : public ModeHandler
 
 class ModuleNoNickChange : public Module
 {
-	NoNicks* nn;
+	NoNicks nn;
+	bool override;
  public:
-	ModuleNoNickChange(InspIRCd* Me)
-		: Module(Me)
+	ModuleNoNickChange() : nn(this)
 	{
-		
-		nn = new NoNicks(ServerInstance);
-		ServerInstance->AddMode(nn);
-		Implementation eventlist[] = { I_OnUserPreNick };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		OnRehash(NULL);
+		ServerInstance->Modes->AddMode(&nn);
+		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
+
 	virtual ~ModuleNoNickChange()
 	{
-		ServerInstance->Modes->DelMode(nn);
-		DELETE(nn);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,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);
 	}
 
-	void Implements(char* List)
+
+	virtual void On005Numeric(std::string &output)
 	{
-		List[I_OnUserPreNick] = 1;
+		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))
+		if (!IS_LOCAL(user))
+			return MOD_RES_PASSTHRU;
+
+		// Allow forced nick changes.
+		if (ServerInstance->NICKForced.get(user))
+			return MOD_RES_PASSTHRU;
+
+		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
-			if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-				return 0;
+			Channel* curr = *i;
 
-			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
-			{
-				Channel* curr = i->first;
+			ModResult res;
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,curr,"nonick"));
 
-				if (curr->IsModeSet('N'))
-				{
-					if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
-						continue;
+			if (res == MOD_RES_ALLOW)
+				continue;
 
-					user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
-					return 1;
-				}
+			if (override && IS_OPER(user))
+				continue;
+
+			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 MOD_RES_DENY;
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
+	}
+
+	virtual void OnRehash(User* user)
+	{
+		ConfigReader Conf;
+		override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
 	}
 };