X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=2ed25dfe5a0b83bb0a945b981f6eb175ee801a60;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=9a1d0079e5ba3deca4c511b50d4714246d4b22ce;hpb=644ed25d8d87874b55aef6b8e700e9e79017ec18;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 9a1d0079e..2ed25dfe5 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.
@@ -18,9 +18,9 @@
 class NoNicks : public ModeHandler
 {
  public:
-	NoNicks(InspIRCd* Instance) : ModeHandler(Instance, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	NoNicks(Module* Creator) : ModeHandler(Creator, '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)
 		{
@@ -45,26 +45,23 @@ class NoNicks : public ModeHandler
 
 class ModuleNoNickChange : public Module
 {
-	NoNicks* nn;
+	NoNicks nn;
  public:
-	ModuleNoNickChange(InspIRCd* Me) : Module(Me)
+	ModuleNoNickChange() : nn(this)
 	{
-
-		nn = new NoNicks(ServerInstance);
-		ServerInstance->Modes->AddMode(nn);
+		ServerInstance->Modes->AddMode(&nn);
 		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleNoNickChange()
 	{
-		ServerInstance->Modes->DelMode(nn);
-		delete nn;
+		ServerInstance->Modes->DelMode(&nn);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,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_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 
@@ -73,29 +70,34 @@ 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;
+			return MOD_RES_PASSTHRU;
 
 		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::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)
+			if (CHANOPS_EXEMPT('N') && curr->GetPrefixValue(user) == OP_VALUE)
 				continue;
 
-			if (curr->IsModeSet('N') || curr->IsExtBanned(user, 'N'))
+			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;
 	}
 };