X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=04d204d7bd9ef23cc0f9afeb98d97b02213743aa;hb=6050df73f498d05597fb37c6157868df1f6f4db2;hp=cdb37690ef3d18b847bee788798060912b666a94;hpb=922d4ebf7a27a6577d6b4f91e0f42ccdfa989455;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index cdb37690e..04d204d7b 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -24,43 +24,38 @@
 #include "commands.h"
 #include "xline.h"
 #include "dns.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 #include "hashcomp.h"
 #include "commands/cmd_nick.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-
 void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char oldnick[NICKMAX];
 
 	if (pcnt < 1) 
 	{
-		log(DEBUG,"not enough params for handle_nick");
+		ServerInstance->Log(DEBUG,"not enough params for handle_nick");
 		return;
 	}
 	if (!parameters[0])
 	{
-		log(DEBUG,"invalid parameter passed to handle_nick");
+		ServerInstance->Log(DEBUG,"invalid parameter passed to handle_nick");
 		return;
 	}
 	if (!parameters[0][0])
 	{
-		log(DEBUG,"zero length new nick passed to handle_nick");
+		ServerInstance->Log(DEBUG,"zero length new nick passed to handle_nick");
 		return;
 	}
 	if (!user)
 	{
-		log(DEBUG,"invalid user passed to handle_nick");
+		ServerInstance->Log(DEBUG,"invalid user passed to handle_nick");
 		return;
 	}
 	if (!user->nick)
 	{
-		log(DEBUG,"invalid old nick passed to handle_nick");
+		ServerInstance->Log(DEBUG,"invalid old nick passed to handle_nick");
 		return;
 	}
 	if (irc::string(user->nick) == irc::string(parameters[0]))
@@ -72,14 +67,14 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		 * able to do silly things like this even though the RFC says
 		 * the nick AAA is the same as the nick aaa.
 		 */
-		log(DEBUG,"old nick is new nick, not updating hash (case change only)");
+		ServerInstance->Log(DEBUG,"old nick is new nick, not updating hash (case change only)");
 		strlcpy(oldnick, user->nick, NICKMAX - 1);
 		int MOD_RESULT = 0;
 		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
 		if (MOD_RESULT)
 			return;
 		if (user->registered == REG_ALL)
-			WriteCommon(user,"NICK %s",parameters[0]);
+			user->WriteCommon("NICK %s",parameters[0]);
 		strlcpy(user->nick, parameters[0], NICKMAX - 1);
 		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 		return;
@@ -90,21 +85,22 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		{
 			parameters[0]++;
 		}
-		if (matches_qline(parameters[0]))
+		char* mq = ServerInstance->XLines->matches_qline(parameters[0]);
+		if (mq)
 		{
-			WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
-			WriteServ(user->fd,"432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0]));
+			ServerInstance->WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,mq);
+			user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0],mq);
 			return;
 		}
-		if ((Find(parameters[0])) && (Find(parameters[0]) != user))
+		if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user))
 		{
-			WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
+			user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
 			return;
 		}
 	}
-	if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user)))
+	if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user)))
 	{
-		WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
+		user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
 		return;
 	}
 
@@ -117,7 +113,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 			return;
 		}
 
-		WriteCommon(user,"NICK %s",parameters[0]);
+		user->WriteCommon("NICK %s",parameters[0]);
 		
 	}
 
@@ -131,7 +127,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 	strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
-	log(DEBUG,"new nick set: %s",user->nick);
+	ServerInstance->Log(DEBUG,"new nick set: %s",user->nick);
 	
 	if (user->registered < REG_NICKUSER)
 	{
@@ -140,9 +136,9 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		// and unless we're lucky we'll get a duff one later on.
 		//user->dns_done = (!lookup_dns(user->nick));
 		//if (user->dns_done)
-		//	log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
+		//	ServerInstance->Log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
 
-		if (Config->NoUserDns)
+		if (ServerInstance->Config->NoUserDns)
 		{
 			user->dns_done = true;
 		}
@@ -150,7 +146,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		{
 			user->StartDNSLookup();
 			if (user->dns_done)
-				log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
+				ServerInstance->Log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
 		}
 	}
 	if (user->registered == REG_NICKUSER)