Add OnParameterMissing to modehandler, called when the mode handler should have a parameter, but the parser found none

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10149 e03df62e-2008-0410-955e-edbf42e46eb7

4 files changed, 20 insertions, 0 deletions

diff --git a/include/mode.h b/include/mode.h
index d00ec3021..3ea4f6d06 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -232,6 +232,14 @@ class CoreExport ModeHandler : public Extensible
 	 */
 	virtual void DisplayList(User* user, Channel* channel);
 
+	/** In the event that the mode should be given a parameter, and no parameter was provided, this method is called.
+	 * This allows you to give special information to the user, or handle this any way you like.
+	 * @param user The user issuing the mode change
+	 * @param dest For user mode changes, the target of the mode. For channel mode changes, NULL.
+	 * @param channel For channel mode changes, the target of the mode. For user mode changes, NULL.
+	 */
+	virtual void OnParameterMissing(User* user, User* dest, Channel* channel);
+
 	/**
 	 * If your mode is a listmode, this method will be called to display an empty list (just the end of list numeric)
 	 * @param user The user issuing the command
diff --git a/include/modes/umode_s.h b/include/modes/umode_s.h
index 7c2648abc..7463a71e5 100644
--- a/include/modes/umode_s.h
+++ b/include/modes/umode_s.h
@@ -22,4 +22,5 @@ class ModeUserServerNoticeMask : public ModeHandler
  public:
 	ModeUserServerNoticeMask(InspIRCd* Instance);
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	void OnParameterMissing(User* user, User* dest, Channel* channel);
 };
diff --git a/src/mode.cpp b/src/mode.cpp
index a530f2eca..7de334689 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -142,6 +142,10 @@ void ModeHandler::DisplayEmptyList(User*, Channel*)
 {
 }
 
+void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+}
+
 bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
 {
 	return (ours < theirs);
@@ -571,6 +575,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 								else
 								{
 									/* No parameter, continue to the next mode */
+									modehandlers[handler_id]->OnParameterMissing(user, targetuser, targetchannel);
 									continue;
 								}
 
diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index 3a70161d5..dde0cb15d 100644
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -51,3 +51,9 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Chan
 	return MODEACTION_DENY;
 }
 
+void ModeUserServerNoticeMask::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+	user->WriteServ("NOTICE %s :*** The user mode +s requires a parameter (server notice mask). Please provide a parameter, e.g. '+s +*'.",
+			user->nick.c_str());
+}
+