X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=280a5ae195b0f7dc3cef33b543d374b2c41c56dc;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=624f0483b1bde1d75679bbb8a12e3c39cb85ef4a;hpb=211b24ba8cf6e21f435f145b0366adc8a3b62460;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 624f0483b..280a5ae19 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
@@ -34,51 +36,56 @@
 #include "channels.h"
 #include "modules.h"
 
-Server *Srv;
+static 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 () : command_t("SAMODE", 'o', 2)
 	{
-		result=result + std::string(" ") + std::string(parameters[n]);
-		n++;
+		this->source = "m_samode.so";
 	}
-	Srv->SendOpers(result);
-}
+
+	void Handle (char **parameters, int pcnt, userrec *user)
+	{
+		/*
+		 * Handles an SAMODE request. Notifies all +s users.
+	 	 */
+		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);
+		result.append(" used SAMODE");
+	  	for (int n = 0; n < pcnt; n++)
+		{
+			result.append(" ");
+			result.append(parameters[n]);
+		}
+		Srv->SendOpers(result);
+	}
+};
 
 class ModuleSaMode : public Module
 {
+	cmd_samode*	mycommand;
  public:
-	ModuleSaMode()
+	ModuleSaMode(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("SAMODE",handle_samode,'o',2,"m_samode.so");
+		Srv = Me;
+		mycommand = new cmd_samode();
+		Srv->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSaMode()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,2,1);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
+		return Version(1,0,2,2,VF_VENDOR);
 	}
-
 };
 
 
@@ -93,9 +100,9 @@ class ModuleSaModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleSaMode;
+		return new ModuleSaMode(Me);
 	}
 	
 };