X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=c1eeb7b9a792d3818bba2e87ffa9211d99802feb;hb=8ec9a73a91ad1c7009fd3055fbad7c980b5e1732;hp=9bb1167f51810caad7d410989dc97e616a794d79;hpb=91e0af0fc4889f20d2f63426f8fe379674fc0393;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 9bb1167f5..c1eeb7b9a 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -22,6 +22,7 @@
 
 #include "inspircd.h"
 #include "modules/regex.h"
+#include "modules/stats.h"
 #include "xline.h"
 
 static bool ZlineOnMatch = false;
@@ -39,7 +40,7 @@ class RLine : public XLine
 	 * @param regex Pattern to match with
 	 * @
 	 */
-	RLine(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& regexs, dynamic_reference<RegexFactory>& rxfactory)
+	RLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& regexs, dynamic_reference<RegexFactory>& rxfactory)
 		: XLine(s_time, d, src, re, "R")
 		, matchtext(regexs)
 	{
@@ -62,8 +63,8 @@ class RLine : public XLine
 		if (lu && lu->exempt)
 			return false;
 
-		const std::string host = u->nick + "!" + u->ident + "@" + u->GetRealHost() + " " + u->fullname;
-		const std::string ip = u->nick + "!" + u->ident + "@" + u->GetIPString() + " " + u->fullname;
+		const std::string host = u->nick + "!" + u->ident + "@" + u->GetRealHost() + " " + u->GetRealName();
+		const std::string ip = u->nick + "!" + u->ident + "@" + u->GetIPString() + " " + u->GetRealName();
 		return (regex->Matches(host) || regex->Matches(ip));
 	}
 
@@ -113,7 +114,7 @@ class RLineFactory : public XLineFactory
 
 	/** Generate a RLine
 	 */
-	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
+	XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
 	{
 		if (!rxfactory)
 		{
@@ -139,7 +140,7 @@ class CommandRLine : public Command
 		flags_needed = 'o'; this->syntax = "<regex> [<rline-duration>] :<reason>";
 	}
 
-	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 
 		if (parameters.size() >= 3)
@@ -197,7 +198,7 @@ class CommandRLine : public Command
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if (IS_LOCAL(user))
 			return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
@@ -206,7 +207,7 @@ class CommandRLine : public Command
 	}
 };
 
-class ModuleRLine : public Module
+class ModuleRLine : public Module, public Stats::EventListener
 {
 	dynamic_reference<RegexFactory> rxfactory;
 	RLineFactory f;
@@ -217,7 +218,10 @@ class ModuleRLine : public Module
 
  public:
 	ModuleRLine()
-		: rxfactory(this, "regex"), f(rxfactory), r(this, f)
+		: Stats::EventListener(this)
+		, rxfactory(this, "regex")
+		, f(rxfactory)
+		, r(this, f)
 		, initing(true)
 	{
 	}