Fix for bug typo, dont let it creep into the release!

[user/henk/code/inspircd.git] / src / cmd_eline.cpp

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index df2455f863a948305916b52b250e0f8d7efcbc33..ed7525e05a5c3419d9bfc548a0970cb030a3b6d9 100644 (file)
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -37,16 +37,20 @@ CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
                        return CMD_FAILURE;
                }
 
-               ServerInstance->XLines->add_eline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddELine,OnAddELine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-
-               if (!ServerInstance->Duration(parameters[1]))
+               if (ServerInstance->XLines->add_eline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
-               }
-               else
-               {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       FOREACH_MOD(I_OnAddELine,OnAddELine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+
+                       if (!ServerInstance->Duration(parameters[1]))
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
+                       }
+                       else
+                       {
+                               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],
+                                               ServerInstance->TimeString(c_requires_crap).c_str());
+                       }
                }
        }
        else