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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index a563a3de5..781875594 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,3 +1,21 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
 /*
  * SAMODE module for InspIRCd
  *  Co authored by Brain and w00t
@@ -17,54 +35,58 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
-Server *Srv;
-	 
 
-void handle_samode(char **parameters, int pcnt, userrec *user)
+
+	 
+class cmd_samode : public command_t
 {
-	/*
-	 * Handles an SAMODE request. Notifies all +s users.
- 	 */
-	int n=0;
-	std::string result;
-	Srv->Log(DEBUG,"SAMODE: Being handled");
-	Srv->SendMode(parameters,pcnt,user);
-	Srv->Log(DEBUG,"SAMODE: Modechange handled");
-	result = std::string(user->nick) + std::string(" used SAMODE ");
-  	while (n<pcnt)
+ public:
+	cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
 	{
-		result=result + std::string(" ") + std::string(parameters[n]);
-		n++;
+		this->source = "m_samode.so";
+		syntax = "<target> <modes> {<mode-parameters>}";
 	}
-	Srv->SendOpers(result);
-}
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	{
+		/*
+		 * Handles an SAMODE request. Notifies all +s users.
+	 	 */
+
+		userrec* n = new userrec(ServerInstance);
+		n->SetFd(FD_MAGIC_NUMBER);
+		ServerInstance->SendMode(parameters,pcnt,n);
+		delete n;
+
+		if (ServerInstance->Modes->GetLastParse().length())
+			ServerInstance->WriteOpers(std::string(user->nick)+" used SAMODE: "+ServerInstance->Modes->GetLastParse());
+
+		return CMD_SUCCESS;
+	}
+};
 
 class ModuleSaMode : public Module
 {
+	cmd_samode*	mycommand;
  public:
-	ModuleSaMode()
+	ModuleSaMode(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-                Srv->Log(DEBUG,"SAMODE: Pre-add cmd");
-		Srv->AddCommand("SAMODE",handle_samode,'o',2);
-		Srv->Log(DEBUG,"SAMODE: Post-add cmd");
+		
+		mycommand = new cmd_samode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSaMode()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,2,1);
+		return Version(1,0,2,2,VF_VENDOR);
 	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-	}
-
 };
 
 
@@ -79,9 +101,9 @@ class ModuleSaModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleSaMode;
+		return new ModuleSaMode(Me);
 	}
 	
 };