X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=90fd93f1ce9451f7281c71377dd4d79a2f475cf1;hb=5a88424dbb33ac825aa0b9b6525179329ee75519;hp=2cf62dd6189b26f3d4778767c804a205330d6a38;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 2cf62dd61..90fd93f1c 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -16,13 +16,11 @@
 
 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 */
@@ -30,7 +28,7 @@ using namespace std;
 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)
 	{
@@ -57,42 +55,36 @@ class NoNicks : public ModeHandler
 
 class ModuleNoNickChange : public Module
 {
-	Server *Srv;
 	NoNicks* nn;
-	
  public:
-	ModuleNoNickChange(Server* Me)
+	ModuleNoNickChange(InspIRCd* Me)
 		: Module::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 = Srv->GetServerName().c_str();
+		irc::string me = ServerInstance->Config->ServerName;
 		if (server == me)
 		{
 			for (std::vector<ucrec*>::iterator i = user->chans.begin(); i != user->chans.end(); i++)
@@ -127,7 +119,7 @@ class ModuleNoNickChangeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleNoNickChange(Me);
 	}