X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=818672ce4897485b0934dbf64c3ec668dcb54c9c;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=1299332feb230762a3d75f425e7ffe976858080e;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 1299332fe..818672ce4 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -25,12 +25,13 @@ using namespace std;
 
 /* $ModDesc: Provides support for SANICK command */
 
-static Server *Srv;
+
+
 
 class cmd_sanick : public command_t
 {
  public:
-	cmd_sanick () : command_t("SANICK", 'o', 2)
+ cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2)
 	{
 		this->source = "m_sanick.so";
 		syntax = "<nick> <new-nick>";
@@ -38,23 +39,23 @@ class cmd_sanick : 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)
 		{
-			if (Srv->IsUlined(source->server))
+			if (ServerInstance->ULine(source->server))
 			{
 				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
 				return;
 			}
-			if (Srv->IsNick(std::string(parameters[1])))
+			if (ServerInstance->IsNick(parameters[1]))
 			{
 				// FIX by brain: Cant use source->nick here because if it traverses a server link then
 				// source->nick becomes invalid as the object data moves in memory.
-				Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+				ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
 				if (!source->ForceNickChange(parameters[1]))
 				{
 					/* We couldnt change the nick */
-					userrec::QuitUser(source, "Nickname collision");
+					userrec::QuitUser(ServerInstance, source, "Nickname collision");
 					return;
 				}
 			}
@@ -67,12 +68,12 @@ class ModuleSanick : public Module
 {
 	cmd_sanick*	mycommand;
  public:
-	ModuleSanick(Server* Me)
+	ModuleSanick(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_sanick();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_sanick(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSanick()
@@ -99,7 +100,7 @@ class ModuleSanickFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSanick(Me);
 	}