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

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 161dfe2c3..416b25dd3 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -27,10 +27,9 @@ class CommandJumpserver : public Command
 	std::string reason;
 	int port;
 
-	CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", "o", 0)
+	CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
 	{
-		this->source = "m_jumpserver.so";
-		syntax = "[<server> <port> <+/-a> :<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;
@@ -80,81 +79,94 @@ class CommandJumpserver : public Command
 					case 'n':
 						redirect_new_users = direction;
 					break;
+					default:
+						user->WriteServ("NOTICE %s :*** Invalid JUMPSERVER flag: %c", user->nick.c_str(), *n);
+						return CMD_FAILURE;
+					break;
 				}
 			}
-		}
 
-		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++)
+			if (!atoi(parameters[1].c_str()))
+			{
+				user->WriteServ("NOTICE %s :*** Invalid port number", user->nick.c_str());
+				return CMD_FAILURE;
+			}
+
+			if (redirect_all_immediately)
 			{
-				User* t = *i;
-				if (!IS_OPER(t))
+				/* 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++)
+				{
+					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)
 				{
-					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++;
+					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].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->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());
-
-		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(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR);
 	}
 
 };