-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
-/* $ModDesc: Provides support for the RPL_REDIR numeric */
+/* $ModDesc: Provides support for the RPL_REDIR numeric and the /JUMPSERVER command. */
/** Handle /JUMPSERVER
*/
class CommandJumpserver : public Command
{
public:
- bool redirect_all_immediately;
bool redirect_new_users;
- bool direction;
std::string redirect_to;
std::string reason;
int port;
CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
{
flags_needed = 'o'; syntax = "[<server> <port> <+/-an> <reason>]";
- redirect_to.clear();
- reason.clear();
port = 0;
- redirect_all_immediately = redirect_new_users = false;
+ redirect_new_users = false;
}
CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
int n_done = 0;
reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3];
- redirect_all_immediately = false;
+ bool redirect_all_immediately = false;
redirect_new_users = true;
- direction = true;
+ bool direction = true;
std::string n_done_s;
/* No parameters: jumpserver disabled */
if (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.c_str());
+ user->WriteServ("NOTICE %s :*** Jumpserver was not enabled.", user->nick.c_str());
port = 0;
redirect_to.clear();
if (parameters.size() >= 3)
{
- for (const char* n = parameters[2].c_str(); *n; n++)
+ for (std::string::const_iterator n = parameters[2].begin(); n != parameters[2].end(); ++n)
{
switch (*n)
{
if (redirect_all_immediately)
{
/* Redirect everyone but the oper sending the command */
- for (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+ for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
{
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());
+ t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", t->nick.c_str(), parameters[0].c_str(), parameters[1].c_str());
ServerInstance->Users->QuitUser(t, reason);
n_done++;
}
public:
ModuleJumpServer() : js(this)
{
- ServerInstance->AddCommand(&js);
- Implementation eventlist[] = { I_OnUserRegister };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ }
+
+ void init()
+ {
+ ServerInstance->Modules->AddService(js);
+ Implementation eventlist[] = { I_OnUserRegister, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
virtual ~ModuleJumpServer()
return MOD_RES_PASSTHRU;
}
+ virtual void OnRehash(User* user)
+ {
+ // Emergency way to unlock
+ if (!user) js.redirect_new_users = false;
+ }
virtual Version GetVersion()
{
- return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR);
+ return Version("Provides support for the RPL_REDIR numeric and the /JUMPSERVER command.", VF_VENDOR);
}
};