X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmode.h;h=f6022c0901e80a577e00e05578d6fcd66772cc11;hb=343f12b9b2d4e519b09877f76a00f6a0714509f2;hp=eda18a528e6786beb2182f78fbde7d894f9db750;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/mode.h b/include/mode.h
index eda18a528..f6022c090 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -14,12 +14,10 @@
 #ifndef __MODE_H
 #define __MODE_H
 
-#include <string>
-#include <deque>
-#include <vector>
-#include "ctables.h"
+/* Forward declarations. */
+class User;
 
-class InspIRCd;
+#include "channels.h"
 
 /**
  * Holds the values for different type of modes
@@ -141,6 +139,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.
@@ -158,7 +161,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
 	 */
@@ -220,7 +223,7 @@ class CoreExport ModeHandler : public Extensible
 	 * @param adding This value is true when the mode is being set, or false when it is being unset.
 	 * @return MODEACTION_ALLOW to allow the mode, or MODEACTION_DENY to prevent the mode, also see the description of 'parameter'.
 	 */
-	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding); /* Can change the mode parameter as its a ref */
+	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode = false); /* Can change the mode parameter as its a ref */
 	/**
 	 * If your mode is a listmode, then this method will be called for displaying an item list, e.g. on MODE #channel +modechar
 	 * without any parameter or other modes in the command.
@@ -284,6 +287,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);
 };
 
 /**
@@ -342,7 +349,7 @@ class CoreExport ModeWatcher : public Extensible
 	 * @return True to allow the mode change to go ahead, false to abort it. If you abort the
 	 * change, the mode handler (and ModeWatcher::AfterMode()) will never see the mode change.
 	 */
-	virtual bool BeforeMode(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, ModeType type);
+	virtual bool BeforeMode(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, ModeType type, bool servermode = false);
 	/**
 	 * After the mode character has been processed by the ModeHandler, this method will be called.
 	 * @param source The sender of the mode
@@ -353,7 +360,7 @@ class CoreExport ModeWatcher : public Extensible
 	 * @param adding True if the mode is being added and false if it is being removed
 	 * @type The mode type, either MODETYPE_USER or MODETYPE_CHANNEL
 	 */
-	virtual void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type);
+	virtual void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type, bool servermode = false);
 };
 
 typedef std::vector<ModeWatcher*>::iterator ModeWatchIter;
@@ -465,7 +472,7 @@ class CoreExport ModeParser : public classbase
 	 * and *user->server == NULL.
 	 * @param servermode True if a server is setting the mode.
 	 */
-	void Process(const char** parameters, int pcnt, User *user, bool servermode);
+	void Process(const char* const* parameters, int pcnt, User *user, bool servermode);
 
 	/** Find the mode handler for a given mode and type.
 	 * @param modeletter mode letter to search for