X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_tline.cpp;h=320515bb02e0fc0482b4833e6c4bde2c9a4e18ef;hb=9f36316d730c7b4457a5625ca8012ead11bd9482;hp=b35ad6d10b0437c5a83932e66b32f46f0f501e19;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index b35ad6d10..320515bb0 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -20,26 +20,24 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "wildcard.h"
 #include "inspircd.h"
 #include "dns.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-	 
+/** Handle /TLINE
+ */ 
 class cmd_tline : public command_t
 {
  public:
-	cmd_tline () : command_t("TLINE", 'o', 1)
+	cmd_tline (InspIRCd* Instance) : command_t(Instance,"TLINE", 'o', 1)
 	{
 		this->source = "m_tline.so";
 		this->syntax = "<mask>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		float n_counted = 0;
 		float n_matched = 0;
@@ -57,7 +55,7 @@ class cmd_tline : public command_t
 			else
 			{
 				char host[MAXBUF];
-				sprintf(host, "%s@%s", u->second->ident, u->second->GetIPString());
+				snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
 				if (match(host, parameters[0], true))
 				{
 					n_matched++;
@@ -66,9 +64,11 @@ class cmd_tline : public command_t
 			}
 		}
 		if (n_matched)
-			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick, n_counted, parameters[0], n_matched, (n_counted/n_matched)*100, n_match_host, n_match_ip);
+			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick, n_counted, parameters[0], n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
 		else
 			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick, n_counted, parameters[0]);
+
+		return CMD_FAILURE;
 			
 	}
 };
@@ -81,8 +81,8 @@ class ModuleTLine : public Module
 		: Module::Module(Me)
 	{
 		
-		newcommand = new cmd_tline();
-		Srv->AddCommand(newcommand);
+		newcommand = new cmd_tline(ServerInstance);
+		ServerInstance->AddCommand(newcommand);
 	}
 
 	void Implements(char* List)
@@ -95,7 +95,7 @@ class ModuleTLine : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR,API_VERSION);
 	}
 };