X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=535edb641052f9ad0ca1007b2058846d96372829;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=ecfa44457f730b3bc4eed39a7a690ba948830b46;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp index ecfa44457..535edb641 100644 --- a/src/modules/m_jumpserver.cpp +++ b/src/modules/m_jumpserver.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -13,9 +13,9 @@ #include "inspircd.h" -/* $ModDesc: Provides support for unreal-style SAPART command */ +/* $ModDesc: Provides support for the RPL_REDIR numeric */ -/** Handle /SAPART +/** Handle /JUMPSERVER */ class CommandJumpserver : public Command { @@ -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 = "[ <+/-a> :]"; @@ -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 ¶meters, 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,58 +62,61 @@ class CommandJumpserver : public Command port = 0; 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; + } } - } - if (redirect_all_immediately) - { - /* Redirect everyone but the oper sending the command */ - for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) + if (redirect_all_immediately) { - User* t = *i; - if (!IS_OPER(t)) + /* Redirect everyone but the oper sending the command */ + for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) { - t->WriteServ("010 %s %s %s :Please use this Server/Port instead", user->nick, parameters[0], parameters[1]); - User::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; } }; @@ -126,13 +129,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 +144,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 +154,9 @@ class ModuleJumpServer : public Module virtual Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } - + }; MODULE_INIT(ModuleJumpServer)