Fix a bunch more conflicting/unnamed numerics.

[user/henk/code/inspircd.git] / src / modules / m_jumpserver.cpp

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index f59ef045d1a0b4c5eeb9cf912ac4251b96e0b52c..9f3b41af7f514b1a564f04e58169ed06ccfbfd3e 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -22,6 +22,12 @@
 #include "inspircd.h"
 #include "modules/ssl.h"
 
+enum
+{
+       // From ircd-ratbox.
+       RPL_REDIR = 10
+};
+
 /** Handle /JUMPSERVER
  */
 class CommandJumpserver : public Command
@@ -42,7 +48,7 @@ class CommandJumpserver : public Command
                redirect_new_users = false;
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                int n_done = 0;
                reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3];
@@ -52,7 +58,7 @@ class CommandJumpserver : public Command
                std::string n_done_s;
 
                /* No parameters: jumpserver disabled */
-               if (!parameters.size())
+               if (parameters.empty())
                {
                        if (port)
                                user->WriteNotice("*** Disabled jumpserver (previously set to '" + redirect_to + ":" + ConvToStr(port) + "')");
@@ -162,7 +168,7 @@ class ModuleJumpServer : public Module
                        int port = js.GetPort(user);
                        user->WriteNumeric(RPL_REDIR, js.redirect_to, port, "Please use this Server/Port instead");
                        ServerInstance->Users->QuitUser(user, js.reason);
-                       return MOD_RES_PASSTHRU;
+                       return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }