Add -Wshadow to cflags, and fix a bunch of warnings that come with it. Add a note...

[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 95063c8e288c7e529b7c720acd85b267b6bf5e61..a9f76a9328b286c1d6dcede0cf26411fae5d809e 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -2,11 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * 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.
  *
  * ---------------------------------------------------
  */
@@ -32,13 +32,37 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                        return CMD_FAILURE;
                }
 
+               User *u = ServerInstance->FindNick(parameters[0]);
+               
+               if (u)
+               {
+                       parameters[0] = u->GetIPString();
+               }
+
                if (ServerInstance->IPMatchesEveryone(parameters[0],user))
                        return CMD_FAILURE;
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->AddZLine(duration,user->nick,parameters[2],parameters[0]))
+
+               const char* ipaddr = parameters[0];
+               User* find = ServerInstance->FindNick(parameters[0]);
+
+               if (find)
+               {
+                       ipaddr = find->GetIPString();
+               }
+               else
+               {
+                       if (strchr(ipaddr,'@'))
+                       {
+                               while (*ipaddr != '@')
+                                       ipaddr++;
+                               ipaddr++;
+                       }
+               }
+               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr);
+               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]);
@@ -53,14 +77,14 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
+                       delete zl;
                        user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
                }
        }
        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