Change allocation of InspIRCd::Parser to be physically part of the object containing it

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

diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp
index 1f694bf2e7a41d34bd8afec2216c53ac32f270fe..722ef866803069a1d26e19eb3a118b83f6ad439e 100644 (file)
--- a/src/coremods/core_info/cmd_admin.cpp
+++ b/src/coremods/core_info/cmd_admin.cpp
@@ -19,33 +19,14 @@
 
 
 #include "inspircd.h"
+#include "core_info.h"
 
-/** Handle /ADMIN.
- */
-class CommandAdmin : public Command
+CommandAdmin::CommandAdmin(Module* parent)
+       : Command(parent, "ADMIN", 0, 0)
 {
- public:
-       /** Constructor for admin.
-        */
-       CommandAdmin(Module* parent) : Command(parent,"ADMIN",0,0)
-       {
-               Penalty = 2;
-               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;
-       }
-};
+       Penalty = 2;
+       syntax = "[<servername>]";
+}
 
 /** Handle /ADMIN
  */
@@ -55,14 +36,19 @@ CmdResult CommandAdmin::Handle (const std::vector<std::string>& parameters, User
                return CMD_SUCCESS;
        user->SendText(":%s %03d %s :Administrative info for %s", ServerInstance->Config->ServerName.c_str(),
                RPL_ADMINME, user->nick.c_str(),ServerInstance->Config->ServerName.c_str());
-       if (!ServerInstance->Config->AdminName.empty())
+       if (!AdminName.empty())
                user->SendText(":%s %03d %s :Name     - %s", ServerInstance->Config->ServerName.c_str(),
-                       RPL_ADMINLOC1, user->nick.c_str(), ServerInstance->Config->AdminName.c_str());
+                       RPL_ADMINLOC1, user->nick.c_str(), AdminName.c_str());
        user->SendText(":%s %03d %s :Nickname - %s", ServerInstance->Config->ServerName.c_str(),
-               RPL_ADMINLOC2, user->nick.c_str(), ServerInstance->Config->AdminNick.c_str());
+               RPL_ADMINLOC2, user->nick.c_str(), AdminNick.c_str());
        user->SendText(":%s %03d %s :E-Mail   - %s", ServerInstance->Config->ServerName.c_str(),
-               RPL_ADMINEMAIL, user->nick.c_str(), ServerInstance->Config->AdminEmail.c_str());
+               RPL_ADMINEMAIL, user->nick.c_str(), AdminEmail.c_str());
        return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandAdmin)
+RouteDescriptor CommandAdmin::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+       if (parameters.size() > 0)
+               return ROUTE_UNICAST(parameters[0]);
+       return ROUTE_LOCALONLY;
+}