Fix /who on opers incorrectly showing +i opers to

[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 7d2522304b8336bd89c298f4f8807c3fe789a821..fa3f7fae942ae9dd12c38f4f08d014a8ace79024 100644 (file)
--- a/src/commands/cmd_away.cpp
+++ b/src/commands/cmd_away.cpp
@@ -1,52 +1,75 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * 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 "commands/cmd_away.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /AWAY. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandAway : public Command
 {
-       return new CommandAway(Instance);
-}
+ public:
+       /** Constructor for away.
+        */
+       CommandAway ( Module* parent) : Command(parent,"AWAY",0,0) { syntax = "[<message>]"; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
 /** Handle /AWAY
  */
 CmdResult CommandAway::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       int MOD_RESULT = 0;
+       ModResult MOD_RESULT;
 
        if ((parameters.size()) && (!parameters[0].empty()))
        {
-               FOREACH_RESULT(I_OnSetAway, OnSetAway(user, parameters[0]));
+               FIRST_MOD_RESULT(OnSetAway, MOD_RESULT, (user, parameters[0]));
 
-               if (MOD_RESULT != 0 && !IS_LOCAL(user))
+               if (MOD_RESULT == MOD_RES_DENY && IS_LOCAL(user))
                        return CMD_FAILURE;
 
                user->awaytime = ServerInstance->Time();
-               strlcpy(user->awaymsg, parameters[0].c_str(), MAXAWAY);
+               user->awaymsg.assign(parameters[0], 0, ServerInstance->Config->Limits.MaxAway);
 
-               user->WriteNumeric(306, "%s :You have been marked as being away",user->nick);
+               user->WriteNumeric(RPL_NOWAWAY, "%s :You have been marked as being away",user->nick.c_str());
        }
        else
        {
-               FOREACH_RESULT(I_OnSetAway, OnSetAway(user, ""));
+               FIRST_MOD_RESULT(OnSetAway, MOD_RESULT, (user, ""));
 
-               if (MOD_RESULT != 0 && !IS_LOCAL(user))
+               if (MOD_RESULT == MOD_RES_DENY && 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;
 }
+
+COMMAND_INIT(CommandAway)