X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmode.h;h=d00ec30211ab11bb1026a0a639bf4647350ff260;hb=4e286021d730168516bbfb8c3ad38d935f28f414;hp=ea52acf362a63ecf136a9f82e9d3cc33e8d0bffa;hpb=5b4e92cc2ca9a08a1a9740daa25c64578325ed78;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/mode.h b/include/mode.h
index ea52acf36..d00ec3021 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -276,7 +276,7 @@ class CoreExport ModeHandler : public Extensible
 	 * your mode properly from each user.
 	 * @param user The user which the server wants to remove your mode from
 	 */
-	virtual void RemoveMode(User* user);
+	virtual void RemoveMode(User* user, irc::modestacker* stack = NULL);
 
 	/**
 	 * When a MODETYPE_CHANNEL mode handler is being removed, the server will call this method for every channel on the server.
@@ -286,13 +286,39 @@ class CoreExport ModeHandler : public Extensible
 	 * your mode properly from each channel. Note that in the case of listmodes, you should remove the entire list of items.
 	 * @param channel The channel which the server wants to remove your mode from
 	 */
-	virtual void RemoveMode(Channel* channel);
+	virtual void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);
 
 	char GetNeededPrefix();
 
 	void SetNeededPrefix(char needsprefix);
 };
 
+/** A prebuilt mode handler which handles a simple user mode, e.g. no parameters, usable by any user, with no extra
+ * behaviour to the mode beyond the basic setting and unsetting of the mode, not allowing the mode to be set if it
+ * is already set and not allowing it to be unset if it is already unset.
+ * An example of a simple user mode is user mode +w.
+ */
+class CoreExport SimpleUserModeHandler : public ModeHandler
+{
+ public:
+	SimpleUserModeHandler(InspIRCd* Instance, char modeletter);
+	virtual ~SimpleUserModeHandler();
+	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode = false);
+};
+
+/** A prebuilt mode handler which handles a simple channel mode, e.g. no parameters, usable by any user, with no extra
+ * behaviour to the mode beyond the basic setting and unsetting of the mode, not allowing the mode to be set if it
+ * is already set and not allowing it to be unset if it is already unset.
+ * An example of a simple channel mode is channel mode +s.
+ */
+class CoreExport SimpleChannelModeHandler : public ModeHandler
+{
+ public:
+	SimpleChannelModeHandler(InspIRCd* Instance, char modeletter);
+	virtual ~SimpleChannelModeHandler();
+	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode = false);
+};
+
 /**
  * The ModeWatcher class can be used to alter the behaviour of a mode implemented
  * by the core or by another module. To use ModeWatcher, derive a class from it,
@@ -398,6 +424,10 @@ class CoreExport ModeParser : public classbase
 	 */
 	std::string LastParse;
 
+	unsigned int sent[256];
+
+	unsigned int seq;
+
  public:
 
 	/** The constructor initializes all the RFC basic modes by using ModeParserAddMode().
@@ -466,13 +496,12 @@ class CoreExport ModeParser : public classbase
 	/** Process a set of mode changes from a server or user.
 	 * @param parameters The parameters of the mode change, in the format
 	 * they would be from a MODE command.
-	 * @param pcnt The number of items in the parameters array
 	 * @param user The user setting or removing the modes. When the modes are set
 	 * by a server, an 'uninitialized' User is used, where *user::nick == NULL
 	 * and *user->server == NULL.
 	 * @param servermode True if a server is setting the mode.
 	 */
-	void Process(const char* const* parameters, int pcnt, User *user, bool servermode);
+	void Process(const std::vector<std::string>& parameters, User *user, bool servermode);
 
 	/** Find the mode handler for a given mode and type.
 	 * @param modeletter mode letter to search for