X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=e7f23e145fc27cb24e2b39530668dd38093dea53;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=338c472f5d24751efab9c7c551e84b899c988566;hpb=40e990ed06126c1ba6164738527127d1f58fc032;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 338c472f5..e7f23e145 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -2,28 +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 "inspircd.h"
 #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 which prevents nick changes on channel */
 
 class NoNicks : public ModeHandler
 {
@@ -58,7 +53,7 @@ class ModuleNoNickChange : public Module
 	NoNicks* nn;
  public:
 	ModuleNoNickChange(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		nn = new NoNicks(ServerInstance);
@@ -73,7 +68,7 @@ class ModuleNoNickChange : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_COMMON|VF_VENDOR);
+		return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
@@ -83,25 +78,23 @@ class ModuleNoNickChange : public Module
 
 	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++)
+			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;
 	}
 };
@@ -127,7 +120,7 @@ class ModuleNoNickChangeFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleNoNickChangeFactory;
 }