X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=f034d5b43c691e43d7cf05e8877d54157d913499;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=6eb22a361cce89316810893710f16cfc80c24f94;hpb=9fc9227cf51585dd2e44c2fcd0014c8da8f8739f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 6eb22a361..f034d5b43 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 /*
  * SAMODE module for InspIRCd
  *  Co authored by Brain and w00t
@@ -33,52 +35,63 @@
 #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);
-}
+
+	void Handle (const char** parameters, int pcnt, userrec *user)
+	{
+		/*
+		 * Handles an SAMODE request. Notifies all +s users.
+	 	 */
+		std::string result;
+		log(DEBUG,"SAMODE: Being handled");
+		userrec* n = new userrec(ServerInstance);
+		n->fd = FD_MAGIC_NUMBER;
+		ServerInstance->SendMode(parameters,pcnt,n);
+		delete n;
+		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);
+	}
+};
 
 class ModuleSaMode : public Module
 {
+	cmd_samode*	mycommand;
  public:
-	ModuleSaMode()
+	ModuleSaMode(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("SAMODE",handle_samode,'o',2,"m_samode.so");
+		
+		mycommand = new cmd_samode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSaMode()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,2,1,0);
+		return Version(1,0,2,2,VF_VENDOR);
 	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-	}
-
 };
 
 
@@ -93,9 +106,9 @@ class ModuleSaModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleSaMode;
+		return new ModuleSaMode(Me);
 	}
 	
 };