X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=3adc9e160f2630ca5232bdfc758813daa6d93822;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=9d1ddb0fffb159ed2ab0e3f3bf5eff93a758685a;hpb=94288cdc2efb02eab9f27b3225adad839a7f2b58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 9d1ddb0ff..3adc9e160 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -2,38 +2,23 @@
  *       | Inspire 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.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "configreader.h"
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
-
-extern InspIRCd* ServerInstance;
+/* $ModDesc: Provides support for channel mode +N which prevents nick changes on channel */
 
 class NoNicks : public ModeHandler
 {
  public:
-	NoNicks() : ModeHandler('N', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	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)
 	{
@@ -60,86 +45,56 @@ class NoNicks : public ModeHandler
 
 class ModuleNoNickChange : public Module
 {
-	Server *Srv;
 	NoNicks* nn;
-	
  public:
-	ModuleNoNickChange(Server* Me)
-		: Module::Module(Me)
+	ModuleNoNickChange(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
-		nn = new NoNicks();
-		Srv->AddMode(nn, 'N');
+		
+		nn = new NoNicks(ServerInstance);
+		ServerInstance->AddMode(nn, 'N');
 	}
 	
 	virtual ~ModuleNoNickChange()
 	{
+		ServerInstance->Modes->DelMode(nn);
 		DELETE(nn);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreNick] = 1;
+		List[I_OnUserPreNick] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output,"N",4);
-	}
-	
 	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
 	{
-		irc::string server = user->server;
-		irc::string me = ServerInstance->Config->ServerName;
-		if (server == me)
+		if (IS_LOCAL(user))
 		{
-			for (std::vector<ucrec*>::iterator i = user->chans.begin(); i != user->chans.end(); i++)
+			if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
+				return 0;
+
+			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 			{
-				if (((ucrec*)(*i))->channel != NULL)
+				chanrec* curr = i->first;
+
+				if (curr->IsModeSet('N'))
 				{
-					chanrec* curr = ((ucrec*)(*i))->channel;
-					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;
-					}
+					if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+						continue;
+
+					user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
+					return 1;
 				}
 			}
 		}
-		return 0;
-	}
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleNoNickChangeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNickChangeFactory()
-	{
-	}
-	
-	~ModuleNoNickChangeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleNoNickChange(Me);
+		return 0;
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNickChangeFactory;
-}
-
+MODULE_INIT(ModuleNoNickChange)