Patch to not increment nickchange counter for nick changes that would be blocked...

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

diff --git a/src/commands/cmd_away.cpp b/src/commands/cmd_away.cpp
index c49813b52eefdd9c8ff5b5bc4b8e4695d3a3794c..aba8031349b7a53723a7630be6bc754b6634fff8 100644 (file)
--- a/src/commands/cmd_away.cpp
+++ b/src/commands/cmd_away.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -21,29 +21,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /AWAY
  */
-CmdResult CommandAway::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandAway::Handle (const std::vector<std::string>& parameters, User *user)
 {
        int MOD_RESULT = 0;
 
-       if ((pcnt) && (*parameters[0]))
+       if ((parameters.size()) && (!parameters[0].empty()))
        {
                FOREACH_RESULT(I_OnSetAway, OnSetAway(user, parameters[0]));
 
-               if (MOD_RESULT != 0 && !IS_LOCAL(user))
+               if (MOD_RESULT != 0 && IS_LOCAL(user))
                        return CMD_FAILURE;
 
-               strlcpy(user->awaymsg,parameters[0],MAXAWAY);
-               user->WriteNumeric(306, "%s :You have been marked as being away",user->nick);
+               user->awaytime = ServerInstance->Time();
+               user->awaymsg.assign(parameters[0], 0, ServerInstance->Config->Limits.MaxAway);
+
+               user->WriteNumeric(RPL_NOWAWAY, "%s :You have been marked as being away",user->nick.c_str());
        }
        else
        {
                FOREACH_RESULT(I_OnSetAway, OnSetAway(user, ""));
 
-               if (MOD_RESULT != 0 && !IS_LOCAL(user))
+               if (MOD_RESULT != 0 && IS_LOCAL(user))
                        return CMD_FAILURE;
 
-               *user->awaymsg = 0;
-               user->WriteNumeric(305, "%s :You are no longer marked as being away",user->nick);
+               user->awaymsg.clear();
+               user->WriteNumeric(RPL_UNAWAY, "%s :You are no longer marked as being away",user->nick.c_str());
        }
 
        return CMD_SUCCESS;