X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=c1c1dd13668fd6286f5451bfcd88268a0075f052;hb=5c29c53f651fb0c513a50c9396e08ba340a6d2bf;hp=d03e2455e7d2c2f20301146858d00a1b06f9e7cc;hpb=0723114557b67f0b4cf20cfb4ddbf7b45f0948e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index d03e2455e..c1c1dd136 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -1,124 +1,97 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
+
 #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
+class NoNicks : public SimpleChannelModeHandler
 {
  public:
-	NoNicks(InspIRCd* Instance) : ModeHandler(Instance, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('N'))
-			{
-				channel->SetMode('N',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('N'))
-			{
-				channel->SetMode('N',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	NoNicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nonick", 'N') { }
 };
 
 class ModuleNoNickChange : public Module
 {
-	NoNicks* nn;
+	NoNicks nn;
+	bool override;
  public:
-	ModuleNoNickChange(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleNoNickChange() : nn(this)
 	{
-		
-		nn = new NoNicks(ServerInstance);
-		ServerInstance->AddMode(nn, 'N');
 	}
-	
-	virtual ~ModuleNoNickChange()
+
+	void init()
 	{
-		ServerInstance->Modes->DelMode(nn);
-		DELETE(nn);
+		OnRehash(NULL);
+		ServerInstance->Modules->AddService(nn);
+		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
-	
+
 	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::map<std::string, std::string>& tokens)
 	{
-		List[I_OnUserPreNick] = 1;
+		tokens["EXTBAN"].push_back('N');
 	}
 
-	virtual int OnUserPreNick(userrec* 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++)
 		{
-			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+			Channel* curr = *i;
+
+			ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
+
+			if (res == MOD_RES_ALLOW)
+				continue;
+
+			if (override && user->IsOper())
+				continue;
+
+			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
 			{
-				chanrec* curr = i->first;
-				if ((curr->IsModeSet('N')) && (!IS_OPER(user)))
-				{
-					// don't allow the nickchange, theyre on at least one channel with +N set
-					// and theyre not an oper
-					user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
-					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;
-	}
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleNoNickChangeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNickChangeFactory()
-	{
-	}
-	
-	~ModuleNoNickChangeFactory()
-	{
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	virtual void OnRehash(User* user)
 	{
-		return new ModuleNoNickChange(Me);
+		override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNickChangeFactory;
-}
-
+MODULE_INIT(ModuleNoNickChange)