Some quick credits updates.. nothing huge, just people that have been helpful during...

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

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index 9c1b3dfd07fbca6a7db0bf8fba67c84b99144e42..1b765bbb4c107626ed059e5c18e2be62125e4e8b 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.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.
  *
  * ---------------------------------------------------
  */
@@ -37,17 +37,25 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
 
                long duration = ServerInstance->Duration(parameters[1]);
 
-               const char* ipaddr = parameters[0]; 
-               if (strchr(ipaddr,'@'))
+               const char* ipaddr = parameters[0];
+               User* find = ServerInstance->FindNick(parameters[0]);
+
+               if (find)
+               {
+                       ipaddr = find->GetIPString();
+               }
+               else
                {
-                       while (*ipaddr != '@')
+                       if (strchr(ipaddr,'@'))
+                       {
+                               while (*ipaddr != '@')
+                                       ipaddr++;
                                ipaddr++;
-                       ipaddr++;
+                       }
                }
                ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr);
-               if (ServerInstance->XLines->AddLine(zl))
+               if (ServerInstance->XLines->AddLine(zl,user))
                {
-                       FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
                        if (!duration)
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
@@ -68,9 +76,8 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(parameters[0],'Z'))
+               if (ServerInstance->XLines->DelLine(parameters[0],"Z",user))
                {
-                       FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
                        ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
                }
                else