X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=3adc9e160f2630ca5232bdfc758813daa6d93822;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=103d07c2a5eb46eca8774c5eff9f6a8cd56f285b;hpb=1635c37dadd8650a7d3ee27a0c003c4e30f1ec4e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 103d07c2a..3adc9e160 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#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 */
@@ -53,7 +48,7 @@ class ModuleNoNickChange : public Module
 	NoNicks* nn;
  public:
 	ModuleNoNickChange(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		nn = new NoNicks(ServerInstance);
@@ -80,6 +75,9 @@ class ModuleNoNickChange : public Module
 	{
 		if (IS_LOCAL(user))
 		{
+			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++)
 			{
 				chanrec* curr = i->first;
@@ -99,29 +97,4 @@ class ModuleNoNickChange : public Module
 	}
 };
 
-// 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(InspIRCd* Me)
-	{
-		return new ModuleNoNickChange(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNickChangeFactory;
-}
-
+MODULE_INIT(ModuleNoNickChange)