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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 7405c7149..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.
@@ -64,13 +64,13 @@ class ModuleNoNickChange : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,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");
+		ServerInstance->AddExtBanChar('N');
 	}
 
 	virtual int OnUserPreNick(User* user, const std::string &newnick)
@@ -81,20 +81,18 @@ class ModuleNoNickChange : public Module
 		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;
+
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
 			Channel* curr = i->first;
 
-			if (curr->IsModeSet('N'))
-			{
-				if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
-					continue;
-
-				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;
-			}
+			if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+				continue;
 
-			if (curr->IsExtBanned(user, 'N'))
+			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;