Merge the latest changes from insp20 into master.

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

diff --git a/src/coremods/core_info/cmd_version.cpp b/src/coremods/core_info/cmd_version.cpp
index 032d9ea0c9bd5be6cf7c9376a5151fbc72fc6cc8..9ec0108b13123ed675572ebf88debae05af44aa3 100644 (file)
--- a/src/coremods/core_info/cmd_version.cpp
+++ b/src/coremods/core_info/cmd_version.cpp
@@ -19,27 +19,18 @@
 
 
 #include "inspircd.h"
+#include "core_info.h"
 
-/** Handle /VERSION.
- */
-class CommandVersion : public Command
+CommandVersion::CommandVersion(Module* parent)
+       : Command(parent, "VERSION", 0, 0)
 {
- public:
-       /** Constructor for version.
-        */
-       CommandVersion ( Module* parent) : Command(parent,"VERSION",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);
-};
+       syntax = "[<servername>]";
+}
 
 CmdResult CommandVersion::Handle (const std::vector<std::string>&, User *user)
 {
        std::string version = ServerInstance->GetVersionString((user->IsOper()));
-       user->WriteNumeric(RPL_VERSION, ":%s", version.c_str());
+       user->WriteNumeric(RPL_VERSION, version);
        LocalUser *lu = IS_LOCAL(user);
        if (lu != NULL)
        {
@@ -47,5 +38,3 @@ CmdResult CommandVersion::Handle (const std::vector<std::string>&, User *user)
        }
        return CMD_SUCCESS;
 }
-
-COMMAND_INIT(CommandVersion)