X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=432c2e8147e31ea57804ee5659b58455884e505d;hb=6dfc98470938a932ddee0100f515658dffe94438;hp=7779926e88e5686402ed4467803b452115a30fb7;hpb=9a8acb590df6216849e787e08e4651b5f2a81276;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 7779926e8..432c2e814 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -14,54 +14,26 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
 #include <vector>
-#include <deque>
+#include "inspircd_config.h"
+#include "configreader.h"
+#include "hash_map.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
 #include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
 #include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_nick.h"
+#include "commands/cmd_nick.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -102,25 +74,22 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 		 * the nick AAA is the same as the nick aaa.
 		 */
 		log(DEBUG,"old nick is new nick, not updating hash (case change only)");
-		strlcpy(oldnick,user->nick,NICKMAX);
+		strlcpy(oldnick, user->nick, NICKMAX - 1);
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(OnUserPreNick(user,parameters[0]));
+		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
 		if (MOD_RESULT)
 			return;
-		strlcpy(user->nick,parameters[0],NICKMAX);
 		if (user->registered == 7)
 			WriteCommon(user,"NICK %s",parameters[0]);
-		FOREACH_MOD OnUserPostNick(user,oldnick);
+		strlcpy(user->nick, parameters[0], NICKMAX - 1);
+		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 		return;
 	}
 	else
 	{
-		if (strlen(parameters[0]) > 1)
+		if ((*parameters[0] == ':') && (*(parameters[0]+1) != 0))
 		{
-			if (parameters[0][0] == ':')
-			{
-				*parameters[0]++;
-			}
+			parameters[0]++;
 		}
 		if (matches_qline(parameters[0]))
 		{
@@ -143,7 +112,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	if (user->registered == 7)
 	{
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(OnUserPreNick(user,parameters[0]));
+		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
 		if (MOD_RESULT) {
 			// if a module returns true, the nick change is silently forbidden.
 			return;
@@ -153,7 +122,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 		
 	}
 
-	strlcpy(oldnick,user->nick,NICKMAX);
+	strlcpy(oldnick, user->nick, NICKMAX - 1);
 
 	/* change the nick of the user in the users_hash */
 	user = ReHashNick(user->nick, parameters[0]);
@@ -161,7 +130,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	if (!user) return;
 	if (!user->nick) return;
 
-	strlcpy(user->nick, parameters[0],NICKMAX);
+	strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
 	log(DEBUG,"new nick set: %s",user->nick);
 	
@@ -190,12 +159,11 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	if (user->registered == 3)
 	{
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		FOREACH_MOD OnUserRegister(user);
-		ConnectUser(user);
+		FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
+		//ConnectUser(user,NULL);
 	}
 	if (user->registered == 7)
 	{
-		FOREACH_MOD OnUserPostNick(user,oldnick);
+		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 	}
 }
-