X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_saquit.cpp;h=20ffdd99eb0b5f8d7d738f7fa85e69a725b4e0b1;hb=9716d24be9e3e567308f6d144a65eeaccd65484a;hp=7f622483c8bdf75b6d9c618b35746fad63477932;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 7f622483c..20ffdd99e 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -31,40 +31,42 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for an SAQUIT command, exits user with a reason */
 
-static Server *Srv;
+
+
 
 class cmd_saquit : public command_t
 {
  public:
-	cmd_saquit () : command_t("SAQUIT",'o',2)
+ cmd_saquit (InspIRCd* Instance) : command_t(Instance,"SAQUIT",'o',2)
 	{
 		this->source = "m_saquit.so";
 		syntax = "<nick> <reason>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		userrec* dest = Srv->FindNick(std::string(parameters[0]));
+		userrec* dest = ServerInstance->FindNick(parameters[0]);
 		if (dest)
 		{
-			if (Srv->IsUlined(dest->server))
+			if (ServerInstance->ULine(dest->server))
 			{
 				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-				return;
+				return CMD_FAILURE;
 			}
-			std::string line = "";
-			for (int i = 1; i < pcnt - 1; i++)
-			{
-				line = line + std::string(parameters[i]) + " ";
-			}
-			line = line + std::string(parameters[pcnt-1]);
-		
-			Srv->SendOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
-			userrec::QuitUser(dest, line);
+			irc::stringjoiner reason_join(" ", parameters, 1, pcnt - 1);
+			std::string line = reason_join.GetJoined();
+
+			ServerInstance->WriteOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
+			userrec::QuitUser(ServerInstance, dest, line);
+
+			return CMD_SUCCESS;
 		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -72,12 +74,12 @@ class ModuleSaquit : public Module
 {
 	cmd_saquit*	mycommand;
  public:
-	ModuleSaquit(Server* Me)
+	ModuleSaquit(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_saquit();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_saquit(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSaquit()
@@ -86,7 +88,7 @@ class ModuleSaquit : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
@@ -104,7 +106,7 @@ class ModuleSaquitFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSaquit(Me);
 	}