X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=416b25dd3e4b54eee0c23fad14867835b3c9c982;hb=8f915e5ddbab4e36bb08f9f9d726e953db1f601f;hp=2fb509af195c80c0662397e6d174451f70252961;hpb=ed961ced07f4505e94a03c26c50738c398f57167;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 2fb509af1..416b25dd3 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,10 +27,9 @@ class CommandJumpserver : public Command
 	std::string reason;
 	int port;
 
-	CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", "o", 0, 4)
+	CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
 	{
-		this->source = "m_jumpserver.so";
-		syntax = "[<server> <port> <+/-an> <reason>]";
+		flags_needed = 'o'; syntax = "[<server> <port> <+/-an> <reason>]";
 		redirect_to.clear();
 		reason.clear();
 		port = 0;
@@ -56,7 +55,7 @@ class CommandJumpserver : public Command
 
 			port = 0;
 			redirect_to.clear();
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 
 		port = 0;
@@ -96,7 +95,7 @@ class CommandJumpserver : public Command
 			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 (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 				{
 					User* t = *i;
 					if (!IS_OPER(t))
@@ -127,44 +126,47 @@ class CommandJumpserver : public Command
 					reason.c_str());
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
 
 class ModuleJumpServer : public Module
 {
-	CommandJumpserver*	js;
+	CommandJumpserver js;
  public:
-	ModuleJumpServer(InspIRCd* Me)
-		: Module(Me)
+	ModuleJumpServer() : js(this)
 	{
-
-		js = new CommandJumpserver(ServerInstance);
-		ServerInstance->AddCommand(js);
-		Implementation eventlist[] = { I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->AddCommand(&js);
+		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleJumpServer()
 	{
 	}
 
-	virtual int OnUserRegister(User* user)
+	virtual ModResult OnUserRegister(LocalUser* user)
 	{
-		if (js->port && js->redirect_new_users)
+		if (js.port && js.redirect_new_users)
 		{
-			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;
+			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 MOD_RES_PASSTHRU;
 		}
-		return 0;
+		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("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR);
 	}
 
 };