Fix SID-sourced KILL being displayed to killee as from SID not from server name

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

diff --git a/include/mode.h b/include/mode.h
index 467e7e2ae033ded7e052e0582c2626f579a0eda7..f78fcda9c3e63d8e1259d99d73967540603cca77 100644 (file)
--- a/include/mode.h
+++ b/include/mode.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -213,7 +213,7 @@ class CoreExport ModeHandler : public Extensible
 
        /** For user modes, return the current parameter, if any
         */
-       std::string GetUserParameter(User* user);
+       virtual std::string GetUserParameter(User* useor);
 
        /**
         * Called when a mode change for your mode occurs.
@@ -460,17 +460,17 @@ class CoreExport ModeParser : public classbase
         * E.g.
         *
         * nick -> nick!*@*
-        * 
+        *
         * nick!ident -> nick!ident@*
-        * 
+        *
         * host.name -> *!*@host.name
-        * 
+        *
         * ident@host.name -> *!ident@host.name
         *
         * This method can be used on both IPV4 and IPV6 user masks.
         */
        static void CleanMask(std::string &mask);
-       /** Get the last string to be processed, as it was sent to the user or channel. 
+       /** Get the last string to be processed, as it was sent to the user or channel.
         * Use this to display a string you just sent to be parsed, as the actual output
         * may be different to what you sent after it has been 'cleaned up' by the parser.
         * @return Last parsed string, as seen by users.
@@ -544,9 +544,14 @@ class CoreExport ModeParser : public classbase
         */
        std::string ParaModeList();
 
-       /** Generates the CHANMODES= 005 sequence
+       /** Generates a list of modes, comma seperated by type:
+        *  1; Listmodes EXCEPT those with a prefix
+        *  2; Modes that take a param when adding or removing
+        *  3; Modes that only take a param when adding
+        *  4; Modes that dont take a param
         */
-       std::string ChanModes();
+       std::string GiveModeList(ModeMasks m);
+
        /** Used by this class internally during std::sort and 005 generation
         */
        static bool PrefixComparison(prefixtype one, prefixtype two);
@@ -569,4 +574,3 @@ class CoreExport ModeParser : public classbase
 };
 
 #endif
-