fixed some indentation and spacing in modules

[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 255d3eac95df198cefc4d3078dc302af14465066..424ea9438c50a68281d64abad36814fbe147240a 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -27,7 +27,7 @@ class CommandJumpserver : public Command
        std::string reason;
        int port;
 
-       CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0)
+       CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", "o", 0)
        {
                this->source = "m_jumpserver.so";
                syntax = "[<server> <port> <+/-a> :<reason>]";
@@ -37,22 +37,22 @@ class CommandJumpserver : public Command
                redirect_all_immediately = redirect_new_users = false;
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                int n_done = 0;
-               reason = (pcnt < 4) ? "Please use this server/port instead" : parameters[3];
+               reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3];
                redirect_all_immediately = false;
                redirect_new_users = true;
                direction = true;
                std::string n_done_s;
 
                /* No parameters: jumpserver disabled */
-               if (!pcnt)
+               if (!parameters.size())
                {
                        if (port)
-                               user->WriteServ("NOTICE %s :*** Disabled jumpserver (previously set to '%s:%d')", user->nick, redirect_to.c_str(), port);
+                               user->WriteServ("NOTICE %s :*** Disabled jumpserver (previously set to '%s:%d')", user->nick.c_str(), redirect_to.c_str(), port);
                        else
-                               user->WriteServ("NOTICE %s :*** jumpserver was not enabled.", user->nick);
+                               user->WriteServ("NOTICE %s :*** jumpserver was not enabled.", user->nick.c_str());
 
                        port = 0;
                        redirect_to.clear();
@@ -62,7 +62,7 @@ class CommandJumpserver : public Command
                port = 0;
                redirect_to.clear();
 
-               for (const char* n = parameters[2]; *n; n++)
+               for (const char* n = parameters[2].c_str(); *n; n++)
                {
                        switch (*n)
                        {
@@ -89,8 +89,8 @@ class CommandJumpserver : public Command
                                User* t = *i;
                                if (!IS_OPER(t))
                                {
-                                       t->WriteServ("010 %s %s %s :Please use this Server/Port instead", user->nick, parameters[0], parameters[1]);
-                                       User::QuitUser(ServerInstance, t, reason);
+                                       t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str());
+                                       ServerInstance->Users->QuitUser(t, reason);
                                        n_done++;
                                }
                        }
@@ -103,10 +103,10 @@ class CommandJumpserver : public Command
                if (redirect_new_users)
                {
                        redirect_to = parameters[0];
-                       port = atoi(parameters[1]);
+                       port = atoi(parameters[1].c_str());
                }
 
-               user->WriteServ("NOTICE %s :*** Set jumpserver to server '%s' port '%s', flags '+%s%s'%s%s%s: %s", user->nick, parameters[0], parameters[1],
+               user->WriteServ("NOTICE %s :*** Set jumpserver to server '%s' port '%s', flags '+%s%s'%s%s%s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str(),
                                redirect_all_immediately ? "a" : "",
                                redirect_new_users ? "n" : "",
                                n_done ? " (" : "",
@@ -126,13 +126,13 @@ class ModuleJumpServer : public Module
        ModuleJumpServer(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                js = new CommandJumpserver(ServerInstance);
                ServerInstance->AddCommand(js);
                Implementation eventlist[] = { I_OnUserRegister };
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
-       
+
        virtual ~ModuleJumpServer()
        {
        }
@@ -141,8 +141,8 @@ class ModuleJumpServer : public Module
        {
                if (js->port && js->redirect_new_users)
                {
-                       user->WriteServ("010 %s %s %d :Please use this Server/Port instead", user->nick, js->redirect_to.c_str(), js->port);
-                       User::QuitUser(ServerInstance, user, js->reason);
+                       user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead", user->nick.c_str(), js->redirect_to.c_str(), js->port);
+                       ServerInstance->Users->QuitUser(user, js->reason);
                        return 0;
                }
                return 0;
@@ -151,9 +151,9 @@ class ModuleJumpServer : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleJumpServer)