X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_away.cpp;h=96da5cda5874c415852cfed466c5fc02ce3fd065;hb=33ce32eb8bfddfc1cb04668a03c9b795d33eb9c0;hp=dd708edfc1bd81c5568ad94a8e64c73d7299d6cb;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_away.cpp b/src/commands/cmd_away.cpp
index dd708edfc..96da5cda5 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** 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->WriteServ("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, ServerInstance->Config->Limits.MaxAway);
+
+		user->WriteNumeric(RPL_NOWAWAY, "%s :You have been marked as being away",user->nick.c_str());
 	}
 	else
 	{
-		*user->awaymsg = 0;
-		user->WriteServ("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.clear();
+		user->WriteNumeric(RPL_UNAWAY, "%s :You are no longer marked as being away",user->nick.c_str());
 	}
+
 	return CMD_SUCCESS;
 }