Tidy up strlens which are not required

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

diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 3e5e9fbdf3df39c38b740ec5d8d7bcaf956fdbad..3c1b8e363563f7ac15b132432c8d01d4469c1121 100644 (file)
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -14,45 +14,58 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
 #include "commands/cmd_qline.h"
 
-extern InspIRCd* ServerInstance;
 
-void cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_qline(Instance);
+}
+
+CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
-               if (nick_matches_everyone(parameters[0],user))
-                       return;
-               add_qline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddQLine,OnAddQLine(duration(parameters[1]), user, parameters[2], parameters[0]));
-               if (!duration(parameters[1]))
+               if (ServerInstance->NickMatchesEveryone(parameters[0],user))
+                       return CMD_FAILURE;
+
+               if (strchr(parameters[0],'@') || strchr(parameters[0],'!') || strchr(parameters[0],'.'))
                {
-                       ServerInstance->WriteOpers("*** %s added permanent Q-line for %s.",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** A Q-Line only bans a nick pattern, not a nick!user@host pattern.",user->nick);
+                       return CMD_FAILURE;
+               }
+
+               ServerInstance->XLines->add_qline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD(I_OnAddQLine,OnAddQLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+               if (!ServerInstance->Duration(parameters[1]))
+               {
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       ServerInstance->WriteOpers("*** %s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
                }
-               apply_lines(APPLY_QLINES);
+               ServerInstance->XLines->apply_lines(APPLY_QLINES);
        }
        else
        {
-               if (del_qline(parameters[0]))
+               if (ServerInstance->XLines->del_qline(parameters[0]))
                {
                        FOREACH_MOD(I_OnDelQLine,OnDelQLine(user, parameters[0]));
-                       ServerInstance->WriteOpers("*** %s Removed Q-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]);
                }
                else
                {
                        user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0]);
+                       return CMD_FAILURE;
                }
        }
+
+       return CMD_SUCCESS;
 }
+