X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=c175e0721385e5737ae61e760cc29eb0ac578dd2;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=76c568ea71964083032644ef36266d974688cb9c;hpb=f96ddd39748f283768217fb1a3cdd3a7cbde353a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 76c568ea7..c175e0721 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -2,14 +2,14 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *		       E-mail:
+ *		<brain@chatspike.net>
+ *	   	  <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -22,47 +22,88 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 
+#include "inspircd.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>";
+	}
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		for (unsigned int x = 0; x < strlen(parameters[1]); x++)
+		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;
+			}
+
+			chanrec::JoinUser(ServerInstance, dest, parameters[1], 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)
+			{
+				if (n->HasUser(dest))
 				{
-					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-					return;
+					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
+		{
+			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::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("SAJOIN",handle_sajoin,'o',2,"m_sajoin.so");
+		
+		mycommand = new cmd_sajoin(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSajoin()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
@@ -80,9 +121,9 @@ class ModuleSajoinFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleSajoin;
+		return new ModuleSajoin(Me);
 	}
 	
 };