Patch by dz avoiding <badchan:redirect> loops, and tidying up on-rehash checks.

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

diff --git a/include/mode.h b/include/mode.h
index 2524c11ddf3f583afcfb89d3a888d7fe43efb47c..8faea3491c821046502d11d7dffb6b6fb085eb31 100644 (file)
--- a/include/mode.h
+++ b/include/mode.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,16 +14,6 @@
 #ifndef __MODE_H
 #define __MODE_H
 
-/* include the common header files */
-#include <string>
-#include <deque>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "ctables.h"
-
-class InspIRCd;
-
 /**
  * Holds the values for different type of modes
  * that can exist, USER or CHANNEL type.
@@ -144,6 +134,11 @@ class CoreExport ModeHandler : public Extensible
         */
        unsigned int count;
 
+       /** The prefix char needed on channel to use this mode,
+        * only checked for channel modes
+        */
+       char prefixneeded;
+
  public:
        /**
         * The constructor for ModeHandler initalizes the mode handler.
@@ -161,7 +156,7 @@ class CoreExport ModeHandler : public Extensible
         * and the rank values OP_VALUE, HALFOP_VALUE and VOICE_VALUE respectively. Any prefixes you define should have unique values proportional
         * to these three defaults or proportional to another mode in a module you depend on. See src/cmode_o.cpp as an example.
         */
-       ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix = 0);
+       ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix = 0, char prefixrequired = '%');
        /**
         * The default destructor does nothing
         */
@@ -287,6 +282,10 @@ class CoreExport ModeHandler : public Extensible
         * @param channel The channel which the server wants to remove your mode from
         */
        virtual void RemoveMode(Channel* channel);
+
+       char GetNeededPrefix();
+
+       void SetNeededPrefix(char needsprefix);
 };
 
 /**
@@ -430,12 +429,10 @@ class CoreExport ModeParser : public classbase
         * @return Last parsed string, as seen by users.
         */
        const std::string& GetLastParse();
-       /** Add a mode to the mode parser. The modeletter parameter
-        * is purely to save on doing a lookup in the function, as
-        * strictly it could be obtained via ModeHandler::GetModeChar().
+       /** Add a mode to the mode parser.
         * @return True if the mode was successfully added.
         */
-       bool AddMode(ModeHandler* mh, unsigned const char modeletter);
+       bool AddMode(ModeHandler* mh);
        /** Delete a mode from the mode parser.
         * When a mode is deleted, the mode handler will be called
         * for every user (if it is a user mode) or for every  channel