X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=08baef5dfcb6ad4edd7fe02eff208df036924278;hb=fcafba14c5408360ec725ed1649ede75b7ae52c1;hp=e3849e9aa43a9c0635df7d747f00b2ac6cbc29da;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e3849e9aa..08baef5df 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,7 +13,7 @@
 
 #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
 {
@@ -47,47 +47,55 @@ class ModuleNoNickChange : public Module
 {
 	NoNicks* nn;
  public:
-	ModuleNoNickChange(InspIRCd* Me)
-		: Module(Me)
+	ModuleNoNickChange(InspIRCd* Me) : Module(Me)
 	{
-		
+
 		nn = new NoNicks(ServerInstance);
 		ServerInstance->Modes->AddMode(nn);
-		Implementation eventlist[] = { I_OnUserPreNick };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
-	
+
 	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("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 
+	virtual void On005Numeric(std::string &output)
+	{
+		ServerInstance->AddExtBanChar('N');
+	}
+
 	virtual int OnUserPreNick(User* user, const std::string &newnick)
 	{
-		if (IS_LOCAL(user))
-		{
-			if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-				return 0;
+		if (!IS_LOCAL(user))
+			return 0;
 
-			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
-			{
-				Channel* curr = i->first;
+		if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
+			return 0;
+
+		// Allow forced nick changes.
+		if (user->GetExt("NICKForced"))
+			return 0;
 
-				if (curr->IsModeSet('N'))
-				{
-					if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
-						continue;
+		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+		{
+			Channel* curr = i->first;
+
+			if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+				continue;
 
-					user->WriteNumeric(447, "%s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
-					return 1;
-				}
+			if (curr->IsModeSet('N') || curr->GetExtBanStatus(user, 'N') < 0)
+			{
+				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;
 			}
 		}