X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=0c9822fb92a743c9990315a13791f47f8de25b3a;hb=fed58f5c25915d60d40c0f407914ff7381902f9d;hp=deea7abd426de51ab7d2b5b531c2c7d7d76188f6;hpb=268e6a408792045abf729214f40abd250250f3f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index deea7abd4..0c9822fb9 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -1,80 +1,114 @@
-// Sajoin and +g support module by C.J.Edwards
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
-Server *Srv;
-	 
-void handle_sajoin(char **parameters, int pcnt, userrec *user)
+/** Handle /SAJOIN
+ */
+class cmd_sajoin : public command_t
 {
-	userrec* dest = Srv->FindNick(std::string(parameters[0]));
-	if (dest)
+ public:
+ cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
 	{
+		this->source = "m_sajoin.so";
+		syntax = "<nick> <channel>";
+	}
 
-		for (int x = 0; x < strlen(parameters[1]); x++)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	{
+		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
 		{
-				if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
+			if (ServerInstance->ULine(dest->server))
+			{
+				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				return CMD_FAILURE;
+			}
+			if (!ServerInstance->IsChannel(parameters[1]))
+			{
+				/* we didn't need to check this for each character ;) */
+				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+				return CMD_FAILURE;
+			}
+
+			/* For local users, we send the JoinUser which may create a channel and set its TS.
+			 * For non-local users, we just return CMD_SUCCESS, knowing this will propogate it where it needs to be
+			 * and then that server will generate the users JOIN or FJOIN instead.
+			 */
+			if (IS_LOCAL(dest))
+			{
+				chanrec::JoinUser(ServerInstance, dest, parameters[1], true, "", ServerInstance->Time(true));
+				/* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propogate */
+				chanrec* n = ServerInstance->FindChan(parameters[1]);
+				if (n)
 				{
-					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-					return;
+					if (n->HasUser(dest))
+					{
+						ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+						return CMD_SUCCESS;
+					}
+					else
+					{
+						user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
+						return CMD_FAILURE;
+					}
 				}
+				else
+				{
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
+					return CMD_FAILURE;
+				}
+			}
+			else
+			{
+				ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+				return CMD_SUCCESS;
+			}
+		}
+		else
+		{
+			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]);
+			return CMD_FAILURE;
 		}
-
-		Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
-		Srv->JoinUserToChannel(dest,std::string(parameters[1]),std::string(dest->nick));
 	}
-}
-
+};
 
 class ModuleSajoin : public Module
 {
+	cmd_sajoin*	mycommand;
  public:
-	ModuleSajoin()
+	ModuleSajoin(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("SAJOIN",handle_sajoin,'o',2);
+		
+		mycommand = new cmd_sajoin(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSajoin()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1);
-	}
-	
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSajoinFactory : public ModuleFactory
-{
- public:
-	ModuleSajoinFactory()
-	{
-	}
-	
-	~ModuleSajoinFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleSajoin;
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin)