X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=781875594d8d55d3f4c38965d8cbb641f088b812;hb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;hp=104e5da337deb198e9a2666bcd240174dc47dfed;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 104e5da33..781875594 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -37,38 +37,33 @@ using namespace std;
 #include "modules.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
 	 
 class cmd_samode : public command_t
 {
  public:
-	cmd_samode () : command_t("SAMODE", 'o', 2)
+	cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		/*
 		 * Handles an SAMODE request. Notifies all +s users.
 	 	 */
-		std::string result;
-		Srv->Log(DEBUG,"SAMODE: Being handled");
+
 		userrec* n = new userrec(ServerInstance);
-		n->fd = FD_MAGIC_NUMBER;
-		Srv->SendMode(parameters,pcnt,n);
+		n->SetFd(FD_MAGIC_NUMBER);
+		ServerInstance->SendMode(parameters,pcnt,n);
 		delete n;
-		Srv->Log(DEBUG,"SAMODE: Modechange handled");
-		result = std::string(user->nick);
-		result.append(" used SAMODE");
-	  	for (int n = 0; n < pcnt; n++)
-		{
-			result.append(" ");
-			result.append(parameters[n]);
-		}
-		ServerInstance->WriteOpers(result);
+
+		if (ServerInstance->Modes->GetLastParse().length())
+			ServerInstance->WriteOpers(std::string(user->nick)+" used SAMODE: "+ServerInstance->Modes->GetLastParse());
+
+		return CMD_SUCCESS;
 	}
 };
 
@@ -76,12 +71,12 @@ class ModuleSaMode : public Module
 {
 	cmd_samode*	mycommand;
  public:
-	ModuleSaMode(Server* Me)
+	ModuleSaMode(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_samode();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_samode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSaMode()
@@ -106,7 +101,7 @@ class ModuleSaModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSaMode(Me);
 	}