X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=f4f5c4e8423bea3a4687fd6dd0522b5478cfa758;hb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;hp=d46e85bdde48dd52af25c9c8ae2422923903bcaf;hpb=9924e5631193ad581d885380fd11ae8bfb91fa0b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index d46e85bdd..f4f5c4e84 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -1,28 +1,34 @@
-/*       +------------------------------------+
- *       | 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 */
+/* $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;
@@ -30,19 +36,17 @@ class CommandJumpserver : public Command
 	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> &parameters, 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 */
@@ -51,7 +55,7 @@ class CommandJumpserver : public Command
 			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();
@@ -63,7 +67,7 @@ class CommandJumpserver : public Command
 
 		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)
 				{
@@ -95,12 +99,12 @@ class CommandJumpserver : public Command
 			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++;
 					}
@@ -136,17 +140,21 @@ class ModuleJumpServer : public Module
 	CommandJumpserver js;
  public:
 	ModuleJumpServer() : js(this)
+	{
+	}
+
+	void init()
 	{
 		ServerInstance->AddCommand(&js);
-		Implementation eventlist[] = { I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleJumpServer()
 	{
 	}
 
-	virtual ModResult OnUserRegister(User* user)
+	virtual ModResult OnUserRegister(LocalUser* user)
 	{
 		if (js.port && js.redirect_new_users)
 		{
@@ -158,10 +166,15 @@ class ModuleJumpServer : public Module
 		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);
 	}
 
 };