From fd820825ac669c9cd8cc8b7a69ca855159b0d3cb Mon Sep 17 00:00:00 2001 From: dz Date: Wed, 28 Jan 2009 02:42:29 +0000 Subject: [PATCH] Make xline expiry messages a bit clearer that the xline may have expired a while ago, and give the correct time since they were set instead of the duration. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11011 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_cban.cpp | 2 +- src/modules/m_rline.cpp | 2 +- src/modules/m_shun.cpp | 2 +- src/modules/m_svshold.cpp | 2 +- src/xline.cpp | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 20f56e3f7..ba0fa6f36 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -47,7 +47,7 @@ public: void DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed CBan %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired CBan %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, ServerInstance->Time() - this->set_time); } const char* Displayable() diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index f6047704e..27ca31f48 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -73,7 +73,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, ServerInstance->Time() - this->set_time); } const char* Displayable() diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 55b7e94f9..25ddfcb58 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -54,7 +54,7 @@ public: void DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, ServerInstance->Time() - this->set_time); } const char* Displayable() diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 5009ad408..b5b308f6a 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -48,7 +48,7 @@ public: void DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, ServerInstance->Time() - this->set_time); } const char* Displayable() diff --git a/src/xline.cpp b/src/xline.cpp index 25987e0a2..c9e6f0a85 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -595,27 +595,27 @@ void ELine::OnAdd() void ELine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,ServerInstance->Time() - this->set_time); } void QLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,ServerInstance->Time() - this->set_time); } void ZLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,ServerInstance->Time() - this->set_time); } void KLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,ServerInstance->Time() - this->set_time); } void GLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,ServerInstance->Time() - this->set_time); } const char* ELine::Displayable() -- 2.39.5