Merge pull request #1018 from SaberUK/insp20+hidekills

[user/henk/code/inspircd.git] / include / command_parse.h

diff --git a/include/command_parse.h b/include/command_parse.h
index ac401ff6756a6312e7cca3f213b7035e97f0ba75..f9e3a740c3012bc3e955f2b6da841600707cdde7 100644 (file)
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -1,22 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __COMMAND_PARSE_H
-#define __COMMAND_PARSE_H
 
-/** A list of dll/so files containing the command handlers for the core
- */
-typedef std::map<std::string, void*> SharedObjectList;
+#ifndef COMMAND_PARSE_H
+#define COMMAND_PARSE_H
 
 /** This class handles command management and parsing.
  * It allows you to add and remove commands from the map,
@@ -26,10 +31,6 @@ typedef std::map<std::string, void*> SharedObjectList;
 class CoreExport CommandParser
 {
  private:
-       /** Parameter buffer
-        */
-       std::vector<std::string> para;
-
        /** Process a parameter string into a list of items
         * @param command_p The output list of items
         * @param parameters The input string
@@ -41,9 +42,7 @@ class CoreExport CommandParser
         * @param user The user to parse the command for
         * @param cmd The command string to process
         */
-       bool ProcessCommand(User *user, std::string &cmd);
-
-
+       bool ProcessCommand(LocalUser *user, std::string &cmd);
 
  public:
        /** Command list, a hash_map of command names to Command*
@@ -51,7 +50,6 @@ class CoreExport CommandParser
        Commandtable cmdlist;
 
        /** Default constructor.
-        * @param Instance The creator of this class
         */
        CommandParser();
 
@@ -88,7 +86,7 @@ class CoreExport CommandParser
         * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once,
         * the channel names and their keys as follows:
         *
-        * JOIN #chan1,#chan2,#chan3 key1,,key3
+        * JOIN \#chan1,\#chan2,\#chan3 key1,,key3
         *
         * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating
         * two instances of irc::commasepstream and reading them both together until the first runs out of tokens.
@@ -98,26 +96,19 @@ class CoreExport CommandParser
         * @param user The user who sent the command
         * @param CommandObj the command object to call for each parameter in the list
         * @param parameters Parameter list as an array of array of char (that's not a typo).
-        * @param The number of items in the parameters list
         * @param splithere The first parameter index to split as a comma seperated list
         * @param extra The second parameter index to split as a comma seperated list
         * @param usemax Limit the command to MaxTargets targets
         * @return This function will return 1 when there are no more parameters to process. When this occurs, its
         * caller should return without doing anything, otherwise it should continue into its main section of code.
         */
-       int LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, unsigned int extra = -1, bool usemax = true);
+       int LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, int extra = -1, bool usemax = true);
 
        /** Take a raw input buffer from a recvq, and process it on behalf of a user.
         * @param buffer The buffer line to process
         * @param user The user to whom this line belongs
         */
-       bool ProcessBuffer(std::string &buffer,User *user);
-
-       /** Process lines in a users sendq.
-        * @param current The user to process
-        * @param one_only if one_only is set only one command is processed from the sendq.
-        */
-       void DoLines(User* current, bool one_only = false);
+       bool ProcessBuffer(std::string &buffer,LocalUser *user);
 
        /** Add a new command to the commands hash
         * @param f The new Command to add to the list