Moved all command handler functions into commands.cpp/commands.h

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

4 files changed, 31 insertions, 1225 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index 40e878b63..31bcad10f 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -117,6 +117,32 @@ int usercount(chanrec *c);
 void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user);
 long GetRevision();
 int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins);
+void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason);
+void purge_empty_chans(void);
+char* Passwd(userrec *user);
+bool IsDenied(userrec *user);
+void AddWhoWas(userrec* u);
+void userlist(userrec *user,chanrec *c);
+std::string GetServerDescription(char* servername);
+int usercnt(void);
+int usercount_invisible(void);
+int usercount_opers(void);
+int usercount_unknown(void);
+long chancount(void);
+long count_servs(void);
+long servercount(void);
+long local_count();
+void ShowMOTD(userrec *user);
+void ShowRULES(userrec *user);
+int usercount(chanrec *c);
+int usercount_i(chanrec *c);
+void update_stats_l(int fd,int data_out);
+void ConnectUser(userrec *user);
+void DoSplitEveryone();
+char islast(const char* s);
+long map_count(const char* s);
+userrec* ReHashNick(char* Old, char* New);
+
 
 // mesh network functions
 
diff --git a/src/Makefile b/src/Makefile
index 4b4242eb7..336b4d267 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@
 
 CC = im a cheezeball
 
-SRC_1 = inspircd.cpp inspircd_util.cpp inspircd_io.cpp connection.cpp message.cpp
+SRC_1 = inspircd.cpp inspircd_util.cpp inspircd_io.cpp connection.cpp message.cpp commands.cpp
 SRC_2 = dynamic.cpp users.cpp modules.cpp wildcard.cpp servers.cpp channels.cpp mode.cpp
 
 SRC = $(SRC_1) $(SRC_2)
diff --git a/src/connection.cpp b/src/connection.cpp
index ce166ace0..ec3007a8c 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -12,11 +12,14 @@
 
 using namespace std;
 
+
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 
 extern int MODCOUNT;
 
+
+
 connection::connection()
 {
 	fd = 0;
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 1398ec90c..fe0b65e59 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -53,6 +53,7 @@ using namespace std;
 #include "wildcard.h"
 #include "message.h"
 #include "mode.h"
+#include "commands.h"
 
 #ifdef GCC3
 #define nspace __gnu_cxx
@@ -1777,112 +1778,6 @@ int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start
 }
 
 
-void handle_join(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* Ptr;
-	int i = 0;
-	
-	if (loop_call(handle_join,parameters,pcnt,user,0,0,1))
-		return;
-	if (parameters[0][0] == '#')
-	{
-		Ptr = add_channel(user,parameters[0],parameters[1],false);
-	}
-}
-
-
-void handle_part(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* Ptr;
-
-	if (pcnt > 1)
-	{
-		if (loop_call(handle_part,parameters,pcnt,user,0,pcnt-2,0))
-			return;
-		del_channel(user,parameters[0],parameters[1],false);
-	}
-	else
-	{
-		if (loop_call(handle_part,parameters,pcnt,user,0,pcnt-1,0))
-			return;
-		del_channel(user,parameters[0],NULL,false);
-	}
-}
-
-void handle_kick(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* Ptr = FindChan(parameters[0]);
-	userrec* u   = Find(parameters[1]);
-
-	if ((!u) || (!Ptr))
-	{
-		WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-		return;
-	}
-	
-	if (!has_channel(u,Ptr))
-	{
-		WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]);
-		return;
-	}
-
-	char reason[MAXBUF];
-	
-	if (pcnt > 2)
-	{
-		strncpy(reason,parameters[2],MAXBUF);
-		if (strlen(reason)>MAXKICK)
-		{
-			reason[MAXKICK-1] = '\0';
-		}
-
-		kick_channel(user,u,Ptr,reason);
-	}
-	else
-	{
-		strcpy(reason,user->nick);
-		kick_channel(user,u,Ptr,reason);
-	}
-	
-	// this must be propogated so that channel membership is kept in step network-wide
-	
-	char buffer[MAXBUF];
-	snprintf(buffer,MAXBUF,"k %s %s %s :%s",user->nick,u->nick,Ptr->name,reason);
-	NetSendToAll(buffer);
-}
-
-
-void handle_die(char **parameters, int pcnt, userrec *user)
-{
-	log(DEBUG,"die: %s",user->nick);
-	if (!strcmp(parameters[0],diepass))
-	{
-		WriteOpers("*** DIE command from %s!%s@%s, terminating...",user->nick,user->ident,user->host);
-		sleep(DieDelay);
-		Exit(ERROR);
-	}
-	else
-	{
-		WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
-	}
-}
-
-void handle_restart(char **parameters, int pcnt, userrec *user)
-{
-	log(DEBUG,"restart: %s",user->nick);
-	if (!strcmp(parameters[0],restartpass))
-	{
-		WriteOpers("*** RESTART command from %s!%s@%s, Pretending to restart till this is finished :D",user->nick,user->ident,user->host);
-		sleep(DieDelay);
-		Exit(ERROR);
-		/* Will finish this later when i can be arsed :) */
-	}
-	else
-	{
-		WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
-	}
-}
-
 
 void kill_link(userrec *user,const char* r)
 {
@@ -1940,61 +1835,6 @@ void kill_link(userrec *user,const char* r)
 }
 
 
-void handle_kill(char **parameters, int pcnt, userrec *user)
-{
-	userrec *u = Find(parameters[0]);
-	char killreason[MAXBUF];
-	
-        log(DEBUG,"kill: %s %s",parameters[0],parameters[1]);
-	if (u)
-	{
-		if (strcmp(ServerName,u->server))
-		{
-			// remote kill
-			WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
-			sprintf(killreason,"[%s] Killed (%s (%s))",ServerName,user->nick,parameters[1]);
-			WriteCommonExcept(u,"QUIT :%s",killreason);
-			// K token must go to ALL servers!!!
-			char buffer[MAXBUF];
-			snprintf(buffer,MAXBUF,"K %s %s :%s",user->nick,u->nick,killreason);
-			NetSendToAll(buffer);
-			
-			user_hash::iterator iter = clientlist.find(u->nick);
-			if (iter != clientlist.end())
-			{
-				log(DEBUG,"deleting user hash value %d",iter->second);
-				if ((iter->second) && (user->registered == 7)) {
-					delete iter->second;
-					}
-			clientlist.erase(iter);
-			}
-			purge_empty_chans();
-		}
-		else
-		{
-			// local kill
-			WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerName,user->dhost,user->nick,parameters[1]);
-			WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
-			sprintf(killreason,"Killed (%s (%s))",user->nick,parameters[1]);
-			kill_link(u,killreason);
-		}
-	}
-	else
-	{
-		WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-	}
-}
-
-void handle_summon(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"445 %s :SUMMON has been disabled (depreciated command)",user->nick);
-}
-
-void handle_users(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"445 %s :USERS has been disabled (depreciated command)",user->nick);
-}
-
 
 // looks up a users password for their connection class (<ALLOW>/<DENY> tags)
 
@@ -2024,135 +1864,6 @@ bool IsDenied(userrec *user)
 
 
 
-void handle_pass(char **parameters, int pcnt, userrec *user)
-{
-	// Check to make sure they havnt registered -- Fix by FCS
-	if (user->registered == 7)
-	{
-		WriteServ(user->fd,"462 %s :You may not reregister",user->nick);
-		return;
-	}
-	if (!strcasecmp(parameters[0],Passwd(user)))
-	{
-		user->haspassed = true;
-	}
-}
-
-void handle_invite(char **parameters, int pcnt, userrec *user)
-{
-	userrec* u = Find(parameters[0]);
-	chanrec* c = FindChan(parameters[1]);
-
-	if ((!c) || (!u))
-	{
-		if (!c)
-		{
-			WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
-		}
-		else
-		{
-			if (c->inviteonly)
-			{
-				WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-			}
-		}
-
-		return;
-	}
-
-	if (c->inviteonly)
-	{
-		if (cstatus(user,c) < STATUS_HOP)
-		{
-			WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
-			return;
-		}
-	}
-	if (has_channel(u,c))
- 	{
- 		WriteServ(user->fd,"443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name);
- 		return;
-	}
-	if (!has_channel(user,c))
- 	{
-		WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
-  		return;
-	}
-	u->InviteTo(c->name);
-	WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
-	WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name);
-	
-	// i token must go to ALL servers!!!
-	char buffer[MAXBUF];
-	snprintf(buffer,MAXBUF,"i %s %s %s",u->nick,user->nick,c->name);
-	NetSendToAll(buffer);
-}
-
-void handle_topic(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* Ptr;
-
-	if (pcnt == 1)
-	{
-		if (strlen(parameters[0]) <= CHANMAX)
-		{
-			Ptr = FindChan(parameters[0]);
-			if (Ptr)
-			{
-				if (Ptr->topicset)
-				{
-					WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
-					WriteServ(user->fd,"333 %s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset);
-				}
-				else
-				{
-					WriteServ(user->fd,"331 %s %s :No topic is set.", user->nick, Ptr->name);
-				}
-			}
-			else
-			{
-				WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-			}
-		}
-		return;
-	}
-	else if (pcnt>1)
-	{
-		if (strlen(parameters[0]) <= CHANMAX)
-		{
-			Ptr = FindChan(parameters[0]);
-			if (Ptr)
-			{
-				if ((Ptr->topiclock) && (cstatus(user,Ptr)<STATUS_HOP))
-				{
-					WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel", user->nick, Ptr->name);
-					return;
-				}
-				
-				char topic[MAXBUF];
-				strncpy(topic,parameters[1],MAXBUF);
-				if (strlen(topic)>MAXTOPIC)
-				{
-					topic[MAXTOPIC-1] = '\0';
-				}
-					
-				strcpy(Ptr->topic,topic);
-				strcpy(Ptr->setby,user->nick);
-				Ptr->topicset = time(NULL);
-				WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic);
-
-				// t token must go to ALL servers!!!
-				char buffer[MAXBUF];
-				snprintf(buffer,MAXBUF,"t %s %s :%s",user->nick,Ptr->name,topic);
-				NetSendToAll(buffer);
-			}
-			else
-			{
-				WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-			}
-		}
-	}
-}
 
 /* sends out an error notice to all connected clients (not to be used
  * lightly!) */
@@ -2386,426 +2097,6 @@ void AddClient(int socket, char* host, int port, bool iscached)
 		kill_link(clientlist[tempnick],"No more connections allowed in this class");
 }
 
-void handle_names(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* c;
-
-	if (loop_call(handle_names,parameters,pcnt,user,0,pcnt-1,0))
-		return;
-	c = FindChan(parameters[0]);
-	if (c)
-	{
-		/*WriteServ(user->fd,"353 %s = %s :%s", user->nick, c->name,*/
-		userlist(user,c);
-		WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
-	}
-	else
-	{
-		WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-	}
-}
-
-void handle_privmsg(char **parameters, int pcnt, userrec *user)
-{
-	userrec *dest;
-	chanrec *chan;
-
-	user->idle_lastmsg = time(NULL);
-	
-	if (loop_call(handle_privmsg,parameters,pcnt,user,0,pcnt-2,0))
-		return;
-	if (parameters[0][0] == '#')
-	{
-		chan = FindChan(parameters[0]);
-		if (chan)
-		{
-			if ((chan->noexternal) && (!has_channel(user,chan)))
-			{
-				WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
-				return;
-			}
-			if ((chan->moderated) && (cstatus(user,chan)<STATUS_VOICE))
-			{
-				WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-				return;
-			}
-			
-			int MOD_RESULT = 0;
-
-			FOREACH_RESULT(OnUserPreMessage(user,chan,TYPE_CHANNEL,std::string(parameters[1])));
-			if (MOD_RESULT) {
-				return;
-			}
-			
-			ChanExceptSender(chan, user, "PRIVMSG %s :%s", chan->name, parameters[1]);
-			
-			// if any users of this channel are on remote servers, broadcast the packet
-			char buffer[MAXBUF];
-			snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,chan->name,parameters[1]);
-			NetSendToCommon(user,buffer);
-		}
-		else
-		{
-			/* no such nick/channel */
-			WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-		}
-		return;
-	}
-	
-	dest = Find(parameters[0]);
-	if (dest)
-	{
-		if (strcmp(dest->awaymsg,""))
-		{
-			/* auto respond with aweh msg */
-			WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
-		}
-
-		int MOD_RESULT = 0;
-		
-		FOREACH_RESULT(OnUserPreMessage(user,dest,TYPE_USER,std::string(parameters[1])));
-		if (MOD_RESULT) {
-			return;
-		}
-
-
-
-		if (!strcmp(dest->server,user->server))
-		{
-			// direct write, same server
-			WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
-		}
-		else
-		{
-			char buffer[MAXBUF];
-			snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,dest->nick,parameters[1]);
-			NetSendToOne(dest->server,buffer);
-		}
-	}
-	else
-	{
-		/* no such nick/channel */
-		WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-	}
-}
-
-void handle_notice(char **parameters, int pcnt, userrec *user)
-{
-	userrec *dest;
-	chanrec *chan;
-
-	user->idle_lastmsg = time(NULL);
-	
-	if (loop_call(handle_notice,parameters,pcnt,user,0,pcnt-2,0))
-		return;
-	if (parameters[0][0] == '#')
-	{
-		chan = FindChan(parameters[0]);
-		if (chan)
-		{
-			if ((chan->noexternal) && (!has_channel(user,chan)))
-			{
-				WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
-				return;
-			}
-			if ((chan->moderated) && (cstatus(user,chan)<STATUS_VOICE))
-			{
-				WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-				return;
-			}
-
-			int MOD_RESULT = 0;
-		
-			FOREACH_RESULT(OnUserPreNotice(user,chan,TYPE_CHANNEL,std::string(parameters[1])));
-			if (MOD_RESULT) {
-				return;
-			}
-
-			ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]);
-
-			// if any users of this channel are on remote servers, broadcast the packet
-			char buffer[MAXBUF];
-			snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,chan->name,parameters[1]);
-			NetSendToCommon(user,buffer);
-		}
-		else
-		{
-			/* no such nick/channel */
-			WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-		}
-		return;
-	}
-	
-	dest = Find(parameters[0]);
-	if (dest)
-	{
-		int MOD_RESULT = 0;
-		
-		FOREACH_RESULT(OnUserPreNotice(user,dest,TYPE_USER,std::string(parameters[1])));
-		if (MOD_RESULT) {
-			return;
-		}
-
-		if (!strcmp(dest->server,user->server))
-		{
-			// direct write, same server
-			WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
-		}
-		else
-		{
-			char buffer[MAXBUF];
-			snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]);
-			NetSendToOne(dest->server,buffer);
-		}
-	}
-	else
-	{
-		/* no such nick/channel */
-		WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-	}
-}
-
-
-void handle_info(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"371 %s :The Inspire IRCd Project Has been brought to you by the following people..",user->nick);
-	WriteServ(user->fd,"371 %s :Craig Edwards, Craig McLure, and Others..",user->nick);
-	WriteServ(user->fd,"371 %s :Will finish this later when i can be arsed :p",user->nick);
-	FOREACH_MOD OnInfo(user);
-	WriteServ(user->fd,"374 %s :End of /INFO list",user->nick);
-}
-
-void handle_time(char **parameters, int pcnt, userrec *user)
-{
-	time_t rawtime;
-	struct tm * timeinfo;
-
-	time ( &rawtime );
-	timeinfo = localtime ( &rawtime );
-	WriteServ(user->fd,"391 %s %s :%s",user->nick,ServerName, asctime (timeinfo) );
-  
-}
-
-void handle_whois(char **parameters, int pcnt, userrec *user)
-{
-	userrec *dest;
-	char *t;
-
-	if (loop_call(handle_whois,parameters,pcnt,user,0,pcnt-1,0))
-		return;
-	dest = Find(parameters[0]);
-	if (dest)
-	{
-		// bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER
-		if (dest->registered == 7)
-		{
-			WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
-			if ((user == dest) || (strchr(user->modes,'o')))
-			{
-				WriteServ(user->fd,"378 %s %s :is connecting from *@%s",user->nick, dest->nick, dest->host);
-			}
-			if (strcmp(chlist(dest),""))
-			{
-				WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, chlist(dest));
-			}
-			WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str());
-			if (strcmp(dest->awaymsg,""))
-			{
-				WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
-			}
-			if (strchr(dest->modes,'o'))
-			{
-				WriteServ(user->fd,"313 %s %s :is an IRC operator",user->nick, dest->nick);
-			}
-			FOREACH_MOD OnWhois(user,dest);
-			if (!strcasecmp(user->server,dest->server))
-			{
-				// idle time and signon line can only be sent if youre on the same server (according to RFC)
-				WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-time(NULL)), dest->signon);
-			}
-			
-			WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
-		}
-		else
-		{
-			WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-		}
-	}
-	else
-	{
-		/* no such nick/channel */
-		WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-	}
-}
-
-void handle_quit(char **parameters, int pcnt, userrec *user)
-{
-	user_hash::iterator iter = clientlist.find(user->nick);
-	char* reason;
-
-	if (user->registered == 7)
-	{
-		/* theres more to do here, but for now just close the socket */
-		if (pcnt == 1)
-		{
-			if (parameters[0][0] == ':')
-			{
-				*parameters[0]++;
-			}
-			reason = parameters[0];
-
-			if (strlen(reason)>MAXQUIT)
-			{
-				reason[MAXQUIT-1] = '\0';
-			}
-
-			Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,parameters[0]);
-			WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,parameters[0]);
-			WriteCommonExcept(user,"QUIT :%s%s",PrefixQuit,parameters[0]);
-
-			char buffer[MAXBUF];
-			snprintf(buffer,MAXBUF,"Q %s :%s%s",user->nick,PrefixQuit,parameters[0]);
-			NetSendToAll(buffer);
-		}
-		else
-		{
-			Write(user->fd,"ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
-			WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
-			WriteCommonExcept(user,"QUIT :Client exited");
-
-			char buffer[MAXBUF];
-			snprintf(buffer,MAXBUF,"Q %s :Client exited",user->nick);
-			NetSendToAll(buffer);
-		}
-		FOREACH_MOD OnUserQuit(user);
-		AddWhoWas(user);
-	}
-
-	/* push the socket on a stack of sockets due to be closed at the next opportunity */
-	fd_reap.push_back(user->fd);
-	
-	if (iter != clientlist.end())
-	{
-		clientlist.erase(iter);
-		log(DEBUG,"deleting user hash value %d",iter->second);
-		//if ((user) && (user->registered == 7)) {
-			//delete user;
-		//}
-	}
-
-	if (user->registered == 7) {
-		purge_empty_chans();
-	}
-}
-
-void handle_who(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* Ptr = NULL;
-	
-	/* theres more to do here, but for now just close the socket */
-	if (pcnt == 1)
-	{
-		if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*")))
-		{
-			if (user->chans[0].channel)
-			{
-				Ptr = user->chans[0].channel;
-			  	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-				{
-					if ((common_channels(user,i->second)) && (isnick(i->second->nick)))
-					{
-						WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
-					}
-				}
-			}
-			if (Ptr)
-			{
-				WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, Ptr->name);
-			}
-			else
-			{
-				WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, user->nick);
-			}
-			return;
-		}
-		if (parameters[0][0] == '#')
-		{
-			Ptr = FindChan(parameters[0]);
-			if (Ptr)
-			{
-			  	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-				{
-					if ((has_channel(i->second,Ptr)) && (isnick(i->second->nick)))
-					{
-						WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
-					}
-				}
-				WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, Ptr->name);
-			}
-			else
-			{
-				WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-			}
-		}
-		else
-		{
-			userrec* u = Find(parameters[0]);
-			if (u)
-			{
-				WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, u->nick, u->ident, u->dhost, u->server, u->nick, u->fullname);
-			}
-			WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]);
-		}
-	}
-	if (pcnt == 2)
-	{
-                if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*")) && (!strcmp(parameters[1],"o")))
-                {
-		  	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-                        {
-                                if ((common_channels(user,i->second)) && (isnick(i->second->nick)))
-                                {
-                                        if (strchr(i->second->modes,'o'))
-                                        {
-                                                WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, user->nick, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
-                                        }
-                                }
-                        }
-                        WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, user->nick);
-                        return;
-                }
-	}
-}
-
-void handle_wallops(char **parameters, int pcnt, userrec *user)
-{
-	WriteWallOps(user,false,"%s",parameters[0]);
-}
-
-void handle_list(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* Ptr;
-	
-	WriteServ(user->fd,"321 %s Channel :Users Name",user->nick);
-	for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
-	{
-		if ((!i->second->c_private) && (!i->second->secret))
-		{
-			WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,usercount_i(i->second),chanmodes(i->second),i->second->topic);
-		}
-	}
-	WriteServ(user->fd,"323 %s :End of channel list.",user->nick);
-}
-
-
-void handle_rehash(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"382 %s %s :Rehashing",user->nick,CleanFilename(CONFIG_FILE));
-	ReadConfig();
-	FOREACH_MOD OnRehash();
-	WriteOpers("%s is rehashing config file %s",user->nick,CleanFilename(CONFIG_FILE));
-}
-
 
 int usercnt(void)
 {
@@ -2879,23 +2170,6 @@ long local_count()
 }
 
 
-void handle_lusers(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,usercnt()-usercount_invisible(),usercount_invisible(),servercount());
-	WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
-	WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
-	WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
-	WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),count_servs());
-}
-
-void handle_admin(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"256 %s :Administrative info for %s",user->nick,ServerName);
-	WriteServ(user->fd,"257 %s :Name     - %s",user->nick,AdminName);
-	WriteServ(user->fd,"258 %s :Nickname - %s",user->nick,AdminNick);
-	WriteServ(user->fd,"258 %s :E-Mail   - %s",user->nick,AdminEmail);
-}
-
 void ShowMOTD(userrec *user)
 {
 	if (!MOTD.size())
@@ -2974,174 +2248,6 @@ void handle_version(char **parameters, int pcnt, userrec *user)
 	WriteServ(user->fd,"351 %s :%s Rev. %s %s :%s (O=%d)",user->nick,VERSION,v2,ServerName,SYSTEM,OPTIMISATION);
 }
 
-void handle_ping(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"PONG %s :%s",ServerName,parameters[0]);
-}
-
-void handle_pong(char **parameters, int pcnt, userrec *user)
-{
-	// set the user as alive so they survive to next ping
-	user->lastping = 1;
-}
-
-void handle_motd(char **parameters, int pcnt, userrec *user)
-{
-	ShowMOTD(user);
-}
-
-void handle_rules(char **parameters, int pcnt, userrec *user)
-{
-	ShowRULES(user);
-}
-
-void handle_user(char **parameters, int pcnt, userrec *user)
-{
-	if (user->registered < 3)
-	{
-		if (isident(parameters[0]) == 0) {
-			// This kinda Sucks, According to the RFC thou, its either this,
-			// or "You have already registered" :p -- Craig
-			WriteServ(user->fd,"461 %s USER :Not enough parameters",user->nick);
-		}
-		else {
-			WriteServ(user->fd,"NOTICE Auth :No ident response, ident prefixed with ~");
-			strcpy(user->ident,"~"); /* we arent checking ident... but these days why bother anyway? */
-			strncat(user->ident,parameters[0],IDENTMAX);
-			strncpy(user->fullname,parameters[3],128);
-			user->registered = (user->registered | 1);
-		}
-	}
-	else
-	{
-		WriteServ(user->fd,"462 %s :You may not reregister",user->nick);
-		return;
-	}
-	/* parameters 2 and 3 are local and remote hosts, ignored when sent by client connection */
-	if (user->registered == 3)
-	{
-		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		ConnectUser(user);
-	}
-}
-
-void handle_userhost(char **parameters, int pcnt, userrec *user)
-{
-	char Return[MAXBUF],junk[MAXBUF];
-	sprintf(Return,"302 %s :",user->nick);
-	for (int i = 0; i < pcnt; i++)
-	{
-		userrec *u = Find(parameters[i]);
-		if (u)
-		{
-			if (strchr(u->modes,'o'))
-			{
-				sprintf(junk,"%s*=+%s@%s ",u->nick,u->ident,u->host);
-				strcat(Return,junk);
-			}
-			else
-			{
-				sprintf(junk,"%s=+%s@%s ",u->nick,u->ident,u->host);
-				strcat(Return,junk);
-			}
-		}
-	}
-	WriteServ(user->fd,Return);
-}
-
-
-void handle_ison(char **parameters, int pcnt, userrec *user)
-{
-	char Return[MAXBUF];
-	sprintf(Return,"303 %s :",user->nick);
-	for (int i = 0; i < pcnt; i++)
-	{
-		userrec *u = Find(parameters[i]);
-		if (u)
-		{
-			strcat(Return,u->nick);
-			strcat(Return," ");
-		}
-	}
-	WriteServ(user->fd,Return);
-}
-
-
-void handle_away(char **parameters, int pcnt, userrec *user)
-{
-	if (pcnt)
-	{
-		strcpy(user->awaymsg,parameters[0]);
-		WriteServ(user->fd,"306 %s :You have been marked as being away",user->nick);
-	}
-	else
-	{
-		strcpy(user->awaymsg,"");
-		WriteServ(user->fd,"305 %s :You are no longer marked as being away",user->nick);
-	}
-}
-
-void handle_whowas(char **parameters, int pcnt, userrec* user)
-{
-	user_hash::iterator i = whowas.find(parameters[0]);
-
-	if (i == whowas.end())
-	{
-		WriteServ(user->fd,"406 %s %s :There was no such nickname",user->nick,parameters[0]);
-		WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
-	}
-	else
-	{
-		time_t rawtime = i->second->signon;
-		tm *timeinfo;
-		char b[MAXBUF];
-		
-		timeinfo = localtime(&rawtime);
-		strcpy(b,asctime(timeinfo));
-		b[strlen(b)-1] = '\0';
-		
-		WriteServ(user->fd,"314 %s %s %s %s * :%s",user->nick,i->second->nick,i->second->ident,i->second->dhost,i->second->fullname);
-		WriteServ(user->fd,"312 %s %s %s :%s",user->nick,i->second->nick,i->second->server,b);
-		WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
-	}
-
-}
-
-void handle_trace(char **parameters, int pcnt, userrec *user)
-{
-	for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
-	{
-		if (i->second)
-		{
-			if (isnick(i->second->nick))
-			{
-				if (strchr(i->second->modes,'o'))
-				{
-					WriteServ(user->fd,"205 %s :Oper 0 %s",user->nick,i->second->nick);
-				}
-				else
-				{
-					WriteServ(user->fd,"204 %s :User 0 %s",user->nick,i->second->nick);
-				}
-			}
-			else
-			{
-				WriteServ(user->fd,"203 %s :???? 0 [%s]",user->nick,i->second->host);
-			}
-		}
-	}
-}
-
-void handle_modules(char **parameters, int pcnt, userrec *user)
-{
-  	for (int i = 0; i < module_names.size(); i++)
-	{
-			Version V = modules[i]->GetVersion();
-			char modulename[MAXBUF];
-			strncpy(modulename,module_names[i].c_str(),256);
-			WriteServ(user->fd,"900 %s :0x%08lx %d.%d.%d.%d %s",user->nick,modules[i],V.Major,V.Minor,V.Revision,V.Build,CleanFilename(modulename));
-	}
-}
 
 // calls a handler function for a command
 
@@ -3165,152 +2271,6 @@ void call_handler(const char* commandname,char **parameters, int pcnt, userrec *
 		}
 }
 
-void handle_stats(char **parameters, int pcnt, userrec *user)
-{
-	if (pcnt != 1)
-	{
-		return;
-	}
-	if (strlen(parameters[0])>1)
-	{
-		/* make the stats query 1 character long */
-		parameters[0][1] = '\0';
-	}
-
-	/* stats m (list number of times each command has been used, plus bytecount) */
-	if (!strcasecmp(parameters[0],"m"))
-	{
-		for (int i = 0; i < cmdlist.size(); i++)
-		{
-			if (cmdlist[i].handler_function)
-			{
-				if (cmdlist[i].use_count)
-				{
-					/* RPL_STATSCOMMANDS */
-					WriteServ(user->fd,"212 %s %s %d %d",user->nick,cmdlist[i].command,cmdlist[i].use_count,cmdlist[i].total_bytes);
-				}
-			}
-		}
-			
-	}
-
-	/* stats z (debug and memory info) */
-	if (!strcasecmp(parameters[0],"z"))
-	{
-		WriteServ(user->fd,"249 %s :Users(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,clientlist.size(),clientlist.size()*sizeof(userrec),clientlist.bucket_count());
-		WriteServ(user->fd,"249 %s :Channels(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,chanlist.size(),chanlist.size()*sizeof(chanrec),chanlist.bucket_count());
-		WriteServ(user->fd,"249 %s :Commands(VECTOR) %d (%d bytes)",user->nick,cmdlist.size(),cmdlist.size()*sizeof(command_t));
-		WriteServ(user->fd,"249 %s :MOTD(VECTOR) %d, RULES(VECTOR) %d",user->nick,MOTD.size(),RULES.size());
-		WriteServ(user->fd,"249 %s :address_cache(HASH_MAP) %d (%d buckets)",user->nick,IP.size(),IP.bucket_count());
-		WriteServ(user->fd,"249 %s :Modules(VECTOR) %d (%d)",user->nick,modules.size(),modules.size()*sizeof(Module));
-		WriteServ(user->fd,"249 %s :ClassFactories(VECTOR) %d (%d)",user->nick,factory.size(),factory.size()*sizeof(ircd_module));
-		WriteServ(user->fd,"249 %s :Ports(STATIC_ARRAY) %d",user->nick,boundPortCount);
-	}
-	
-	/* stats o */
-	if (!strcasecmp(parameters[0],"o"))
-	{
-		for (int i = 0; i < ConfValueEnum("oper",&config_f); i++)
-		{
-			char LoginName[MAXBUF];
-			char HostName[MAXBUF];
-			char OperType[MAXBUF];
-			ConfValue("oper","name",i,LoginName,&config_f);
-			ConfValue("oper","host",i,HostName,&config_f);
-			ConfValue("oper","type",i,OperType,&config_f);
-			WriteServ(user->fd,"243 %s O %s * %s %s 0",user->nick,HostName,LoginName,OperType);
-		}
-	}
-	
-	/* stats l (show user I/O stats) */
-	if (!strcasecmp(parameters[0],"l"))
-	{
-		WriteServ(user->fd,"211 %s :server:port nick bytes_in cmds_in bytes_out cmds_out",user->nick);
-	  	for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
-		{
-			if (isnick(i->second->nick))
-			{
-				WriteServ(user->fd,"211 %s :%s:%d %s %d %d %d %d",user->nick,ServerName,i->second->port,i->second->nick,i->second->bytes_in,i->second->cmds_in,i->second->bytes_out,i->second->cmds_out);
-			}
-			else
-			{
-				WriteServ(user->fd,"211 %s :%s:%d (unknown@%d) %d %d %d %d",user->nick,ServerName,i->second->port,i->second->fd,i->second->bytes_in,i->second->cmds_in,i->second->bytes_out,i->second->cmds_out);
-			}
-			
-		}
-	}
-	
-	/* stats u (show server uptime) */
-	if (!strcasecmp(parameters[0],"u"))
-	{
-		time_t current_time = 0;
-		current_time = time(NULL);
-		time_t server_uptime = current_time - startup_time;
-		struct tm* stime;
-		stime = gmtime(&server_uptime);
-		/* i dont know who the hell would have an ircd running for over a year nonstop, but
-		 * Craig suggested this, and it seemed a good idea so in it went */
-		if (stime->tm_year > 70)
-		{
-			WriteServ(user->fd,"242 %s :Server up %d years, %d days, %.2d:%.2d:%.2d",user->nick,(stime->tm_year-70),stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
-		}
-		else
-		{
-			WriteServ(user->fd,"242 %s :Server up %d days, %.2d:%.2d:%.2d",user->nick,stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
-		}
-	}
-
-	WriteServ(user->fd,"219 %s %s :End of /STATS report",user->nick,parameters[0]);
-	WriteOpers("*** Notice: Stats '%s' requested by %s (%s@%s)",parameters[0],user->nick,user->ident,user->host);
-	
-}
-
-void handle_connect(char **parameters, int pcnt, userrec *user)
-{
-	char Link_ServerName[1024];
-	char Link_IPAddr[1024];
-	char Link_Port[1024];
-	char Link_Pass[1024];
-	int LinkPort;
-	bool found = false;
-	
-	for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
-	{
-		if (!found)
-		{
-			ConfValue("link","name",i,Link_ServerName,&config_f);
-			ConfValue("link","ipaddr",i,Link_IPAddr,&config_f);
-			ConfValue("link","port",i,Link_Port,&config_f);
-			ConfValue("link","sendpass",i,Link_Pass,&config_f);
-			log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass);
-			LinkPort = atoi(Link_Port);
-			if (match(Link_ServerName,parameters[0])) {
-				found = true;
-				break;
-			}
-		}
-	}
-	
-	if (!found) {
-		WriteServ(user->fd,"NOTICE %s :*** Failed to connect to %s: No servers matching this pattern are configured for linking.",user->nick,parameters[0]);
-		return;
-	}
-	
-	// TODO: Perform a check here to stop a server being linked twice!
-
-	WriteServ(user->fd,"NOTICE %s :*** Connecting to %s (%s) port %s...",user->nick,Link_ServerName,Link_IPAddr,Link_Port);
-
-	if (me[defaultRoute])
-	{
-		me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass,Link_ServerName,me[defaultRoute]->port);
-		return;
-	}
-	else
-	{
-		WriteServ(user->fd,"NOTICE %s :No default route is defined for server connections on this server. You must define a server connection to be default route so that sockets can be bound to it.",user->nick);
-	}
-}
-
 void DoSplitEveryone()
 {
 	bool go_again = true;
@@ -3359,23 +2319,6 @@ void DoSplitEveryone()
 
 
 
-void handle_squit(char **parameters, int pcnt, userrec *user)
-{
-	// send out an squit across the mesh and then clear the server list (for local squit)
-	if (!pcnt)
-	{
-		WriteOpers("SQUIT command issued by %s",user->nick);
-		char buffer[MAXBUF];
-		snprintf(buffer,MAXBUF,"& %s",ServerName);
-		NetSendToAll(buffer);
-		DoSplitEveryone();
-	}
-	else
-	{
-		WriteServ(user->fd,"NOTICE :*** Remote SQUIT not supported yet.");
-	}
-}
-
 char islast(const char* s)
 {
 	char c = '`';
@@ -3409,172 +2352,6 @@ long map_count(const char* s)
 	return c;
 }
 
-void handle_links(char **parameters, int pcnt, userrec *user)
-{
-	WriteServ(user->fd,"364 %s %s %s :0 %s",user->nick,ServerName,ServerName,ServerDesc);
-	for (int j = 0; j < 32; j++)
- 	{
-		if (me[j] != NULL)
-  		{
-			for (int k = 0; k < me[j]->connectors.size(); k++)
-			{
-				WriteServ(user->fd,"364 %s %s %s :1 %s",user->nick,me[j]->connectors[k].GetServerName().c_str(),ServerName,me[j]->connectors[k].GetDescription().c_str());
-			}
-		}
-	}
-	WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick);
-}
-
-void handle_map(char **parameters, int pcnt, userrec *user)
-{
-	char line[MAXBUF];
-	snprintf(line,MAXBUF,"006 %s :%s",user->nick,ServerName);
-	while (strlen(line) < 50)
-		strcat(line," ");
-	WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)usercnt())*100));
-	for (int j = 0; j < 32; j++)
- 	{
-		if (me[j] != NULL)
-  		{
-			for (int k = 0; k < me[j]->connectors.size(); k++)
-			{
-				snprintf(line,MAXBUF,"006 %s :%c-%s",user->nick,islast(me[j]->connectors[k].GetServerName().c_str()),me[j]->connectors[k].GetServerName().c_str());
-				while (strlen(line) < 50)
-					strcat(line," ");
-				WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(me[j]->connectors[k].GetServerName().c_str()),(float)(((float)map_count(me[j]->connectors[k].GetServerName().c_str())/(float)usercnt())*100));
-			}
-		}
-	}
-	WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
-}
-
-
-void handle_oper(char **parameters, int pcnt, userrec *user)
-{
-	char LoginName[MAXBUF];
-	char Password[MAXBUF];
-	char OperType[MAXBUF];
-	char TypeName[MAXBUF];
-	char Hostname[MAXBUF];
-	int i,j;
-
-	for (int i = 0; i < ConfValueEnum("oper",&config_f); i++)
-	{
-		ConfValue("oper","name",i,LoginName,&config_f);
-		ConfValue("oper","password",i,Password,&config_f);
-		if ((!strcmp(LoginName,parameters[0])) && (!strcmp(Password,parameters[1])))
-		{
-			/* correct oper credentials */
-			ConfValue("oper","type",i,OperType,&config_f);
-			WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType);
-			WriteServ(user->fd,"381 %s :You are now an IRC operator of type %s",user->nick,OperType);
-			WriteServ(user->fd,"MODE %s :+o",user->nick);
-			for (j =0; j < ConfValueEnum("type",&config_f); j++)
-			{
-				ConfValue("type","name",j,TypeName,&config_f);
-				if (!strcmp(TypeName,OperType))
-				{
-					/* found this oper's opertype */
-					ConfValue("type","host",j,Hostname,&config_f);
-					ChangeDisplayedHost(user,Hostname);
-				}
-			}
-			if (!strchr(user->modes,'o'))
-			{
-				strcat(user->modes,"o");
-			}
-			FOREACH_MOD OnOper(user);
-			return;
-		}
-	}
-	/* no such oper */
-	WriteServ(user->fd,"491 %s :Invalid oper credentials",user->nick);
-	WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host);
-}
-
-void handle_nick(char **parameters, int pcnt, userrec *user)
-{
-	if (pcnt < 1) 
-	{
-		log(DEBUG,"not enough params for handle_nick");
-		return;
-	}
-	if (!parameters[0])
-	{
-		log(DEBUG,"invalid parameter passed to handle_nick");
-		return;
-	}
-	if (!strlen(parameters[0]))
-	{
-		log(DEBUG,"zero length new nick passed to handle_nick");
-		return;
-	}
-	if (!user)
-	{
-		log(DEBUG,"invalid user passed to handle_nick");
-		return;
-	}
-	if (!user->nick)
-	{
-		log(DEBUG,"invalid old nick passed to handle_nick");
-		return;
-	}
-	if (!strcasecmp(user->nick,parameters[0]))
-	{
-		log(DEBUG,"old nick is new nick, skipping");
-		return;
-	}
-	else
-	{
-		if (strlen(parameters[0]) > 1)
-		{
-			if (parameters[0][0] == ':')
-			{
-				*parameters[0]++;
-			}
-		}
-		if ((Find(parameters[0])) && (Find(parameters[0]) != user))
-		{
-			WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
-			return;
-		}
-	}
-	if (isnick(parameters[0]) == 0)
-	{
-		WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
-		return;
-	}
-
-	if (user->registered == 7)
-	{
-		WriteCommon(user,"NICK %s",parameters[0]);
-		
-		// Q token must go to ALL servers!!!
-		char buffer[MAXBUF];
-		snprintf(buffer,MAXBUF,"n %s %s",user->nick,parameters[0]);
-		NetSendToAll(buffer);
-		
-	}
-	
-	/* change the nick of the user in the users_hash */
-	user = ReHashNick(user->nick, parameters[0]);
-	/* actually change the nick within the record */
-	if (!user) return;
-	if (!user->nick) return;
-
-	strncpy(user->nick, parameters[0],NICKMAX);
-
-	log(DEBUG,"new nick set: %s",user->nick);
-	
-	if (user->registered < 3)
-		user->registered = (user->registered | 2);
-	if (user->registered == 3)
-	{
-		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		ConnectUser(user);
-	}
-	log(DEBUG,"exit nickchange: %s",user->nick);
-}
 
 void force_nickchange(userrec* user,const char* newnick)
 {