In the grand tradition of huge fucking commits:

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

diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 9f3d3c3169c670ac880288f24955e25b2148dda8..4f843cb5ebe4f9230ed40689ab9b5a9b44fd70ec 100644 (file)
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -2,96 +2,76 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_qline.h"
+#include "commands/cmd_qline.h"
+
+
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
+{
+       return new cmd_qline(Instance);
+}
 
-void cmd_qline::Handle (char **parameters, int pcnt, userrec *user)
+CmdResult cmd_qline::Handle (const char** parameters, int pcnt, User *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 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],'.'))
                {
-                       WriteOpers("*** %s added permenant 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;
+               }
+
+               long duration = ServerInstance->Duration(parameters[1]);
+               if (ServerInstance->XLines->add_qline(duration,user->nick,parameters[2],parameters[0]))
+               {
+                       int to_apply = APPLY_QLINES;
+                       FOREACH_MOD(I_OnAddQLine,OnAddQLine(duration, user, parameters[2], parameters[0]));
+                       if (!duration)
+                       {
+                               to_apply |= APPLY_PERM_ONLY;
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
+                       }
+                       else
+                       {
+                               time_t c_requires_crap = duration + ServerInstance->Time();
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0],
+                                         ServerInstance->TimeString(c_requires_crap).c_str());
+                       }
+                       ServerInstance->XLines->apply_lines(to_apply);
                }
                else
                {
-                       WriteOpers("*** %s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+                       user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick,parameters[0]);
                }
-               apply_lines(APPLY_QLINES);
        }
        else
        {
-               if (del_qline(parameters[0]))
+               if (ServerInstance->XLines->del_qline(parameters[0]))
                {
-                       FOREACH_MOD OnDelQLine(user, parameters[0]);
-                       WriteOpers("*** %s Removed Q-line on %s.",user->nick,parameters[0]);
+                       FOREACH_MOD(I_OnDelQLine,OnDelQLine(user, parameters[0]));
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]);
                }
                else
                {
-                       WriteServ(user->fd,"NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0]);
+                       return CMD_FAILURE;
                }
        }
-}
 
+       return CMD_SUCCESS;
+}