Fix for parameters which contain a colon (which is not the first char in the string)

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

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index ea526f8c81397b860c56453c314cda5e954816c2..c2921d64d961478449bae5baba0556254049d2a2 100644 (file)
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -3,59 +3,56 @@
  *       +------------------------------------+
  *
  *  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.
  *
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
-#include "commands/cmd_eline.h"
-
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+#include "commands/cmd_gline.h"
 
 void cmd_gline::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;
+
+               if (!strchr(parameters[0],'@'))
+               {       
+                       user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
                        return;
+               }
 
-               add_gline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration(parameters[1]), user, parameters[2], parameters[0]));
+               ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 
-               if (!duration(parameters[1]))
+               if (!ServerInstance->Duration(parameters[1]))
                {
-                       ServerInstance->WriteOpers("*** %s added permanent G-line for %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       ServerInstance->WriteOpers("*** %s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
                }
 
-               apply_lines(APPLY_GLINES);
+               ServerInstance->XLines->apply_lines(APPLY_GLINES);
        }
        else
        {
-               if (del_gline(parameters[0]))
+               if (ServerInstance->XLines->del_gline(parameters[0]))
                {
                        FOREACH_MOD(I_OnDelGLine,OnDelGLine(user, parameters[0]));
-                       ServerInstance->WriteOpers("*** %s Removed G-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
                }
                else
                {