* Fix inspsocket to not include uio.h on windows.

[user/henk/code/inspircd.git] / src / commands / cmd_nick.cpp

diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index 3851b36e653be95e7939a48e6be12cce62be6f68..bdaff8723d62364ba66323762d44a155db613022 100644 (file)
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -13,26 +13,6 @@
 
 #include "inspircd.h"
 #include "xline.h"
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
- *
- * This program is free but copyrighted software; see
- *      the file COPYING for details.
- *
- * ---------------------------------------------------
- */
-
-#ifndef __CMD_NICK_H__
-#define __CMD_NICK_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
 
 /** Handle /NICK. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -44,7 +24,7 @@ class CommandNick : public Command
  public:
        /** Constructor for nick.
         */
-       CommandNick (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"NICK", 0, 1, true, 3) { syntax = "<newnick>"; }
+       CommandNick ( Module* parent) : Command(parent,"NICK", 1, 1) { works_before_reg = true; syntax = "<newnick>"; Penalty = 3; }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -54,9 +34,6 @@ class CommandNick : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 /** Handle nick changes from users.
  * NOTE: If you are used to ircds based on ircd2.8, and are looking
  * for the client introduction code in here, youre in the wrong place.
@@ -75,16 +52,16 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 
        if (((!ServerInstance->IsNick(parameters[0].c_str(), ServerInstance->Config->Limits.NickMax))) && (IS_LOCAL(user)))
        {
-               if (!user->GetExt("NICKForced"))
+               if (!User::NICKForced.get(user))
                {
                        if (parameters[0] == "0")
                        {
                                // Special case, Fake a /nick UIDHERE. Useful for evading "ERR: NICK IN USE" on connect etc.
                                std::vector<std::string> p2;
                                p2.push_back(user->uuid);
-                               user->Extend("NICKForced");
+                               User::NICKForced.set(user, 1);
                                this->Handle(p2, user);
-                               user->Shrink("NICKForced");
+                               User::NICKForced.set(user, 0);
                                return CMD_SUCCESS;
                        }
 
@@ -107,7 +84,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                 */
                oldnick.assign(user->nick, 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
                ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (user,parameters[0]));
+               FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user,parameters[0]));
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
                if (user->registered == REG_ALL)
@@ -134,7 +111,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                        {
                                if (user->registered == REG_ALL)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s",
+                                       ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s!%s@%s: %s",
                                                parameters[0].c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), mq->reason.c_str());
                                }
                                user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick.c_str(), parameters[0].c_str(), mq->reason.c_str());
@@ -145,8 +122,8 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                        {
                                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                                {
-                                       Channel *chan = i->first;
-                                       if (chan->GetStatus(user) < STATUS_VOICE && chan->IsBanned(user))
+                                       Channel *chan = *i;
+                                       if (chan->GetPrefixValue(user) < VOICE_VALUE && chan->IsBanned(user))
                                        {
                                                user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
                                                return CMD_FAILURE;
@@ -188,7 +165,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 
 
        ModResult MOD_RESULT;
-       FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (user, parameters[0]));
+       FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user, parameters[0]));
        if (MOD_RESULT == MOD_RES_DENY)
                // if a module returns true, the nick change is silently forbidden.
                return CMD_FAILURE;
@@ -208,22 +185,13 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        user->nick.assign(parameters[0], 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
        user->InvalidateCache();
 
-       /* Update display nicks */
-       for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-       {
-               CUList* ulist = v->first->GetUsers();
-               CUList::iterator i = ulist->find(user);
-               if (i != ulist->end())
-                       i->second = user->nick;
-       }
-
        if (user->registered < REG_NICKUSER)
        {
                user->registered = (user->registered | REG_NICK);
                if (user->registered == REG_NICKUSER)
                {
                        /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-                       FIRST_MOD_RESULT(ServerInstance, OnUserRegister, MOD_RESULT, (user));
+                       FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (user));
                        if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;