X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_tline.cpp;h=77ec0e26ceb06f6211a5583463d2da70c1665beb;hb=d23c030c9a8fd58807438245a004e4aa5b7288ba;hp=06941c168da2ec38d4a1f61996c35e7501f3d5b7;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 06941c168..77ec0e26c 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -1,90 +1,86 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "wildcard.h"
 
-/* $ModDesc: Provides /tline command used to test who a mask matches */
+#include "inspircd.h"
 
 /** Handle /TLINE
- */ 
+ */
 class CommandTline : public Command
 {
  public:
-	CommandTline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1)
+	CommandTline(Module* Creator) : Command(Creator,"TLINE", 1)
 	{
-		this->source = "m_tline.so";
-		this->syntax = "<mask>";
+		flags_needed = 'o'; this->syntax = "<mask>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		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->clientlist->begin(); u != ServerInstance->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 (match(u->second->GetFullRealHost(),parameters[0]))
+			if (InspIRCd::Match(u->second->GetFullRealHost(),parameters[0]))
 			{
 				n_matched++;
 				n_match_host++;
 			}
 			else
 			{
-				char host[MAXBUF];
-				snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
-				if (match(host, parameters[0], true))
+				std::string host = u->second->ident + "@" + u->second->GetIPString();
+				if (InspIRCd::MatchCIDR(host, parameters[0]))
 				{
 					n_matched++;
 					n_match_ip++;
 				}
 			}
 		}
+
+		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, n_counted, parameters[0], 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, n_counted, parameters[0]);
+			user->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against no user(s).", n_counted, parameters[0].c_str()));
 
-		return CMD_LOCALONLY;			
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleTLine : public Module
 {
-	CommandTline* newcommand;
+	CommandTline cmd;
  public:
-	ModuleTLine(InspIRCd* Me)
-		: Module(Me)
+	ModuleTLine()
+		: cmd(this)
 	{
-		
-		newcommand = new CommandTline(ServerInstance);
-		ServerInstance->AddCommand(newcommand);
-
 	}
 
-
-	virtual ~ModuleTLine()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 1, 0, 0, VF_VENDOR,API_VERSION);
+		return Version("Provides /tline command used to test who a mask matches", VF_VENDOR);
 	}
 };
 
 MODULE_INIT(ModuleTLine)
-