Spotted problem: must clear out all prefixes attached to a user when they quit or...

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

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 67874b5d7cad01790b6a074e8067e9d5667b8d1e..27cad8c210fcfcdd48e88d1827eb3c4f76a080a0 100644 (file)
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -21,7 +21,7 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_eline.h"
 
 
@@ -30,19 +30,25 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
-               if (host_matches_everyone(parameters[0],user))
+               if (ServerInstance->HostMatchesEveryone(parameters[0],user))
                        return;
 
-               ServerInstance->XLines->add_eline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddELine,OnAddELine(duration(parameters[1]), user, parameters[2], parameters[0]));
+               if (!strchr(parameters[0],'@'))
+               {
+                       user->WriteServ("NOTICE %s :*** E-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+                       return;
+               }
+
+               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 (!duration(parameters[1]))
+               if (!ServerInstance->Duration(parameters[1]))
                {
                        ServerInstance->WriteOpers("*** %s added permanent E-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       ServerInstance->WriteOpers("*** %s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+                       ServerInstance->WriteOpers("*** %s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
                }
        }
        else