X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=5e1c01acb4ec085af2a0e013b0009a8818308ff8;hb=7141ccc5bbf043ae2891905f8059635981b36717;hp=2d06df199ccbc6b76840290d7f44f4fd203d7953;hpb=4818b1bc1b0dd8560b0c83901aa33ecaf6fb1275;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 2d06df199..5e1c01acb 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -30,9 +30,18 @@ enum
 
 class CheckContext
 {
+ private:
 	User* const user;
 	const std::string& target;
 
+	std::string FormatTime(time_t ts)
+	{
+		std::string timestr(InspIRCd::TimeString(ts, "%Y-%m-%d %H:%M:%S UTC (", true));
+		timestr.append(ConvToStr(ts));
+		timestr.push_back(')');
+		return timestr;
+	}
+
  public:
 	CheckContext(User* u, const std::string& targetstr)
 		: user(u)
@@ -51,6 +60,11 @@ class CheckContext
 		user->WriteRemoteNumeric(RPL_CHECK, type, text);
 	}
 
+	void Write(const std::string& type, time_t ts)
+	{
+		user->WriteRemoteNumeric(RPL_CHECK, type, FormatTime(ts));
+	}
+
 	User* GetUser() const { return user; }
 
 	void DumpListMode(const ListModeBase::ModeList* list)
@@ -130,16 +144,6 @@ class CommandCheck : public Command
 		flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
 	}
 
-	std::string timestring(time_t time)
-	{
-		char timebuf[60];
-		struct tm *mytime = gmtime(&time);
-		strftime(timebuf, 59, "%Y-%m-%d %H:%M:%S UTC (", mytime);
-		std::string ret(timebuf);
-		ret.append(ConvToStr(time)).push_back(')');
-		return ret;
-	}
-
 	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if (parameters.size() > 1 && !irc::equals(parameters[1], ServerInstance->Config->ServerName))
@@ -173,15 +177,15 @@ class CommandCheck : public Command
 			context.Write("snomasks", GetSnomasks(targuser));
 			context.Write("server", targuser->server->GetName());
 			context.Write("uid", targuser->uuid);
-			context.Write("signon", timestring(targuser->signon));
-			context.Write("nickts", timestring(targuser->age));
+			context.Write("signon", targuser->signon);
+			context.Write("nickts", targuser->age);
 			if (loctarg)
-				context.Write("lastmsg", timestring(loctarg->idle_lastmsg));
+				context.Write("lastmsg", loctarg->idle_lastmsg);
 
 			if (targuser->IsAway())
 			{
 				/* user is away */
-				context.Write("awaytime", timestring(targuser->awaytime));
+				context.Write("awaytime", targuser->awaytime);
 				context.Write("awaymsg", targuser->awaymsg);
 			}
 
@@ -195,13 +199,8 @@ class CommandCheck : public Command
 					std::string umodes = GetAllowedOperOnlyModes(loctarg, MODETYPE_USER);
 					std::string cmodes = GetAllowedOperOnlyModes(loctarg, MODETYPE_CHANNEL);
 					context.Write("modeperms", "user=" + umodes + " channel=" + cmodes);
-
-					CheckContext::List opcmdlist(context, "commandperms");
-					opcmdlist.Add(oper->AllowedOperCommands.ToString());
-					opcmdlist.Flush();
-					CheckContext::List privlist(context, "permissions");
-					privlist.Add(oper->AllowedPrivs.ToString());
-					privlist.Flush();
+					context.Write("commandperms", oper->AllowedOperCommands.ToString());
+					context.Write("permissions", oper->AllowedPrivs.ToString());
 				}
 			}
 
@@ -237,14 +236,14 @@ class CommandCheck : public Command
 		else if (targchan)
 		{
 			/* /check on a channel */
-			context.Write("timestamp", timestring(targchan->age));
+			context.Write("timestamp", targchan->age);
 
 			if (!targchan->topic.empty())
 			{
 				/* there is a topic, assume topic related information exists */
 				context.Write("topic", targchan->topic);
 				context.Write("topic_setby", targchan->setby);
-				context.Write("topic_setat", timestring(targchan->topicset));
+				context.Write("topic_setat", targchan->topicset);
 			}
 
 			context.Write("modes", targchan->ChanModes(true));