X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=338c472f5d24751efab9c7c551e84b899c988566;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=7c13d678ae46993acf6eadd32253535926e9a869;hpb=79262c9d8751eca8cff50eca0b9f5b57f6730577;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 7c13d678a..d4da3e951 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -1,128 +1,80 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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 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/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
+#include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+class NoNicks : public SimpleChannelModeHandler
+{
+ public:
+	NoNicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nonick", 'N') { }
+};
 
 class ModuleNoNickChange : public Module
 {
-	Server *Srv;
-	
+	NoNicks nn;
+	bool override;
  public:
-	ModuleNoNickChange(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		
-		Srv->AddExtendedMode('N',MT_CHANNEL,false,0,0);
-	}
-	
-	virtual ~ModuleNoNickChange()
+	ModuleNoNickChange() : nn(this)
 	{
 	}
-	
-	virtual Version GetVersion()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
 	}
 
-	void Implements(char* List)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		List[I_On005Numeric] = List[I_OnUserPreNick] = List[I_OnExtendedMode] = 1;
+		tokens["EXTBAN"].push_back('N');
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
-		InsertMode(output,"N",4);
-        }
-	
-	virtual int OnUserPreNick(userrec* user, std::string newnick)
+	ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
 	{
-		irc::string server = user->server;
-		irc::string me = Srv->GetServerName().c_str();
-		if (server == me)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 		{
-			for (unsigned int i =0; i < user->chans.size(); i++)
+			Channel* curr = (*i)->chan;
+
+			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(nn)))
 			{
-				if (user->chans[i].channel != NULL)
-				{
-					chanrec* curr = user->chans[i].channel;
-					if (curr->IsCustomModeSet('N'))
-					{
-						if (!strchr(user->modes,'o'))
-						{
-							// don't allow the nickchange, theyre on at least one channel with +N set
-							// and theyre not an oper
-							WriteServ(user->fd,"447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
-							return 1;
-						}
-					}
-				}
+				user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (+N is set)",
+					curr->name.c_str()));
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
-	}
- 	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'N') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			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(Server* Me)
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		return new ModuleNoNickChange(Me);
+		override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNickChangeFactory;
-}
-
+MODULE_INIT(ModuleNoNickChange)