FindNick, FindChan, ChanModes, UserList, CountInvisible, PurgeEmptyChannels, GetClass, WriteOpers, GetServerDescription -> into classes

ServerConfig takes InspIRCd pointer in its constructor


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4832 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 5 insertions, 4 deletions

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index e46b56901..58a4c2686 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -23,6 +23,7 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */
 
@@ -41,7 +42,7 @@ class cmd_nicklock : public command_t
 
 	void Handle(const char** parameters, int pcnt, userrec *user)
 	{
-		userrec* source = Srv->FindNick(std::string(parameters[0]));
+		userrec* source = ServerInstance->FindNick(parameters[0]);
 		irc::string server;
 		irc::string me;
 
@@ -55,7 +56,7 @@ class cmd_nicklock : public command_t
 			if (Srv->IsNick(std::string(parameters[1])))
 			{
 				// give them a lock flag
-				Srv->SendOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+std::string(parameters[0])+" to "+parameters[1]);
+				ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
 				if (!source->ForceNickChange(parameters[1]))
 				{
 					userrec::QuitUser(ServerInstance, source, "Nickname collision");
@@ -78,12 +79,12 @@ class cmd_nickunlock : public command_t
 
 	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		userrec* source = Srv->FindNick(std::string(parameters[0]));
+		userrec* source = ServerInstance->FindNick(parameters[0]);
 		if (source)
 		{
 			source->Shrink("nick_locked");
 			user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick);
-			Srv->SendOpers(std::string(user->nick)+" used NICKUNLOCK on "+std::string(parameters[0]));
+			ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
 		}
 	}
 };