X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_away.cpp;h=7fac7ae6d382792f05e9e07b3e8846924ae40fc7;hb=4b856bda135a08e800b96c970a10b0b6a34d433a;hp=2ca2df7dbb57e24350ec89307b5df6ce50b6c012;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_away.cpp b/src/commands/cmd_away.cpp
index 2ca2df7db..7fac7ae6d 100644
--- a/src/commands/cmd_away.cpp
+++ b/src/commands/cmd_away.cpp
@@ -21,19 +21,32 @@ 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)
 {
-	if ((pcnt) && (*parameters[0]))
+	int MOD_RESULT = 0;
+
+	if ((parameters.size()) && (!parameters[0].empty()))
 	{
-		strlcpy(user->awaymsg,parameters[0],MAXAWAY);
-		user->WriteNumeric(306, "%s :You have been marked as being away",user->nick);
-		FOREACH_MOD(I_OnSetAway,OnSetAway(user));
+		FOREACH_RESULT(I_OnSetAway, OnSetAway(user, parameters[0]));
+
+		if (MOD_RESULT != 0 && !IS_LOCAL(user))
+			return CMD_FAILURE;
+
+		user->awaytime = ServerInstance->Time();
+		user->awaymsg.assign(parameters[0], 0, MAXAWAY);
+
+		user->WriteNumeric(306, "%s :You have been marked as being away",user->nick.c_str());
 	}
 	else
 	{
-		*user->awaymsg = 0;
-		user->WriteNumeric(305, "%s :You are no longer marked as being away",user->nick);
-		FOREACH_MOD(I_OnCancelAway,OnCancelAway(user));
+		FOREACH_RESULT(I_OnSetAway, OnSetAway(user, ""));
+
+		if (MOD_RESULT != 0 && !IS_LOCAL(user))
+			return CMD_FAILURE;
+
+		user->awaymsg.empty();
+		user->WriteNumeric(305, "%s :You are no longer marked as being away",user->nick.c_str());
 	}
+
 	return CMD_SUCCESS;
 }