Fix incorrect ModResult for noctcp user target.

[user/henk/code/inspircd.git] / src / coremods / core_info / cmd_time.cpp

diff --git a/src/coremods/core_info/cmd_time.cpp b/src/coremods/core_info/cmd_time.cpp
index 9c4688029767624435a3cea6cfb0bdd735587246..725ef6cb5232dd1ed26245acdc7071167bb71889 100644 (file)
--- a/src/coremods/core_info/cmd_time.cpp
+++ b/src/coremods/core_info/cmd_time.cpp
@@ -19,42 +19,20 @@
 
 
 #include "inspircd.h"
+#include "core_info.h"
 
-/** Handle /TIME.
- */
-class CommandTime : public Command
+CommandTime::CommandTime(Module* parent)
+       : ServerTargetCommand(parent, "TIME")
 {
- public:
-       /** Constructor for time.
-        */
-       CommandTime ( Module* parent) : Command(parent,"TIME",0,0) { syntax = "[<servername>]"; }
-       /** Handle command.
-        * @param parameters The parameters to the 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);
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
-       {
-               if (parameters.size() > 0)
-                       return ROUTE_UNICAST(parameters[0]);
-               return ROUTE_LOCALONLY;
-       }
-};
+       syntax = "[<servername>]";
+}
 
-CmdResult CommandTime::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandTime::Handle(User* user, const Params& parameters)
 {
-       if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
+       if (parameters.size() > 0 && !irc::equals(parameters[0], ServerInstance->Config->ServerName))
                return CMD_SUCCESS;
 
-       time_t local = ServerInstance->Time();
-       struct tm* timeinfo = localtime(&local);
-       const std::string& humanTime = asctime(timeinfo);
-
-       user->SendText(":%s %03d %s %s :%s", ServerInstance->Config->ServerName.c_str(), RPL_TIME, user->nick.c_str(),
-               ServerInstance->Config->ServerName.c_str(), humanTime.c_str());
+       user->WriteRemoteNumeric(RPL_TIME, ServerInstance->Config->ServerName, InspIRCd::TimeString(ServerInstance->Time()));
 
        return CMD_SUCCESS;
 }
-
-COMMAND_INIT(CommandTime)