X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=bd2f398545cc1f4faecaee29f6deaa636d28fc81;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=8fb60385ef763ce65a4c6771314d8a1636ef6a41;hpb=1daa5273d70105f112d93a7528032826c9a66983;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 8fb60385e..bd2f39854 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,12 +15,12 @@
 #include "m_regex.h"
 #include "xline.h"
 
-static Module* rxengine = 0;
-static Module* mymodule = 0; /* Needed to let RLine send request! */
+static Module* rxengine = NULL;
+static Module* mymodule = NULL; /* Needed to let RLine send request! */
 
 /* $ModDesc: RLINE: Regexp user banning. */
 
-class CoreExport RLine : public XLine
+class RLine : public XLine
 {
  public:
 
@@ -73,7 +73,7 @@ class CoreExport RLine : public XLine
 
 	void DisplayExpiry()
 	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed R-Line %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired R-Line %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
 	}
 
 	const char* Displayable()
@@ -89,10 +89,12 @@ class CoreExport RLine : public XLine
 
 /** An XLineFactory specialized to generate RLine* pointers
  */
-class CoreExport RLineFactory : public XLineFactory
+class RLineFactory : public XLineFactory
 {
  public:
-	RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R") { }
+	RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R")
+	{
+	}
 
 	/** Generate a RLine
 	 */
@@ -100,6 +102,10 @@ class CoreExport RLineFactory : public XLineFactory
 	{
 		return new RLine(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
 	}
+
+	~RLineFactory()
+	{
+	}
 };
 
 /** Handle /RLINE
@@ -110,9 +116,10 @@ class CommandRLine : public Command
 	std::string rxengine;
 
  public:
-	CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1)
+	CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1, 3)
 	{
 		this->source = "m_rline.so";
+		this->syntax = "<regex> [<rline-duration>] :<reason>";
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -140,13 +147,12 @@ class CommandRLine : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick.c_str(), parameters[0].c_str());
+						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
 					}
 					else
 					{
 						time_t c_requires_crap = duration + ServerInstance->Time();
-						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
-								ServerInstance->TimeString(c_requires_crap).c_str());
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
 					}
 
 					ServerInstance->XLines->ApplyLines();