Remove current time parameter of the Timer constructor

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 7fba57faa8b59b5825ea6dc40398c4633f1dedd3..abe0f8804b4f7765281387f2b943741aa6d0cfa5 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -24,8 +24,6 @@
 
 
 #include "inspircd.h"
-#include <stdarg.h>
-#include "socketengine.h"
 #include "xline.h"
 
 already_sent_t LocalUser::already_sent_id = 0;
@@ -288,7 +286,7 @@ eol_found:
                user->bytes_in += qpos;
                user->cmds_in++;
 
-               ServerInstance->Parser->ProcessBuffer(line, user);
+               ServerInstance->Parser.ProcessBuffer(line, user);
                if (user->quitting)
                        return;
        }
@@ -575,13 +573,13 @@ void LocalUser::FullConnect()
        std::vector<std::string> parameters;
        FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
        if (!MOD_RESULT)
-               ServerInstance->Parser->CallHandler(command, parameters, this);
+               ServerInstance->Parser.CallHandler(command, parameters, this);
 
        MOD_RESULT = MOD_RES_PASSTHRU;
        command = "MOTD";
        FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
        if (!MOD_RESULT)
-               ServerInstance->Parser->CallHandler(command, parameters, this);
+               ServerInstance->Parser.CallHandler(command, parameters, this);
 
        if (ServerInstance->Config->RawLog)
                WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
@@ -599,7 +597,7 @@ void LocalUser::FullConnect()
        ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]",
                this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->fullname.c_str());
        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding NEGATIVE hit for " + this->GetIPString());
-       ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
+       ServerInstance->BanCache.AddHit(this->GetIPString(), "", "");
        // reset the flood penalty (which could have been raised due to things like auto +x)
        CommandFloodPenalty = 0;
 }
@@ -613,7 +611,7 @@ void User::InvalidateCache()
        cached_fullrealhost.clear();
 }
 
-bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
+bool User::ChangeNick(const std::string& newnick, time_t newts)
 {
        if (quitting)
        {
@@ -621,21 +619,10 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
                return false;
        }
 
-       if (!force)
+       User* const InUse = ServerInstance->FindNickOnly(newnick);
+       if (InUse == this)
        {
-               ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
-
-               if (MOD_RESULT == MOD_RES_DENY)
-               {
-                       ServerInstance->stats.Collisions++;
-                       return false;
-               }
-       }
-
-       if (assign(newnick) == assign(nick))
-       {
-               // case change, don't need to check Q:lines and such
+               // case change, don't need to check campers
                // and, if it's identical including case, we can leave right now
                // We also don't update the nick TS if it's a case change, either
                if (newnick == nick)
@@ -643,42 +630,6 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
        }
        else
        {
-               /*
-                * Don't check Q:Lines if it's a server-enforced change, just on the off-chance some fucking *moron*
-                * tries to Q:Line SIDs, also, this means we just get our way period, as it really should be.
-                * Thanks Kein for finding this. -- w00t
-                *
-                * Also don't check Q:Lines for remote nickchanges, they should have our Q:Lines anyway to enforce themselves.
-                *              -- w00t
-                */
-               if (IS_LOCAL(this) && !force)
-               {
-                       XLine* mq = ServerInstance->XLines->MatchesLine("Q",newnick);
-                       if (mq)
-                       {
-                               if (this->registered == REG_ALL)
-                               {
-                                       ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s",
-                                               newnick.c_str(), GetFullRealHost().c_str(), mq->reason.c_str());
-                               }
-                               this->WriteNumeric(ERR_ERRONEUSNICKNAME, "%s :Invalid nickname: %s", newnick.c_str(), mq->reason.c_str());
-                               return false;
-                       }
-
-                       if (ServerInstance->Config->RestrictBannedUsers)
-                       {
-                               for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
-                               {
-                                       Channel* chan = (*i)->chan;
-                                       if (chan->GetPrefixValue(this) < VOICE_VALUE && chan->IsBanned(this))
-                                       {
-                                               this->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Cannot send to channel (you're banned)", chan->name.c_str());
-                                               return false;
-                                       }
-                               }
-                       }
-               }
-
                /*
                 * Uh oh.. if the nickname is in use, and it's not in use by the person using it (doh) --
                 * then we have a potential collide. Check whether someone else is camping on the nick
@@ -688,8 +639,7 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
                 * If the guy using the nick is already using it, tell the incoming nick change to gtfo,
                 * because the nick is already (rightfully) in use. -- w00t
                 */
-               User* InUse = ServerInstance->FindNickOnly(newnick);
-               if (InUse && (InUse != this))
+               if (InUse)
                {
                        if (InUse->registered != REG_ALL)
                        {
@@ -697,12 +647,8 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
                                InUse->WriteFrom(InUse, "NICK %s", InUse->uuid.c_str());
                                InUse->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", InUse->nick.c_str());
 
-                               ServerInstance->Users->clientlist.erase(InUse->nick);
-                               ServerInstance->Users->clientlist[InUse->uuid] = InUse;
-
-                               InUse->nick = InUse->uuid;
-                               InUse->InvalidateCache();
                                InUse->registered &= ~REG_NICK;
+                               InUse->ChangeNick(InUse->uuid);
                        }
                        else
                        {