]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/users.cpp
Fix for parameters which contain a colon (which is not the first char in the string)
[user/henk/code/inspircd.git] / src / users.cpp
index e35c5cab8db1854bb6f8a2f430d56f8112fd01c4..46f5d512bde6acc69365ccfaf11155f4c4a03a15 100644 (file)
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "configreader.h"
 #include "channels.h"
-#include "connection.h"
 #include "users.h"
 #include "inspircd.h"
 #include <stdarg.h>
-#include "inspstring.h"
-#include "commands.h"
-#include "helperfuncs.h"
-#include "typedefs.h"
 #include "socketengine.h"
-#include "hashcomp.h"
-#include "message.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "cull_list.h"
 
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
-extern Server* MyServer;
-
 irc::whowas::whowas_users whowas;
 static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
-std::vector<userrec*> all_opers;
 
 typedef std::map<irc::string,char*> opertype_t;
 typedef opertype_t operclass_t;
@@ -81,7 +66,7 @@ bool DoType(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* Classes = (char*)values[1];
        
        opertypes[TypeName] = strdup(Classes);
-       log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
+       conf->GetInstance()->Log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
        return true;
 }
 
@@ -91,7 +76,7 @@ bool DoClass(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* CommandList = (char*)values[1];
        
        operclass[ClassName] = strdup(CommandList);
-       log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
+       conf->GetInstance()->Log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
        return true;
 }
 
@@ -100,71 +85,92 @@ bool DoneClassesAndTypes(ServerConfig* conf, const char* tag)
        return true;
 }
 
-bool userrec::ProcessNoticeMasks(const char *sm)
+std::string userrec::ProcessNoticeMasks(const char *sm)
 {
-       bool adding = true;
+       bool adding = true, oldadding = false;
        const char *c = sm;
+       std::string output = "";
+
+       ServerInstance->Log(DEBUG,"Process notice masks");
 
        while (c && *c)
        {
+               ServerInstance->Log(DEBUG,"Process notice mask %c",*c);
+               
                switch (*c)
                {
                        case '+':
                                adding = true;
-                               break;
+                       break;
                        case '-':
                                adding = false;
-                               break;
+                       break;
                        default:
-                               if ((*c >= 'A') && (*c <= 'z'))
-                                       this->SetNoticeMask(*c, adding);
-                               break;
+                               if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
+                               {
+                                       if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
+                                       {
+                                               if ((oldadding != adding) || (!output.length()))
+                                                       output += (adding ? '+' : '-');
+
+                                               this->SetNoticeMask(*c, adding);
+
+                                               output += *c;
+                                       }
+                               }
+                               oldadding = adding;
+                       break;
                }
 
                *c++;
        }
 
-       return true;
+       return output;
 }
 
 void userrec::StartDNSLookup()
 {
-       log(DEBUG,"Commencing reverse lookup");
+       ServerInstance->Log(DEBUG,"Commencing reverse lookup");
        try
        {
-               res_reverse = new UserResolver(ServerInstance, this, this->GetIPString(), false);
-               MyServer->AddResolver(res_reverse);
+               ServerInstance->Log(DEBUG,"Passing instance: %08x",this->ServerInstance);
+               res_reverse = new UserResolver(this->ServerInstance, this, this->GetIPString(), false);
+               this->ServerInstance->AddResolver(res_reverse);
        }
        catch (ModuleException& e)
        {
-               log(DEBUG,"Error in resolver: %s",e.GetReason());
+               ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
        }
 }
 
 UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, bool forward) :
-       Resolver(to_resolve, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), bound_user(user), ServerInstance(Instance)
+       Resolver(Instance, to_resolve, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), bound_user(user)
 {
        this->fwd = forward;
-       this->bound_fd = user->fd;
+       this->bound_fd = user->GetFd();
 }
 
 void UserResolver::OnLookupComplete(const std::string &result)
 {
-       if ((!this->fwd) && (ServerInstance->fd_ref_table[this->bound_fd] == this->bound_user))
+       if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
-               log(DEBUG,"Commencing forward lookup");
+               ServerInstance->Log(DEBUG,"Commencing forward lookup");
                this->bound_user->stored_host = result;
                try
                {
-                       bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, true);
-                       MyServer->AddResolver(bound_user->res_forward);
+                       /* Check we didnt time out */
+                       if (this->bound_user->registered != REG_ALL)
+                       {
+                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, true);
+                               this->ServerInstance->AddResolver(bound_user->res_forward);
+                       }
                }
                catch (ModuleException& e)
                {
-                       log(DEBUG,"Error in resolver: %s",e.GetReason());
+                       ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
                }
        }
-       else if ((this->fwd) && (ServerInstance->fd_ref_table[this->bound_fd] == this->bound_user))
+       else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
                /* Both lookups completed */
                if (this->bound_user->GetIPString() == result)
@@ -172,14 +178,18 @@ void UserResolver::OnLookupComplete(const std::string &result)
                        std::string hostname = this->bound_user->stored_host;
                        if (hostname.length() < 65)
                        {
-                               /* Hostnames starting with : are not a good thing (tm) */
-                               if (*(hostname.c_str()) == ':')
-                                       hostname = "0" + hostname;
-
-                               this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)", hostname.c_str());
-                               this->bound_user->dns_done = true;
-                               strlcpy(this->bound_user->dhost, hostname.c_str(),64);
-                               strlcpy(this->bound_user->host, hostname.c_str(),64);
+                               /* Check we didnt time out */
+                               if (this->bound_user->registered != REG_ALL)
+                               {
+                                       /* Hostnames starting with : are not a good thing (tm) */
+                                       if (*(hostname.c_str()) == ':')
+                                               hostname = "0" + hostname;
+
+                                       this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)", hostname.c_str());
+                                       this->bound_user->dns_done = true;
+                                       strlcpy(this->bound_user->dhost, hostname.c_str(),64);
+                                       strlcpy(this->bound_user->host, hostname.c_str(),64);
+                               }
                        }
                        else
                        {
@@ -195,7 +205,7 @@ void UserResolver::OnLookupComplete(const std::string &result)
 
 void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 {
-       if (ServerInstance->fd_ref_table[this->bound_fd] == this->bound_user)
+       if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
        {
                /* Error message here */
                this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname, using your IP address (%s) instead.", this->bound_user->GetIPString());
@@ -256,13 +266,15 @@ const char* userrec::FormatModes()
 
 userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
 {
+       ServerInstance->Log(DEBUG,"userrec::userrec(): Instance: %08x",ServerInstance);
        // the PROPER way to do it, AVOID bzero at *ALL* costs
        *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = 0;
        server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
-       reset_due = TIME;
-       lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
+       reset_due = ServerInstance->Time();
+       lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
        timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
        haspassed = dns_done = false;
+       fd = -1;
        recvq = "";
        sendq = "";
        WriteError = "";
@@ -272,6 +284,7 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
        invites.clear();
        chans.resize(MAXCHANS);
        memset(modes,0,sizeof(modes));
+       memset(snomasks,0,sizeof(snomasks));
        
        for (unsigned int n = 0; n < MAXCHANS; n++)
        {
@@ -407,7 +420,7 @@ void userrec::InviteTo(irc::string &channel)
 
 void userrec::RemoveInvite(irc::string &channel)
 {
-       log(DEBUG,"Removing invites");
+       ServerInstance->Log(DEBUG,"Removing invites");
        
        if (invites.size())
        {
@@ -475,27 +488,29 @@ bool userrec::HasPermission(const std::string &command)
        return false;
 }
 
-
-bool userrec::AddBuffer(const std::string &a)
+/** NOTE: We cannot pass a const reference to this method.
+ * The string is changed by the workings of the method,
+ * so that if we pass const ref, we end up copying it to
+ * something we can change anyway. Makes sense to just let
+ * the compiler do that copy for us.
+ */
+bool userrec::AddBuffer(std::string a)
 {
-       std::string b = "";
+       std::string::size_type i = a.rfind('\r');
 
-       /* NB: std::string is arsey about \r and \n and tries to translate them
-        * somehow, so we CANNOT use std::string::find() here :(
-        */
-       for (std::string::const_iterator i = a.begin(); i != a.end(); i++)
+       while (i != std::string::npos)
        {
-               if (*i != '\r')
-                       b += *i;
+               a.erase(i, 1);
+               i = a.rfind('\r');
        }
 
-       if (b.length())
-               recvq.append(b);
+       if (a.length())
+               recvq.append(a);
 
        if (recvq.length() > (unsigned)this->recvqmax)
        {
                this->SetWriteError("RecvQ exceeded");
-               WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
+               ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
                return false;
        }
 
@@ -552,7 +567,7 @@ void userrec::AddWriteBuf(const std::string &data)
                 * to repeatedly add the text to the sendq!
                 */
                this->SetWriteError("SendQ exceeded");
-               WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
+               ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
                return;
        }
        
@@ -595,11 +610,11 @@ void userrec::FlushWriteBuf()
 
 void userrec::SetWriteError(const std::string &error)
 {
-       log(DEBUG,"SetWriteError: %s",error.c_str());
+       ServerInstance->Log(DEBUG,"SetWriteError: %s",error.c_str());
        // don't try to set the error twice, its already set take the first string.
        if (!this->WriteError.length())
        {
-               log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
+               ServerInstance->Log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
                this->WriteError = error;
        }
 }
@@ -614,9 +629,9 @@ void userrec::Oper(const std::string &opertype)
        this->modes[UM_OPERATOR] = 1;
        this->WriteServ("MODE %s :+o", this->nick);
        FOREACH_MOD(I_OnOper, OnOper(this, opertype));
-       log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
+       ServerInstance->Log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
        strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
-       all_opers.push_back(this);
+       ServerInstance->all_opers.push_back(this);
        FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype));
 }
 
@@ -626,12 +641,12 @@ void userrec::UnOper()
        {
                *this->oper = 0;
                this->modes[UM_OPERATOR] = 0;
-               for (std::vector<userrec*>::iterator a = all_opers.begin(); a < all_opers.end(); a++)
+               for (std::vector<userrec*>::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++)
                {
                        if (*a == this)
                        {
-                               log(DEBUG,"Oper removed from optimization list");
-                               all_opers.erase(a);
+                               ServerInstance->Log(DEBUG,"Oper removed from optimization list");
+                               ServerInstance->all_opers.erase(a);
                                return;
                        }
                }
@@ -662,7 +677,7 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quit
 
        if (user->registered == REG_ALL)
        {
-               purge_empty_chans(user);
+               user->PurgeEmptyChannels();
                FOREACH_MOD_I(Instance,I_OnUserQuit,OnUserQuit(user,reason));
                user->WriteCommonExcept("QUIT :%s",reason.c_str());
        }
@@ -682,35 +697,32 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quit
                        }
                        catch (ModuleException& modexcept)
                        {
-                               log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
+                               Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
                        }
                }
                
-               Instance->SE->DelFd(user->fd);
+               Instance->SE->DelFd(user);
                user->CloseSocket();
        }
 
        /*
-        * this must come before the WriteOpers so that it doesnt try to fill their buffer with anything
-        * if they were an oper with +s.
-        *
-        * XXX -
-        * In the current implementation, we only show local quits, as we only show local connects. With 
-        * the proposed implmentation of snomasks however, this will likely change in the (near?) future.
+        * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
+        * if they were an oper with +sn +qQ.
         */
        if (user->registered == REG_ALL)
        {
                if (IS_LOCAL(user))
-                       WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str());
+                       Instance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str());
+               else
+                       Instance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,reason.c_str());
                user->AddToWhoWas();
        }
 
        if (iter != Instance->clientlist.end())
        {
-               log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
+               Instance->Log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
                if (IS_LOCAL(user))
                {
-                       Instance->fd_ref_table[user->fd] = NULL;
                        if (find(Instance->local_users.begin(),Instance->local_users.end(),user) != Instance->local_users.end())
                                Instance->local_users.erase(find(Instance->local_users.begin(),Instance->local_users.end(),user));
                }
@@ -746,14 +758,14 @@ namespace irc
                }
 
                /* every hour, run this function which removes all entries over 3 days */
-               void MaintainWhoWas(time_t TIME)
+               void MaintainWhoWas(time_t t)
                {
                        for (whowas_users::iterator iter = ::whowas.begin(); iter != ::whowas.end(); iter++)
                        {
                                whowas_set* n = (whowas_set*)iter->second;
                                if (n->size())
                                {
-                                       while ((n->begin() != n->end()) && ((*n->begin())->signon < TIME - 259200)) // 3 days
+                                       while ((n->begin() != n->end()) && ((*n->begin())->signon < t - 259200)) // 3 days
                                        {
                                                WhoWasGroup *a = *(n->begin());
                                                DELETE(a);
@@ -818,7 +830,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
                Instance->clientlist.erase(iter);
        }
 
-       log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
+       Instance->Log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
        
        _new = new userrec(Instance);
        Instance->clientlist[tempnick] = _new;
@@ -830,12 +842,12 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
        strcpy(_new->ident, "unknown");
 
        _new->registered = REG_NONE;
-       _new->signon = TIME + Instance->Config->dns_timeout;
+       _new->signon = Instance->Time() + Instance->Config->dns_timeout;
        _new->lastping = 1;
 
-       log(DEBUG,"Setting socket addresses");
+       Instance->Log(DEBUG,"Setting socket addresses");
        _new->SetSockAddr(AF_FAMILY, ipaddr, port);
-       log(DEBUG,"Socket addresses set.");
+       Instance->Log(DEBUG,"Socket addresses set.");
 
        /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
        for (const char* temp = _new->GetIPString(); *temp && j < 64; temp++, j++)
@@ -863,14 +875,13 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
                }
        }
 
-       _new->nping = TIME + _new->pingmax + Instance->Config->dns_timeout;
-       _new->timeout = TIME+class_regtimeout;
+       _new->nping = Instance->Time() + _new->pingmax + Instance->Config->dns_timeout;
+       _new->timeout = Instance->Time() + class_regtimeout;
        _new->flood = class_flood;
        _new->threshold = class_threshold;
        _new->sendqmax = class_sqmax;
        _new->recvqmax = class_rqmax;
 
-       Instance->fd_ref_table[socket] = _new;
        Instance->local_users.push_back(_new);
 
        if (Instance->local_users.size() > Instance->Config->SoftLimit)
@@ -900,10 +911,10 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
                userrec::QuitUser(Instance, _new,"Server is full");
                return;
        }
-       char* e = matches_exception(ipaddr);
+       char* e = Instance->XLines->matches_exception(ipaddr);
        if (!e)
        {
-               char* r = matches_zline(ipaddr);
+               char* r = Instance->XLines->matches_zline(ipaddr);
                if (r)
                {
                        char reason[MAXBUF];
@@ -915,7 +926,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 
        if (socket > -1)
        {
-               if (!Instance->SE->AddFd(socket,true,X_ESTAB_CLIENT))
+               if (!Instance->SE->AddFd(_new))
                {
                        userrec::QuitUser(Instance, _new, "Internal error handling connection");
                        return;
@@ -966,9 +977,9 @@ long userrec::LocalCloneCount()
 void userrec::FullConnect(CullList* Goners)
 {
        ServerInstance->stats->statsConnects++;
-       this->idle_lastmsg = TIME;
+       this->idle_lastmsg = ServerInstance->Time();
 
-       ConnectClass a = GetClass(this);
+       ConnectClass a = this->GetClass();
 
        if (a.type == CC_DENY)
        {
@@ -985,23 +996,23 @@ void userrec::FullConnect(CullList* Goners)
        if (this->LocalCloneCount() > a.maxlocal)
        {
                Goners->AddItem(this, "No more connections allowed from your host via this connect class (local)");
-               WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a.maxlocal, this->GetIPString());
+               ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a.maxlocal, this->GetIPString());
                return;
        }
        else if (this->GlobalCloneCount() > a.maxglobal)
        {
                Goners->AddItem(this, "No more connections allowed from your host via this connect class (global)");
-               WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal, this->GetIPString());
+               ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal, this->GetIPString());
                return;
        }
 
        char match_against[MAXBUF];
        snprintf(match_against,MAXBUF,"%s@%s", this->ident, this->host);
-       char* e = matches_exception(match_against);
+       char* e = ServerInstance->XLines->matches_exception(match_against);
 
        if (!e)
        {
-               char* r = matches_gline(match_against);
+               char* r = ServerInstance->XLines->matches_gline(match_against);
                
                if (r)
                {
@@ -1011,7 +1022,7 @@ void userrec::FullConnect(CullList* Goners)
                        return;
                }
                
-               r = matches_kline(match_against);
+               r = ServerInstance->XLines->matches_kline(match_against);
                
                if (r)
                {
@@ -1027,7 +1038,7 @@ void userrec::FullConnect(CullList* Goners)
        this->WriteServ("001 %s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
        this->WriteServ("002 %s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
        this->WriteServ("003 %s :This server was created %s %s", this->nick, __TIME__, __DATE__);
-       this->WriteServ("004 %s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->ModeGrok->UserModeList().c_str(), ServerInstance->ModeGrok->ChannelModeList().c_str(), ServerInstance->ModeGrok->ParaModeList().c_str());
+       this->WriteServ("004 %s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
 
        // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
        // so i'd better split it :)
@@ -1050,16 +1061,16 @@ void userrec::FullConnect(CullList* Goners)
                }
        }
        
-       ShowMOTD(this);
+       this->ShowMOTD();
 
        /*
         * fix 3 by brain, move registered = 7 below these so that spurious modes and host
         * changes dont go out onto the network and produce 'fake direction'.
         */
        FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
-       FOREACH_MOD(I_OnGlobalConnect,OnGlobalConnect(this));
+       FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
        this->registered = REG_ALL;
-       WriteOpers("*** Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
+       ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
 }
 
 /** userrec::UpdateNick()
@@ -1098,7 +1109,7 @@ bool userrec::ForceNickChange(const char* newnick)
                return false;
        }
        
-       if (matches_qline(newnick))
+       if (ServerInstance->XLines->matches_qline(newnick))
        {
                ServerInstance->stats->statsCollisions++;
                return false;
@@ -1125,7 +1136,7 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
 #ifdef SUPPORT_IP6LINKS
                case AF_INET6:
                {
-                       log(DEBUG,"Set inet6 protocol address");
+                       ServerInstance->Log(DEBUG,"Set inet6 protocol address");
                        sockaddr_in6* sin = new sockaddr_in6;
                        sin->sin6_family = AF_INET6;
                        sin->sin6_port = port;
@@ -1136,7 +1147,7 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
 #endif
                case AF_INET:
                {
-                       log(DEBUG,"Set inet4 protocol address");
+                       ServerInstance->Log(DEBUG,"Set inet4 protocol address");
                        sockaddr_in* sin = new sockaddr_in;
                        sin->sin_family = AF_INET;
                        sin->sin_port = port;
@@ -1145,7 +1156,7 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
                }
                break;
                default:
-                       log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
+                       ServerInstance->Log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
                break;
        }
 }
@@ -1172,7 +1183,7 @@ int userrec::GetPort()
                }
                break;
                default:
-                       log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
+                       ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
                break;
        }
        return 0;
@@ -1190,7 +1201,6 @@ int userrec::GetProtocolFamily()
 const char* userrec::GetIPString()
 {
        static char buf[1024];
-       static char temp[1024];
 
        if (this->ip == NULL)
                return "";
@@ -1200,6 +1210,8 @@ const char* userrec::GetIPString()
 #ifdef SUPPORT_IP6LINKS
                case AF_INET6:
                {
+                       static char temp[1024];
+               
                        sockaddr_in6* sin = (sockaddr_in6*)this->ip;
                        inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
                        /* IP addresses starting with a : on irc are a Bad Thing (tm) */
@@ -1221,7 +1233,7 @@ const char* userrec::GetIPString()
                }
                break;
                default:
-                       log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
+                       ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
                break;
        }
        return "";
@@ -1229,8 +1241,6 @@ const char* userrec::GetIPString()
 
 const char* userrec::GetIPString(char* buf)
 {
-       static char temp[1024];
-
        if (this->ip == NULL)
        {
                *buf = 0;
@@ -1242,6 +1252,8 @@ const char* userrec::GetIPString(char* buf)
 #ifdef SUPPORT_IP6LINKS
                case AF_INET6:
                {
+                       static char temp[1024];
+               
                        sockaddr_in6* sin = (sockaddr_in6*)this->ip;
                        inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
                        /* IP addresses starting with a : on irc are a Bad Thing (tm) */
@@ -1264,37 +1276,41 @@ const char* userrec::GetIPString(char* buf)
                break;
 
                default:
-                       log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
+                       ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
                break;
        }
        return "";
 }
 
-
-void userrec::Write(const std::string &text)
+/** NOTE: We cannot pass a const reference to this method.
+ * The string is changed by the workings of the method,
+ * so that if we pass const ref, we end up copying it to
+ * something we can change anyway. Makes sense to just let
+ * the compiler do that copy for us.
+ */
+void userrec::Write(std::string text)
 {
        if ((this->fd < 0) || (this->fd > MAX_DESCRIPTORS))
                return;
 
-       std::string crlf = text;
-       crlf.append("\r\n");
+       text.append("\r\n");
 
        if (ServerInstance->Config->GetIOHook(this->GetPort()))
        {
                try
                {
-                       ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, crlf.data(), crlf.length());
+                       ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length());
                }
                catch (ModuleException& modexcept)
                {
-                       log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
+                       ServerInstance->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
                }
        }
        else
        {
-               this->AddWriteBuf(crlf);
+               this->AddWriteBuf(text);
        }
-       ServerInstance->stats->statsSent += crlf.length();
+       ServerInstance->stats->statsSent += text.length();
 }
 
 /** Write()
@@ -1452,7 +1468,7 @@ void userrec::WriteCommonExcept(const char* text, ...)
 
 void userrec::WriteCommonExcept(const std::string &text)
 {
-       bool quit_munge = true;
+       bool quit_munge = false;
        char oper_quit[MAXBUF];
        char textbuffer[MAXBUF];
 
@@ -1624,14 +1640,55 @@ bool userrec::ChangeDisplayedHost(const char* host)
                        return false;
                FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,host));
        }
+       if (this->ServerInstance->Config->CycleHosts)
+               this->WriteCommonExcept("%s","QUIT :Changing hosts");
+
        strlcpy(this->dhost,host,63);
 
+       if (this->ServerInstance->Config->CycleHosts)
+       {
+               for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+               {
+                       if ((*i)->channel)
+                       {
+                               (*i)->channel->WriteAllExceptSender(this, 0, "JOIN %s", (*i)->channel->name);
+                               std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
+                               if (n.length())
+                                       (*i)->channel->WriteChannelWithServ(this->ServerInstance->Config->ServerName, "MODE %s +%s", (*i)->channel->name, n.c_str());
+                       }
+               }
+       }
+
        if (IS_LOCAL(this))
                this->WriteServ("396 %s %s :is now your hidden host",this->nick,this->dhost);
 
        return true;
 }
 
+bool userrec::ChangeIdent(const char* newident)
+{
+       if (this->ServerInstance->Config->CycleHosts)
+               this->WriteCommonExcept("%s","QUIT :Changing ident");
+
+       strlcpy(this->ident, newident, IDENTMAX+2);
+
+       if (this->ServerInstance->Config->CycleHosts)
+       {
+               for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+               {
+                       if ((*i)->channel)
+                       {
+                               (*i)->channel->WriteAllExceptSender(this, 0, "JOIN %s", (*i)->channel->name);
+                               std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
+                               if (n.length())
+                                       (*i)->channel->WriteChannelWithServ(this->ServerInstance->Config->ServerName, "MODE %s +%s", (*i)->channel->name, n.c_str());
+                       }
+               }
+       }
+
+       return true;
+}
+
 void userrec::NoticeAll(char* text, ...)
 {
        char textbuffer[MAXBUF];
@@ -1651,3 +1708,150 @@ void userrec::NoticeAll(char* text, ...)
        }
 }
 
+
+std::string userrec::ChannelList(userrec* source)
+{
+       std::string list;
+       for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+       {
+               ucrec* rec = *i;
+
+               if(rec->channel && rec->channel->name)
+               {
+                       /* If the target is the same as the sender, let them see all their channels.
+                        * If the channel is NOT private/secret OR the user shares a common channel
+                        * If the user is an oper, and the <options:operspywhois> option is set.
+                        */
+                       if ((source == this) || (*source->oper && ServerInstance->Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
+                       {
+                               list.append(rec->channel->GetPrefixChar(this)).append(rec->channel->name).append(" ");
+                       }
+               }
+       }
+       return list;
+}
+
+void userrec::SplitChanList(userrec* dest, const std::string &cl)
+{
+       std::string line;
+       std::ostringstream prefix;
+       std::string::size_type start, pos, length;
+
+       prefix << ":" << ServerInstance->Config->ServerName << " 319 " << this->nick << " " << dest->nick << " :";
+       line = prefix.str();
+
+       for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
+       {
+               length = (pos == std::string::npos) ? cl.length() : pos;
+
+               if (line.length() + length - start > 510)
+               {
+                       this->Write(line);
+                       line = prefix.str();
+               }
+
+               if(pos == std::string::npos)
+               {
+                       line.append(cl.substr(start, length - start));
+                       break;
+               }
+               else
+               {
+                       line.append(cl.substr(start, length - start + 1));
+               }
+       }
+
+       if (line.length())
+       {
+               this->Write(line);
+       }
+}
+
+
+/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+ * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
+ * then their ip will be taken as 'priority' anyway, so for example,
+ * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
+ */
+ConnectClass& userrec::GetClass()
+{
+       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+       {
+               if ((match(this->GetIPString(),i->host.c_str(),true)) || (match(this->host,i->host.c_str())))
+                       return *i;
+       }
+
+       return *(ServerInstance->Config->Classes.begin());
+}
+
+void userrec::PurgeEmptyChannels()
+{
+       std::vector<chanrec*> to_delete;
+
+       // firstly decrement the count on each channel
+       for (std::vector<ucrec*>::iterator f = this->chans.begin(); f != this->chans.end(); f++)
+       {
+               ucrec* uc = *f;
+               if (uc->channel)
+               {
+                       uc->channel->RemoveAllPrefixes(this);
+                       if (uc->channel->DelUser(this) == 0)
+                       {
+                               /* No users left in here, mark it for deletion */
+                               to_delete.push_back(uc->channel);
+                               uc->channel = NULL;
+                       }
+               }
+       }
+
+       for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
+       {
+               chanrec* thischan = *n;
+               chan_hash::iterator i2 = ServerInstance->chanlist.find(thischan->name);
+               if (i2 != ServerInstance->chanlist.end())
+               {
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
+                       DELETE(i2->second);
+                       ServerInstance->chanlist.erase(i2);
+               }
+       }
+
+       this->UnOper();
+}
+
+void userrec::ShowMOTD()
+{
+       if (!ServerInstance->Config->MOTD.size())
+       {
+               this->WriteServ("422 %s :Message of the day file is missing.",this->nick);
+               return;
+       }
+       this->WriteServ("375 %s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
+
+       for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+               this->WriteServ("372 %s :- %s",this->nick,ServerInstance->Config->MOTD[i].c_str());
+
+       this->WriteServ("376 %s :End of message of the day.", this->nick);
+}
+
+void userrec::ShowRULES()
+{
+       if (!ServerInstance->Config->RULES.size())
+       {
+               this->WriteServ("NOTICE %s :Rules file is missing.",this->nick);
+               return;
+       }
+       this->WriteServ("NOTICE %s :%s rules",this->nick,ServerInstance->Config->ServerName);
+
+       for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
+               this->WriteServ("NOTICE %s :%s",this->nick,ServerInstance->Config->RULES[i].c_str());
+
+       this->WriteServ("NOTICE %s :End of %s rules.",this->nick,ServerInstance->Config->ServerName);
+}
+
+void userrec::HandleEvent(EventType et)
+{
+       /* WARNING: May delete this user! */
+       ServerInstance->ProcessUser(this);
+}
+