Strip a zline target of anything resembling an ident prior to sanity checking rather...

[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 6151d7181e72f113e5d96b79cdc04d977177c1b2..fa54590e2f464ee6cfac751d6600180b3cac8bae 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -35,45 +35,38 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
                }
 
                User *u = ServerInstance->FindNick(target.c_str());
-               
+
                if (u)
                {
                        target = u->GetIPString();
                }
 
-               if (ServerInstance->IPMatchesEveryone(target.c_str(),user))
-                       return CMD_FAILURE;
-
-               long duration = ServerInstance->Duration(parameters[1].c_str());
-
                const char* ipaddr = target.c_str();
-               User* find = ServerInstance->FindNick(target.c_str());
 
-               if (find)
-               {
-                       ipaddr = find->GetIPString();
-               }
-               else
+               if (strchr(ipaddr,'@'))
                {
-                       if (strchr(ipaddr,'@'))
-                       {
-                               while (*ipaddr != '@')
-                                       ipaddr++;
+                       while (*ipaddr != '@')
                                ipaddr++;
-                       }
+                       ipaddr++;
                }
+
+               if (ServerInstance->IPMatchesEveryone(ipaddr,user))
+                       return CMD_FAILURE;
+
+               long duration = ServerInstance->Duration(parameters[1].c_str());
+
                ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
                if (ServerInstance->XLines->AddLine(zl,user))
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick.c_str(),target.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
                        }
                        else
                        {
                                time_t c_requires_crap = duration + ServerInstance->Time();
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick.c_str(),target.c_str(),
-                                               ServerInstance->TimeString(c_requires_crap).c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
+                                               ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
                        }
                        ServerInstance->XLines->ApplyLines();
                }