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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 403bf5abb..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.
@@ -11,21 +11,16 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $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(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -50,77 +45,70 @@ class NoNicks : public ModeHandler
 
 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');
+		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(userrec* user, const std::string &newnick)
+	virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
 	{
-		irc::string server = user->server;
-		irc::string me = ServerInstance->Config->ServerName;
-		if (server == me)
+		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;
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,curr,"nonick"));
+
+			if (res == MOD_RES_ALLOW)
+				continue;
+
+			if (override && IS_OPER(user))
+				continue;
+
+			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
 			{
-				chanrec* curr = i->first;
-				if ((curr->IsModeSet('N')) && (!*user->oper))
-				{
-					// 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);
+		ConfigReader Conf;
+		override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNickChangeFactory;
-}
-
+MODULE_INIT(ModuleNoNickChange)