X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=9d090ec2ed45e1f08dd59e64bd464d5801930346;hb=0da6b3a13def40e8fd002b9fc60f955467f6372d;hp=5fdb1804293bff54a033c7872caf0a8d64cff5cb;hpb=ddef7e7a06775863b971b6e657b9484feea67f47;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 5fdb18042..9d090ec2e 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -57,6 +57,9 @@ class RLine : public XLine
 
 	bool Matches(User *u)
 	{
+		if (u->exempt)
+			return false;
+
 		std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname;
 		return regex->Matches(compare);
 	}
@@ -73,7 +76,7 @@ class 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()
@@ -192,7 +195,7 @@ class ModuleRLine : public Module
 	ModuleRLine(InspIRCd* Me) : Module(Me)
 	{
 		mymodule = this;
-		OnRehash(NULL, "");
+		OnRehash(NULL);
 
 		Me->Modules->UseInterface("RegularExpression");
 
@@ -232,7 +235,7 @@ class ModuleRLine : public Module
 		}
 	}
 
-	virtual void OnRehash(User *user, const std::string &parameter)
+	virtual void OnRehash(User *user)
 	{
 		ConfigReader Conf(ServerInstance);