Show expiry times of glines, klines, qlines and elines as the time theyre due to expire rather than number of secs (thanks bricker)

Oh, and i hate C time formatting functions.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6748 e03df62e-2008-0410-955e-edbf42e46eb7

5 files changed, 14 insertions, 5 deletions

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 1abe0ca4f..803f08b03 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -47,7 +47,9 @@ CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 			}
 			else
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,parameters[0],
+						ctime(&c_requires_crap));
 			}
 		}
 	}
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 39118c369..d929414c1 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -55,7 +55,9 @@ CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 			}
 			else
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,parameters[0],
+						ctime(&c_requires_crap));
 			}
 
 			ServerInstance->XLines->apply_lines(to_apply);
diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 3d81ecf4d..0ddd8a5a1 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -55,7 +55,9 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 			}
 			else
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s",user->nick,parameters[0],
+						ctime(&c_requires_crap));
 			}
 
 			ServerInstance->XLines->apply_lines(to_apply);
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 951f39df8..d1f717c8f 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -49,7 +49,9 @@ CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
 			}
 			else
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0],
+						ctime(&c_requires_crap));
 			}
 			ServerInstance->XLines->apply_lines(to_apply);
 		}
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 21f2b2b16..c78bb26ab 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -543,7 +543,8 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
 	{
 		if (atoi(params[4].c_str()))
 		{
-			this->Instance->SNO->WriteToSnoMask('x',"%s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str());
+			time_t c_requires_crap = ConvToInt(params[4]) + Instance->Time();
+			this->Instance->SNO->WriteToSnoMask('x',"%s Added %cLINE on %s to expire on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),ctime(&c_requires_crap),params[5].c_str());
 		}
 		else
 		{