X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=e6e2a98bc8f559035aa576d62513fc68ac73d82d;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=9313899f74573c93907086f817881c3782a25023;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 9313899f7..e6e2a98bc 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -14,25 +14,19 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "hash_map.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
+#include "inspircd.h"
 #include "xline.h"
-#include "dns.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
 #include "commands/cmd_nick.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_nick(Instance);
+}
 
 void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
@@ -40,27 +34,27 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 	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,7 +66,7 @@ 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]));
@@ -90,10 +84,11 @@ 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)
 		{
-			ServerInstance->WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
-			user->WriteServ("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 ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user))
@@ -102,7 +97,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 			return;
 		}
 	}
-	if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user)))
+	if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user)))
 	{
 		user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
 		return;
@@ -131,7 +126,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,7 +135,7 @@ 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 (ServerInstance->Config->NoUserDns)
 		{
@@ -150,7 +145,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)