-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 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 */
+#include "inspircd.h"
/** 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 (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "JUMPSERVER", "o", 0, 4)
+ CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
{
- syntax = "[<server> <port> <+/-an> <reason>]";
- redirect_to.clear();
- reason.clear();
+ flags_needed = 'o'; syntax = "[<server> <port> <+/-an> <reason>]";
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 (!parameters.size())
{
if (port)
- user->WriteServ("NOTICE %s :*** Disabled jumpserver (previously set to '%s:%d')", user->nick.c_str(), redirect_to.c_str(), port);
+ user->WriteNotice("*** Disabled jumpserver (previously set to '" + redirect_to + ":" + ConvToStr(port) + "')");
else
- user->WriteServ("NOTICE %s :*** jumpserver was not enabled.", user->nick.c_str());
+ user->WriteNotice("*** Jumpserver was not enabled.");
port = 0;
redirect_to.clear();
- return CMD_LOCALONLY;
+ return CMD_SUCCESS;
}
port = 0;
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)
{
redirect_new_users = direction;
break;
default:
- user->WriteServ("NOTICE %s :*** Invalid JUMPSERVER flag: %c", user->nick.c_str(), *n);
+ user->WriteNotice("*** Invalid JUMPSERVER flag: " + ConvToStr(*n));
return CMD_FAILURE;
break;
}
if (!atoi(parameters[1].c_str()))
{
- user->WriteServ("NOTICE %s :*** Invalid port number", user->nick.c_str());
+ user->WriteNotice("*** Invalid port number");
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++)
+ for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
{
User* t = *i;
- if (!IS_OPER(t))
+ if (!t->IsOper())
{
- 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++;
}
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.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->WriteNotice("*** Set jumpserver to server '" + parameters[0] + "' port '" + parameters[1] + "', flags '+" +
+ (redirect_all_immediately ? "a" : "") + (redirect_new_users ? "n'" : "'") +
+ (n_done ? " (" + n_done_s + "user(s) redirected): " : ": ") + reason);
}
- return CMD_LOCALONLY;
+ return CMD_SUCCESS;
}
};
-
class ModuleJumpServer : public Module
{
CommandJumpserver js;
public:
- ModuleJumpServer(InspIRCd* Me)
- : Module(Me), js(Me, this)
+ ModuleJumpServer() : js(this)
{
- ServerInstance->AddCommand(&js);
- Implementation eventlist[] = { I_OnUserRegister };
- ServerInstance->Modules->Attach(eventlist, this, 1);
}
- virtual ~ModuleJumpServer()
+ void init() CXX11_OVERRIDE
{
+ ServerInstance->Modules->AddService(js);
}
- virtual ModResult OnUserRegister(User* user)
+ ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
{
if (js.port && js.redirect_new_users)
{
return MOD_RES_PASSTHRU;
}
-
- virtual Version GetVersion()
+ void OnRehash(User* user) CXX11_OVERRIDE
{
- return Version("$Id$", VF_VENDOR, API_VERSION);
+ // Emergency way to unlock
+ if (!user) js.redirect_new_users = false;
}
+ Version GetVersion() CXX11_OVERRIDE
+ {
+ return Version("Provides support for the RPL_REDIR numeric and the /JUMPSERVER command.", VF_VENDOR);
+ }
};
MODULE_INIT(ModuleJumpServer)
projects / user / henk / code / inspircd.git / blobdiff