]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_jumpserver.cpp
Use Utils->ServerUser instead of ServerInstance->FakeClient in m_spanningtree
[user/henk/code/inspircd.git] / src / modules / m_jumpserver.cpp
index 28694403e2b05809fbb9fbae2113ef87c456b254..2fb509af195c80c0662397e6d174451f70252961 100644 (file)
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style SAPART command */
+/* $ModDesc: Provides support for the RPL_REDIR numeric */
 
-/** Handle /SAPART
+/** Handle /JUMPSERVER
  */
-class cmd_jumpserver : public command_t
+class CommandJumpserver : public Command
 {
  public:
        bool redirect_all_immediately;
@@ -32,92 +27,106 @@ class cmd_jumpserver : public command_t
        std::string reason;
        int port;
 
-       cmd_jumpserver (InspIRCd* Instance) : command_t(Instance, "JUMPSERVER", 'o', 0)
+       CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", "o", 0, 4)
        {
                this->source = "m_jumpserver.so";
-               syntax = "[<server> <port> <+/-a> :<reason>]";
-               redirect_to = reason = "";
+               syntax = "[<server> <port> <+/-an> <reason>]";
+               redirect_to.clear();
+               reason.clear();
                port = 0;
                redirect_all_immediately = redirect_new_users = false;
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *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 = "";
+                       redirect_to.clear();
                        return CMD_LOCALONLY;
                }
 
                port = 0;
-               redirect_to = "";
+               redirect_to.clear();
 
-               for (const char* n = parameters[2]; *n; n++)
+               if (parameters.size() >= 3)
                {
-                       switch (*n)
+                       for (const char* n = parameters[2].c_str(); *n; n++)
                        {
-                               case '+':
-                                       direction = true;
-                               break;
-                               case '-':
-                                       direction = false;
-                               break;
-                               case 'a':
-                                       redirect_all_immediately = direction;
-                               break;
-                               case 'n':
-                                       redirect_new_users = direction;
-                               break;
+                               switch (*n)
+                               {
+                                       case '+':
+                                               direction = true;
+                                       break;
+                                       case '-':
+                                               direction = false;
+                                       break;
+                                       case 'a':
+                                               redirect_all_immediately = direction;
+                                       break;
+                                       case 'n':
+                                               redirect_new_users = direction;
+                                       break;
+                                       default:
+                                               user->WriteServ("NOTICE %s :*** Invalid JUMPSERVER flag: %c", user->nick.c_str(), *n);
+                                               return CMD_FAILURE;
+                                       break;
+                               }
                        }
-               }
 
-               if (redirect_all_immediately)
-               {
-                       /* Redirect everyone but the oper sending the command */
-                       for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+                       if (!atoi(parameters[1].c_str()))
                        {
-                               userrec* t = *i;
-                               if (!IS_OPER(t))
+                               user->WriteServ("NOTICE %s :*** Invalid port number", user->nick.c_str());
+                               return CMD_FAILURE;
+                       }
+
+                       if (redirect_all_immediately)
+                       {
+                               /* Redirect everyone but the oper sending the command */
+                               for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
                                {
-                                       t->WriteServ("010 %s %s %s :%s", user->nick, parameters[0], parameters[1], reason.c_str());
-                                       userrec::QuitUser(ServerInstance, t, reason);
-                                       n_done++;
+                                       User* t = *i;
+                                       if (!IS_OPER(t))
+                                       {
+                                               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++;
+                                       }
+                               }
+                               if (n_done)
+                               {
+                                       n_done_s = ConvToStr(n_done);
                                }
                        }
-                       if (n_done)
+
+                       if (redirect_new_users)
                        {
-                               n_done_s = ConvToStr(n_done);
+                               redirect_to = parameters[0];
+                               port = atoi(parameters[1].c_str());
                        }
-               }
 
-               if (redirect_new_users)
-               {
-                       redirect_to = parameters[0];
-                       port = atoi(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 ? " (" : "",
+                                       n_done ? n_done_s.c_str() : "",
+                                       n_done ? " user(s) redirected)" : "",
+                                       reason.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],
-                               redirect_all_immediately ? "a" : "",
-                               redirect_new_users ? "n" : "",
-                               n_done ? " (" : "",
-                               n_done ? n_done_s.c_str() : "",
-                               n_done ? " user(s) redirected)" : "",
-                               reason.c_str());
-
                return CMD_LOCALONLY;
        }
 };
@@ -125,64 +134,39 @@ class cmd_jumpserver : public command_t
 
 class ModuleJumpServer : public Module
 {
-       cmd_jumpserver* js;
+       CommandJumpserver*      js;
  public:
        ModuleJumpServer(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
-               
-               js = new cmd_jumpserver(ServerInstance);
+
+               js = new CommandJumpserver(ServerInstance);
                ServerInstance->AddCommand(js);
+               Implementation eventlist[] = { I_OnUserRegister };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
-       
+
        virtual ~ModuleJumpServer()
        {
        }
 
-       virtual int OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
                if (js->port && js->redirect_new_users)
                {
-                       user->WriteServ("010 %s %s %d :%s", user->nick, js->redirect_to.c_str(), js->port, js->reason.c_str());
-                       userrec::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;
        }
 
-       virtual void Implements(char* List)
-       {
-               List[I_OnUserRegister] = 1;
-       }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
-       
-};
 
-class ModuleJumpServerFactory : public ModuleFactory
-{
- public:
-       ModuleJumpServerFactory()
-       {
-       }
-       
-       ~ModuleJumpServerFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleJumpServer(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleJumpServerFactory;
-}
-
+MODULE_INIT(ModuleJumpServer)