Read the muteban config in ReadConfig().

[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 3104a0c5578fb59f4f05a39c2e535b1580a3bcdb..02950e0e97c3c12e85dbfc4016708442e441830e 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
@@ -32,8 +38,11 @@ class CommandJumpserver : public Command
        std::string reason;
        int port;
        int sslport;
+       UserCertificateAPI sslapi;
 
-       CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
+       CommandJumpserver(Module* Creator)
+               : Command(Creator, "JUMPSERVER", 0, 4)
+               , sslapi(Creator)
        {
                flags_needed = 'o';
                syntax = "[<server> <port>[:<sslport>] <+/-an> <reason>]";
@@ -42,7 +51,7 @@ class CommandJumpserver : public Command
                redirect_new_users = false;
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       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 +61,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) + "')");
@@ -94,8 +103,8 @@ class CommandJumpserver : public Command
                        }
 
                        size_t delimpos = parameters[1].find(':');
-                       port = ConvToInt(parameters[1].substr(0, delimpos ? delimpos : std::string::npos));
-                       sslport = (delimpos == std::string::npos ? 0 : ConvToInt(parameters[1].substr(delimpos + 1)));
+                       port = ConvToNum<int>(parameters[1].substr(0, delimpos ? delimpos : std::string::npos));
+                       sslport = (delimpos == std::string::npos ? 0 : ConvToNum<int>(parameters[1].substr(delimpos + 1)));
 
                        if (parameters[1].find_first_not_of("0123456789:") != std::string::npos
                                || parameters[1].rfind(':') != delimpos
@@ -140,7 +149,7 @@ class CommandJumpserver : public Command
 
        int GetPort(LocalUser* user)
        {
-               int p = (SSLIOHook::IsSSL(&user->eh) ? sslport : port);
+               int p = (sslapi && sslapi->GetCertificate(user) ? sslport : port);
                if (p == 0)
                        p = user->GetServerPort();
                return p;
@@ -155,6 +164,12 @@ class ModuleJumpServer : public Module
        {
        }
 
+       void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE
+       {
+               if (irc::equals(param, "jumpserver") && js.redirect_new_users)
+                       js.redirect_new_users = false;
+       }
+
        ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
        {
                if (js.redirect_new_users)