Merge pull request #213 from attilamolnar/insp20+namesx

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 22c8239b9ed328c5f0f6a2360b8f6cb26a8d2499..7da57646fa207b36895c3d350eb3f4dd8197231b 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
@@ -90,6 +99,8 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
         * This will be done again after DNS resolution. -- w00t
         */
        New->CheckClass();
+       if (New->quitting)
+               return;
 
        /*
         * even with bancache, we still have to keep User::exempt current.
@@ -138,6 +149,8 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
         * BOPM and other stuff requires it.
         */
        New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
+       if (ServerInstance->Config->RawLog)
+               New->WriteServ("NOTICE Auth :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
        FOREACH_MOD(I_OnUserInit,OnUserInit(New));
 
@@ -200,7 +213,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
        /*
         * 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 they were an oper with +s +qQ.
         */
        if (user->registered == REG_ALL)
        {
@@ -208,16 +221,16 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                {
                        if (!user->quietquit)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s] (%s)",
-                                       user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s (%s) [%s]",
+                                       user->nick.c_str(), user->ident.c_str(), user->host.c_str(), user->GetIPString(), oper_reason.c_str());
                        }
                }
                else
                {
                        if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s] (%s)",
-                                       user->server.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
+                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s (%s) [%s]",
+                                       user->server.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), user->GetIPString(), oper_reason.c_str());
                        }
                }
                user->AddToWhoWas();