X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_tline.cpp;h=f8c0842b72c16edd7f2955d87aa5ada832de4594;hb=da53c17315d3eb0d0177608d306d208bdf05786b;hp=cf5814fd185eae0f21de96df4e6273c9d5036702;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index cf5814fd1..f8c0842b7 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -30,16 +30,15 @@ class CommandTline : public Command
 		flags_needed = 'o'; this->syntax = "<mask>";
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		float n_counted = 0;
-		float n_matched = 0;
-		float n_match_host = 0;
-		float n_match_ip = 0;
+		unsigned int n_matched = 0;
+		unsigned int n_match_host = 0;
+		unsigned int n_match_ip = 0;
 
-		for (user_hash::const_iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
+		const user_hash& users = ServerInstance->Users->GetUsers();
+		for (user_hash::const_iterator u = users.begin(); u != users.end(); ++u)
 		{
-			n_counted++;
 			if (InspIRCd::Match(u->second->GetFullRealHost(),parameters[0]))
 			{
 				n_matched++;
@@ -55,10 +54,15 @@ class CommandTline : public Command
 				}
 			}
 		}
+
+		unsigned long n_counted = users.size();
 		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.c_str(), n_counted, parameters[0].c_str(), n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
+		{
+			float p = (n_matched / (float)n_counted) * 100;
+			user->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against %u user(s) (%0.2f%% of the userbase). %u by hostname and %u by IP address.", n_counted, parameters[0].c_str(), n_matched, p, 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.c_str(), n_counted, parameters[0].c_str());
+			user->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against no user(s).", n_counted, parameters[0].c_str()));
 
 		return CMD_SUCCESS;
 	}
@@ -75,7 +79,7 @@ class ModuleTLine : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides /tline command used to test who a mask matches", VF_VENDOR);
+		return Version("Provides the TLINE command, used to test how many users a mask matches against", VF_VENDOR);
 	}
 };