We had to roll our own time function because some craqsmoker thought having a carriag...

strftime.

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 293a3ba42b055b01d0b20783750cf99fd110d068..bfd2ea4212161cab60bb6f808c049610491fc598 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -1241,6 +1241,10 @@ class InspIRCd : public classbase
         */
        void ResetMaxBans();
 
+       /** Return a time_t as a human-readable string.
+        */
+       std::string TimeString(time_t curtime);
+
        /** Begin execution of the server.
         * NOTE: this function NEVER returns. Internally,
         * after performing some initialisation routines,

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 803f08b032043e837f4d6d08c8f9a04176cf12e9..ed7525e05a5c3419d9bfc548a0970cb030a3b6d9 100644 (file)
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -49,7 +49,7 @@ CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
                        {
                                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));
+                                               ServerInstance->TimeString(c_requires_crap).c_str());
                        }
                }
        }

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index d929414c1909a6330beb267bd9766e566cd942ed..98f088c8ba61de4e2720704a5d1d225897abd5f5 100644 (file)
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -57,7 +57,7 @@ CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
                        {
                                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->TimeString(c_requires_crap).c_str());
                        }
 
                        ServerInstance->XLines->apply_lines(to_apply);

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 0ddd8a5a1de3a33a347ca2e3e3e2e00d2b290515..e7ec7b61791be510aa6777d93e2fd238fd65e8cb 100644 (file)
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -57,7 +57,7 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
                        {
                                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->TimeString(c_requires_crap).c_str());
                        }
 
                        ServerInstance->XLines->apply_lines(to_apply);

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index f2b14c5ba91e2caa4804756cf860354ee6ba9178..70ca81664a67a2972f4e743226e68fa477230104 100644 (file)
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -50,7 +50,9 @@ CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        else
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-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 Z-line for %s, expires on %s",user->nick,parameters[0],
+                                               ServerInstance->TimeString(c_requires_crap).c_str());
                        }
                        ServerInstance->XLines->apply_lines(to_apply);
                }

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index a59d6db628693d251648c52a5ed251b2e459762a..bf04960bd8a887f3d613c80f53ee95844e61d859 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -53,6 +53,11 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
        return strcmp(data,input);
 }
 
+std::string InspIRCd::TimeString(time_t curtime)
+{
+       return std::string(ctime(&curtime),24);
+}
+
 long InspIRCd::Duration(const char* str)
 {
        char n_field[MAXBUF];

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index c78bb26abeb00492e2784192bdb8cc1905dd8e93..2172940216149fbeef60add7967631092f7f3f2d 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -544,7 +544,7 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
                if (atoi(params[4].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());
+                       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(),Instance->TimeString(c_requires_crap).c_str(),params[5].c_str());
                }
                else
                {