Merge m_restrictchans and m_regonlycreate due to converging functionality (#1541).

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

diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp
index 3100995a82b86c76ebc3e769bf34dda168a13eb6..542c1831dce9b959e27199f80584419bbe292bfe 100644 (file)
--- a/src/coremods/core_userhost.cpp
+++ b/src/coremods/core_userhost.cpp
@@ -40,10 +40,10 @@ class CommandUserhost : public 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);
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
-CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandUserhost::Handle(User* user, const Params& parameters)
 {
        const bool has_privs = user->HasPrivPermission("users/auspex");
 
@@ -72,7 +72,7 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
                        retbuf += (u->IsAway() ? '-' : '+');
                        retbuf += u->ident;
                        retbuf += '@';
-                       retbuf += (((u == user) || (has_privs)) ? u->host : u->dhost);
+                       retbuf += u->GetHost(u == user || has_privs);
                        retbuf += ' ';
                }
        }
@@ -82,4 +82,21 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
        return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandUserhost)
+class CoreModUserhost : public Module
+{
+ private:
+       CommandUserhost cmd;
+
+ public:
+       CoreModUserhost()
+               : cmd(this)
+       {
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Provides the USERHOST command", VF_CORE | VF_VENDOR);
+       }
+};
+
+MODULE_INIT(CoreModUserhost)