Remove users from uuidlist on QuitUser, not during cull (allows UID reuse on fast...

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

diff --git a/src/users.cpp b/src/users.cpp
index 98c362f95f02e60cb0d164fec9d3f06b2ee10a6f..eea27f6f713f300fd27ab791616a90778540a99b 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -104,7 +104,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
                        break;
                }
 
-               *c++;
+               c++;
        }
 
        std::string s = this->FormatNoticeMasks();
@@ -203,24 +203,6 @@ const char* User::FormatModes(bool showparameters)
        return data;
 }
 
-void User::DecrementModes()
-{
-       ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()");
-       for (unsigned char n = 'A'; n <= 'z'; n++)
-       {
-               if (modes[n-65])
-               {
-                       ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n);
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
-                       if (mh)
-                       {
-                               ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n);
-                               mh->ChangeCount(-1);
-                       }
-               }
-       }
-}
-
 User::User(const std::string &uid, const std::string& sid, int type)
        : uuid(uid), server(sid), usertype(type)
 {
@@ -254,7 +236,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
 User::~User()
 {
        if (ServerInstance->Users->uuidlist->find(uuid) != ServerInstance->Users->uuidlist->end())
-               ServerInstance->Logs->Log("USERS", ERROR, "User destructor for %s called without cull", uuid.c_str());
+               ServerInstance->Logs->Log("USERS", DEFAULT, "User destructor for %s called without cull", uuid.c_str());
 }
 
 const std::string& User::MakeHost()
@@ -589,12 +571,10 @@ CullResult User::cull()
        PurgeEmptyChannels();
 
        this->InvalidateCache();
-       this->DecrementModes();
 
        if (client_sa.sa.sa_family != AF_UNSPEC)
                ServerInstance->Users->RemoveCloneCounts(this);
 
-       ServerInstance->Users->uuidlist->erase(uuid);
        return Extensible::cull();
 }
 
@@ -848,18 +828,21 @@ void LocalUser::FullConnect()
        ServerInstance->Config->Send005(this);
        this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
-
-       this->ShowMOTD();
-
        /* Now registered */
        if (ServerInstance->Users->unregistered_count)
                ServerInstance->Users->unregistered_count--;
 
-       /* Trigger LUSERS output, give modules a chance too */
+       /* Trigger MOTD and LUSERS output, give modules a chance too */
        ModResult MOD_RESULT;
-       std::string command("LUSERS");
+       std::string command("MOTD");
        std::vector<std::string> parameters;
-       FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS"));
+       FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
+       if (!MOD_RESULT)
+               ServerInstance->CallCommandHandler(command, parameters, this);
+
+       MOD_RESULT = MOD_RES_PASSTHRU;
+       command = "LUSERS";
+       FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
        if (!MOD_RESULT)
                ServerInstance->CallCommandHandler(command, parameters, this);
 
@@ -1645,37 +1628,6 @@ void User::PurgeEmptyChannels()
        this->UnOper();
 }
 
-void User::ShowMOTD()
-{
-       if (!ServerInstance->Config->MOTD.size())
-       {
-               this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
-               return;
-       }
-       this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName.c_str());
-
-       for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
-               this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
-
-       this->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str());
-}
-
-void User::ShowRULES()
-{
-       if (!ServerInstance->Config->RULES.size())
-       {
-               this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
-               return;
-       }
-
-       this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
-
-       for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
-               this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str());
-
-       this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
-}
-
 const std::string& FakeUser::GetFullHost()
 {
        if (!ServerInstance->Config->HideWhoisServer.empty())