Fake lag on nick change, thanks pLaYa

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

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index b32c2af91df6caf0fe77e3063e1d7bda9f2b23b2..8d1951b3c3fa853a992815a0ca96e4f4031f7b08 100644 (file)
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -6,7 +6,7 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -26,7 +26,16 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
 {
        if (pcnt >= 3)
        {
-               IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+               IdentHostPair ih;
+               User* find = ServerInstance->FindNick(parameters[0]);
+               if (find)
+               {
+                       ih.first = "*";
+                       ih.second = find->GetIPString();
+               }
+               else
+                       ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+
                if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
@@ -39,10 +48,8 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
                long duration = ServerInstance->Duration(parameters[1]);
 
                ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
-               if (ServerInstance->XLines->AddLine(el))
+               if (ServerInstance->XLines->AddLine(el, user))
                {
-                       FOREACH_MOD(I_OnAddELine,OnAddELine(duration, user, parameters[2], parameters[0]));
-
                        if (!duration)
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
@@ -62,9 +69,8 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(parameters[0], 'E'))
+               if (ServerInstance->XLines->DelLine(parameters[0], "E", user))
                {
-                       FOREACH_MOD(I_OnDelELine,OnDelELine(user, parameters[0]));
                        ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]);
                }
                else