Added BotInfo* sender arg to all of the User mode functions, changed IRcdProto::SendMode for channels to accept a Channel pointer and fixed unsetting users vhosts on Unreal

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2710 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 18 insertions, 11 deletions

diff --git a/include/services.h b/include/services.h
index 8a5585973..d184cd3f4 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1320,8 +1320,8 @@ class CoreExport IRCDProto
 {
  private:
 		virtual void SendSVSKillInternal(BotInfo *, User *, const char *) = 0;
-		virtual void SendModeInternal(BotInfo *, const char *, const char *) = 0;
-		virtual void SendModeInternal(User *, const char *) = 0;
+		virtual void SendModeInternal(BotInfo *, Channel *, const char *) = 0;
+		virtual void SendModeInternal(BotInfo *, User *, const char *) = 0;
 		virtual void SendKickInternal(BotInfo *, Channel *, User *, const char *) = 0;
 		virtual void SendNoticeChanopsInternal(BotInfo *bi, Channel *, const char *) = 0;
 		virtual void SendMessageInternal(BotInfo *bi, const char *dest, const char *buf);
@@ -1343,8 +1343,8 @@ class CoreExport IRCDProto
 		virtual void SendAkillDel(Akill *) = 0;
 		virtual void SendSVSKill(BotInfo *source, User *user, const char *fmt, ...);
 		virtual void SendSVSMode(User *, int, const char **) = 0;
-		virtual void SendMode(BotInfo *bi, const char *dest, const char *fmt, ...);
-		virtual void SendMode(User *u, const char *fmt, ...);
+		virtual void SendMode(BotInfo *bi, Channel *dest, const char *fmt, ...);
+		virtual void SendMode(BotInfo *bi, User *u, const char *fmt, ...);
 		virtual void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *, const char *uid) = 0;
 		virtual void SendKick(BotInfo *bi, Channel *chan, User *user, const char *fmt, ...);
 		virtual void SendNoticeChanops(BotInfo *bi, Channel *dest, const char *fmt, ...);
diff --git a/include/users.h b/include/users.h
index d277704ad..3733609ac 100644
--- a/include/users.h
+++ b/include/users.h
@@ -174,41 +174,48 @@ class CoreExport User : public Extensible
 	void RemoveModeInternal(UserMode *um);
 
 	/** Set a mode on the user
+	 * @param bi The client setting the mode
 	 * @param um The user mode
 	 * @param Param Optional param for the mode
 	 */
-	void SetMode(UserMode *um, const std::string &Param = "");
+	void SetMode(BotInfo *bi, UserMode *um, const std::string &Param = "");
 
 	/** Set a mode on the user
+	 * @param bi The client setting the mode
 	 * @param Name The mode name
 	 * @param Param Optional param for the mode
 	 */
-	void SetMode(UserModeName Name, const std::string &Param = "");
+	void SetMode(BotInfo *bi, UserModeName Name, const std::string &Param = "");
 
 	/* Set a mode on the user
+	 * @param bi The client setting the mode
 	 * @param ModeChar The mode char
 	 * @param param Optional param for the mode
 	 */
-	void SetMode(char ModeChar, const std::string &Param = "");
+	void SetMode(BotInfo *bi, char ModeChar, const std::string &Param = "");
 
 	/** Remove a mode on the user
+	 * @param bi The client setting the mode
 	 * @param um The user mode
 	 */
-	void RemoveMode(UserMode *um);
+	void RemoveMode(BotInfo *bi, UserMode *um);
 
 	/** Remove a mode from the user
+	 * @param bi The client setting the mode
 	 * @param Name The mode name
 	 */
-	void RemoveMode(UserModeName Name);
+	void RemoveMode(BotInfo *bi, UserModeName Name);
 
 	/** Remove a mode from the user
+	 * @param bi The client setting the mode
 	 * @param ModeChar The mode char
 	 */
-	void RemoveMode(char ModeChar);
+	void RemoveMode(BotInfo *bi, char ModeChar);
 
 	/** Set a string of modes on a user
+	 * @param bi The client setting the mode
 	 * @param modes The modes
 	 */
-	void SetModes(const std::string &modes, ...);
+	void SetModes(BotInfo *bi, const std::string &modes, ...);
 };